From 4715b1787c85a2186b9c0c43222b64b63c58459b Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期五, 05 十二月 2025 16:43:38 +0800
Subject: [PATCH] #1

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

diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 2d82d5e..239c40e 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -77,6 +77,8 @@
                 wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
             } else if (entry.getKey().equals("loc_no")){
                 wrapper.like(entry.getKey(), val);
+            } else if (entry.getKey().equals("barcode")){
+                wrapper.like(entry.getKey(),val);
             } else {
                 if (entry.getKey().equals("loc_type1")){
                     sign=true;
@@ -116,6 +118,7 @@
                 locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
             }
         }
+        locMast.setBarcode("");
         locMast.setModiUser(getUserId());
         locMast.setModiTime(new Date());
         locMastService.updateById(locMast);
@@ -176,7 +179,7 @@
     @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
 //    @Transactional
     public R init(LocMastInitParam param) {
-        List<LocMast> list = new ArrayList<>();
+       List<LocMast> list = new ArrayList<>();
         for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
             for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
                 for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {

--
Gitblit v1.9.1