From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java
index 07014d1..4943af9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CacheSiteServiceImpl.java
@@ -71,15 +71,7 @@
List<WaveSeed> waveSeeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderId, orderId));
//fixme 鏍￠獙褰撳墠璁㈠崟鏄惁瀹屾垚鎾锛岄渶瑕佽幏鍙栧綋鍓嶆尝娆℃墍鏈変换鍔′腑A鐗╂枡鐨勬墽琛屾暟閲忔槸鍚︾瓑浜庤鍗曠殑鎬婚噺-宸插畬鎴愭暟閲�(anfme - qty) 鎴栬�� 浠诲姟涓凡鎵ц鏁伴噺鏄惁绛夎鍗曚腑鐨勬墽琛屾暟閲� workQty = workQty
List<OrderDetl> orderDetls = orderDetlService.getOrderDetlByOrderId(orderId);
- //鑾峰彇璁㈠崟A鎵�鏈夋槑缁嗙墿鏂�
-// if (orderDetls.isEmpty()) {
-// throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�");
-// }
-// List<Long> matnrs = orderDetls.stream().map(OrderDetl::getMatId).collect(Collectors.toList());
-// orderDetls.forEach(orderDetl -> {
-//
-// });
-// List<WaveSeed> waveSeeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getWaveId, order.getWaveId()));
+
for (WaveSeed waveSeed : waveSeeds) {
Double anfme = stockMap.get(waveSeed.getOrderDetlId());
if (anfme == null) {
@@ -89,7 +81,6 @@
stockMap.put(waveSeed.getOrderDetlId(), anfme);
}
-// List<OrderDetl> orderDetls = orderDetlService.getOrderDetlByOrderId(orderId);
boolean check = true;
for (OrderDetl orderDetl : orderDetls) {
Double anfme = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
@@ -135,6 +126,7 @@
Long waveId = order.getWaveId();
boolean check = this.seedCompletePreview(param);
+
if (!check) {//璁㈠崟鏈鐞嗗畬鎴�
List<Long> taskIds = new ArrayList<>();
List<TaskDetl> taskDetls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getWaveId, waveId));
@@ -145,7 +137,8 @@
}
if (!taskIds.isEmpty()) {
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds).notIn(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id, TaskStsType.UPDATED_OUT.id));
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds)
+ .notIn(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id, TaskStsType.UPDATED_OUT.id));
if (!tasks.isEmpty()) {
throw new CoolException("瀛樺湪鏈畬鎴愪换鍔�");
}
--
Gitblit v1.9.1