修改bug

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

@@ -406,17 +406,20 @@ public class StockInfoServiceImpl extends SuperServiceImpl<StockInfoMapper, Stoc
         StockInfo infoBean = new StockInfo();
         infoBean.setStorgeId(storgeId);
         infoBean.setLockStatus("1");
-        if("1".equals(bomProcedureTray.getBizType())){//托盘
-            //Tray tray = trayService.getById(bomProcedureTray.getTrayId());
-            infoBean.setGoodsId(bomProcedureTray.getTrayId());
-            infoBean.setGoodsType("2");
-            infoBean.setSpecId(bomProcedureTray.getTrayId());
-        }else{//夹具其实也是来自于原材料数据
-            //MToolMeterial meterial = toolMeterialService.getById(bomProcedureTray.getTrayId());
-            infoBean.setGoodsId(bomProcedureTray.getSpecificationId());
-            infoBean.setGoodsType("1");
-            infoBean.setSpecId(bomProcedureTray.getSpecificationId());
-        }
+//        if("1".equals(bomProcedureTray.getBizType())){//托盘
+//            //Tray tray = trayService.getById(bomProcedureTray.getTrayId());
+//            infoBean.setGoodsId(bomProcedureTray.getTrayId());
+//            infoBean.setGoodsType(bomProcedureTray.getBizType());
+//            infoBean.setSpecId(bomProcedureTray.getTrayId());
+//        }else{//夹具其实也是来自于原材料数据
+//            //MToolMeterial meterial = toolMeterialService.getById(bomProcedureTray.getTrayId());
+//            infoBean.setGoodsId(bomProcedureTray.getSpecificationId());
+//            infoBean.setGoodsType("1");
+//            infoBean.setSpecId(bomProcedureTray.getSpecificationId());
+//        }
+        infoBean.setGoodsId(bomProcedureTray.getTrayId());
+        infoBean.setGoodsType(bomProcedureTray.getBizType());
+        infoBean.setSpecId(bomProcedureTray.getTrayId());
         infoBean.setNum(1);
         if(StringUtil.isEmpty(uniqueCode)){
             //根据编码规则

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/TaskService.java

@@ -88,5 +88,7 @@ public interface TaskService extends SuperService<TTask> {
 
     R procesRfid(Map<String, Object> map);
 
+    public TTask assignResource(TTask task,Map<Long,BomProcedure>bpMap);
+
     void assemblingCandidate(Map<String, List<CandidateProcess>> candidateProMap, Map<String, Machine> machineMap, TWorkpiece workpiece, List<CandidateProcess> candidateProcesses, BomProcedure bomProcedure, Machine machine, CandidateProcess candidateProcess, BomProcedureProductionresource bomProcedureProductionresource);
 }

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

@@ -374,6 +374,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
                             // 生成task表，因为工序定了以后不变，排产时只需更新预计开始时间和结束时间
                             Long bomId = planProduct.getBomId();
                             List<BomProcedure> bomProcedureList = bomProcedureMap.get(bomId);
+                            Map<Long,BomProcedure> bpMap = bomProcedureList.stream().collect(Collectors.toMap(BomProcedure::getId, t->t));
                             //产品批次号，用于产品分解任务关联
                             String bomBatchNo = UUID.randomUUID().toString().replace("-", "");
 
@@ -408,6 +409,8 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
                                 task.setExecutorName("");
                                 task.setTmpId(UUID.randomUUID().toString().replace("-", ""));
                                 task.setCompleteBatchNo(workpiece.getCompleteBatchNo());
+                                //设置
+                                taskService.assignResource(task,bpMap);
                                 taskList.add(task);
                             }
                         }