From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期五, 31 五月 2024 14:56:58 +0800 Subject: [PATCH] 仓库: 显示在库信息,入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成,单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔ --- 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