添加产线字段

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

@@ -66,7 +66,7 @@ public interface WorkpieceService extends SuperService<TWorkpiece> {
     public List<Tray>traylist();
 
 
-    public void setWorkPieceStock(Long taskNodeId,String targetStorgeId);
+    public void setWorkPieceStock(String completeBatchNo,String targetStorgeId,String  parentStorgeId);
 
 
     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

@@ -1512,7 +1512,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         String targetStorgeId = callBackJson.getString("targetPostion");
 
         //更新目标位置
-        workpieceService.setWorkPieceStock(taskNode.getId(),targetStorgeId);
+        workpieceService.setWorkPieceStock(taskNode.getCompleteBatchNo(),targetStorgeId,"");
 
         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

@@ -491,13 +491,20 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
     }
 
     @Override
-    public void setWorkPieceStock(Long taskNodeId,String targetStorgeId) {
-        List<TWorkpiece>list = baseMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getTaskNodeId,taskNodeId));
+    public void setWorkPieceStock(String completeBatchNo,String targetStorgeId,String parentStorgeId) {
+        List<TWorkpiece>list = baseMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getCompleteBatchNo,completeBatchNo));
         if(CollectionUtil.isNotEmpty(list)){
             TWorkpiece tWorkpiece = list.get(0);
             Storge storge = storgeMapper.selectById(targetStorgeId);
             tWorkpiece.setStorgeId(Long.parseLong(targetStorgeId));
             tWorkpiece.setPointId(storge.getPointId());
+
+            if(StringUtil.isNotEmpty(parentStorgeId)){
+                Storge pstorge = storgeMapper.selectById(parentStorgeId);
+                tWorkpiece.setPstorgeId(Long.parseLong(parentStorgeId));
+                tWorkpiece.setPpointId(pstorge.getPointId());
+            }
+
             baseMapper.updateAllById(tWorkpiece);
         }
     }