From ed8bd2cd2634798298e90cf075a67173b154f0fa Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 18 八月 2025 14:19:05 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 8ece97a..b68e7ee 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -10,9 +10,12 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.LocMast;
 import com.zy.asrs.entity.param.LocMastInitParam;
+import com.zy.asrs.service.LocDetlService;
 import com.zy.asrs.service.LocMastService;
+import com.zy.common.entity.Parameter;
 import com.zy.common.model.Shelves;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +28,22 @@
 
     @Autowired
     private LocMastService locMastService;
+    @Autowired
+    private LocDetlService locDetlService;
+
+    @RequestMapping(value = "/locMast/init/pwd")
+    public R locMastInitPwd(@RequestParam(required = false) String pwd) {
+        if (Cools.isEmpty(pwd)) {
+            return R.error("璇疯緭鍏ュ彛浠�");
+        }
+        return R.ok().add(Parameter.get().getLocMastInitPwd().equals(pwd));
+    }
+
+    @PostMapping(value = "/group/empty/stock")
+    @ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅")
+    public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
+        return R.ok().add(locMastService.queryGroupEmptyStock(sourceLocNo));
+    }
 
     @RequestMapping(value = "/locMast/{id}/auth")
     @ManagerAuth
@@ -46,14 +65,15 @@
         return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
-    private void convert(Map<String, Object> map, EntityWrapper wrapper){
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
-            if (entry.getKey().endsWith(">")) {
-                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
-            } else if (entry.getKey().endsWith("<")) {
-                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
             } else {
-                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+                wrapper.like(entry.getKey(), val);
             }
         }
     }
@@ -74,6 +94,18 @@
     public R update(LocMast locMast){
         if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
             return R.error();
+        }
+        LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
+        if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
+            return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+        }
+        // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
+        if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
+            // 娓呯┖搴撲綅鏉＄爜
+            locMast.setBarcode("");
+            if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
+                locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+            }
         }
         locMast.setModiUser(getUserId());
         locMast.setModiTime(new Date());
@@ -150,26 +182,28 @@
                             break;
                         }
                     }
+                    Date now =  new Date();
                     LocMast locMast = new LocMast();
                     locMast.setLocNo(locNo);
-                    locMast.setLocType("O");
+                    locMast.setLocSts("O");
                     locMast.setRow1(r); // 鎺�
                     locMast.setBay1(b); // 鍒�
                     locMast.setLev1(l); // 灞�
                     locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
-                    if (null != param.getWhsType()) {
-                        locMast.setWhsType(Long.valueOf(param.getWhsType()));
-                    }
+                    locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
+                    locMast.setLocType2(param.getLocType2());
+                    locMast.setLocType3(param.getLocType3());
                     locMast.setAppeUser(getUserId());
-                    locMast.setAppeTime(new Date());
+                    locMast.setAppeTime(now);
                     locMast.setModiUser(getUserId());
-                    locMast.setModiTime(new Date());
+                    locMast.setModiTime(now);
                     list.add(locMast);
                 }
             }
         }
-        locMastService.delete(new EntityWrapper<>());
-        locMastService.insertBatch(list);
+//        locMastService.delete(new EntityWrapper<>());
+//        locDetlService.delete(new EntityWrapper<>());
+//        locMastService.insertBatch(list);
         return R.ok("鍒濆鍖栨垚鍔�");
     }
 }

--
Gitblit v1.9.1