From 49b8b52ae6dfb28e3e9a741bb277c231bd13418d Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 04 七月 2025 15:51:45 +0800 Subject: [PATCH] 库存明细出库 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 17 +++++++++++++++-- 1 files changed, 15 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..3c19a34 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 @@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zy.asrs.wms.asrs.entity.param.StockOutParam; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.exception.CoolException; import com.zy.asrs.wms.asrs.entity.Order; @@ -24,6 +25,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; @RestController @@ -107,9 +109,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,13 +125,23 @@ } @PostMapping("/out/orderOut/merge/wave") - @OperationLog("娉㈡鍚堝苟璁㈠崟鍑哄簱") + @OperationLog("鐢熸垚娉㈡浠诲姟") @Transactional public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) { outManage.orderOutMergeWave(param); return R.ok(); } + @PostMapping("/out/locs/stock") + @OperationLog("鎵嬪姩鍑哄簱") + public R stockOut(@RequestBody StockOutParam param) { + if (Objects.isNull(param)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + outManage.outLocStock(param); + return R.ok(); + } + @PostMapping("/out/wave/generate") @OperationLog("鐢熸垚娉㈡") @Transactional -- Gitblit v1.9.1