报工添加金额

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionReporting.java

@@ -41,5 +41,14 @@ public class ProductionReporting extends BasePo {
      * 归属公司id
      */
     private Long companyId;
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
 
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionReportingDetail.java

@@ -50,4 +50,13 @@ public class ProductionReportingDetail extends BasePo {
      */
     private Long userId;
 
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionReportingServiceImpl.java

@@ -120,6 +120,15 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
         Long companyId = SecurityUtils.getCompanyId();
         dto.setCompanyId(companyId);
 
+        //获取工序信息
+        ProductionProcesses productionProcesses = productionProcessesService.getById(productionProcessesId);
+        Assert.notEmpty(productionProcesses, "查询不到工序信息！");
+
+        //赋值价格
+        BigDecimal costPrice = ObjectUtil.defaultIfNull(productionProcesses.getCostPrice(), BigDecimal.ZERO);
+        dto.setPrice(costPrice);
+        dto.setAmount(reportingQuantity.multiply(dto.getPrice()));
+
         //保存报工
         this.save(dto);
 
@@ -136,6 +145,10 @@ public class ProductionReportingServiceImpl extends ServiceImpl<ProductionReport
             productionReportingDetail.setQuantity(divide);
             productionReportingDetail.setUserId(userId);
             productionReportingDetail.setCompanyId(companyId);
+            //单价信息
+            productionReportingDetail.setPrice(dto.getPrice());
+            productionReportingDetail.setAmount(divide.multiply(dto.getPrice()));
+
             productionReportingDetailList.add(productionReportingDetail);
         }
         productionReportingDetailService.saveBatch(productionReportingDetailList);

hx-mes/src/main/resources/mapper/production/ProductionReportingDetailMapper.xml

@@ -14,7 +14,9 @@
                pp.`name` AS processesName,
                prd.company_id,
                prd.user_id,
-               pod.product_id
+               pod.product_id,
+               prd.price,
+               prd.amount
         FROM production_reporting_detail prd
                  LEFT JOIN production_order_detail pod ON prd.production_task_id = pod.id
                  LEFT JOIN production_order po ON pod.produce_order_id = po.id