From 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 14:15:07 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/asrs/controller/LocMastController.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 96adfe8..d29290e 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -107,6 +107,10 @@
             return R.error();
         }
 
+        if (!locMast.getLocSts().equals("F") && !Cools.isEmpty(locMast.getFrozen()) && locMast.getFrozen() == 1) {
+            return R.error("搴撳瓨鍦ㄥ簱鐘舵�佹墠鑳藉喕缁�");
+        }
+
         WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                 .eq("source_loc_no", locMast.getLocNo())
                 .or().eq("loc_no", locMast.getLocNo()));
@@ -142,10 +146,20 @@
                 if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()))) {
                     throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
                 }
+                locMast.setBarcode("");
             }
         }
         locMast.setModiUser(getUserId());
         locMast.setModiTime(now);
+        AdjDetl adjDetl = new AdjDetl();
+        adjDetl.setLocNo(locMast.getLocNo());
+        adjDetl.setMatnr("鍘熷簱浣嶇姸鎬侊細" + oldLocMast.getLocSts());
+        adjDetl.setBatch("鏇存敼搴撲綅鐘舵�佷负锛�" + locMast.getLocSts());
+        adjDetl.setModiTime(now);
+        adjDetl.setModiUser(getUserId());
+        if (!adjDetlService.insert(adjDetl)) {
+            throw new CoolException("搴撲綅璋冩暣璁板綍澶辫触");
+        }
         if(!locMastService.updateById(locMast)) {
             throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
         }

--
Gitblit v1.9.1