fix：合并mes任务

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/MesController.java

@@ -35,7 +35,6 @@ import com.github.zuihou.context.BaseContextHandler;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
-import com.github.zuihou.exception.BizException;
 import com.github.zuihou.file.biz.FileBiz;
 import com.github.zuihou.file.service.AttachmentService;
 import com.github.zuihou.log.annotation.SysLog;
@@ -750,9 +749,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         String materialName = null;
         String materialCode = null;
         String workOrderNo = null;
-        String drawingNo = null;
         String version = null;
-        String partsNo = null;
         List<Object> taskList = null;
         List<Object> workPieceList = null;
 
@@ -768,9 +765,9 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
 
 
             //获取默认虚拟原材料
-             mMeterial = materialService.getById(1L);
-             MMeterialReceiveLog mMeterialReceiveLog = meterialReceiveLogService.getById(1L);
-             materialCode = StringUtil.isNotEmpty(idnr)? idnr: mMeterial.getMeterialCode();
+            mMeterial = materialService.getById(1L);
+            MMeterialReceiveLog mMeterialReceiveLog = meterialReceiveLogService.getById(1L);
+            materialCode = StringUtil.isNotEmpty(idnr)? idnr: mMeterial.getMeterialCode();
             BBom bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getDrawingNo, drawingNo).eq(BBom::getSynFlag, "1"));
             if(bom==null){
                 materialName = mMeterial.getTradeMark();
@@ -795,11 +792,11 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
                 data.put("serialNo", serialNo);
                 orderProductSeqList.add(data);
             }else{
-                 String plmenge = dataInfo.getString("plmenge");
-                 if(StringUtil.isEmpty(plmenge)) {
-                     msgUtil.createWarnLog("Mes订单加工零件个数不允许为空","MESException");
-                     return;
-                 }
+                String plmenge = dataInfo.getString("plmenge");
+                if(StringUtil.isEmpty(plmenge)) {
+                    msgUtil.createWarnLog("Mes订单加工零件个数不允许为空","MESException");
+                    return;
+                }
                 List<JSONObject> dataList = IntStream.range(0, (int)Float.parseFloat(plmenge)).mapToObj(i-> {
                     JSONObject obj = new JSONObject();
                     obj.put("serialNo", String.valueOf(i));
@@ -954,24 +951,24 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         }
         List<BomProcedure> bomProcedureList = bomProcedureService.list(new LbqWrapper<BomProcedure>().eq(BomProcedure::getVersionId,  versionId).eq(BomProcedure::getBomId, bom.getId()));
 
-            //节点处理
-            if (bomProcedureList.size()== 0  && workOrder.containsKey("bez")) {
-                List<String> noArr = Stream.of("OP05","OP10", "OP11", "OP15").collect(Collectors.toList());
-                List<String> nameArr = Stream.of("上料", workOrder.getString("bez"), "清洗","下料").collect(Collectors.toList());
-                List<String> typeArr = Stream.of("上料","设备序", "设备序","下料").collect(Collectors.toList());
-
-                List<BomProcedureVersion> bomProcedureVersionsList = Lists.newArrayList();
-                for(int i=0; i<noArr.size();i++){
-                    BomProcedureVersion bomProcedureVersion = BomProcedureVersion.builder().versionId(versionId).bomId(bom.getId()).auditStatus("0").name(nameArr.get(i)).type(typeArr.get(i)).content(nameArr.get(i)).sort(100-i).ratedWorkhours(10f).no(noArr.get(i))
-                            .build();
-                    bomProcedureVersionsList.add(bomProcedureVersion);
-                    BomProcedure bomProcedure = BeanUtil.toBean(bomProcedureVersion, BomProcedure.class);
-                    bomProcedure.setRatedWorkhours(10f);
-                    bomProcedureList.add(bomProcedure);
-                }
-                bomProcedureVersionService.saveBatch(bomProcedureVersionsList);
-                bomProcedureService.saveBatch(bomProcedureList);
+        //节点处理
+        if (bomProcedureList.size()== 0  && workOrder.containsKey("bez")) {
+            List<String> noArr = Stream.of("OP05","OP10", "OP11", "OP15").collect(Collectors.toList());
+            List<String> nameArr = Stream.of("上料", workOrder.getString("bez"), "清洗","下料").collect(Collectors.toList());
+            List<String> typeArr = Stream.of("上料","设备序", "设备序","下料").collect(Collectors.toList());
+
+            List<BomProcedureVersion> bomProcedureVersionsList = Lists.newArrayList();
+            for(int i=0; i<noArr.size();i++){
+                BomProcedureVersion bomProcedureVersion = BomProcedureVersion.builder().versionId(versionId).bomId(bom.getId()).auditStatus("0").name(nameArr.get(i)).type(typeArr.get(i)).content(nameArr.get(i)).sort(100-i).ratedWorkhours(10f).no(noArr.get(i))
+                        .build();
+                bomProcedureVersionsList.add(bomProcedureVersion);
+                BomProcedure bomProcedure = BeanUtil.toBean(bomProcedureVersion, BomProcedure.class);
+                bomProcedure.setRatedWorkhours(10f);
+                bomProcedureList.add(bomProcedure);
             }
+            bomProcedureVersionService.saveBatch(bomProcedureVersionsList);
+            bomProcedureService.saveBatch(bomProcedureList);
+        }
 
         //处理工单信息
         Order order = Order.builder().build();