From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期一, 24 三月 2025 19:41:36 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 14 +++++++------- src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 6 +++--- src/main/java/com/zy/asrs/controller/OrderDetlController.java | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java index 6d70670..77bc3c8 100644 --- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java +++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java @@ -359,6 +359,41 @@ return R.ok(page); } + @RequestMapping(value = "/orderDetl/pakout/list/authV9") + @ManagerAuth + public R pakoutList9(@RequestParam(defaultValue = "1") Integer curr, + @RequestParam(defaultValue = "10") Integer limit, + @RequestParam(required = false) String orderByField, + @RequestParam(required = false) String orderByType, + @RequestParam Map<String, Object> param) { + EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convertLike(param, wrapper); + if (!Cools.isEmpty(orderByField)) { + wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); + } else { + wrapper.orderBy("create_time", false); + } + List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1)); + List<Long> docIds = new ArrayList<>(); + for (DocType pakin : pakins) { + if (pakin.getDocId() == 48) { + 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.getSumAnfmeProcessed2(record.getMatnr(), record.getThreeCode()); + record.setStock(sumAnfme == null ? 0 : sumAnfme); + //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo()); + //record.setWorkNum(workNum == null ? 0 : workNum); + } + + return R.ok(page); + } + @RequestMapping(value = "/orderDetl/pakout/list/authV6") @ManagerAuth public R pakoutList6(@RequestParam(defaultValue = "1") Integer curr, diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java index 9af4f46..4b28cff 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java @@ -880,13 +880,13 @@ agvWrkMast.setModiTime(now); agvWrkMast.setIoTime(now); // 鎵撴爣璁帮紝鑻ュ簱浣嶄笉澶燂紝鍏ュ簱鍒板埆鐨勬ゼ灞傦紝閭d箞闇�瑕佽法灞傜Щ搴� - if (!Cools.isEmpty(factory)) { - if (newLocMast.getLev1() == 1 && !factory.equals(AsrsConstants.SANCHANG)) { - agvWrkMast.setCtnNo("1"); - } else if (newLocMast.getLev1() == 2 && !factory.equals(AsrsConstants.ERCHANG)) { - agvWrkMast.setCtnNo("2"); - } - } +// if (!Cools.isEmpty(factory)) { +// if (newLocMast.getLev1() == 1 && factory.equals(AsrsConstants.ERCHANG)) { +// agvWrkMast.setCtnNo("2"); +// } else if (newLocMast.getLev1() == 2 && factory.equals(AsrsConstants.SANCHANG)) { +// agvWrkMast.setCtnNo("1"); +// } +// } if (!agvWrkMastService.update(agvWrkMast, new EntityWrapper<AgvWrkMast>().eq("wrk_no", agvWrkMast.getWrkNo()))) { throw new CoolException("鏇存柊宸ヤ綔妗eけ璐�"); } 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 e6a63d9..9d3dd0e 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java @@ -752,9 +752,9 @@ String ctnNo = null; // 鎵撴爣璁帮紝鑻ュ簱浣嶄笉澶燂紝鍏ュ簱鍒板埆鐨勬ゼ灞傦紝閭d箞闇�瑕佽法灞傜Щ搴� if (!Cools.isEmpty(code)) { - if (agvLocMast.getLev1() == 1 && !code.equals(AsrsConstants.SANCHANG)) { - ctnNo = "1"; - } else if (agvLocMast.getLev1() == 2 && !code.equals(AsrsConstants.ERCHANG)) { + if (agvLocMast.getLev1() == 1 && code.equals(AsrsConstants.ERCHANG)) { + ctnNo = "2"; + } else if (agvLocMast.getLev1() == 2 && code.equals(AsrsConstants.SANCHANG)) { ctnNo = "1"; } } -- Gitblit v1.9.1