From 84168cb0fa1ca6bc2b8d088776d9e04401edb883 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 05 五月 2025 16:08:04 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pakStoreSxk/emptyOut.html             |    2 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   57 +++++++++++++++++++---------
 src/main/webapp/views/pakStoreSxk/pakStore.html             |    2 
 3 files changed, 41 insertions(+), 20 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 8e69163..f085db0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -541,6 +541,7 @@
         if ((locMast.getBay1() >= 3 && locMast.getBay1() <= 6) ) {
             locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                     .eq("row1", locMast.getBay1())
+                    .in("bay1", 3,4,5,6)
                     .eq("crn_no", 7)
                     .eq("loc_type1", locMast.getLocType1())
                     .orderBy("bay1", true));
@@ -1770,31 +1771,51 @@
             LocMast locMast = locMastService.selectById(dto.getLocNo());
 
             List<LocMast> locMasts = new ArrayList<>();
-            if ((locMast.getBay1() >= 1 && locMast.getBay1() <= 2) || (locMast.getBay1() >= 6 && locMast.getBay1() <= 7 && locMast.getRow1() != 36 && locMast.getRow1() != 29) || (locMast.getBay1() >= 11 && locMast.getBay1() <= 12)) {
+//            if ((locMast.getBay1() >= 1 && locMast.getBay1() <= 2) || (locMast.getBay1() >= 6 && locMast.getBay1() <= 7 && locMast.getRow1() != 36 && locMast.getRow1() != 29) || (locMast.getBay1() >= 11 && locMast.getBay1() <= 12)) {
+//                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+//                        .eq("gro1", locMast.getGro1())
+//                        .eq("crn_no", 7)
+//                        .eq("loc_type1", locMast.getLocType1())
+//                        .orderBy("bay1", false));
+//            } else {
+//                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+//                        .eq("gro1", locMast.getGro1())
+//                        .eq("crn_no", 7)
+//                        .eq("loc_type1", locMast.getLocType1())
+//                        .orderBy("bay1", true));
+//            }
+//            for (LocMast locMast1 : locMasts) {
+//                if (locMast1.getLocNo().equals(dto.getLocNo())) {
+//                    break;
+//                }
+//                if (locMast1.getLocSts().equals("X")) {
+//                    throw new CoolException(dto.getLocNo() + "搴撲綅鍓嶆柟鏈夐攣瀹氬簱浣嶏紝绂佹鍑哄簱");
+//                }
+//                if (locMast1.getLocSts().equals("F")) {
+//                    moveLocForDeepLoc(locMast1);
+//                }
+//            }
+            if ((locMast.getBay1() >= 3 && locMast.getBay1() <= 6) ) {
                 locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-                        .eq("gro1", locMast.getGro1())
-                        .eq("crn_no", 7)
-                        .eq("loc_type1", locMast.getLocType1())
-                        .orderBy("bay1", false));
-            } else {
-                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-                        .eq("gro1", locMast.getGro1())
+                        .eq("row1", locMast.getBay1())
+                        .in("bay1", 3,4,5,6)
                         .eq("crn_no", 7)
                         .eq("loc_type1", locMast.getLocType1())
                         .orderBy("bay1", true));
-            }
-            for (LocMast locMast1 : locMasts) {
-                if (locMast1.getLocNo().equals(dto.getLocNo())) {
-                    break;
-                }
-                if (locMast1.getLocSts().equals("X")) {
-                    throw new CoolException(dto.getLocNo() + "搴撲綅鍓嶆柟鏈夐攣瀹氬簱浣嶏紝绂佹鍑哄簱");
-                }
-                if (locMast1.getLocSts().equals("F")) {
-                    moveLocForDeepLoc(locMast1);
+                for (LocMast locMast1 : locMasts) {
+                    if (locMast1.getLocNo().equals(locMast.getLocNo())) {
+                        break;
+                    }
+                    if (locMast1.getLocSts().equals("X")) {
+                        throw new CoolException(locMast.getLocNo() + "搴撲綅鍓嶆柟鏈夐攣瀹氬簱浣嶏紝绂佹鍑哄簱");
+                    }
+                    if (locMast1.getLocSts().equals("F")) {
+                        locMast = locMast1;
+                    }
                 }
             }
 
+
             Integer outSta = staNo.getDevNo();
 //            //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷f枡绔欐寚瀹氫负202
 //            if(locMast.getCrnNo()==2){
diff --git a/src/main/webapp/views/pakStoreSxk/emptyOut.html b/src/main/webapp/views/pakStoreSxk/emptyOut.html
index b7a008b..d81f86c 100644
--- a/src/main/webapp/views/pakStoreSxk/emptyOut.html
+++ b/src/main/webapp/views/pakStoreSxk/emptyOut.html
@@ -125,7 +125,7 @@
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStoreSxk/emptyOut.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/pakStoreSxk/emptyOut.js?v=1" charset="utf-8"></script>
 
 <!--鍚姩鍑哄簱-->
 <div id="outboundDiv">
diff --git a/src/main/webapp/views/pakStoreSxk/pakStore.html b/src/main/webapp/views/pakStoreSxk/pakStore.html
index e230ba4..3c1762d 100644
--- a/src/main/webapp/views/pakStoreSxk/pakStore.html
+++ b/src/main/webapp/views/pakStoreSxk/pakStore.html
@@ -121,7 +121,7 @@
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStoreSxk/pakStore.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/pakStoreSxk/pakStore.js?v=1" charset="utf-8"></script>
 
 <script type="text/template" id="putSiteSelectTemplate">
     {{#each data}}

--
Gitblit v1.9.1