aps-作业报工生成输出物料时，带出工序作业的level排序

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

@@ -691,7 +691,11 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             //遍历查询是否有工序没有对应的设备代号和车间代号
             for (ApsProcessOperationProcessEquDo equDo : list) {
                 //查询工序作业
-                ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationList.stream().filter(item -> item.getId().equals(equDo.getProcessid())).findFirst().get();
+                ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationList.stream().filter(item -> item.getId().equals(equDo.getProcessid())).findFirst().orElse(null);
+
+                if (ObjectUtil.isEmpty(apsProcessOperationDo)) {
+                    return R.error("未找到对应工序作业，请检查是否正在排程");
+                }
 
                 //校验设备代号
                 if (ObjectUtil.isNotEmpty(equDo.getProcessdeviceid())) {
@@ -1013,28 +1017,29 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
     /**
      * 忽略冲突
+     *
      * @param ids
      * @return
      */
     @Override
     public R cancelConflict(List<String> ids) {
         List<String> collect = ids.stream().filter(StringUtils::isNotBlank).collect(Collectors.toList());
-        if(collect.isEmpty()){
+        if (collect.isEmpty()) {
             log.error("参数异常");
             return R.error("参数异常");
         }
         List<ApsProcessOperationProcessEquDo> list = apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
                 .in(ApsProcessOperationProcessEquDo::getProcessid, ids)
                 .eq(BaseDo::getDeleted, "0"));
-        if(list.isEmpty()){
-            log.error("无法根据工序作业ID:{} 获取到工序作业明细",ids);
+        if (list.isEmpty()) {
+            log.error("无法根据工序作业ID:{} 获取到工序作业明细", ids);
             return R.error("无法找到工序作业明细");
         }
-        list.forEach(info->{
+        list.forEach(info -> {
             info.setConflictdes("");
-            if(StringUtils.isBlank(info.getConflictdes()) && StringUtils.isBlank(info.getSoftconflictdes())){
+            if (StringUtils.isBlank(info.getConflictdes()) && StringUtils.isBlank(info.getSoftconflictdes())) {
                 info.setHasconflict(LOCKMARK_N);
-            }else{
+            } else {
                 info.setHasconflict(LOCKMARK_Y);
             }
         });

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

@@ -62,6 +62,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         apsReportOutputDo.setMainid(req.getMainId());
                         apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
                         apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
+                        apsReportOutputDo.setLevel(req.getLevel());
                         //生成批次号
                         SysSerialVo vo = new SysSerialVo();
                         vo.setModulecode("aps_report_output_" + req.getDeviceId());
@@ -93,6 +94,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         apsReportOutputDo.setMainid(req.getMainId());
                         apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
                         apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
+                        apsReportOutputDo.setLevel(req.getLevel());
                         //生成批次号
                         String code = req.getMark() + req.getYearCode() + req.getMonthCode() + req.getEquipmentCode() + req.getHeatNumber() + i;
                         apsReportOutputDo.setOutputnumber(code);
@@ -116,6 +118,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                 apsReportOutputDo.setOutputid(list.get(0).getId());
                 apsReportOutputDo.setOutputmaterial(list.get(0).getOutputmaterial());
                 apsReportOutputDo.setOutputnumber(req.getInputBatchNumber());
+                apsReportOutputDo.setLevel(req.getLevel());
                 JSONObject json = new JSONObject();
                 json.put("batchNumber", req.getInputBatchNumber());
                 //生成二维码
@@ -132,6 +135,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         apsReportOutputDo.setMainid(req.getMainId());
                         apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
                         apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
+                        apsReportOutputDo.setLevel(req.getLevel());
                         //生成批次号
                         //生成批次号
                         SysSerialVo vo = new SysSerialVo();
@@ -197,6 +201,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
                         apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
                         apsReportOutputDo.setId(SecurityUtil.getUUID());
+                        apsReportOutputDo.setLevel(req.getLevel());
                         resList.add(apsReportOutputDo);
                     }
                 }
@@ -211,6 +216,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         apsReportOutputDo.setMainid(req.getMainId());
                         apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
                         apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
+                        apsReportOutputDo.setLevel(req.getLevel());
                         resList.add(apsReportOutputDo);
                     }
                 }
@@ -225,6 +231,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                 apsReportOutputDo.setMainid(req.getMainId());
                 apsReportOutputDo.setOutputid(list.get(0).getId());
                 apsReportOutputDo.setOutputmaterial(list.get(0).getOutputmaterial());
+                apsReportOutputDo.setLevel(req.getLevel());
                 resList.add(apsReportOutputDo);
             } else {//输出物料数量>1，或者单卷输出数量>1
                 for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
@@ -237,6 +244,7 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
                         apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
                         apsReportOutputDo.setId(SecurityUtil.getUUID());
+                        apsReportOutputDo.setLevel(req.getLevel());
                         resList.add(apsReportOutputDo);
                     }
                 }

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

@@ -264,6 +264,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         req2.setIfBlankProcess(apsProcessOperationDo.getIfblankprocess());
         req2.setBlankType(apsBlankOrderDo.getBlanktype());
         req2.setMainId(apsReportRecordsDo.getId());
+        req2.setLevel(apsProcessOperationDo.getLevel());
         R r = apsReportOutputService.insertMyReportOutputWithOutBatchNumber(req2);
         if (!r.getCode().equals("200")) {
             return R.error(r.getMsg());
@@ -463,6 +464,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         insertMyReportOutputReq.setHeatNumber(heatNumber);
         insertMyReportOutputReq.setInputBatchNumber(apsReportRecordsDo.getBatchnumber());
         insertMyReportOutputReq.setBlankType(apsBlankOrderDo.getBlanktype());
+        insertMyReportOutputReq.setLevel(apsProcessOperationDo.getLevel());
 
         R r = apsReportOutputService.insertMyReportOutput(insertMyReportOutputReq);
         if (!r.getCode().equals("200")) {

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

@@ -140,6 +140,11 @@ public class ApsReportOutputDo extends BaseDo implements Serializable {
      */
     private String minordesc;
 
+    /**
+     * 对应工序作业的排序
+     */
+    private Integer level;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

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

@@ -68,4 +68,9 @@ public class InsertMyReportOutputReq {
      */
     private String inputBatchNumber;
 
+    /**
+     * 工序作业的排序
+     */
+    private Integer level;
+
 }