From 2a3c0e4877a08368bbb43ff72b401c5c8ea334f7 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 09 九月 2023 16:09:05 +0800 Subject: [PATCH] #库位、库存冻结 --- src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 52 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java index db1218c..3babdbf 100644 --- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java @@ -2,16 +2,14 @@ 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.LocDetlService; import com.zy.asrs.service.ManLocDetlService; @@ -146,13 +144,47 @@ .doWrite(list); } - @RequestMapping(value = "/manlocDetl/updateStockFreeze/auth") +// @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(ManLocDetl manLocDetl){ - if (Cools.isEmpty(manLocDetl) || null==manLocDetl.getMatnr()){ - return R.error(); + public R updateStockFreeze(@RequestParam String param){ + List<ManLocDetl> list = JSONArray.parseArray(param, ManLocDetl.class); + if (Cools.isEmpty(list)){ + return R.error("鏃犳暟鎹�"); } - manLocDetlService.updateStockFreeze(manLocDetl.getMatnr(), manLocDetl.getLocNo(), manLocDetl.getStockFreeze()); - return R.ok(); + 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 = "搴撲綅瑙e喕") + 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()+"瑙i櫎鍐荤粨澶辫触"); + } + + } + return R.ok("瑙i櫎鍐荤粨鎴愬姛"); } } -- Gitblit v1.9.1