临时测试

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

@@ -333,6 +333,20 @@ public class TaskWorkNode {
             bizJsonObject.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, stockType);
         }
 
+        //起点、终点缓存。
+        Storge fstorge =  conMap.get("fromStorge") == null?null:(Storge) conMap.get("fromStorge") ;
+        Storge tstorge =  conMap.get("toStorge") == null?null:(Storge) conMap.get("toStorge") ;
+        //如果是线边库的时候，目标缓存位
+        Storge aimStorge =  conMap.get("aimStorge") == null?null:(Storge) conMap.get("aimStorge") ;
+
+        //此数据用来业务回传
+        bizJsonObject.put("srcPosition",  fstorge==null?"":fstorge.getId().toString());
+        bizJsonObject.put("targetPostion",tstorge==null?"":tstorge.getId().toString());
+        bizJsonObject.put("aimStorge",aimStorge==null?"":aimStorge.getId().toString());
+
+        //放入到线边库
+        String xbkFlag = conMap.get(DemoLineConstant.DEMOLINE_XBKFLAG) == null ? "" : conMap.get(DemoLineConstant.DEMOLINE_XBKFLAG).toString();
+        bizJsonObject.put(DemoLineConstant.DEMOLINE_XBKFLAG, xbkFlag);
 
         //业务回调数据,传给接口，接口再返回过来。
         jsonObject.put("bizCallBackData", bizJsonObject.toJSONString());

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

@@ -10,6 +10,7 @@ import com.github.zuihou.business.externalApi.dto.ManualInfo;
 import com.github.zuihou.business.operationManagementCenter.entity.PlanProduct;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
+import com.github.zuihou.business.operationManagementCenter.entity.TaskNode;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedure;
 import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
 import com.github.zuihou.business.productionReadyCenter.entity.Tray;
@@ -66,7 +67,7 @@ public interface WorkpieceService extends SuperService<TWorkpiece> {
     public List<Tray>traylist();
 
 
-    public void setWorkPieceStock(String completeBatchNo,String currStorgeId,String parentStorgeId,String targetStorgeId);
+    public void setWorkPieceStock(String completeBatchNo, String currStorgeId, String parentStorgeId, TaskNode taskNode);
 
 
     public Storge getWorkPieceStock(Long taskNodeId, boolean isParent);

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

@@ -1545,7 +1545,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         String targetStorgeId = callBackJson.getString("targetPostion");
 
         //更新目标位置
-        workpieceService.setWorkPieceStock(taskNode.getCompleteBatchNo(),targetStorgeId,"","");
+        workpieceService.setWorkPieceStock(taskNode.getCompleteBatchNo(),targetStorgeId,"",taskNode);
 
         if (DemoLineConstant.DEMOLINE_STOCK_TYPE_METERIAL_RK.equals(stockType)) {
             List<BomProcedureMeterial> meterialList = bomProcedureMeterialService.list(Wraps.<BomProcedureMeterial>lbQ().eq(BomProcedureMeterial::getId, task.getProcedureMeterialId()));

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

@@ -501,7 +501,7 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
     }
 
     @Override
-    public void setWorkPieceStock(String completeBatchNo,String currStorgeId,String parentStorgeId,String targetStorgeId) {
+    public void setWorkPieceStock(String completeBatchNo,String currStorgeId,String parentStorgeId,TaskNode taskNode) {
         List<TWorkpiece>list = baseMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getCompleteBatchNo,completeBatchNo));
         if(CollectionUtil.isNotEmpty(list)){
             TWorkpiece tWorkpiece = list.get(0);
@@ -515,9 +515,9 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
                 tWorkpiece.setPpointId(pstorge.getPointId());
             }
 
-            if(StringUtil.isNotEmpty(targetStorgeId)){
-                Storge tstorge = storgeMapper.selectById(targetStorgeId);
-                tWorkpiece.setTstorgeId(Long.parseLong(targetStorgeId));
+            if(taskNode.getTargetResourceId()!=null){
+                Storge tstorge = storgeMapper.selectById(taskNode.getTargetResourceId());
+                tWorkpiece.setTstorgeId(taskNode.getTargetResourceId());
                 tWorkpiece.setTpointId(tstorge.getPointId());
             }