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/LWhFormOutputServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index 8beeee4..8978da5 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -4,6 +4,7 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.param.BaseWarehouseParam1;
+import com.consum.base.core.utils.CurrencyUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
@@ -44,7 +45,7 @@
@Autowired
private CodeGeneratorService codeGeneratorService;
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
@@ -52,7 +53,7 @@
@Autowired
private LWhFormOutputCoreService lWhFormOutputCoreService;
@Autowired
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseGoodsModelsService baseGoodsModelsService;
private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
@@ -123,7 +124,7 @@
}
//3.鏍规嵁鍑哄簱鍗曞嚭搴�
- Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.CHUKU, currentUser, param.getDealTime());
+ Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.CHUKU, currentUser, param.getDealTime(), null);
if (lWarehouseFlowId == null) {
log.error("鏍规嵁鍑哄簱鍗曞嚭搴撳け璐�");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -257,6 +258,7 @@
List<OutputExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
OutputExcelTemplate templateExcelExport = MapUtils.convertMapToObj(item, OutputExcelTemplate.class);
+ templateExcelExport.setAmount(CurrencyUtil.convertFenToYuan(templateExcelExport.getTotalAmount()));
list.add(templateExcelExport);
});
return list;
--
Gitblit v1.9.1