Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java

@@ -601,7 +601,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService
         qualityOrderReportUnqualified.setMaterialName(warehouseStorageOrderDetail.getMaterialName());
         qualityOrderReportUnqualified.setCreateTime(new Date());
         qualityOrderReportUnqualified.setCreateBy(warehouseStorageOrderDetail.getCreateBy());
-        orderReportUnqualifiedMapper.insertQualityOrderReportUnqualified(qualityOrderReportUnqualified);
+        int insertQualityOrderReportUnqualifiedResult = orderReportUnqualifiedMapper.insertQualityOrderReportUnqualified(qualityOrderReportUnqualified);
+        if (insertQualityOrderReportUnqualifiedResult <= 0){
+            throw new BusinessException("插入品质单不合格分类表失败");
+        }
 
     }
 
@@ -619,7 +622,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService
         qualityOrderReport.setQualityHasqualifiedNum(warehouseStorageOrderDetail.getQualityHasQualifiedNum());
         qualityOrderReport.setCreateTime(new Date());
         qualityOrderReport.setCreateBy(warehouseStorageOrderDetail.getCreateBy());
-        orderReportMapper.insertQualityOrderReport(qualityOrderReport);
+        int insertResult = orderReportMapper.insertQualityOrderReport(qualityOrderReport);
+        if (insertResult <= 0){
+            throw new BusinessException("插入品质单报告失败");
+        }
     }
 
     //品质单详情表
@@ -653,7 +659,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService
             qualityOrderDetail.setQualityHasqualifiedNum(warehouseStorageOrderDetail.getQualityHasQualifiedNum());
             qualityOrderDetail.setCreateTime(new Date());
             qualityOrderDetail.setCreateBy(warehouseStorageOrderDetail.getCreateBy());
-            orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail);
+            int insertResult= orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail);
+           if (insertResult <= 0){
+            throw new BusinessException("插入品质单详情失败");
+           }
 
 
     }

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPick.java

@@ -50,6 +50,11 @@ public class SysMakeorderPick extends BaseEntity
     @Excel(name = "领料员")
     private String pickUser;
 
+    /*物料合计*/
+    private Integer materialSum;
+    /*数量合计*/
+    private Integer enterpriseSum;
+
     /** 审核状态 0-待审核 1-审核通过 2-审核拒绝 */
     @Excel(name = "审核状态 0-待审核 1-审核通过 2-审核拒绝")
     private String auditStatus;
@@ -161,7 +166,24 @@ public class SysMakeorderPick extends BaseEntity
     {
         return pickUser;
     }
-    public void setAuditStatus(String auditStatus) 
+
+    public Integer getMaterialSum() {
+        return materialSum;
+    }
+
+    public void setMaterialSum(Integer materialSum) {
+        this.materialSum = materialSum;
+    }
+
+    public Integer getEnterpriseSum() {
+        return enterpriseSum;
+    }
+
+    public void setEnterpriseSum(Integer enterpriseSum) {
+        this.enterpriseSum = enterpriseSum;
+    }
+
+    public void setAuditStatus(String auditStatus)
     {
         this.auditStatus = auditStatus;
     }
@@ -267,6 +289,8 @@ public class SysMakeorderPick extends BaseEntity
             .append("outOrderCode", getOutOrderCode())
             .append("pickStatus", getPickStatus())
             .append("pickUser", getPickUser())
+            .append("materialSum", getMaterialSum())
+            .append("enterpriseSum", getEnterpriseSum())
             .append("auditStatus", getAuditStatus())
             .append("instanceId", getInstanceId())
             .append("instanceType", getInstanceType())

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPickVo.java

@@ -32,11 +32,6 @@ public class SysMakeorderPickVo extends SysMakeorderPick {
     /** 流程实例类型名称 */
     private String instanceTypeName;
 
-    /*物料合计*/
-    private Integer materialSum;
-    /*数量合计*/
-    private Integer enterpriseSum;
-
     /**
      * 关键词
      */

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java

@@ -174,10 +174,20 @@ public class SysMakeorderPickServiceImpl implements ISysMakeorderPickService
         // 生成编号，年月日规则
         String billNo = redisCache.generateBillNo("SCLL");
         sysMakeorderPick.setPickNo(billNo);
-        int id = sysMakeorderPickMapper.insertSysMakeorderPick(sysMakeorderPick);
+
         //保留领料单数不为空的数据
         List<SysMakeorderPickDetail>  filterPickDetails = pickDetails.stream().filter(details -> details.getPickNum() != null).collect(Collectors.toList());
 
+        Integer enterpriseSum = (int) filterPickDetails.stream()
+                .mapToLong(SysMakeorderPickDetail::getPickNum)
+                .sum();
+
+        sysMakeorderPick.setEnterpriseSum(enterpriseSum);
+        sysMakeorderPick.setMaterialSum(filterPickDetails.size());
+
+        int id = sysMakeorderPickMapper.insertSysMakeorderPick(sysMakeorderPick);
+
+
         // 插入子表
         for (int i = 0; i < filterPickDetails.size(); i++) {
             //获取过滤后的领料单详情

ruoyi-admin/src/main/resources/mapper/system/SysMakeorderPickMapper.xml

@@ -36,8 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.id, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark
              , a.make_no, a.sale_no, a.pick_no, a.out_order_code, a.pick_status, a.pick_user, a.audit_status
              , a.instance_id, a.instance_type, a.submit_instance_id, a.cancel_instance_id, a.restore_instance_id, a.apply_title, a.apply_user, a.apply_time
-            ,b.material_sum
-            ,b.enterprise_sum
+            ,a.material_sum
+            ,a.enterprise_sum
         from sys_makeorder_pick a
         left join sys_sales_order b
         on a.sale_no = b.sales_order_code
@@ -90,6 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outOrderCode != null">out_order_code,</if>
             <if test="pickStatus != null">pick_status,</if>
             <if test="pickUser != null">pick_user,</if>
+            <if test="materialSum != null">material_sum,</if>
+            <if test="enterpriseSum != null">enterprise_sum,</if>
             <if test="auditStatus != null">audit_status,</if>
             <if test="instanceId != null">instance_id,</if>
             <if test="instanceType != null">instance_type,</if>
@@ -113,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outOrderCode != null">#{outOrderCode},</if>
             <if test="pickStatus != null">#{pickStatus},</if>
             <if test="pickUser != null">#{pickUser},</if>
+            <if test="materialSum != null">#{materialSum},</if>
+            <if test="enterpriseSum != null">#{enterpriseSum},</if>
             <if test="auditStatus != null">#{auditStatus},</if>
             <if test="instanceId != null">#{instanceId},</if>
             <if test="instanceType != null">#{instanceType},</if>