From 6bbaeff9658e297a6087c559352393fc732e8742 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 15 五月 2023 08:39:04 +0800
Subject: [PATCH] 库存明细-库存冻结

---
 src/main/java/com/zy/asrs/controller/LocDetlController.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 553be70..cf08cdd 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -92,7 +92,7 @@
                   @RequestParam(required = false)String condition,
                   @RequestParam Map<String, Object> param,
                   @RequestParam(required = false)Boolean unreason){
-        if (unreason) {
+        if (!Cools.isEmpty(unreason) && unreason) {
 
             return R.ok(locDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<LocDetl>()
                     .where(" DATALENGTH( batch ) != 11 or\n" +
@@ -163,6 +163,16 @@
         return R.ok();
     }
 
+    @RequestMapping(value = "/locDetl/updateStockFreeze/auth")
+    @ManagerAuth(memo = "搴撲綅鍐荤粨")
+    public R updateStockFreeze(LocDetl locDetl){
+        if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+            return R.error();
+        }
+        locDetlService.updateStockFreeze(locDetl.getMatnr(), locDetl.getLocNo(), locDetl.getStockFreeze());
+        return R.ok();
+    }
+
     @RequestMapping(value = "/locDetl/delete/auth")
     @ManagerAuth(memo = "搴撲綅鏄庣粏鍒犻櫎")
     public R delete(@RequestParam String param){
@@ -178,7 +188,7 @@
 
     @RequestMapping(value = "/locDetl/export/auth")
     @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
-    public R export(@RequestBody JSONObject param){
+    public synchronized R export(@RequestBody JSONObject param){
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
         EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
         Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));

--
Gitblit v1.9.1