From 87ff2a60723119530d071f6ed6b16fc2f3f023ca Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 16:32:05 +0800
Subject: [PATCH] 报废单导出金额信息
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
index 0e75cae..b82944a 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
@@ -16,6 +16,7 @@
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
+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;
@@ -34,8 +35,6 @@
import com.consum.base.service.BaseGoodsTemplateService;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.LWhFormScrappedCoreService;
-import com.consum.base.service.LWhFormScrappedGoodsService;
import com.consum.base.service.LWhFormScrappedService;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.SDictDataServiceImpl;
@@ -69,7 +68,7 @@
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
- private LWhFormScrappedGoodsService scrappedGoodsService;
+ private LWhFormScrappedGoodsServiceImpl scrappedGoodsService;
@Autowired
private SDictDataServiceImpl sDictDataService;
@Autowired
@@ -197,10 +196,6 @@
scrappedGoods.setBaseGoodsModelsName(baseGoodsModels.getModelName());
scrappedGoods.setUnit(baseGoodsModels.getUnit());
}
- // 閫氳繃鍨嬪彿id鏌ヨ璇ュ瀷鍙锋墍鏈夊晢鍝佺殑鎬婚噾棰�
- // GoodsModelCountDTO goodsModelCountDTO =
- // lWhGoodsService.queryGoodsAmount(baseGoodsModelsId, GoodsStatesType.SCRAP.getValue());
- // scrappedGoods.setTotalAmount(goodsModelCountDTO.getAmount());
scrappedGoodsList.add(scrappedGoods);
}
int flag2 = this.scrappedGoodsService.insertBatch(scrappedGoodsList);
@@ -387,11 +382,11 @@
@Override
public List<ScrappedInfoExcelTemplate> export(Long id) {
- String sql = "SELECT\n" + "\tBUSINESS_FORM_CODE,\n" + "\tfs.DEAL_TIME,\n" + "\tOPERATOR_NAME,\n"
- + "\tAGENCY_NAME tenantName,\n" + "\tGOODS_TEMPLATE_NAME templateName,\n"
- + "\tBASE_GOODS_MODELS_NAME baseModelName,\n" + "\tCOUNTS num,\n" + "\tSCRAPPED_NAME deception,\n"
- + "\tBEIZ remark\n" + "FROM\n" + "\tl_wh_form_scrapped_goods fsg\n"
- + "\tLEFT JOIN l_wh_form_scrapped fs ON fs.id = fsg.FORM_SCRAPPED_ID\n" + "WHERE\n" + "\tfs.ID = :id\n"
+ String sql = "SELECT BUSINESS_FORM_CODE,fs.DEAL_TIME,OPERATOR_NAME,\n"
+ + "\tAGENCY_NAME tenantName,GOODS_TEMPLATE_NAME templateName,\n"
+ + "\tBASE_GOODS_MODELS_NAME baseModelName,COUNTS num,SCRAPPED_NAME deception,\n"
+ + "\tBEIZ remark,total_amount FROM l_wh_form_scrapped_goods fsg\n"
+ + "\tLEFT JOIN l_wh_form_scrapped fs ON fs.id = fsg.FORM_SCRAPPED_ID WHERE fs.ID = :id\n"
+ "\tAND STATES = 1";
Map<String, Object> param = new HashMap<>();
param.put("id", id);
@@ -403,6 +398,7 @@
select.forEach(item -> {
ScrappedInfoExcelTemplate inventoryExcelTemplate =
MapUtils.convertMapToObj(item, ScrappedInfoExcelTemplate.class);
+ inventoryExcelTemplate.setAmount(CurrencyUtil.convertFenToYuan(inventoryExcelTemplate.getTotalAmount()));
list.add(inventoryExcelTemplate);
});
return list;
--
Gitblit v1.9.1