fix：修改mes任务接受数据

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/edgeLibrary/service/impl/StockInfoServiceImpl.java

@@ -167,6 +167,9 @@ public class StockInfoServiceImpl extends SuperServiceImpl<StockInfoMapper, Stoc
         LbqWrapper<Storge> query = Wraps.<Storge>lbQ()
                 .in(User::getId, idList)
                 .eq(User::getStatus, true); */
+        // 查询存储的产品信息
+
+
         IPage<Storge> pages = storgeService.pageList(new Page<Storge>(1L, 2000), Wraps.<Storge>lbQ().orderByAsc(Storge::getNo).orderByAsc(Storge::getWeight).orderByAsc(Storge::getName));
         List<Storge> storgeList= pages!=null? pages.getRecords(): Lists.newArrayList();
         //查询所有的库位

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/externalApi/service/impl/MesNoticeServiceImpl.java

@@ -93,6 +93,11 @@ public class MesNoticeServiceImpl extends SuperServiceImpl<MesNoticeMapper, MesN
         return mesNotice1;
     }
 
+    /**
+     * 零件加工完成报工
+     * @param order
+     * @return
+     */
     @Override
     public MesNotice updateNoticeById(Order order) {
 
@@ -107,6 +112,10 @@ public class MesNoticeServiceImpl extends SuperServiceImpl<MesNoticeMapper, MesN
         // 修改上报MES的数据完工零件数据
         MesNoticeLog mesNoticeLog = mesNoticeLogService.getOne(new LbqWrapper<MesNoticeLog>().eq(MesNoticeLog::getStatus,"4").eq(MesNoticeLog::getNoticeId, mesNotice.getId()).orderByDesc(MesNoticeLog::getCreateTime).last("limit 1"));
         MesNotice mesNoticeRepost = baseMapper.selectOne(new LbqWrapper<MesNotice>().eq(MesNotice::getBatchNo, order.getBatchNo()).eq(MesNotice::getBuType, "TASKAPPLY").ne(MesNotice::getStatus, "3").last("limit 1"));
+        if(mesNoticeRepost == null){
+            mesNotice.getAcceptPar();
+
+        }
         double plmenge =  Double.parseDouble(order.getProduceNum().toString());
         mesNoticeRepost.setStatus("5").setOrderInfo(String.valueOf(plmenge)).setWorkReport(mesNoticeLog!=null? String.format("%.1f",(plmenge - Double.parseDouble(mesNoticeLog.getOrderInfo()))): String.valueOf(plmenge));
         mesNoticeList.add(mesNoticeRepost);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/MachineCuttingToolServiceImpl.java

@@ -207,6 +207,7 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
                         }
                         CuttingTool cuttingTool = cutterDataAll.get(Long.parseLong(cuttingToolNo)).get(0);
                         cuttingTool.setDeviceId(resourceId);
+                        cuttingTool.setStorgeId(null);
                         cuttingTool.setCutterNo(Long.parseLong(position.replace("1.","")));
                         cuttingTool.setDoc("");
                         if(tool.containsKey("doc")&& tool.getString("doc").length()>0){

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

@@ -1010,13 +1010,13 @@ public class MesController extends SuperController<MesNoticeService, Long, MesNo
 
             // 数字话检测系统点单号需要拼接，才能保证唯一
             externalTaskCode = (qualityInfo != null) ? (workOrderNo +"&"+ externalTaskCode ) : null;
-            workOrderNo = (qualityInfo != null) ? (workOrderNo +"&"+ processNo +"&"+serialNo) : workOrderNo;
+            workOrderNo = (qualityInfo != null) ? (workOrderNo +"_"+ processNo +"_"+serialNo) : workOrderNo;
 
             //获取默认虚拟原材料
             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::getPartsNo, drawingNo + "_" + processNo).eq(BBom::getDrawingNo, drawingNo).eq(BBom::getSynFlag, "1"));
+            BBom bom = bBomService.getOne(new LambdaQueryWrapper<BBom>().eq(BBom::getPartsNo, drawingNo + "_V" + processNo).eq(BBom::getDrawingNo, drawingNo).eq(BBom::getSynFlag, "1"));
             if (bom == null) {
                 materialName = partName==null?  mMeterial.getTradeMark() : partName;
                 partsNo = drawingNo + "_V" + processNo;

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/ToolController.java

@@ -258,6 +258,8 @@ public class ToolController extends SuperController<ToolService, Long, Tool, Too
         ProductionresourcePosition productionresourcePosition = productionresourcePositionService.getOne(new LbqWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getResourceId, machineId).like(ProductionresourcePosition::getPointId, "CNC0").last("limit 1"));
         //判断当前机床是否处于加工执行状态
         TWorkpiece workpiece = workpieceService.getOne(new LbqWrapper<TWorkpiece>().eq(TWorkpiece::getIsEnd, "0").eq(TWorkpiece::getPointId, productionresourcePosition.getPointId()));
+        if(workpiece == null) return false;
+
         BBom bom = bBomService.getById(workpiece.getBomId());
         //判断当前工艺刀具分组是否存在
         int count = cutterCategoriesGroupService.count(new LbqWrapper<CutterCategoriesGroup>().eq(CutterCategoriesGroup::getDeviceId, machineId).eq(CutterCategoriesGroup::getGroupName, bom.getPartsNo()+"_"+bom.getNo()));