From 3cc2ebefcb08153594ee1384f62694d4a906f843 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 18:18:52 +0800
Subject: [PATCH] feat: 导出木板
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
index c21a84c..25e980b 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -155,7 +155,7 @@
* @return 娴佹按璁板綍鎬昏〃ID
*/
@Transactional(rollbackFor = Exception.class)
- public Long outFormByTransId(Long outWarehouseFormId, WhBusinessEnum businessType, S_user_core currentUser, Long dealTime) {
+ public Long outFormByTransId(Long outWarehouseFormId, WhBusinessEnum businessType, S_user_core currentUser, Long dealTime, Long whFormTransferId) {
if (outWarehouseFormId == null) {
return null;
}
@@ -295,7 +295,7 @@
warehouseFlow.setThisType(2);
warehouseFlow.setBusinessType(businessType.getValue() + 0);
- warehouseFlow.setBusinessFormId(lWarehouseFlowBusinessId);
+ warehouseFlow.setBusinessFormId(whFormTransferId == null ? lWarehouseFlowBusinessId : whFormTransferId);
warehouseFlow.setOperatorId(userId);
warehouseFlow.setOperatorName(nickName);
warehouseFlow.setDealTime(dealTime);
@@ -311,7 +311,7 @@
lWhFormOutputService.update(lWhFormOutput);
//褰撳簱瀛樺彉鍔ㄦ椂璋冪敤璇ユ柟娉�
- if (outWarehouseType == 0){
+ if (outWarehouseType == 0) {
lWhWarningCoreService.updateKuCun(Convert.toShort(outWarehouseType, (short) 0), outWarehouseId, allChangModelList, null, dealTime);
}
return lWarehouseFlowId;
--
Gitblit v1.9.1