From 5d468e5ccd96dc068d91d593c770643ecdc6f1af Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 03 七月 2025 16:34:41 +0800 Subject: [PATCH] 1. 入库历史订单明细数据丢失 2. 库存信息响应问题 3. 出库明细新加客户信息 4. 库存明细增加查询条件 5. 出库修改物料来源 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 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 e407211..8921f91 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 @@ -107,9 +107,10 @@ MergePreviewDto dto = new MergePreviewDto(); dtos.add(dto); - double anfme = waveDetl.getAnfme() - waveDetl.getWorkQty(); + double anfme = Math.round((waveDetl.getAnfme() - waveDetl.getWorkQty()) * 1000) / 1000.0; dto.setMatnr(waveDetl.getMatnr()); dto.setBatch(waveDetl.getBatch()); + dto.setStatus(0); dto.setWorkQty(0.0); dto.setAnfme(anfme); dto.setOrderIds(orderIds); @@ -122,7 +123,7 @@ } @PostMapping("/out/orderOut/merge/wave") - @OperationLog("娉㈡鍚堝苟璁㈠崟鍑哄簱") + @OperationLog("鐢熸垚娉㈡浠诲姟") @Transactional public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) { outManage.orderOutMergeWave(param); -- Gitblit v1.9.1