From 083659a2e1a8eb245b086d7046ee7d8e61f07a8f Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 17 七月 2025 18:22:06 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/controller/LocDetlController.java |   68 ++++++++++++++++++++++++++++++---
 1 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 34b0ba9..feda529 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,9 +13,11 @@
 import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.ManLocDetl;
 import com.zy.asrs.entity.Mat;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.ManLocDetlService;
 import com.zy.asrs.service.MatService;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,7 @@
 
     @Autowired
     private LocDetlService locDetlService;
+
     @Autowired
     private LocDetlMapper locDetlMapper;
     @Autowired
@@ -80,10 +83,14 @@
                 param.remove("modi_time");
             }
         }
-        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
+        Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+        if (stockOut.getRecords().size()==0){
+            stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
+        }
+        return R.ok(stockOut);
     }
 
-    @RequestMapping(value = "/locDetl/list/auth")
+    @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
     @ManagerAuth
     public R list(@RequestParam(defaultValue = "1")Integer curr,
                   @RequestParam(defaultValue = "10")Integer limit,
@@ -91,13 +98,29 @@
                   @RequestParam(required = false)String orderByType,
                   @RequestParam(required = false)String condition,
                   @RequestParam Map<String, Object> param){
-        excludeTrash(param);
+//        String row = "";
         EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+//        if (param.get("row") != null) {
+//            String chooseRow = (String) param.get("row");
+//            if (chooseRow.length() == 1) {
+//                row = "0" + chooseRow;
+//                param.remove("row");
+//            }else {
+//                row = chooseRow;
+//                param.remove("row");
+//            }
+//        }
+        excludeTrash(param);
         convert(param, wrapper);
         allLike(LocDetl.class, param.keySet(), wrapper, condition);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+//        if (!row.equals("")){
+//            wrapper.and()
+//                    .where("loc_no like '" +row +"%'");
+//        }
         return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
     }
+
 
     private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -130,12 +153,18 @@
 	@RequestMapping(value = "/locDetl/update/auth")
 	@ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
     public R update(LocDetl locDetl){
-        if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+        if (Cools.isEmpty(locDetl) || null==locDetl.getBatch()){
             return R.error();
         }
-        locDetl.setModiUser(getUserId());
-        locDetl.setModiTime(new Date());
-        locDetlService.updateById(locDetl);
+        LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
+        if (Cools.isEmpty(locDetl1) ){
+            return R.error();
+        }
+        locDetl1.setModiUser(getUserId());
+        locDetl1.setModiTime(new Date());
+        locDetl1.setDanger(locDetl.getDanger());
+        locDetlService.update(locDetl1,new EntityWrapper<LocDetl>().eq("loc_no", locDetl.getLocNo()).eq("batch", locDetl.getBatch()));
+//        locDetlService.updateById(locDetl1);
         return R.ok();
     }
 
@@ -158,7 +187,22 @@
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
         EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
         Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
+        String row = "";
+        if (map.get("row") != null) {
+            String chooseRow = (String) map.get("row");
+            if (chooseRow.length() == 1) {
+                row = "0" + chooseRow;
+                map.remove("row");
+            }else {
+                row = chooseRow;
+                map.remove("row");
+            }
+        }
         convert(map, wrapper);
+        if (!row.equals("")){
+            wrapper.and()
+                    .where("loc_no like '" +row +"%'");
+        }
         List<LocDetl> list = locDetlService.selectList(wrapper);
         return R.ok(exportSupport(list, fields));
     }
@@ -227,4 +271,14 @@
                 .doWrite(excel);
     }
 
+    /**
+     * 鑾峰彇搴撳瓨鎬绘暟
+     * @return
+     */
+    @RequestMapping("/locDetl/count")
+    public R getAllCount(){
+        Integer sum = locDetlService.sum();
+        return R.ok(sum);
+    }
+
 }

--
Gitblit v1.9.1