From dd570625f2d784f94f78b70c508cc1dd39128f1f Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期一, 30 十月 2023 10:01:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
index 70c38b4..ab0191b 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java
@@ -54,14 +54,22 @@
Long outWarehouseFormId = null;
try {
// 鏍规嵁璋冩嫧鍗� 鐢熸垚 鍑哄簱鍗�
- outWarehouseFormId = lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, currentUser);
+ outWarehouseFormId = lWhFormOutputCoreService.createOutFormByTransId(whFormTransferId, currentUser, dealTime);
} catch (Exception e) {
log.error(e.getMessage());
return;
}
- // 鍑哄簱鍗� 鍑哄簱
- Long aLong = lWhFormOutputCoreService.outFormByTransId(whFormTransferId, currentUser);
+ // 鍑哄簱鍗� 鍑哄簱锛岃繑鍥� 鍑哄簱鍗曟祦姘碔d
+ Long outFormByTransId = lWhFormOutputCoreService.outFormByTransId(whFormTransferId, currentUser, dealTime);
+ // 鏇存柊璋冩嫧鍗�
+ lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
+ lWhFormTransfer.setOutWarehouseFormId(outWarehouseFormId);
+ lWhFormTransfer.setStates(1);
+ lWhFormTransfer.setOutOperatorId(userId);
+ lWhFormTransfer.setOutOperatorName(nickName);
+ lWhFormTransfer.setOutputTime(dealTime);
+ lWhFormTransferService.update(lWhFormTransfer);
log.info("璋冩嫧鍗曪細{} 鍑哄簱瀹屾垚", whFormTransferId);
return;
--
Gitblit v1.9.1