From 0a3a59432a0ff8d4169ad7484250a0a0d5bed1f9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 09 一月 2025 19:50:58 +0800
Subject: [PATCH] # 1. 波次预览重复问题 2. PDA组拖超过3个物料后，组拖按钮被遮挡 3. 平库入库物料ID为空 4. PDA出库成功后，界面数据重置，避免重复操作 5. 入库单历史档，按时间倒序排列
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
index 9eb6627..e407211 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
@@ -93,12 +93,14 @@
throw new CoolException("娉㈡涓嶈兘涓虹┖");
}
+ //鑾峰彇鍑哄簱璁㈠崟
List<Long> orderIds = new ArrayList<>();
List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getWaveId, waveId));
for (Order order : orders) {
orderIds.add(order.getId());
}
+ //鑾峰彇璁㈠崟娉㈡鏄庣粏
List<MergePreviewDto> dtos = new ArrayList<>();
List<WaveDetl> waveDetls = waveDetlService.list(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, waveId));
for (WaveDetl waveDetl : waveDetls) {
@@ -108,12 +110,13 @@
double anfme = waveDetl.getAnfme() - waveDetl.getWorkQty();
dto.setMatnr(waveDetl.getMatnr());
dto.setBatch(waveDetl.getBatch());
+ dto.setWorkQty(0.0);
dto.setAnfme(anfme);
dto.setOrderIds(orderIds);
dto.setFieldParams(JSON.parseArray(waveDetl.getFieldParams(), FieldParam.class));
dto.setFieldParamsEncode(waveDetl.getFieldParams());
}
-
+ //鑾峰彇娉㈡鏄庣粏搴撲綅淇℃伅
List<MergePreviewResultDto> resultDtos = outManage.orderOutMergeLocPreview(dtos);
return R.ok().add(resultDtos);
}
--
Gitblit v1.9.1