Mes代办功能处理

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

@@ -301,7 +301,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
             StringBuilder stringBuilder = new StringBuilder();
             jsonArray.stream().forEach(item->{
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(item);
-                MesNotice mesNotice = MesNotice.builder().orderNo(jsonObject.getString("auidnr")).userCode(jsonObject.getString("usercode")).
+                MesNotice mesNotice = MesNotice.builder().orderNo(jsonObject.getString("auidnr")).userCode(jsonObject.getString("userno")).
                         buType("TASKDISTRIBUTE").lineCode("407109").status("1").source("智能总控系统").apiType("MESTASK").apiSort(jsonObject.getInteger("prio"))
                         .targetSource("产线管控单元").acceptPar(jsonObject.toJSONString()).build();
                 if(!baseService.checkExists(mesNotice)) {
@@ -458,7 +458,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         MesNotice mesNotice = BeanUtil.toBean(data, MesNotice.class);
         wrapper.eq(MesNotice::getOrderNo, mesNotice.getOrderNo())
                 .eq(MesNotice::getBuType, mesNotice.getBuType())
-                .ne(MesNotice::getStatus, "2");
+                .ne(MesNotice::getStatus, "3");
         //page.setSize(10000L);
         baseService.pageList(page, wrapper);
         /*
@@ -909,6 +909,8 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
         String materialCode = null;
         String workOrderNo = null;
         String version = null;
+        String partsNo = null;
+        String batchNo = null;
         List<Object> taskList = null;
         List<Object> workPieceList = null;
 
@@ -917,7 +919,7 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
             JSONObject dataInfo = (qualityInfo != null) ? qualityInfo : mesInfo;
             processNo = (qualityInfo != null) ? dataInfo.getString("ProcessCode") : dataInfo.getString("afonr");
             workOrderNo = (qualityInfo != null) ? dataInfo.getString("TaskCode") : dataInfo.getString("auidnr");
-            String batchNo = (qualityInfo != null) ? dataInfo.getString("BatchNo") : dataInfo.getString("batchno");
+            batchNo = (qualityInfo != null) ? dataInfo.getString("BatchNo") : dataInfo.getString("batchno");
             String serialNo = (qualityInfo != null) ? dataInfo.getString("PartOrder") : dataInfo.getString("sno");
             String drawingNo = (qualityInfo != null) ? dataInfo.getString("DrawNumber") : dataInfo.getString("graphno");
             String idnr = (qualityInfo != null) ? null : dataInfo.getString("idnr");
@@ -929,12 +931,14 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
             BBom bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getPartsNo, drawingNo + "_" + processNo).eq(BBom::getDrawingNo, drawingNo).eq(BBom::getSynFlag, "1"));
             if (bom == null) {
                 materialName = mMeterial.getTradeMark();
-                bom = BBom.builder().synFlag("1").name(materialName + "V" + processNo).batchNo(batchNo).partsNo(drawingNo + "_" + processNo).partsAlias(materialCode).no(processNo).brand(workOrderNo).status("1").importantFlag("1").keyFlag("1").zoneId(zone.getId()).drawingNo(drawingNo).build();
+                partsNo = drawingNo + "_" + processNo;
+                bom = BBom.builder().synFlag("1").name(materialName + "V" + processNo).batchNo(batchNo).partsNo(partsNo).partsAlias(materialCode).no(processNo).brand(workOrderNo).status("1").importantFlag("1").keyFlag("1").zoneId(zone.getId()).drawingNo(drawingNo).build();
                 bom.setMeterialId(1L);
-                bom.setBomAlias(drawingNo + "_" + processNo);
+                bom.setBomAlias(partsNo);
                 bBomService.save(bom);
             } else {
                 materialName = bom.getName();
+                partsNo = bom.getPartsNo();
             }
             version = "V" + processNo;
 
@@ -971,7 +975,8 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
             }
             workOrder.put("orderProductSeqList", orderProductSeqList);
             workPieceList = orderProductSeqList;
-        } else {
+        }
+        else {
             if (null != consumMaterial) {
                 //处理原材料信息
                 //判断原材料是否存在
@@ -1076,10 +1081,10 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
 
         String bomName = materialName.contains("V") ? materialName : materialName + "V" + processNo;
 
-        BBom bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getPartsAlias, mMeterial.getMeterialCode()).eq(BBom::getSynFlag, "1"));
+        BBom bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getPartsNo, partsNo).eq(BBom::getPartsAlias, materialCode).eq(BBom::getSynFlag, "1"));
         if (bom == null) {
             bom = BBom.builder().build();
-            bom.setPartsNo(mMeterial.getMeterialCode()).setBomAlias(mMeterial.getMeterialCode()).setPartsAlias(mMeterial.getMeterialCode()).setBatchNo(mMeterial.getMeterialCode()).setName(bomName).setStatus("1").setSynFlag("1").setImportantFlag("1").setKeyFlag("1").setNo(processNo);
+            bom.setPartsNo(partsNo).setBomAlias(partsNo).setPartsAlias(materialCode).setBatchNo(batchNo).setName(bomName).setStatus("1").setSynFlag("1").setImportantFlag("1").setKeyFlag("1").setNo(processNo);
             bom.setMeterialId(mMeterial.getId()).setBrand(workOrderNo);
             if (zone != null) {
                 bom.setZoneId(zone.getId());