From a06eb7682556938481810c2ea36477cc42d002b5 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期六, 04 四月 2026 00:04:21 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 4771849..8d86038 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -428,6 +428,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);
@@ -1294,7 +1298,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