手动模式

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/HandModeWorkNode.java

@@ -106,22 +106,12 @@ public class HandModeWorkNode {
         //获取接口类型
         String interfaceType = getInterfaceType(bizType);
 
-        String startPointId = conMap.get("startPointId")==null?"":conMap.get("startPointId").toString();
-        String endPointId = conMap.get("endPointId")==null?"":conMap.get("endPointId").toString();
-
-
         //回调参数构建
         JSONObject jsonObject = new JSONObject();
         //业务回调数据
         JSONObject bizJsonObject = new JSONObject();
 
 
-        if (StringUtil.isNotEmpty(startPointId)) {
-            bizJsonObject.put("srcPosition", startPointId);
-        }
-        if (StringUtil.isNotEmpty(endPointId)) {
-            bizJsonObject.put("targetPostion", endPointId);
-        }
         //需要回调
         jsonObject.put("IsCallBackFlag", "1");
 

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

@@ -1558,26 +1558,26 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
 
         R<String> result = R.success("");
 
-        for(ProductionresourcePosition p:list){
-            String stockGoodsId = p.getGoodsId()==null?"":p.getGoodsId().toString();
-            if(!goodsId.equals(stockGoodsId))
-                continue;
-
-            if("1".equals(p.getCategory())||"2".equals(p.getCategory())){//托盘夹具
-                BomProcedureTray tray = new BomProcedureTray();
-                tray.setTrayId(p.getGoodsId());
-                result = stockInfoService.procedureTrayStockOut(tray, p.getStorgeId());
-            }
-
-            if("4".equals(p.getCategory())){//原材料
-                BomProcedureMeterial meterial = new BomProcedureMeterial();
-                meterial.setMeterialId(p.getGoodsId());
-                result = stockInfoService.meterialStockOut(meterial,  p.getStorgeId(), "");
-            }
-            if (!result.getIsSuccess()) {
-                break;
-            }
-        }
+//        for(ProductionresourcePosition p:list){
+//            String stockGoodsId = p.getGoodsId()==null?"":p.getGoodsId().toString();
+//            if(!goodsId.equals(stockGoodsId))
+//                continue;
+//
+//            if("1".equals(p.getCategory())||"2".equals(p.getCategory())){//托盘夹具
+//                BomProcedureTray tray = new BomProcedureTray();
+//                tray.setTrayId(p.getGoodsId());
+//                result = stockInfoService.procedureTrayStockOut(tray, p.getStorgeId());
+//            }
+//
+//            if("4".equals(p.getCategory())){//原材料
+//                BomProcedureMeterial meterial = new BomProcedureMeterial();
+//                meterial.setMeterialId(p.getGoodsId());
+//                result = stockInfoService.meterialStockOut(meterial,  p.getStorgeId(), "");
+//            }
+//            if (!result.getIsSuccess()) {
+//                break;
+//            }
+//        }
         return result;
     }
 
@@ -1593,26 +1593,26 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
 
         R<String> result = R.success("");
 
-        for(ProductionresourcePosition p:list){
-            String stockGoodsId = p.getGoodsId()==null?"":p.getGoodsId().toString();
-            if(!goodsId.equals(stockGoodsId))
-                continue;
-
-            if("1".equals(p.getCategory())||"2".equals(p.getCategory())){//托盘夹具
-                BomProcedureTray tray = new BomProcedureTray();
-                tray.setTrayId(p.getGoodsId());
-                result = stockInfoService.procedureTrayStockIn(tray, list.get(0).getStorgeId(), "", "");
-            }
-
-            if("4".equals(p.getCategory())){//原材料
-                BomProcedureMeterial meterial = new BomProcedureMeterial();
-                meterial.setMeterialId(p.getGoodsId());
-                result = stockInfoService.meterialStockIn(meterial, list.get(0).getStorgeId(), "","");
-            }
-            if (!result.getIsSuccess()) {
-                break;
-            }
-        }
+//        for(ProductionresourcePosition p:list){
+//            String stockGoodsId = p.getGoodsId()==null?"":p.getGoodsId().toString();
+//            if(!goodsId.equals(stockGoodsId))
+//                continue;
+//
+//            if("1".equals(p.getCategory())||"2".equals(p.getCategory())){//托盘夹具
+//                BomProcedureTray tray = new BomProcedureTray();
+//                tray.setTrayId(p.getGoodsId());
+//                result = stockInfoService.procedureTrayStockIn(tray, list.get(0).getStorgeId(), "", "");
+//            }
+//
+//            if("4".equals(p.getCategory())){//原材料
+//                BomProcedureMeterial meterial = new BomProcedureMeterial();
+//                meterial.setMeterialId(p.getGoodsId());
+//                result = stockInfoService.meterialStockIn(meterial, list.get(0).getStorgeId(), "","");
+//            }
+//            if (!result.getIsSuccess()) {
+//                break;
+//            }
+//        }
         return result;
     }
 }

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

@@ -227,7 +227,7 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
     @Override
     public String  execute(Map map) {
         BaseContextHandler.setTenant("0000");
-       return handModeWorkNode.getRequestParam(map);
+       return handModeWorkNode.handMode(map);
     }
 
     @Override