From 85f4c6b7d6df1c67be43fa87b7cc74af3765ccef Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 22 五月 2025 10:56:43 +0800
Subject: [PATCH] 出库判断深库位对应浅库位状态

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

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 18c8b4b..1ad3099 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -419,24 +419,24 @@
 
                     LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
                     //鍒ゆ柇鍏跺簱浣嶆槸鍚︿负娣卞簱浣嶏紝濡傛灉涓烘繁搴撲綅鎵惧叾娴呭簱浣嶆槸閮芥湁璐�
-                    boolean flag = false;
+                    int flag = 0;
                     if (locMast.getRow1() == 1 || locMast.getRow1() == 5 || locMast.getRow1() == 9) {
-                        flag = true;
+                        flag = 1;
                     } else if (locMast.getRow1() == 4 || locMast.getRow1() == 8 || locMast.getRow1() == 12) {
-                        flag = true;
+                        flag = 2;
                     }
-                    if (flag) {
+                    if (flag == 1) {
                         LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
-                                .eq("row1", (locMast.getRow1() - 1))
+                                .eq("row1", (locMast.getRow1() + 1))
                                 .eq("bay1", locMast.getBay1())
                                 .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
                         if (!Cools.isEmpty(locMast1)) {
                             log.info(locMast.getLocNo() + "鍑烘繁搴撲綅锛屾祬搴撲綅鏈夎揣");
                             continue;
                         }
-                    } else {
+                    } else if (flag == 2){
                         LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
-                                .eq("row1", (locMast.getRow1() + 1))
+                                .eq("row1", (locMast.getRow1() - 1))
                                 .eq("bay1", locMast.getBay1())
                                 .eq("lev1", locMast.getLev1()).eq("loc_sts", "F"));
                         if (!Cools.isEmpty(locMast1)) {

--
Gitblit v1.9.1