Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -500,7 +500,7 @@ public class SaveConstans {
         /**
          * 作业延期提醒
          */
-        public static final String PROCESSDELAY_CONTENT = "订单【%s】有作业未按计划完工，请及时调整计划";
+        public static final String PROCESSDELAY_CONTENT = "订单【%s】有作业未按计划开工或完工，请及时调整计划";
         /**
          * 特种设备提醒内容前缀
          */

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProductionOrderDao.java

@@ -52,7 +52,8 @@ public interface ApsProductionOrderDao extends BaseMapper<ApsProductionOrderDo>
             "\tselect distinct b.PRODUCTIONORDERID from aps_process_operation_process_equ e\n" +
             "\tleft join aps_process_operation p on p.DELETED='0' and p.ID=e.PROCESSID\n" +
             "\tleft join aps_blank_order b on b.DELETED='0' and b.ID=p.BLANKID\n" +
-            "\twhere e.DELETED='0' and (p.PROCESSSTATUS='30' or p.PROCESSSTATUS='40') and (e.WORKSTATUS='待开工' or e.WORKSTATUS='加工中') and TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(),'%Y-%m-%d'),DATE_FORMAT(e.PLANENDDATE,'%Y-%m-%d'))<0)")
+            "\twhere e.DELETED='0' and (((e.WORKSTATUS='待开工' or e.WORKSTATUS='加工中') and TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(),'%Y-%m-%d'),DATE_FORMAT(e.PLANENDDATE,'%Y-%m-%d'))<0) \n" +
+            "\t\tor (e.WORKSTATUS='待开工' and TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(),'%Y-%m-%d'),DATE_FORMAT(e.PLANSTARTDATE,'%Y-%m-%d'))<0)))")
     List<ApsProductionOrderDo> getProcessDelay();
 
     @Select("select po.ID,po.ORDERNO,po.CUSTOMNAME,po.ORDERDATE,b.ID as AUDITORID,o.OUTPUTNUMBER as AUDITOR,p.PROCESS as CUSTOMORDERNO,o.INSEPCTIONLEVEL as CUSTOMORDERTYPE,\n" +

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/ApsBlankOrderServiceImpl.java

@@ -1950,7 +1950,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 ApsProcessOperationProcessEquDo borrowOperationEqu = apsProcessOperationProcessEquService.getById(processoperationequid);
                 //查询被借调作业的信息
                 ApsProcessOperationDo needBorrowOperation = apsProcessOperationDao.selectNeedBorrowOperation(joboutputmaterialid);
-                List<ApsProcessOperationProcessEquDo> apsProcessOperationProcessEquDoList = apsProcessOperationProcessEquService.list(new QueryWrapper<ApsProcessOperationProcessEquDo>().lambda().eq(ApsProcessOperationProcessEquDo::getPreviousprocessesids, borrowOperationEqu));
+                List<ApsProcessOperationProcessEquDo> apsProcessOperationProcessEquDoList = apsProcessOperationProcessEquService.list(new QueryWrapper<ApsProcessOperationProcessEquDo>().lambda().eq(ApsProcessOperationProcessEquDo::getPreviousprocessesids, borrowOperationEqu.getId()));
                 //所有后道作业明细中计划加工卷数-已开工卷数-已借调卷数>0的作业明细
                 List<ApsProcessOperationProcessEquDo> collect1 = apsProcessOperationProcessEquDoList.stream().filter(item -> (item.getPlanprocessrall() - item.getStartingroll() - item.getSecondroll()) > 0).collect(Collectors.toList());
                 //优先取已取消卷数>已借调卷数
@@ -2015,6 +2015,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         needBorrowOperation.setSecondroll(secondroll);
                         cancelProcessOperationVo.setApsprocessoperationdo(needBorrowOperation);
                         cancelProcessOperationVo.setCurcancelroll(1);
+                        cancelProcessOperationVo.setUpdatecuropration(false);
                         R r = apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
                         if (!r.getCode().equals("200")) {
                             throw new CustomException(r.getMsg());

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

@@ -189,7 +189,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             List<SysMindMappingDo> sysMindMappingDoList = sysMindMappingService.listByMap(mindMap).stream().collect(Collectors.toList());
             Collections.sort(sysMindMappingDoList, Comparator.comparing(SysMindMappingDo::getTreecode, Comparator.nullsFirst(Comparator.naturalOrder())));
             if (sysMindMappingDoList.size() == 0) {
-                return R.error("工艺路线图不存在");
+                return R.error("工艺路线思维导图不存在");
             }
             SysMindMappingDo sysMindMappingDo = BeanUtil.toBean(sysMindMappingDoList.get(0), SysMindMappingDo.class);
             String mindStrId = SecurityUtil.getUUID();
@@ -567,10 +567,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             boolean bool1 = apsProcessOperationService.saveOrUpdateBatch(apsProcessOperationDoList);
             boolean bool2 = apsProcessOperationOutMaterService.saveOrUpdateBatch(apsProcessOperationOutMaterDoList);
-            boolean bool3 = true;
-            if (apsProcessOperationEquDoList.size() > 0) {
-                bool3 = apsProcessOperationEquService.saveOrUpdateBatch(apsProcessOperationEquDoList);
-            }
+            boolean bool3 = apsProcessOperationEquService.saveOrUpdateBatch(apsProcessOperationEquDoList);
             boolean bool4 = sysMindMappingService.saveOrUpdateBatch(sysMindMappingDos);
 
             if (bool1 && bool2 && bool3 && bool4) {
@@ -2140,10 +2137,11 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     @Transactional
     public R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo, ApsProcessOperationProcessEquDo processOperationProcessEquDo) {
         processOperationProcessEquDo.setCancelroll(processOperationProcessEquDo.getCancelroll() + curEquCancelRoll);
+        List<String> noUpdatePlanenddateList = Arrays.asList("小卷成退", "中退", "成退");
         if (processOperationProcessEquDo.getPlanprocessrall() == processOperationProcessEquDo.getCancelroll()) {
             processOperationProcessEquDo.setProcessdevice("");
             processOperationProcessEquDo.setProcessdeviceid("");
-        } else if (!apsProcessOperationDo.getProcess().equals("小卷成退") && processOperationProcessEquDo.getPlanprocessrall() > processOperationProcessEquDo.getCancelroll()) {
+        } else if (!noUpdatePlanenddateList.contains(apsProcessOperationDo.getProcess()) && processOperationProcessEquDo.getPlanprocessrall() > processOperationProcessEquDo.getCancelroll()) {
             BigDecimal addMinute = apsProcessOperationDo.getOnceprocessmin().multiply(new BigDecimal(60)).multiply(new BigDecimal(processOperationProcessEquDo.getPlanprocessrall() - processOperationProcessEquDo.getCancelroll()));//秒向上取整
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(processOperationProcessEquDo.getPlanstartdate());

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")) {
@@ -573,6 +577,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                     apsReportMachiningDo.setTenantid(tenantId);
                     apsReportMachiningDo.setMainid(apsReportRecordsDo.getId());
                     apsReportMachiningDo.setMatching(apsParameterDo.getParameter());
+                    apsReportMachiningDo.setRemark(apsParameterDo.getRemark());
                     needInsertApsReportMachingList.add(apsReportMachiningDo);
                 }
                 if (ObjectUtil.isNotEmpty(needInsertApsReportMachingList)) {
@@ -1169,6 +1174,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")) {
@@ -1190,6 +1199,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                     apsReportMachiningDo.setTenantid(tenantId);
                     apsReportMachiningDo.setMainid(apsReportRecordsDo.getId());
                     apsReportMachiningDo.setMatching(apsParameterDo.getParameter());
+                    apsReportMachiningDo.setRemark(apsParameterDo.getRemark());
                     needInsertApsReportMachingList.add(apsReportMachiningDo);
                 }
                 if (ObjectUtil.isNotEmpty(needInsertApsReportMachingList)) {

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProductionOrderDo.java

@@ -39,7 +39,7 @@ public class ApsProductionOrderDo extends BaseDo implements Serializable {
     /**
      * 下单日期
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date orderdate;
 
     /**

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 = "是";
+
 }