From 24e32eac68140d4c7419c201480fd40e267a52a4 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期三, 08 五月 2024 08:30:37 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OrderController.java | 29 +++++++++++++++++++++++++++++ src/main/webapp/views/agvLocMast/locMast.html | 2 +- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 4 +++- 3 files changed, 33 insertions(+), 2 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..22f28e5 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.getSumAnfme(record.getMatnr(), record.getThreeCode()); + record.setStock(sumAnfme == null ? 0 : sumAnfme); + } + return R.ok(page); + } + @RequestMapping(value = "/order/detl/all/auth") @ManagerAuth public R head(@RequestParam Long orderId){ diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java index 2be82e0..a565b5b 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -326,7 +326,9 @@ if (Cools.isEmpty(agvBasDevp)) { throw new CoolException("鏆傛棤"+ station + "绔欑偣"); } - if (containerType == 21 && agvBasDevp.getFloor() == 3) { + if (containerType == 40 && agvBasDevp.getFloor() == 3) { + locType = 5; + } else if (containerType == 21 && agvBasDevp.getFloor() == 3) { locType = 4; } else if (containerType == 20 && agvBasDevp.getFloor() == 3) { locType = 2; diff --git a/src/main/webapp/views/agvLocMast/locMast.html b/src/main/webapp/views/agvLocMast/locMast.html index 55b949c..432473c 100644 --- a/src/main/webapp/views/agvLocMast/locMast.html +++ b/src/main/webapp/views/agvLocMast/locMast.html @@ -46,7 +46,7 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="lev1" placeholder="灞�" autocomplete="off"> + <input class="layui-input" type="text" name="floor" placeholder="灞�" autocomplete="off"> </div> </div> <!-- 寰呮坊鍔� --> -- Gitblit v1.9.1