From af082a3f27b88bb7afbe73ffe38c7fa5091ee841 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期日, 22 六月 2025 17:09:15 +0800
Subject: [PATCH] 大屏显示优化

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
index 26cfdd1..5325151 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -347,7 +347,7 @@
     public R slapLightLogic(Map<String, Object> request) {
         String taskNo = request.get("taskNo").toString();
         String orderNo = request.get("orderNo").toString();
-
+        String siteNo = Objects.isNull(request.get("siteNo")) ? null : request.get("siteNo").toString();
         List<CacheSite> performs = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo));
         if (Objects.isNull(performs.stream().findFirst().get().getPlatformId())) {
             throw new CoolException("璇锋墦鍗版槑缁嗭紝骞剁粦瀹氱洰鏍囬泦璐у尯");
@@ -376,21 +376,21 @@
 //            }).collect(Collectors.toList());
 
             //鍒ゆ柇鏁伴噺鏄惁涓庤鍗曟槑缁嗙殑闇�姹傞噺鐩稿悓锛岀浉鍚屽垯璁㈠崟瀹屾垚
-            if (one.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_DONE.val) {
-                //鎾瀹屾垚锛岄噴鏀剧粦瀹氱珯鐐�
-                List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo));
-                for (CacheSite cacheSite : cacheSites) {
-                    if (!cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) {
-                        cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
-                        cacheSite.setOrderId(null);
-                        cacheSite.setBarcode(null);
-                        cacheSite.setOrderNo(null);
-                        cacheSite.setPlatformId(null);
-                        cacheSite.setPlatformNo(null);
-                        cacheSite.setUpdateTime(new Date());
-                        if (!cacheSiteService.updateById(cacheSite)) {
-                            throw new CoolException("鎾绔欑偣鏇存柊澶辫触");
-                        }
+            //鎾瀹屾垚锛岄噴鏀剧粦瀹氱珯鐐�
+            List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
+                    .eq(!Objects.isNull(siteNo), CacheSite::getSiteNo, siteNo)
+                    .eq(CacheSite::getOrderNo, orderNo));
+            for (CacheSite cacheSite : cacheSites) {
+                if (!cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) {
+                    cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
+                    cacheSite.setOrderId(null);
+                    cacheSite.setBarcode(null);
+                    cacheSite.setOrderNo(null);
+                    cacheSite.setPlatformId(null);
+                    cacheSite.setPlatformNo(null);
+                    cacheSite.setUpdateTime(new Date());
+                    if (!cacheSiteService.updateById(cacheSite)) {
+                        throw new CoolException("鎾绔欑偣鏇存柊澶辫触");
                     }
                 }
             }

--
Gitblit v1.9.1