From 85f15182f6a6d97ad86739967e59e80299e1b98f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 09 九月 2025 14:14:10 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 4 ++--
1 files changed, 2 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 95bd733..b81dd08 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
@@ -84,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("鍙傛暟涓嶈兘涓虹┖");
@@ -126,12 +126,12 @@
@PostMapping("/out/orderOut/merge/wave")
@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) {
--
Gitblit v1.9.1