From 01107e8aadfaf1e84a971d8eeb9ab37e1c5569f3 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 01 十二月 2023 09:38:56 +0800
Subject: [PATCH] feat: 部门退回/报废公用接口
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java | 180 ++++++++++++++++++++++++-----------------------------------
1 files changed, 73 insertions(+), 107 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 5e88b08..b022376 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,25 +5,34 @@
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.LWFormsOutputGoodsParam;
-import com.consum.base.pojo.LWhFormOutputInsertParam;
+import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.pojo.excel.TemplateExcelExport;
import com.consum.base.pojo.query.LWhFormOutputQry;
-import com.consum.model.po.*;
+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.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.CollectionUtils;
+import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-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 java.util.Optional;
+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;
/**
* @Description 鍑哄簱鍗�
@@ -49,108 +58,13 @@
private static String QUERY_FORM_OUTPUT_LIST = "SELECT * FROM l_wh_form_output WHERE 1 = 1";
- // /**
-// * @Description 鏂板鍑哄簱鍗�
-// * @Author 鍗㈠簡闃�
-// * @Date 2023/10/27
-// */
-// public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
-// //1.鏂板鍑哄簱鍗曡褰�
-// LWhFormOutput lWhFormOutput = new LWhFormOutput();
-// //鍑哄叆搴搃d
-// long lWhFormOutputId = IdUtil.generateId();
-// lWhFormOutput.setId(lWhFormOutputId);
-// Long warehouseId = param.getWarehouseId();
-// lWhFormOutput.setWarehouseId(warehouseId);
-// //鏍规嵁浠撳簱id鏌ヨ浠撳簱
-// BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
-// if (warehouse == null) {
-// log.error("浠撳簱id涓嶅瓨鍦�");
-// return 0;
-// }
-// lWhFormOutput.setWarehouseName(warehouse.getWarehouseName());
-// lWhFormOutput.setOutputCode(BaseWarehouseParam1.In_OutPutTypeEnum.Fragmentary_Output.getValue()+"");
-// lWhFormOutput.setOutputName("闆舵槦鍑哄簱");
-// lWhFormOutput.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
-// lWhFormOutput.setAgencyName(sysInfo.getTenantName());
-// lWhFormOutput.setOperatorId(sysInfo.getId());
-// lWhFormOutput.setOperatorName(sysInfo.getUserName());
-// long dateTimeNumber = DateUtils.getDateTimeNumber(System.currentTimeMillis());
-// lWhFormOutput.setDealTime(dateTimeNumber);
-// lWhFormOutput.setStates(1);
-// int flag1 = this.insert(lWhFormOutput);
-//
-// //2.鏍规嵁鍑哄簱鍗曞嚭搴�
-// Long lWarehouseFlowId = this.lWhFormOutputCoreService.outFormByTransId(lWhFormOutput.getId(), currentUser, dateTimeNumber);
-// //3.鍚戝嚭搴撳崟 鎻掑叆 杩涘嚭搴撴祦姘存�昏〃ID
-// int flag3 = 0;
-// if (flag1 > 0) {
-// LWhFormOutput lWhFormOutput1 = new LWhFormOutput(lWhFormOutputId);
-// lWhFormOutput1.setWarehouseFlowId(lWarehouseFlowId);
-// flag3 = this.update(lWhFormOutput1);
-// }
-//
-// //4.鏂板l_wh_goods_record璁板綍
-// List<LWhGoodsRecord> recordList = param.getList();
-// if (CollectionUtils.isEmpty(recordList)) {
-// log.error("瑙勬牸鍨嬪彿涓虹┖");
-// return 0;
-// }
-// int flag5 = 0;
-// int number = -1; //鍑哄簱鍚庯紝鐗╁搧鍓╀綑鏁伴噺
-// for (LWhGoodsRecord record : recordList) {
-// //鐗╁搧id鍜岀墿鍝佸悕绉�
-// record.setBaseGoodsTemplateId(param.getBaseGoodsTemplateId());
-// record.setGoodsTemplateName(param.getGoodsTemplateName());
-//
-// record.setId(IdUtil.generateId());
-// record.setWarehouseId(warehouseId);
-// //鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
-// int goodsNum = this.lWhGoodsService.queryGoodsModelNum(warehouseId, record.getBaseGoodsModelsId(), (short) 1, null);
-// record.setInitialCount(goodsNum);
-// record.setThisType(2);
-//
-// //鍒ゆ柇鍑哄簱鏁伴噺鏄惁灏忎簬搴撳瓨
-// number = goodsNum - record.getThisCount();
-// if (number < 0) {
-// log.error("搴撳瓨涓嶈冻");
-// break;
-// }
-// record.setEndCount(number);
-// record.setDealTime(dateTimeNumber);
-// record.setWarehouseFlowId(lWarehouseFlowId);
-//
-// //5.鏂板L_WH_PROCURE_MODEL璁板綍
-// LWhProcureModel lWhProcureModel = new LWhProcureModel();
-// lWhProcureModel.setId(IdUtil.generateId());
-// lWhProcureModel.setBusinessType(3);
-// lWhProcureModel.setBaseGoodsModelsId(record.getBaseGoodsModelsId());
-// lWhProcureModel.setCounts(record.getThisCount());
-// lWhProcureModel.setWorehouseCount(goodsNum);
-// int res = this.lWhProcureModelService.insert(lWhProcureModel);
-// flag5 += res;
-// }
-// //濡傛灉鍑哄簱鍚庯紝鍓╀綑搴撳瓨澶т簬0锛屾柊澧瀕_wh_goods_record璁板綍
-// int flag4 = 0;
-// if (number >= 0){
-// flag4 = this.lWhGoodsService.insert(recordList);
-// }
-//
-// //濡傛灉鏈変竴鏉¤褰曟柊澧炲け璐ワ紝鍒欏洖婊�
-// if (flag1 == 0 || flag3 == 0 || flag4 != recordList.size() || flag5 != recordList.size() || number < 0) {
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-// return 0;
-// }
-//
-// return 1;
-// }
/**
* @Description 鏂板鍑哄簱鍗�
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
- public int add(LWhFormOutputInsertParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
+ public int add(LWhFormOutputParam param, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏂板鍑哄簱鍗曡褰�
LWhFormOutput lWhFormOutput = new LWhFormOutput();
//鍑哄叆搴搃d
@@ -181,9 +95,9 @@
return 0;
}
//2.鏂板鐗╁搧鍨嬪彿璁板綍
- List<LWFormsOutputGoodsParam> goodsList = param.getGoods();
+ List<LWFormsOutputGoodsInfoParam> goodsList = param.getGoods();
List<LWhProcureModel> modelList = new ArrayList<>();
- for (LWFormsOutputGoodsParam goods : goodsList) {
+ for (LWFormsOutputGoodsInfoParam goods : goodsList) {
List<LWFormsOutputGoodsModelParam> models = goods.getModels();
for (LWFormsOutputGoodsModelParam model : models) {
LWhProcureModel lWhProcureModel = new LWhProcureModel();
@@ -198,7 +112,7 @@
}
lWhProcureModel.setCounts(model.getCounts());
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), (short) 1, null);
+ int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, model.getBaseGoodsModelsId(), 1, null);
lWhProcureModel.setWorehouseCount(goodsNum);
modelList.add(lWhProcureModel);
}
@@ -317,4 +231,56 @@
}
+ public Map<String, Object> getExportList(Long id, String userName) {
+ String sql = "SELECT\n"
+ + "\tfo.BUSINESS_FORM_CODE,\n"
+ + "\tfo.AGENCY_NAME tenantName,\n"
+ + "\tGOODS_NAME goodsName,\n"
+ + "\tpm.BASE_GOODS_MODELS_NAME goodsModeName,\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<TemplateExcelExport> list = Lists.newArrayList();
+ select.forEach(item -> {
+ TemplateExcelExport templateExcelExport = MapUtils.convertMapToObj(item, TemplateExcelExport.class);
+ templateExcelExport.setTenantName(StringUtils.isNotEmpty(templateExcelExport.getTenantName()) ? templateExcelExport.getTenantName() : "");
+ templateExcelExport.setRemark(StringUtils.isNotEmpty(templateExcelExport.getRemark()) ? templateExcelExport.getRemark() : "");
+ templateExcelExport.setTotalAmount(templateExcelExport.getTotalAmount() == null ? 0 : templateExcelExport.getTotalAmount());
+ templateExcelExport.setNum(templateExcelExport.getNum() == null ? 0 : templateExcelExport.getNum());
+ list.add(templateExcelExport);
+ });
+ int sum = list.stream().filter(item -> item.getNum() != null).mapToInt(TemplateExcelExport::getNum).sum();
+ int totalAmount = list.stream().filter(export -> export.getTotalAmount() != null).mapToInt(TemplateExcelExport::getTotalAmount).sum();
+ Optional<TemplateExcelExport> first = list.stream().findFirst();
+ TemplateExcelExport templateExcelExport = first.get();
+ String businessFormCode = templateExcelExport.getBusinessFormCode();
+ Long createTime = templateExcelExport.getCreateTime();
+ String operatorName = templateExcelExport.getOperatorName();
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", businessFormCode);
+ map.put("date", DateUtils.toShowDate(createTime));
+ map.put("name", operatorName);
+ map.put("sum", sum);
+ map.put("totalAmount", totalAmount);
+ map.put("data", list);
+ return map;
+ }
+
}
--
Gitblit v1.9.1