From 33f4541719f5bf8f98616e3bcfcae1c416c69551 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 30 十一月 2023 13:29:32 +0800
Subject: [PATCH] 调拨出入库导出
---
consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
index df5197e..bd531dd 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
@@ -197,6 +197,9 @@
int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
}
+ if (businessType == 1) {
+ lWhProcureModel.setBusinessType(4);
+ }
lWhProcureModel.setCounts(model.getCounts());
lWhProcureModel.setBusinessId(lWhFormTransferId);
lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
@@ -213,7 +216,6 @@
// 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
//閮ㄩ棬鍒嗗彂绫诲瀷
if (businessType == 1 && "A".equals(baseModelMap.get("type"))) {
- lWhProcureModel.setBusinessType(4);
LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
lWhProcureModelUserRecord.setId(IdUtil.generateId());
lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId);
@@ -404,11 +406,12 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
- public Map<String, Object> export(Long id) {
+ public Map<String, Object> export(Long id, Integer type) {
String sql = "SELECT\n"
+ "\tft.BUSINESS_FORM_CODE,\n"
+ "\tft.OPERATOR_NAME,\n"
+ "\tft.CREATE_TIME,\n"
+ + "\tft.IN_AGENCY_NAME,\n"
+ "\tft.OUT_AGENCY_NAME,\n"
+ "\tGOODS_NAME,\n"
+ "\tpm.BASE_GOODS_MODELS_NAME,\n"
@@ -429,6 +432,11 @@
List<TemplateExcelTransfer> list = Lists.newArrayList();
select.forEach(item -> {
TemplateExcelTransfer templateExcelTransfer = MapUtils.convertMapToObj(item, TemplateExcelTransfer.class);
+ if (type == 1) {
+ templateExcelTransfer.setTenantName(templateExcelTransfer.getOutAgencyName());
+ } else {
+ templateExcelTransfer.setTenantName(templateExcelTransfer.getInAgencyName());
+ }
list.add(templateExcelTransfer);
});
@@ -439,10 +447,16 @@
String businessFormCode = entity.getBusinessFormCode();
Long createTime = entity.getCreateTime();
String operatorName = entity.getOperatorName();
-
+ String tenantName;
+ if (type == 1) {
+ tenantName = entity.getInAgencyName();
+ } else {
+ tenantName = entity.getOutAgencyName();
+ }
Map<String, Object> map = new HashMap<>();
map.put("code", businessFormCode);
map.put("date", DateUtils.toShowDate(createTime));
+ map.put("tenantName", tenantName);
map.put("name", operatorName);
map.put("countNum", countNum);
map.put("totalAmount", totalAmount);
--
Gitblit v1.9.1