From 8a8e9883dc14f70952e9fb5af702cfbea73c7125 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期五, 01 八月 2025 15:11:01 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index effb1d3..e590dc7 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -126,7 +126,7 @@
//缁勬嫋閫氱煡妗�
waitPakins.forEach(pakin -> {
- waitPakinService.comb(pakin);
+ waitPakinService.comb(pakin, ordersParam.getInType());
});
@@ -373,27 +373,30 @@
}
}
});
+
+ //鍒ゆ柇鏄惁涓烘尝娆″崟鎹�
+ if (pickSheet.getType().equals(1)) {
+ //鍒犻櫎娉㈡鍙婂搴旀槑缁嗕俊鎭�
+ if (!waveService.remove(new LambdaQueryWrapper<Wave>().eq(Wave::getId, pickSheet.getWaveId()))) {
+ throw new CoolException("娉㈡鍒楄〃鍗曟嵁鍒犻櫎澶辫触锛侊紒");
+ }
- //鍒犻櫎娉㈡鍙婂搴旀槑缁嗕俊鎭�
- if (!waveService.remove(new LambdaQueryWrapper<Wave>().eq(Wave::getId, pickSheet.getWaveId()))) {
- throw new CoolException("娉㈡鍒楄〃鍗曟嵁鍒犻櫎澶辫触锛侊紒");
- }
+ if (!waveDetlService.remove(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, pickSheet.getWaveId()))) {
+ throw new CoolException("娉㈡鏄庣粏鍒楄〃鍒犻櫎澶辫触锛侊紒");
+ }
- if (!waveDetlService.remove(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, pickSheet.getWaveId()))) {
- throw new CoolException("娉㈡鏄庣粏鍒楄〃鍒犻櫎澶辫触锛侊紒");
- }
-
- List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveId, pickSheet.getWaveId()));
- if (orders.isEmpty()) {
- throw new CoolException("娉㈡璁㈠崟涓嶅瓨鍦紒锛�");
- }
- List<Long> list = orders.stream().map(Order::getId).collect(Collectors.toList());
- boolean remove = orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list));
- if (!remove) {
- throw new CoolException("鍘熷璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
- }
- if (!orderService.remove(new LambdaQueryWrapper<Order>().in(Order::getId, list))) {
- throw new CoolException("鍘熷璁㈠崟鍒犻櫎澶辫触锛侊紒");
+ List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveId, pickSheet.getWaveId()));
+ if (orders.isEmpty()) {
+ throw new CoolException("娉㈡璁㈠崟涓嶅瓨鍦紒锛�");
+ }
+ List<Long> list = orders.stream().map(Order::getId).collect(Collectors.toList());
+ boolean remove = orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, list));
+ if (!remove) {
+ throw new CoolException("鍘熷璁㈠崟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+ if (!orderService.remove(new LambdaQueryWrapper<Order>().in(Order::getId, list))) {
+ throw new CoolException("鍘熷璁㈠崟鍒犻櫎澶辫触锛侊紒");
+ }
}
return true;
@@ -438,12 +441,12 @@
throw new CoolException("璁㈠崟鎾浣嶇粦瀹氬け璐ワ紒锛�");
}
- if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
- .eq(WaveSeed::getOrderNo, order.getOrderNo())
- .set(WaveSeed::getSiteId, siteNo.getId())
- .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {
- throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒");
- }
+// if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
+// .eq(WaveSeed::getOrderNo, order.getOrderNo())
+// .set(WaveSeed::getSiteId, siteNo.getId())
+// .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {
+// throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒");
+// }
//缁戝畾鎴愬姛锛屾挱绉嶅浜伅
sowLightMange(siteNo.getSiteNo(), order, "LIGHT");
} else {
--
Gitblit v1.9.1