From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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..2d501ee 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
@@ -82,7 +84,7 @@
@PostMapping("/out/orderOut/wave/preview")
@OperationLog("棰勮娉㈡鍑哄簱")
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public R orderOutWavePreview(@RequestBody OrderOutWavePreviewParam param) {
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
@@ -93,39 +95,53 @@
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) {
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);
dto.setFieldParams(JSON.parseArray(waveDetl.getFieldParams(), FieldParam.class));
dto.setFieldParamsEncode(waveDetl.getFieldParams());
}
-
+ //鑾峰彇娉㈡鏄庣粏搴撲綅淇℃伅
List<MergePreviewResultDto> resultDtos = outManage.orderOutMergeLocPreview(dtos);
return R.ok().add(resultDtos);
}
@PostMapping("/out/orderOut/merge/wave")
- @OperationLog("娉㈡鍚堝苟璁㈠崟鍑哄簱")
- @Transactional
+ @OperationLog("鐢熸垚娉㈡浠诲姟")
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