姚云青 3 years ago
parent
commit
d679aef004

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

@@ -213,6 +213,7 @@ public class StorgeServiceImpl extends SuperCacheServiceImpl<StorgeMapper, Storg
         storgeList.forEach(t->{
             t.setLockStatus("1");
             t.setCampId(null);
+            t.setCompleteBatchNo("");
         });
         this.saveOrUpdateBatch(storgeList);
         return storgeList;

+ 3 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/TaskNodeService.java

@@ -160,4 +160,7 @@ public interface TaskNodeService extends SuperService<TaskNode> {
     boolean getRunStatus(Long resourceId);
 
     int getProducingBom(Long bomId);
+
+    void freeLock(String completeBatchNo);
+
 }

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

@@ -2159,4 +2159,12 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         List<TWorkpiece> list = workpieceService.list(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getBomId, bomId).eq(TWorkpiece::getIsEnd,"0"));
         return list==null?0:list.size();
     }
+
+    @Override
+    public void freeLock(String completeBatchNo) {
+        List<Storge> storgeList = storgeService.list(Wraps.<Storge>lbQ().eq(Storge::getCompleteBatchNo, completeBatchNo));
+        if (CollectionUtil.isNotEmpty(storgeList)) {
+            storgeService.unlockStorgeList(storgeList);
+        }
+    }
 }