From d41a06bb77cca03b97eba0630d0e4dcf3557cbd4 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期一, 04 十二月 2023 13:20:50 +0800
Subject: [PATCH] feat: 登录页图片更换 导航栏标题更换
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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..cca17c4 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
@@ -8,20 +8,23 @@
import com.consum.base.core.service.LWhWarningCoreServiceImpl;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.LockManage;
-import com.consum.model.po.*;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhGoodsRecord;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.NumberGenerator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
/**
* @ClassName WhFormOutputCoreService
@@ -34,7 +37,7 @@
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
public class LWhFormOutputCoreService {
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
private CodeGeneratorService codeGeneratorService;
private LWhProcureModelService lWhProcureModelService;
@@ -45,7 +48,7 @@
private LWhGoodsRecordService lWhGoodsRecordService;
@Autowired
- public LWhFormOutputCoreService(BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ public LWhFormOutputCoreService(BaseGoodsTemplateService baseGoodsTemplateService,
LWhGoodsService lWhGoodsService,
CodeGeneratorService codeGeneratorService,
LWhProcureModelService lWhProcureModelService,
@@ -155,7 +158,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 +298,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 +314,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