aps-开工时根据工序决定 输出物料检验默认值

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsReportOutputService.java

@@ -14,5 +14,5 @@ public interface ApsReportOutputService extends IService<ApsReportOutputDo> {
 
     R insertMyReportOutput(InsertMyReportOutputReq req);
 
-    R insertMyReportOutputWithOutBatchNumber(InsertMyReportOutputReq req);
+//    R insertMyReportOutputWithOutBatchNumber(InsertMyReportOutputReq req);
 }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportOutputServiceImpl.java

@@ -52,6 +52,10 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
         //查询工序作业输出物料子表信息
         List<ApsProcessOperationOutMaterDo> list = apsProcessOperationOutMaterService.list(new QueryWrapper<ApsProcessOperationOutMaterDo>().lambda().eq(ApsProcessOperationOutMaterDo::getMainid, req.getProcessId()));
 
+        //默认检验结果设置
+        String insepctionLevel = req.getInsepctionLevel();
+        String qualified = req.getQualified();
+
         if (req.getIfBlankProcess().equals("是")) {
             if (req.getBlankType().equals("铸轧")) {
                 for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
@@ -86,8 +90,8 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
                         apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
                         apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
-                        apsReportOutputDo.setInsepctionlevel(B);
-                        apsReportOutputDo.setQualified("是");
+                        apsReportOutputDo.setInsepctionlevel(insepctionLevel);
+                        apsReportOutputDo.setQualified(qualified);
                         resList.add(apsReportOutputDo);
                     }
                 }
@@ -117,8 +121,8 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
                         apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
                         apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
-                        apsReportOutputDo.setInsepctionlevel(B);
-                        apsReportOutputDo.setQualified("是");
+                        apsReportOutputDo.setInsepctionlevel(insepctionLevel);
+                        apsReportOutputDo.setQualified(qualified);
                         resList.add(apsReportOutputDo);
                     }
                 }
@@ -139,8 +143,8 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                 apsReportOutputDo.setWidth(list.get(0).getProwidth());
                 apsReportOutputDo.setLength(list.get(0).getProlength());
                 apsReportOutputDo.setWeight(list.get(0).getSinglerollweight());
-                apsReportOutputDo.setInsepctionlevel(B);
-                apsReportOutputDo.setQualified("是");
+                apsReportOutputDo.setInsepctionlevel(insepctionLevel);
+                apsReportOutputDo.setQualified(qualified);
                 JSONObject json = new JSONObject();
                 json.put("batchNumber", req.getInputBatchNumber());
                 //生成二维码
@@ -187,8 +191,8 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
                         apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
                         apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
-                        apsReportOutputDo.setInsepctionlevel(B);
-                        apsReportOutputDo.setQualified("是");
+                        apsReportOutputDo.setInsepctionlevel(insepctionLevel);
+                        apsReportOutputDo.setQualified(qualified);
                         resList.add(apsReportOutputDo);
                     }
                 }
@@ -215,111 +219,111 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
         return R.ok();
     }
 
-    public R insertMyReportOutputWithOutBatchNumber(InsertMyReportOutputReq req) {
-        //最终新增的子表数据
-        List<ApsReportOutputDo> resList = new LinkedList<>();
-
-        //查询工序作业输出物料子表信息
-        List<ApsProcessOperationOutMaterDo> list = apsProcessOperationOutMaterService.list(new QueryWrapper<ApsProcessOperationOutMaterDo>().lambda().eq(ApsProcessOperationOutMaterDo::getMainid, req.getProcessId()));
-
-        if (req.getIfBlankProcess().equals("是")) {
-            if (req.getBlankType().equals("铸轧")) {
-                for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
-                    int outval = apsProcessOperationOutMaterDo.getOutval();
-
-                    for (int i = 1; i <= outval; i++) {
-                        //插入记录物料子表
-                        ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
-
-                        apsReportOutputDo.setMainid(req.getMainId());
-                        apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
-                        apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
-                        apsReportOutputDo.setId(SecurityUtil.getUUID());
-                        apsReportOutputDo.setLevel(req.getLevel());
-                        apsReportOutputDo.setThickness(apsProcessOperationOutMaterDo.getThickness());
-                        apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
-                        apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
-                        apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
-                        apsReportOutputDo.setInsepctionlevel(B);
-                        apsReportOutputDo.setQualified("是");
-                        resList.add(apsReportOutputDo);
-                    }
-                }
-            }
-            if (req.getBlankType().equals("热轧")) {
-                for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
-                    int outval = apsProcessOperationOutMaterDo.getOutval();
-                    for (int i = 1; i <= outval; i++) {
-                        //插入记录物料子表
-                        ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
-                        apsReportOutputDo.setId(SecurityUtil.getUUID());
-                        apsReportOutputDo.setMainid(req.getMainId());
-                        apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
-                        apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
-                        apsReportOutputDo.setLevel(req.getLevel());
-                        apsReportOutputDo.setThickness(apsProcessOperationOutMaterDo.getThickness());
-                        apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
-                        apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
-                        apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
-                        apsReportOutputDo.setInsepctionlevel(B);
-                        apsReportOutputDo.setQualified("是");
-                        resList.add(apsReportOutputDo);
-                    }
-                }
-            }
-        }
-        if (req.getIfBlankProcess().equals("否")) {
-            //如果输出物料数量=1，并且单卷输出数量=1，批次号不变
-            if (list.size() == 1 && list.get(0).getOutval() == 1) {
-                //插入记录物料子表
-                ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
-                apsReportOutputDo.setId(SecurityUtil.getUUID());
-                apsReportOutputDo.setMainid(req.getMainId());
-                apsReportOutputDo.setOutputid(list.get(0).getId());
-                apsReportOutputDo.setOutputmaterial(list.get(0).getOutputmaterial());
-                apsReportOutputDo.setLevel(req.getLevel());
-                apsReportOutputDo.setThickness(list.get(0).getThickness());
-                apsReportOutputDo.setWidth(list.get(0).getProwidth());
-                apsReportOutputDo.setLength(list.get(0).getProlength());
-                apsReportOutputDo.setWeight(list.get(0).getSinglerollweight());
-                apsReportOutputDo.setInsepctionlevel(B);
-                apsReportOutputDo.setQualified("是");
-                resList.add(apsReportOutputDo);
-            } else {//输出物料数量>1，或者单卷输出数量>1
-                for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
-                    int outval = apsProcessOperationOutMaterDo.getOutval();
-                    for (int i = 1; i <= outval; i++) {
-                        //插入记录物料子表
-                        ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
-
-                        apsReportOutputDo.setMainid(req.getMainId());
-                        apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
-                        apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
-                        apsReportOutputDo.setId(SecurityUtil.getUUID());
-                        apsReportOutputDo.setLevel(req.getLevel());
-                        apsReportOutputDo.setThickness(apsProcessOperationOutMaterDo.getThickness());
-                        apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
-                        apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
-                        apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
-                        apsReportOutputDo.setInsepctionlevel(B);
-                        apsReportOutputDo.setQualified("是");
-                        resList.add(apsReportOutputDo);
-                    }
-                }
-            }
-        }
-
-        //插入子表
-        //获取当前用户信息
-        //获取当前用户的所属工厂
-        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
-        String tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
-        for (ApsReportOutputDo apsReportOutputDo : resList) {
-            apsReportOutputDo.setTenantid(tenantId);
-        }
-        this.saveBatch(resList);
-        return R.ok();
-    }
+//    public R insertMyReportOutputWithOutBatchNumber(InsertMyReportOutputReq req) {
+//        //最终新增的子表数据
+//        List<ApsReportOutputDo> resList = new LinkedList<>();
+//
+//        //查询工序作业输出物料子表信息
+//        List<ApsProcessOperationOutMaterDo> list = apsProcessOperationOutMaterService.list(new QueryWrapper<ApsProcessOperationOutMaterDo>().lambda().eq(ApsProcessOperationOutMaterDo::getMainid, req.getProcessId()));
+//
+//        if (req.getIfBlankProcess().equals("是")) {
+//            if (req.getBlankType().equals("铸轧")) {
+//                for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
+//                    int outval = apsProcessOperationOutMaterDo.getOutval();
+//
+//                    for (int i = 1; i <= outval; i++) {
+//                        //插入记录物料子表
+//                        ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
+//
+//                        apsReportOutputDo.setMainid(req.getMainId());
+//                        apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
+//                        apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
+//                        apsReportOutputDo.setId(SecurityUtil.getUUID());
+//                        apsReportOutputDo.setLevel(req.getLevel());
+//                        apsReportOutputDo.setThickness(apsProcessOperationOutMaterDo.getThickness());
+//                        apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
+//                        apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
+//                        apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
+//                        apsReportOutputDo.setInsepctionlevel(B);
+//                        apsReportOutputDo.setQualified("是");
+//                        resList.add(apsReportOutputDo);
+//                    }
+//                }
+//            }
+//            if (req.getBlankType().equals("热轧")) {
+//                for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
+//                    int outval = apsProcessOperationOutMaterDo.getOutval();
+//                    for (int i = 1; i <= outval; i++) {
+//                        //插入记录物料子表
+//                        ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
+//                        apsReportOutputDo.setId(SecurityUtil.getUUID());
+//                        apsReportOutputDo.setMainid(req.getMainId());
+//                        apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
+//                        apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
+//                        apsReportOutputDo.setLevel(req.getLevel());
+//                        apsReportOutputDo.setThickness(apsProcessOperationOutMaterDo.getThickness());
+//                        apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
+//                        apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
+//                        apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
+//                        apsReportOutputDo.setInsepctionlevel(B);
+//                        apsReportOutputDo.setQualified("是");
+//                        resList.add(apsReportOutputDo);
+//                    }
+//                }
+//            }
+//        }
+//        if (req.getIfBlankProcess().equals("否")) {
+//            //如果输出物料数量=1，并且单卷输出数量=1，批次号不变
+//            if (list.size() == 1 && list.get(0).getOutval() == 1) {
+//                //插入记录物料子表
+//                ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
+//                apsReportOutputDo.setId(SecurityUtil.getUUID());
+//                apsReportOutputDo.setMainid(req.getMainId());
+//                apsReportOutputDo.setOutputid(list.get(0).getId());
+//                apsReportOutputDo.setOutputmaterial(list.get(0).getOutputmaterial());
+//                apsReportOutputDo.setLevel(req.getLevel());
+//                apsReportOutputDo.setThickness(list.get(0).getThickness());
+//                apsReportOutputDo.setWidth(list.get(0).getProwidth());
+//                apsReportOutputDo.setLength(list.get(0).getProlength());
+//                apsReportOutputDo.setWeight(list.get(0).getSinglerollweight());
+//                apsReportOutputDo.setInsepctionlevel(B);
+//                apsReportOutputDo.setQualified("是");
+//                resList.add(apsReportOutputDo);
+//            } else {//输出物料数量>1，或者单卷输出数量>1
+//                for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
+//                    int outval = apsProcessOperationOutMaterDo.getOutval();
+//                    for (int i = 1; i <= outval; i++) {
+//                        //插入记录物料子表
+//                        ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
+//
+//                        apsReportOutputDo.setMainid(req.getMainId());
+//                        apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
+//                        apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
+//                        apsReportOutputDo.setId(SecurityUtil.getUUID());
+//                        apsReportOutputDo.setLevel(req.getLevel());
+//                        apsReportOutputDo.setThickness(apsProcessOperationOutMaterDo.getThickness());
+//                        apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
+//                        apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
+//                        apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
+//                        apsReportOutputDo.setInsepctionlevel(B);
+//                        apsReportOutputDo.setQualified("是");
+//                        resList.add(apsReportOutputDo);
+//                    }
+//                }
+//            }
+//        }
+//
+//        //插入子表
+//        //获取当前用户信息
+//        //获取当前用户的所属工厂
+//        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+//        String tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
+//        for (ApsReportOutputDo apsReportOutputDo : resList) {
+//            apsReportOutputDo.setTenantid(tenantId);
+//        }
+//        this.saveBatch(resList);
+//        return R.ok();
+//    }
 }
 
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -551,6 +551,10 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         insertMyReportOutputReq.setInputBatchNumber(apsReportRecordsDo.getBatchnumber());
         insertMyReportOutputReq.setBlankType(apsBlankOrderDo.getBlanktype());
         insertMyReportOutputReq.setLevel(apsProcessOperationDo.getLevel());
+        if (apsProcessOperationDo.getProcess().equals("铸轧")) {
+            insertMyReportOutputReq.setInsepctionLevel(SaveConstans.CheckLevel.WAITING_JUDGMENT);
+            insertMyReportOutputReq.setQualified("");
+        }
 
         R r = apsReportOutputService.insertMyReportOutput(insertMyReportOutputReq);
         if (!r.getCode().equals("200")) {
@@ -1169,6 +1173,10 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             insertMyReportOutputReq.setInputBatchNumber(inputBatchNumber);
             insertMyReportOutputReq.setBlankType(apsBlankOrderDo.getBlanktype());
             insertMyReportOutputReq.setLevel(apsProcessOperationDo.getLevel());
+            if (apsProcessOperationDo.getProcess().equals("铸轧")) {
+                insertMyReportOutputReq.setInsepctionLevel(SaveConstans.CheckLevel.WAITING_JUDGMENT);
+                insertMyReportOutputReq.setQualified("");
+            }
 
             R r = apsReportOutputService.insertMyReportOutput(insertMyReportOutputReq);
             if (!r.getCode().equals("200")) {

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/InsertMyReportOutputReq.java

@@ -73,4 +73,14 @@ public class InsertMyReportOutputReq {
      */
     private Integer level;
 
+    /**
+     * 检验结果默认值
+     */
+    private String insepctionLevel = "B级";
+
+    /**
+     * 戒烟结果是否合格默认值
+     */
+    private String qualified = "是";
+
 }