移动位置

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

@@ -1503,19 +1503,24 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
     public R<String> handModeStock(JSONObject callBackJson) {
         String srcStorgeId = callBackJson.getString("srcPosition");
         String targetStorgeId = callBackJson.getString("targetPostion");
+        String goodsId = callBackJson.getString("goodsId");
         Map queryMap = new HashMap();
         queryMap.put("pointId", srcStorgeId);
         List<ProductionresourcePosition> list = productionresourcePositionMapper.getPPList(queryMap);
 
         List<ProductionresourcePosition> targetlist = productionresourcePositionMapper.selectList(Wraps.<ProductionresourcePosition>lbQ().eq(ProductionresourcePosition::getPointId, targetStorgeId));
 
-        R<String> result = null;
+        R<String> result =  R.success("");;
 
         if(CollectionUtil.isEmpty(targetlist))
             return result;
 
 
         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());

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

@@ -192,9 +192,11 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
         BaseContextHandler.setTenant("0000");
         String startPointId = conMap.get("startPointId")==null?"":conMap.get("startPointId").toString();
         String endPointId = conMap.get("endPointId")==null?"":conMap.get("endPointId").toString();
+        String goodsId = conMap.get("goodsId")==null?"":conMap.get("goodsId").toString();
         JSONObject callBackJson = new JSONObject();
         callBackJson.put("srcPosition",startPointId);
         callBackJson.put("targetPostion",endPointId);
+        callBackJson.put("goodsId",goodsId);
         return taskNodeService.handModeStock(callBackJson).getData();
     }