From eb8577aac0f1f7d783ecd067e7eef05e53e7fd10 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期五, 27 十月 2023 17:24:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 bedd0f9..e8988b6 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
@@ -72,7 +72,7 @@
* @return 鍑哄簱鍗旾d
*/
@Transactional(rollbackFor = Exception.class)
- public Long createOutFormByTransId(Long whFormTransferId, S_user_core currentUser,Long dealTime) {
+ public Long createOutFormByTransId(Long whFormTransferId, S_user_core currentUser, Long dealTime) {
if (whFormTransferId == null) {
return null;
}
@@ -152,7 +152,7 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public Long outFormByTransId(Long outWarehouseFormId, S_user_core currentUser,Long dealTime) {
+ public Long outFormByTransId(Long outWarehouseFormId, S_user_core currentUser, Long dealTime) {
if (outWarehouseFormId == null) {
return null;
}
@@ -195,6 +195,11 @@
} else if ((BaseWarehouseParam1.In_OutPutTypeEnum.Dept_Lending_Out.getValue() + "").equals(outputCode)) {
// 閮ㄩ棬浠撳簱 鍒嗗彂鍑哄簱
// queryModelStatusT = 2;
+ } else if ((BaseWarehouseParam1.In_OutPutTypeEnum.Fragmentary_Output.getValue() + "").equals(outputCode)) {
+ // 闆舵槦鍑哄簱
+ queryModelStatusT = 1;
+ buyTypeT = null;
+ modGoodsTransferingStatusT = 4;
}
short queryModelStatus = queryModelStatusT;
Short buyType = buyTypeT;
--
Gitblit v1.9.1