From 1a0bdd8df58435ec37e9d8345e67cd092902b5e4 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期六, 04 四月 2026 00:27:18 +0800
Subject: [PATCH] 序号控制

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 13256d9..36dae29 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -33,7 +33,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.rmi.CORBA.Util;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -428,6 +427,10 @@
             for (WrkMast wrkMast : activeTasks) {
                 HashMap<String,Object> hashMap = new HashMap<>();
                 hashMap.put("taskNo", wrkMast.getWrkNo());
+                if (!Cools.isEmpty(wrkMast) && wrkMast.getWrkSts() ==11L) {
+                    workService.cancelWrkMast(wrkMast.getWrkNo()+"", 9955L);
+                    continue;
+                }
                 taskList.add(hashMap);
             }
             wcsApiService.pauseOutTasks(taskList);
@@ -1300,7 +1303,7 @@
     public R outOrder(OutTaskParam param,int count) {
         LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", param.getPalletId()));
         if (locMast == null) {
-            return R.error("娌℃湁鎵惧埌鎵樼洏鐮�=" + param.getPalletId() + "瀵瑰簲鐨勫簱浣�");
+            throw new CoolException("娌℃湁鎵惧埌鎵樼洏鐮�=" + param.getPalletId() + "瀵瑰簲鐨勫簱浣�");
         }
         Integer ioType = 101;
         // 鑾峰彇璺緞

--
Gitblit v1.9.1