From c1ac6d13630b04b4e11d6f383858e4f8fa64f924 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 02 十二月 2023 17:24:34 +0800
Subject: [PATCH] 盘点查询返回结果修改
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 79df3ac..e3879e3 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -1,17 +1,17 @@
package com.consum.base.controller;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.util.ReflectUtil;
import com.consum.base.BaseController;
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.core.utils.MapUtils;
-import com.consum.base.core.utils.MapperUtil;
-import com.consum.base.core.utils.PageUtil;
+import com.consum.base.core.utils.*;
import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
import com.consum.base.pojo.LWhFormProcureParam;
import com.consum.base.pojo.LWhProcureModelParam;
+import com.consum.base.pojo.excel.ProcureExcelTemplate;
import com.consum.base.pojo.query.FormProcureQry;
import com.consum.base.pojo.response.*;
import com.consum.base.service.*;
@@ -19,17 +19,19 @@
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.NumberGenerator;
+import com.walker.infrastructure.utils.DateUtils;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.compress.utils.Lists;
+import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Field;
import java.util.*;
@@ -48,8 +50,6 @@
private LWhFormProcureService lWhFormProcureService;
@Resource
private BaseWarehouseServiceImpl baseWarehouseService;
- @Resource
- private FinSysTenantServiceImpl finSysTenantService;
@Resource
private CodeGeneratorService codeGeneratorService;
@Resource
@@ -96,7 +96,7 @@
// 閲囪喘鍗昳d
Long whFormProcureId = param.getId();
if (whFormProcureId == null) {
- whFormProcureId = NumberGenerator.getLongSequenceNumber();
+ whFormProcureId = IdUtil.generateId();
}
long procureTime = Long.valueOf(param.getProcureTime());
@@ -120,7 +120,7 @@
return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
}
LWhFormProcureGoods procureGood = new LWhFormProcureGoods();
- long fromProcureGoodsId = NumberGenerator.getLongSequenceNumber();
+ long fromProcureGoodsId = IdUtil.generateId();
procureGood.setId(fromProcureGoodsId);
procureGood.setWhFormProcureId(whFormProcureId);
procureGood.setBaseCategoryId(baseCategoryId);
@@ -151,7 +151,7 @@
// 鏌ヨ鍨嬪彿搴撳瓨
int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
LWhProcureModel model = new LWhProcureModel();
- model.setId(NumberGenerator.getLongSequenceNumber());
+ model.setId(IdUtil.generateId());
model.setFromProcureGoodsId(fromProcureGoodsId);
model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
model.setBusinessId(whFormProcureId);
@@ -187,7 +187,7 @@
supplierList.forEach(supplier -> {
LOrgSupplier lOrgSupplier = new LOrgSupplier();
- lOrgSupplier.setId(NumberGenerator.getLongSequenceNumber());
+ lOrgSupplier.setId(IdUtil.generateId());
lOrgSupplier.setAgencyId(tenantId);
lOrgSupplier.setAgencyName(tenantName);
lOrgSupplier.setSupplier(supplier);
@@ -204,7 +204,7 @@
*/
@ApiOperation(value = "閲囪喘鍗曞垪琛ㄦ煡璇�", notes = "閲囪喘鍗曞垪琛ㄦ煡璇�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
+ @ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
})
@GetMapping("/list")
public ResponseValue queryFormProcureList() {
@@ -234,8 +234,8 @@
// 鏌ヨ鍨嬪彿鏁伴噺
String sql = "select fpg.id,BASE_CATEGORY_ID ,BASE_GOODS_TEMPLATE_ID ,GOODS_TEMPLATE_NAME ,sum(counts) count "
- + "from L_WH_FORM_PROCURE_GOODS fpg left join L_WH_PROCURE_MODEL pm on fpg.id = pm.FROM_PROCURE_GOODS_ID "
- + "where fpg.WH_FORM_PROCURE_ID =:id group by pm.FROM_PROCURE_GOODS_ID";
+ + "from L_WH_FORM_PROCURE_GOODS fpg left join L_WH_PROCURE_MODEL pm on fpg.id = pm.FROM_PROCURE_GOODS_ID "
+ + "where fpg.WH_FORM_PROCURE_ID =:id group by pm.FROM_PROCURE_GOODS_ID";
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("id", item.getId());
List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
@@ -354,8 +354,8 @@
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("formProcureGoodId", formProcureGood.getId());
String sql = "SELECT\n" + "pm.BASE_GOODS_MODELS_ID,pm.BASE_GOODS_MODELS_NAME,pm.PRICE,pm.COUNTS,pm.WOREHOUSE_COUNT,bgm.unit " + "FROM\n"
- + "\tl_wh_procure_model pm\n"
- + "\tLEFT JOIN base_goods_models bgm on pm.BASE_GOODS_MODELS_ID = bgm.id where pm.FROM_PROCURE_GOODS_ID =:formProcureGoodId";
+ + "\tl_wh_procure_model pm\n"
+ + "\tLEFT JOIN base_goods_models bgm on pm.BASE_GOODS_MODELS_ID = bgm.id where pm.FROM_PROCURE_GOODS_ID =:formProcureGoodId";
List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
procureModelList.forEach(item -> {
@@ -389,4 +389,43 @@
GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
return ResponseValue.success(genericPager);
}
+
+ @ApiOperation(value = "閲囪喘鍗曞鍑�", notes = "閲囪喘鍗曞鍑�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "閲囪喘鍗昳d", required = true, dataType = "Long", paramType = "query")
+ })
+ @GetMapping("/list/export")
+ public void export(Long id, HttpServletResponse response) throws Exception {
+ TemplateExportParams params = new TemplateExportParams(
+ "import/閲囪喘鍏ュ簱鍗�.xls");
+ params.setHeadingStartRow(2);
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+
+ List<ProcureExcelTemplate> exportList = lWhFormProcureService.getExportList(id);
+ if (CollectionUtils.isEmpty(exportList)) {
+ throw new RuntimeException("鏁版嵁涓虹┖");
+ }
+
+ int countNum = exportList.stream().filter(item -> item.getNum() != null).mapToInt(ProcureExcelTemplate::getNum).sum();
+ int totalAmount = exportList.stream().filter(export -> export.getTotalAmount() != null).mapToInt(ProcureExcelTemplate::getTotalAmount).sum();
+ Optional<ProcureExcelTemplate> first = exportList.stream().findFirst();
+ ProcureExcelTemplate 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("countNum", countNum);
+ map.put("totalAmount", totalAmount);
+
+ Workbook workbook = ExcelExportUtil.exportExcel(params, ProcureExcelTemplate.class, exportList, map);
+ downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+
+ }
}
--
Gitblit v1.9.1