From 029ffbf20db7196d4f460bc741fd5f36a80689ae Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 15 一月 2026 19:55:45 +0800
Subject: [PATCH] 空板回库称重再校验

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

diff --git a/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java
index 6029d47..0fc46fe 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocAroundBindServiceImpl.java
@@ -55,6 +55,7 @@
         List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                 .between("row1", params.getStartRow(), params.getEndRow())
                 .between("bay1", params.getStartBay(), params.getEndBay())
+                .eq("frozen", 0).eq("deleted", 0)
                 .between("lev1", params.getStartLev(), params.getEndLev())
                 .ne("loc_sts", LocStsType.LOC_STS_TYPE_X.type));
         if (Cools.isEmpty(locMasts)) {
@@ -64,18 +65,27 @@
         // 鏍¢獙搴撲綅鏄惁宸茬粦瀹�
         for (LocMast mast : locMasts) {
             LocAroundBind aroundBind = this.selectOne(new EntityWrapper<LocAroundBind>()
-                    .eq("dev_no", params.getDevNo())
                     .eq("b_loc_no", mast.getLocNo()));
             if (!Objects.isNull(aroundBind)) {
                 continue;
             }
             LocAroundBind bind = new LocAroundBind();
             bind.setDevNo(params.getDevNo());
-            bind.setBLocNo(mast.getLocNo());
+            bind.setBlocNo(mast.getLocNo());
             bind.setDevId(basDevice.getId());
             if (!this.insert(bind)) {
                 throw new CoolException("缁戝畾搴撲綅澶辫触");
             }
+
+            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", bind.getBlocNo()));
+            locMast.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
+            locMast.setDeleted(1);
+            locMast.setFrozen(1);
+
+            if (!locMastService.updateById(locMast)) {
+                return R.error("鍘熷簱绂佺敤澶辫触锛侊紒");
+            }
+
         }
         return R.ok("缁戝畾搴撲綅鎴愬姛");
     }

--
Gitblit v1.9.1