From 69abbfbdbda77af152490e47851622905df7eb8e Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 20:35:52 +0800
Subject: [PATCH] feat: 部门物品回退
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 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 aebbe2f..1815c52 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
@@ -5,28 +5,29 @@
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.param.BaseWarehouseParam1;
import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.LWFormsOutputGoodsInfoParam;
import com.consum.base.pojo.LWFormsOutputGoodsModelParam;
import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.pojo.excel.OutputExcelTemplate;
import com.consum.base.pojo.query.LWhFormOutputQry;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormOutput;
-import com.consum.model.po.LWhProcureModel;
+import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
import java.util.ArrayList;
import java.util.HashMap;
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.interceptor.TransactionAspectSupport;
/**
* @Description 鍑哄簱鍗�
@@ -119,7 +120,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();
@@ -225,4 +226,38 @@
}
+ public List<OutputExcelTemplate> getExportList(Long id) {
+ String sql = "SELECT\n"
+ + "\tfo.BUSINESS_FORM_CODE,\n"
+ + "\tfo.AGENCY_NAME tenantName,\n"
+ + "\tGOODS_NAME templateName,\n"
+ + "\tpm.BASE_GOODS_MODELS_NAME baseModelName,\n"
+ + "\tcounts num,\n"
+ + "\ttotal_amount totalAmount,\n"
+ + "\tfo.DEAL_TIME createTime,\n"
+ + "\tfo.OPERATOR_NAME,\n"
+ + "\tBEIZ remark\n"
+ + "FROM\n"
+ + "\tl_wh_procure_model pm\n"
+ + "\tLEFT JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id\n"
+ + "\tLEFT JOIN base_goods_template bgt ON bgm.GOODS_TEMPLATES_ID = bgt.id\n"
+ + "\tLEFT JOIN l_wh_form_output fo ON fo.ID = pm.BUSINESS_ID\n"
+ + "WHERE\n"
+ + "\tpm.BUSINESS_ID = :id";
+
+ Map<String, Object> param = new HashMap<>();
+ param.put("id", id);
+ List<Map<String, Object>> select = this.select(sql, param, new MapperUtil());
+ if (CollectionUtils.isEmpty(select)) {
+ return null;
+ }
+ List<OutputExcelTemplate> list = Lists.newArrayList();
+ select.forEach(item -> {
+ OutputExcelTemplate templateExcelExport = MapUtils.convertMapToObj(item, OutputExcelTemplate.class);
+ list.add(templateExcelExport);
+ });
+ return list;
+
+ }
+
}
--
Gitblit v1.9.1