From d84ed060312f3e7fd5f53dd47d3a1729706a880b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 04 十一月 2024 16:52:50 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 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 03b6140..3d635a7 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -422,6 +422,8 @@
if (agvLocMast.getFloor() != floor) {
if (agvLocMast.getFloor() == 1 && (floor == 2 || floor == 3)) {
throw new CoolException("褰撳墠搴撲綅璇烽�夋嫨璋冩嫧鍗曡皟鎷紒");
+ } else if ((agvLocMast.getFloor() == 2 || agvLocMast.getFloor() == 3) && (floor == 1 || floor == 4)) {
+ throw new CoolException("褰撳墠搴撲綅璇烽�夋嫨璋冩嫧鍥炴祦鍗曞洖閫�锛�");
} else {
ioType = 12;
}
@@ -512,29 +514,29 @@
});
}
- // 濡傛灉褰撳墠浠诲姟鏄澹充簩涓夋ゼ鍥為��涓�妤肩殑 鍥炴粴璋冩嫧鍗�
- if (ioType == 12 && locMast.getFloor() == 1 && floor != 4 && agvLocMast.getFloor() != 1) {
- List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
- for (AgvLocDetl agvLocDetl : agvLocDetls) {
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("source", 33));
- if (Cools.isEmpty(orderDetl)) {
- throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
- }
- Order order = orderService.selectByNo(orderDetl.getOrderNo());
- if (Cools.isEmpty(order)) {
- throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
- }
- if (order.getSettle() == 4L) {
- if (!orderService.updateSettle(order.getId(),2L,userId)) {
- throw new CoolException("璋冩嫧鍗曞洖婊氬紓甯�!");
- }
- }
- orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
- if (!orderDetlService.updateById(orderDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- }
- }
+// // 濡傛灉褰撳墠浠诲姟鏄澹充簩涓夋ゼ鍥為��涓�妤肩殑 鍥炴粴璋冩嫧鍗�
+// if (ioType == 12 && locMast.getFloor() == 1 && floor != 4 && agvLocMast.getFloor() != 1) {
+// List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
+// for (AgvLocDetl agvLocDetl : agvLocDetls) {
+// OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("three_code", agvLocDetl.getThreeCode()).eq("matnr", agvLocDetl.getMatnr()).eq("source", 33));
+// if (Cools.isEmpty(orderDetl)) {
+// throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
+// }
+// Order order = orderService.selectByNo(orderDetl.getOrderNo());
+// if (Cools.isEmpty(order)) {
+// throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
+// }
+// if (order.getSettle() == 4L) {
+// if (!orderService.updateSettle(order.getId(),2L,userId)) {
+// throw new CoolException("璋冩嫧鍗曞洖婊氬紓甯�!");
+// }
+// }
+// orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
+// if (!orderDetlService.updateById(orderDetl)) {
+// throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+// }
+// }
+// }
//鏇存柊鐩爣搴撲綅鐘舵��
updateAgvLocMast(agvLocMast,"P");
updateAgvLocMast(locMast,"Q");
--
Gitblit v1.9.1