Преглед изворни кода

更新workpiece的unioncode

姚云青 пре 3 година
родитељ
комит
5652312c0c

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

@@ -67,7 +67,7 @@ public interface WorkpieceService extends SuperService<TWorkpiece> {
     public List<Tray>traylist();
 
 
-    public void setWorkPieceStock(String completeBatchNo, String currStorgeId, String parentStorgeId, TaskNode taskNode);
+    public void setWorkPieceStock(String completeBatchNo, String currStorgeId, String parentStorgeId, TaskNode taskNode,String uniqueCode);
 
 
     public Storge getWorkPieceStock(String  completeBatchNo, boolean isParent);

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

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

+ 1 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -1092,6 +1092,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             if(currstorge!=null){
                 jsonObject.put("targetPostion", currstorge.getId());
                 jsonObject.put("srcPosition", "");
+                jsonObject.put("uniqueCode",uniqueCode);
 
                 //查询库位里有托盘夹具,还是只有托盘
                 List<StockInfo>stockInfoList = stockInfoMapper.selectList(Wraps.<StockInfo>lbQ().eq(StockInfo::getStorgeId, currstorge.getId()));

+ 5 - 1
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,TaskNode taskNode) {
+    public void setWorkPieceStock(String completeBatchNo,String currStorgeId,String parentStorgeId,TaskNode taskNode,String uniqueCode) {
         List<TWorkpiece>list = baseMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getCompleteBatchNo,completeBatchNo));
         if(CollectionUtil.isNotEmpty(list)){
             TWorkpiece tWorkpiece = list.get(0);
@@ -524,6 +524,10 @@ public class WorkpieceServiceImpl extends SuperServiceImpl<WorkpieceMapper, TWor
 //                tWorkpiece.setTpointId(tstorge.getPointId());
 //            }
 
+            if(StringUtil.isNotEmpty(uniqueCode)){
+                tWorkpiece.setUniqueCode(uniqueCode);
+            }
+
             baseMapper.updateAllById(tWorkpiece);
         }
     }