From 76c7d995ac56b60880e998df5e9e3d82fea313f8 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 07 十二月 2023 11:58:15 +0800
Subject: [PATCH] 出库单金额处理
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 219 ++++++++++++++++++++++++++++--------------------------
1 files changed, 114 insertions(+), 105 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 0143c76..55f8dcc 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -1,44 +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.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.pojo.LWhFormOutputParam;
-import com.consum.base.pojo.query.LWhFormOutputQry;
-import com.consum.base.pojo.response.FormOutputGoodsVO;
-import com.consum.base.pojo.response.FormOutputTemplateInfoVO;
-import com.consum.base.pojo.response.FormOutputVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.LWhFormOutputExtendVO;
-import com.consum.base.service.LWarehouseFlowService;
-import com.consum.base.service.LWhFormOutputServiceImpl;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormOutput;
-import com.iplatform.model.po.S_user_core;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.CollectionUtils;
-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 java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.lang.reflect.Field;
-import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.compress.utils.Lists;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
@@ -49,6 +22,38 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.CurrencyUtil;
+import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.LWhFormOutputParam;
+import com.consum.base.pojo.dto.GoodModelInfoDTO;
+import com.consum.base.pojo.excel.OutputExcelTemplate;
+import com.consum.base.pojo.query.LWhFormOutputQry;
+import com.consum.base.pojo.response.FormOutputVO;
+import com.consum.base.pojo.response.GoodsModelVO;
+import com.consum.base.pojo.response.GoodsTemplateCountVO;
+import com.consum.base.pojo.response.GoodsTemplateInfoVO;
+import com.consum.base.pojo.response.LWhFormOutputExtendVO;
+import com.consum.base.service.LWarehouseFlowService;
+import com.consum.base.service.LWhFormOutputService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormOutput;
+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.web.ResponseValue;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.ReflectUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
/**
* @Description 鍑哄簱鍗�
@@ -61,7 +66,7 @@
public class LWhFormOutputController extends BaseController {
@Autowired
- private LWhFormOutputServiceImpl lWhFormOutputService;
+ private LWhFormOutputService lWhFormOutputService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Resource
@@ -73,9 +78,8 @@
* @Date 2023/10/27
*/
@ApiOperation(value = "鏂板鍑哄簱鍗�", notes = "鏂板鍑哄簱鍗�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", dataType = "lWhFormOutputParam", dataTypeClass = LWhFormOutputParam.class, paramType = "body")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", dataType = "lWhFormOutputParam",
+ dataTypeClass = LWhFormOutputParam.class, paramType = "body")})
@PostMapping("/add")
public ResponseValue add() {
LWhFormOutputParam param = CommonUtil.getObjFromReqBody(LWhFormOutputParam.class);
@@ -94,7 +98,8 @@
* @Description 鍒楄〃鏌ヨ
*/
@ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ")
- @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam", paramType = "query")
+ @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam",
+ paramType = "query")
@GetMapping("/list")
public ResponseValue queryFormOutputList() {
LWhFormOutputQry param = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
@@ -114,36 +119,24 @@
List<FormOutputVO> resultList = Lists.newArrayList();
if (!CollectionUtils.isEmpty(data)) {
data.forEach(item -> {
- // 鏌ヨ鍨嬪彿鏁伴噺
FormOutputVO formOutputVO = new FormOutputVO();
BeanUtils.copyProperties(item, formOutputVO);
- List<FormOutputTemplateInfoVO> procureTemplateInfoList = Lists.newArrayList();
-
- // 鏌ヨ鍨嬪彿鏁伴噺
- String sql = "SELECT bgt.id,bgm.GOODS_TEMPLATES_ID,GOODS_NAME,sum( counts ) count FROM "
- + "l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id "
- + "LEFT JOIN base_goods_template bgt ON bgm.GOODS_TEMPLATES_ID = bgt.id "
- + "WHERE pm.BUSINESS_ID =:id GROUP BY bgm.GOODS_TEMPLATES_ID";
- Map<String, Object> paramMap = new HashMap<>();
- paramMap.put("id", item.getId());
- List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
- for (Map<String, Object> map : procureModelList) {
- FormOutputTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputTemplateInfoVO.class);
- procureTemplateInfoList.add(procureTemplateInfoVO);
- }
- formOutputVO.setFormOutputTemplateInfoList(procureTemplateInfoList);
+ // 鏌ヨ鐗╁搧鍨嬪彿缁熻鏁伴噺
+ List<GoodsTemplateCountVO> goodsTemplateCount =
+ lWhProcureModelService.getGoodsTemplateCountByBusinessId(item.getId());
+ formOutputVO.setFormOutputTemplateInfoList(goodsTemplateCount);
resultList.add(formOutputVO);
});
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-// fieldDatas.setAccessible(true);
-// fieldDatas.set(genericPager, resultList);
+ // fieldDatas.setAccessible(true);
+ // fieldDatas.set(genericPager, resultList);
ReflectUtil.setFieldValue(genericPager, fieldDatas, resultList);
} catch (Exception e) {
- e.printStackTrace();
+ logger.error("鏌ヨ鍑哄簱鍗曞垪琛ㄥけ璐�", e);
}
return ResponseValue.success(genericPager);
}
@@ -161,40 +154,52 @@
LWhFormOutput lWhFormOutput = lWhFormOutputService.get(new LWhFormOutput(id));
LWhFormOutputExtendVO lWhFormOutputExtendVO = new LWhFormOutputExtendVO();
BeanUtils.copyProperties(lWhFormOutput, lWhFormOutputExtendVO);
+ lWhFormOutputExtendVO.setDoc(lWhFormOutput.getOutputDoc());
- String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME "
- + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
- + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
- + "WHERE pm.BUSINESS_ID =:id GROUP BY bgt.id ";
- Map<String, Object> paramMap = new HashMap<>();
- paramMap.put("id", lWhFormOutputExtendVO.getId());
- List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap, new MapperUtil());
- List<FormOutputGoodsVO> fromOutputGoods = Lists.newArrayList();
- for (Map<String, Object> map : procureModelList) {
- FormOutputGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputGoodsVO.class);
-
- // 鏌ヨ鍨嬪彿鏁伴噺
- List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
- String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
- + "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
- + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
- + "WHERE pm.BUSINESS_ID =:id";
- List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil());
- modelList.forEach(item -> {
- GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
- goodsModelVOList.add(goodsModelVO);
- });
- procureTemplateInfoVO.setModels(goodsModelVOList);
- fromOutputGoods.add(procureTemplateInfoVO);
+ List<GoodModelInfoDTO> goodsModelList =
+ lWhProcureModelService.getGoodsModelListByBusinessId(lWhFormOutputExtendVO.getId(), null);
+ if (CollectionUtils.isEmpty(goodsModelList)) {
+ return ResponseValue.success(lWhFormOutputExtendVO);
}
- lWhFormOutputExtendVO.setFromOutputGoods(fromOutputGoods);
+ Map<Long, List<GoodModelInfoDTO>> collect =
+ goodsModelList.stream().collect(Collectors.groupingBy(GoodModelInfoDTO::getBaseGoodsTemplateId));
+ List<GoodsTemplateInfoVO> goodsTemplateInfoList = Lists.newArrayList();
+ for (Map.Entry<Long, List<GoodModelInfoDTO>> entry : collect.entrySet()) {
+ GoodsTemplateInfoVO goodsTemplateInfoVO = getFormOutputGoodsVO(entry);
+ goodsTemplateInfoList.add(goodsTemplateInfoVO);
+ }
+ lWhFormOutputExtendVO.setFromOutputGoods(goodsTemplateInfoList);
return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormOutputExtendVO);
}
+ private GoodsTemplateInfoVO getFormOutputGoodsVO(Entry<Long, List<GoodModelInfoDTO>> entry) {
+ Long baseGoodsTemplateId = entry.getKey();
+ List<GoodModelInfoDTO> goodModelInfoDTOS = entry.getValue();
+ GoodModelInfoDTO goodModelInfoDTO = goodModelInfoDTOS.stream().findFirst().orElse(null);
+ GoodsTemplateInfoVO goodsTemplateInfoVO = new GoodsTemplateInfoVO();
+ if (goodModelInfoDTO != null) {
+ goodsTemplateInfoVO.setId(baseGoodsTemplateId);
+ goodsTemplateInfoVO.setCategoryName(goodModelInfoDTO.getCategoryName());
+ goodsTemplateInfoVO.setGoodsName(goodModelInfoDTO.getBaseGoodsModelsName());
+ }
+ List<GoodsModelVO> goodsModelList = Lists.newArrayList();
+ for (GoodModelInfoDTO goodModelInfo : goodModelInfoDTOS) {
+ GoodsModelVO goodsModelVO = new GoodsModelVO();
+ goodsModelVO.setId(goodModelInfo.getId());
+ goodsModelVO.setBaseGoodsModelsName(goodModelInfo.getBaseGoodsModelsName());
+ goodsModelVO.setUnit(goodModelInfo.getUnit());
+ goodsModelVO.setCounts(goodModelInfo.getCounts());
+ goodsModelVO.setTotalAmount(CurrencyUtil.convertFenToYuan(goodModelInfo.getTotalAmount()));
+ goodsModelList.add(goodsModelVO);
+ }
+ goodsTemplateInfoVO.setModels(goodsModelList);
+ return goodsTemplateInfoVO;
+ }
@ApiOperation(value = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�", notes = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�")
- @ApiImplicitParam(name = "formOutputQry", value = "鍑哄簱鍗曡鎯呮煡璇㈡潯浠�", required = true, dataType = "LWhFormOutputQry", paramType = "query")
+ @ApiImplicitParam(name = "formOutputQry", value = "鍑哄簱鍗曡鎯呮煡璇㈡潯浠�", required = true, dataType = "LWhFormOutputQry",
+ paramType = "query")
@GetMapping("/detail/list")
public ResponseValue queryFormOutputDetailList() {
LWhFormOutputQry formOutputQry = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
@@ -206,43 +211,47 @@
return ResponseValue.success(genericPager);
}
-
@ApiOperation(value = "鍑哄簱鍗曞鍑�", notes = "鍑哄簱鍗曞鍑�")
+ @ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws IOException {
- ClassPathResource classPathResource = new ClassPathResource("import/閲囪喘閫�璐у崟.xls");
+ public void export(Long id, HttpServletResponse response) throws Exception {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ ClassPathResource classPathResource = new ClassPathResource("import/鍑哄簱鍗�.xls");
// 鑾峰彇鏂囦欢杈撳叆娴�
InputStream inputStream = classPathResource.getInputStream();
Workbook wb = new HSSFWorkbook(inputStream);
TemplateExportParams params = new TemplateExportParams();
params.setTemplateWb(wb);
+ params.setHeadingStartRow(2);
- FinSysTenantUser sysInfo = this.getSysInfo();
- String userName = sysInfo.getUserName();
+ List<OutputExcelTemplate> exportList = lWhFormOutputService.getExportList(id);
- Map<String, Object> map = lWhFormOutputService.getExportList(id, userName);
- if (CollectionUtils.isEmpty(map)) {
+ if (CollectionUtils.isEmpty(exportList)) {
throw new RuntimeException("鏁版嵁涓虹┖");
}
+ int countNum =
+ exportList.stream().filter(item -> item.getNum() != null).mapToInt(OutputExcelTemplate::getNum).sum();
+ double totalAmount = exportList.stream().filter(item -> item.getTotalAmount() != null)
+ .mapToDouble(OutputExcelTemplate::getAmount).sum();
+ Optional<OutputExcelTemplate> first = exportList.stream().findFirst();
+ OutputExcelTemplate templateExcelExport = first.get();
+ String businessFormCode = templateExcelExport.getBusinessFormCode();
+ Long createTime = templateExcelExport.getCreateTime();
+ String operatorName = templateExcelExport.getOperatorName();
- Workbook workbook = ExcelExportUtil.exportExcel(params, map);
- downLoadExcel("閲囪喘閫�璐у崟", response, workbook);
+ 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, OutputExcelTemplate.class, exportList, map);
+ downLoadExcel("鍑哄簱鍗�", response, workbook);
- private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) {
- try (OutputStream out = response.getOutputStream()) {
- response.setCharacterEncoding("UTF-8");
- response.setHeader("content-Type", "application/vnd.ms-excel");
- response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName + ".xls", "UTF-8"));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- workbook.write(baos);
- response.setHeader("Content-Length", String.valueOf(baos.size()));
- out.write(baos.toByteArray());
- } catch (Exception e) {
- logger.error("瀵煎嚭鏂囦欢澶辫触", e);
- }
}
}
-
--
Gitblit v1.9.1