From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期四, 14 三月 2024 10:14:28 +0800 Subject: [PATCH] 1.增加牌号作为唯一物料条件 (当前牌号 批号 包号可以筛选出唯一物料) 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善 --- src/main/java/com/zy/asrs/controller/LocDetlController.java | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index d10ed26..3eaa3f7 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -43,8 +43,32 @@ @Autowired private ManLocDetlService manLocDetlService; + @RequestMapping(value = "/locDetl/selectAllNumWarning/auth") + @ManagerAuth(memo = "搴撳瓨鏁伴噺棰勮") + public R selectAllNumWarning(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit, + @RequestParam Map<String, Object> param) { +// Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class)); +// for (LocDetl locDetl : stockStatis.getRecords()) { +// Mat mat = matService.selectByMatnr(locDetl.getMatnr()); +// if (mat != null) { +// locDetl.sync(mat); +// } +// } +// return R.ok().add(stockStatis); + + Page<LocDetlAll> stockStatis = locDetlService.getWarningNumPage(toPage(curr, limit, param, LocDetlAll.class)); + for (LocDetlAll locDetlAll : stockStatis.getRecords()) { + Mat mat = matService.selectByMatnr(locDetlAll.getMatnr()); + if (mat != null) { + locDetlAll.sync(mat); + } + } + return R.ok().add(stockStatis); + } + @RequestMapping(value = "/locDetl/selectAllWarning/auth") - @ManagerAuth(memo = "搴撳瓨棰勮") + @ManagerAuth(memo = "搴撻緞棰勮") public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam Map<String, Object> param){ -- Gitblit v1.9.1