From 9145f8a44c6ae733019e43c775cc30243032e502 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 16:16:43 +0800
Subject: [PATCH] 拍照触发修改

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

diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index c914c92..aea5fc8 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -15,6 +15,7 @@
 import com.zy.asrs.entity.param.LocMastInitParam;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.*;
+import com.zy.asrs.utils.LocAliasUtils;
 import com.zy.common.entity.Parameter;
 import com.zy.common.model.Shelves;
 import com.zy.common.service.CommonService;
@@ -95,13 +96,17 @@
                 String[] dates = val.split(RANGE_TIME_LINK);
                 wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                 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("loc_type1")){
                     sign=true;
                 }
-                wrapper.eq(entry.getKey(), val);
+                if (entry.getKey().equals("loc_no")){
+                    wrapper.andNew().like("loc_no", val).or().like("loc_alias", val);
+                } else if (entry.getKey().equals("area_id")) {
+                    wrapper.eq(entry.getKey(), val);
+                } else {
+                    wrapper.like(entry.getKey(), val);
+                }
             }
         }
         if (sign){
@@ -116,6 +121,7 @@
         locMast.setModiTime(new Date());
         locMast.setAppeUser(getUserId());
         locMast.setAppeTime(new Date());
+        locMastService.prepareAreaAlias(locMast);
         locMastService.insert(locMast);
         return R.ok();
     }
@@ -136,6 +142,15 @@
         }
 
         LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
+        if (locMast.getAreaId() == null && oldLocMast != null) {
+            locMast.setAreaId(oldLocMast.getAreaId());
+        }
+        if (locMast.getFrozen() == null && oldLocMast != null) {
+            locMast.setFrozen(oldLocMast.getFrozen());
+        }
+        if (locMast.getFrozenMemo() == null && oldLocMast != null) {
+            locMast.setFrozenMemo(oldLocMast.getFrozenMemo());
+        }
         if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
             return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
         }
@@ -207,6 +222,7 @@
         }
         locMast.setModiUser(getUserId());
         locMast.setModiTime(now);
+        locMastService.prepareAreaAlias(locMast);
         AdjDetl adjDetl = new AdjDetl();
         adjDetl.setLocNo(locMast.getLocNo());
         adjDetl.setMatnr("鍘熷簱浣嶇姸鎬侊細" + oldLocMast.getLocSts());
@@ -217,12 +233,27 @@
             throw new CoolException("搴撲綅璋冩暣璁板綍澶辫触");
         }
         // 搴撲綅鍐荤粨->鍐荤粨鎵�鏈夊簱瀛�
-        if (locMast.getFrozen() == 1 && oldLocMast.getFrozen() == 0 && locMast.getLocSts().equals("F") && oldLocMast.getLocSts().equals("F")) {
+        if (Integer.valueOf(1).equals(locMast.getFrozen())
+                && Integer.valueOf(0).equals(oldLocMast.getFrozen())
+                && locMast.getLocSts().equals("F")
+                && oldLocMast.getLocSts().equals("F")) {
             locDetlMapper.updateDetlFrozenByLocNo(oldLocMast.getLocNo());
         }
         if(!locMastService.updateById(locMast)) {
             throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
         }
+        return R.ok();
+    }
+
+    @PostMapping(value = "/locMast/batch/area/auth")
+    @ManagerAuth(memo = "鎵归噺淇敼搴撳尯")
+    public R batchArea(@RequestBody JSONObject param) {
+        if (Cools.isEmpty(param) || Cools.isEmpty(param.getJSONArray("locNos"))) {
+            return R.error("璇烽�夋嫨搴撲綅");
+        }
+        List<String> locNos = JSONObject.parseArray(param.getJSONArray("locNos").toJSONString(), String.class);
+        Integer areaId = param.getInteger("areaId");
+        locMastService.batchUpdateArea(locNos, areaId, getUserId());
         return R.ok();
     }
 
@@ -254,13 +285,13 @@
     @ManagerAuth
     public R query(String condition) {
         EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
-        wrapper.like("loc_no", condition);
+        wrapper.andNew().like("loc_no", condition).or().like("loc_alias", condition);
         Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (LocMast locMast : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
             map.put("id", locMast.getLocNo());
-            map.put("value", locMast.getLocNo());
+            map.put("value", LocAliasUtils.displayLocNo(locMast));
             result.add(map);
         }
         return R.ok(result);
@@ -332,6 +363,7 @@
                     }
                 }
             }
+            locMastService.fillAreaAlias(list);
             if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
                 locMastService.delete(new EntityWrapper<>());
             }

--
Gitblit v1.9.1