增加下料毛料及夹具下料

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/aps/instance/manager/AssignManager.java

@@ -66,7 +66,7 @@ public class AssignManager implements AssignManagerIface {
 				}
 			}
 			// end modify for 多机调度优化，不用随机数的方式,先简单根据任务个数平均分配
-			machine = instance.getMachineMap().get("M" + candidateProcess.getMachineId());
+			machine = instance.getMachineMap().get("M" + bestMachine.getId());
 		}
 		operation.setMachineId(machine.getId());
 		operation.setMachineName(machine.getName());

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

@@ -1633,11 +1633,32 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         }
         if (DemoLineConstant.DEMOLINE_STOCK_TYPE_METERIAL_CK.equals(stockType)) {
             List<BomProcedureMeterial> meterialList = bomProcedureMeterialService.list(Wraps.<BomProcedureMeterial>lbQ().eq(BomProcedureMeterial::getId, task.getProcedureMeterialId()));
-            if (meterialList != null && meterialList.size() > 0) {//只有入库
-                //WMS只要把原材料入库
+            // 毛料出库
+            if (meterialList != null && meterialList.size() > 0) {
+
                 R<String> ckresult = stockInfoService.meterialStockOut(meterialList.get(0), Long.parseLong(srcStorgeId), task.getCompleteBatchNo());
                 return ckresult;
             }
+        } if (DemoLineConstant.DEMOLINE_STOCK_TYPE_METERIAL_JIAJU_CK.equals(stockType)) {
+            List<BomProcedureMeterial> meterialList = bomProcedureMeterialService.list(Wraps.<BomProcedureMeterial>lbQ().eq(BomProcedureMeterial::getId, task.getProcedureMeterialId()));
+            if (meterialList != null && meterialList.size() > 0) {
+                //WMS只要把原材料入库
+                R<String> ckresult = stockInfoService.meterialStockOut(meterialList.get(0), Long.parseLong(srcStorgeId), task.getCompleteBatchNo());
+
+            }
+            List<BomProcedureTray> trayList = procedureTrayService.list(Wraps.<BomProcedureTray>lbQ().eq(BomProcedureTray::getGroupId, task.getProcedureTrayGroupId()));
+            R<String> result = null;
+            if (trayList != null && trayList.size() > 0) {
+                for (BomProcedureTray tray : trayList) {
+                    //托盘不用入库
+                    if("1".equals(tray.getBizType())){
+                        break;
+                    }
+                    result = stockInfoService.procedureTrayStockOut(tray, Long.parseLong(targetStorgeId) , task.getCompleteBatchNo());
+                }
+            }
+            return result;
+
         } else if (DemoLineConstant.DEMOLINE_STOCK_TYPE_METERIAL_CRK.equals(stockType)) {//出入库
             List<BomProcedureMeterial> meterialList = bomProcedureMeterialService.list(Wraps.<BomProcedureMeterial>lbQ().eq(BomProcedureMeterial::getId, task.getProcedureMeterialId()));
             if (meterialList != null && meterialList.size() > 0) {