From 973590171b483627b9e5c556302c02000fd666fc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 八月 2024 16:50:10 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 3aa9551..8747729 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -173,6 +173,17 @@
         }
         if (!locDetlDtos.isEmpty()) {
             LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                    .eq("lev1", locMast.getLev1())
+                    .orderBy("bay1",false));
+            for (LocMast locMast1 : locMasts) {
+                if (locMast1.getLocNo().equals(locMast.getLocNo())) {
+                    break;
+                }
+                if (locMast1.getLocSts().equals("D") || locMast1.getLocSts().equals("F")) {
+                    throw new CoolException(locMast.getLocNo()+"搴撲綅鍫靛锛岀姝㈠嚭搴�");
+                }
+            }
             if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
                 // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
                 stockOut(staNo, locDetlDtos, null, userId);
@@ -443,6 +454,17 @@
             if (!locMast.getLocSts().equals("D")){
                 throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
             }
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                    .eq("lev1", locMast.getLev1())
+                    .orderBy("bay1",false));
+            for (LocMast locMast1 : locMasts) {
+                if (locMast1.getLocNo().equals(locMast.getLocNo())) {
+                    break;
+                }
+                if (locMast1.getLocSts().equals("D") || locMast1.getLocSts().equals("F")) {
+                    throw new CoolException(locNo+"搴撲綅鍫靛锛岀姝㈠嚭搴�");
+                }
+            }
             // 鑾峰彇婧愮珯
             Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                     .eq("type_no", 110)

--
Gitblit v1.9.1