From 133e9fccff97927467a2edbfec8ae1f382722fae Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 27 一月 2024 16:31:38 +0800
Subject: [PATCH] # 打印物料码 文本自动换行

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

diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 49e65f6..a9298cf 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -2,22 +2,22 @@
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.annotations.ManagerAuth;
 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.LocDetlWarningDTO;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.LocDetlAdjustParam;
+import com.zy.asrs.service.LocCheckService;
 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;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -40,6 +40,20 @@
 
     @Autowired
     private MatService matService;
+
+    @Autowired
+    private LocCheckService locCheckService;
+
+    @RequestMapping(value = "/manlocDetl/orderNo")
+    @ManagerAuth
+    public R locNoList(@RequestParam String orderNo){
+
+        if (Cools.isEmpty(orderNo)){
+            return R.error("鏃犳暟鎹�");
+        }
+        List<LocCheck> list = locCheckService.selectList(new EntityWrapper<LocCheck>().eq("order_no", orderNo));
+        return R.ok(list);
+    }
 
     @RequestMapping(value = "/manLocDetl/list/auth")
     @ManagerAuth
@@ -145,4 +159,48 @@
                 .sheet("琛�1")
                 .doWrite(list);
     }
+
+//    @RequestMapping(value = "/manlocDetl/updateStockFreeze/auth")
+//    @ManagerAuth(memo = "搴撲綅鍐荤粨")
+//    public R updateStockFreeze(ManLocDetl manLocDetl){
+//        if (Cools.isEmpty(manLocDetl) || null==manLocDetl.getMatnr()){
+//            return R.error();
+//        }
+//        manLocDetlService.updateStockFreeze(manLocDetl.getMatnr(), manLocDetl.getLocNo(), manLocDetl.getStockFreeze());
+//        return R.ok();
+//    }
+
+    @RequestMapping(value = "/manlocDetl/updateStockFreeze")
+    @ManagerAuth(memo = "搴撲綅鍐荤粨")
+    public R updateStockFreeze(@RequestParam String param){
+        List<ManLocDetl> list = JSONArray.parseArray(param, ManLocDetl.class);
+        if (Cools.isEmpty(list)){
+            return R.error("鏃犳暟鎹�");
+        }
+        for (ManLocDetl manLocDetl : list){
+            manLocDetl.setStockFreeze(0);
+            if (manLocDetlService.updateStockFreeze(manLocDetl.getMatnr(), manLocDetl.getLocNo(), manLocDetl.getStockFreeze()) != 1){
+                return R.error(manLocDetl.getMatnr()+"鍐荤粨澶辫触");
+            }
+
+        }
+        return R.ok("鍐荤粨鎴愬姛");
+    }
+
+    @RequestMapping(value = "/manlocDetl/updateStockDisFreeze")
+    @ManagerAuth(memo = "搴撲綅瑙ｅ喕")
+    public R updateStockDisFreeze(@RequestParam String param){
+        List<ManLocDetl> list = JSONArray.parseArray(param, ManLocDetl.class);
+        if (Cools.isEmpty(list)){
+            return R.error("鏃犳暟鎹�");
+        }
+        for (ManLocDetl manLocDetl : list){
+            manLocDetl.setStockFreeze(1);
+            if (manLocDetlService.updateStockFreeze(manLocDetl.getMatnr(), manLocDetl.getLocNo(), manLocDetl.getStockFreeze()) != 1){
+                return R.error(manLocDetl.getMatnr()+"瑙ｉ櫎鍐荤粨澶辫触");
+            }
+
+        }
+        return R.ok("瑙ｉ櫎鍐荤粨鎴愬姛");
+    }
 }

--
Gitblit v1.9.1