From 2fbf3adb37334f90c29b1f119f0652f37a2608dc Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 19 十一月 2024 10:03:17 +0800 Subject: [PATCH] #优化 --- src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) 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 3d635a7..af0be84 100644 --- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java @@ -164,6 +164,12 @@ if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no", pick.getOrderNo()).eq("matnr", pick.getMatnr()).eq("three_code",pick.getThreeCode()))){ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"+pick.getOrderNo()+pick.getMatnr()); } + Order order = orderService.selectByNo(orderDetl.getOrderNo()); + if (order.getSettle() == 1) { + if (!orderService.updateSettle(order.getId(), 2L, userId)) { + throw new CoolException("鍐嶆鎷f枡锛氭洿鏂拌鍗曠姸鎬佸け璐ワ紒"); + } + } } // 纭鏄惁鍏ㄩ儴鍑哄簱 double totleWrkdetl = 0.0; @@ -183,7 +189,7 @@ // agvLocDetls.size() == 1 - return "缁勬墭鎴愬姛锛岀粦瀹氱珯鐐规垚鍔�"; + return "鎷f枡鎴愬姛"; } /* @@ -278,8 +284,13 @@ if (Cools.isEmpty(mat)) { throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗f涓嶅瓨鍦�"); } + OrderDetl orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), detlDto.getBatch(), detlDto.getCsocode()); AgvWaitPakin waitPakin = new AgvWaitPakin(); waitPakin.sync(mat); + if (orderDetl != null) { + waitPakin.setWeight(orderDetl.getWeight()); + waitPakin.setVolume(orderDetl.getVolume()); + } waitPakin.setOrderNo(orderNo); // 鍗曟嵁缂栧彿 waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮� //waitPakin.setZpallet(zpallet); // 璐ф灦鐮� -- Gitblit v1.9.1