From 152977eef89328bae791ae0f7691fb633744bd03 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 14 五月 2024 18:43:47 +0800 Subject: [PATCH] # 调拨单同步 --- src/main/java/com/zy/asrs/controller/OrderController.java | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index cdb49c0..2808a62 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -52,6 +52,8 @@ private LocDetlService locDetlService; @Autowired private MatService matService; + @Autowired + private AgvLocDetlService agvLocDetlService; @RequestMapping(value = "/order/nav/list/auth") @ManagerAuth @@ -187,6 +189,33 @@ return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper)); } + @RequestMapping(value = "/order/bcpDb/detls/pakin/page/auth") + @ManagerAuth + public R bcpDbOrderDetls(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "100")Integer limit, + @RequestParam(required = false)String orderByField, + @RequestParam(required = false)String orderByType, + @RequestParam Map<String, Object> param){ + EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); +// return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class))); + List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1)); + List<Long> docIds = new ArrayList<>(); + for (DocType pakin : pakins) { + if (pakin.getDocId() == 33) { + docIds.add(pakin.getDocId()); + } + } + wrapper.in("source",docIds); + Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper); + for (OrderDetl record : page.getRecords()) { + Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(),1); + record.setStock(sumAnfme == null ? 0 : sumAnfme); + } + return R.ok(page); + } + @RequestMapping(value = "/order/detl/all/auth") @ManagerAuth public R head(@RequestParam Long orderId){ -- Gitblit v1.9.1