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 | 250 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 178 insertions(+), 72 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 c54ba7f..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,32 +1,59 @@
package com.consum.base.controller;
-import com.consum.base.BaseController;
-import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.pojo.LWhFormOutputExtend;
-import com.consum.base.pojo.LWhFormOutputInsertParam;
-import com.consum.base.pojo.LWhFormOutputParam;
-import com.consum.base.service.LWhFormOutputServiceImpl;
-import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.LWhProcureModelService;
-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.web.ResponseValue;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
+import java.io.InputStream;
import java.lang.reflect.Field;
-import java.util.ArrayList;
+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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.web.bind.annotation.GetMapping;
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 鍑哄簱鍗�
@@ -39,11 +66,11 @@
public class LWhFormOutputController extends BaseController {
@Autowired
- private LWhFormOutputServiceImpl lWhFormOutputService;
+ private LWhFormOutputService lWhFormOutputService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
- @Autowired
- private LWhGoodsService lWhGoodsService;
+ @Resource
+ private LWarehouseFlowService lWarehouseFlowService;
/**
* @Description 鏂板鍑哄簱鍗�
@@ -51,10 +78,11 @@
* @Date 2023/10/27
*/
@ApiOperation(value = "鏂板鍑哄簱鍗�", notes = "鏂板鍑哄簱鍗�")
-// @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputInsertParam")
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", dataType = "lWhFormOutputParam",
+ dataTypeClass = LWhFormOutputParam.class, paramType = "body")})
@PostMapping("/add")
public ResponseValue add() {
- LWhFormOutputInsertParam param = CommonUtil.getObjFromReqBody(LWhFormOutputInsertParam.class);
+ LWhFormOutputParam param = CommonUtil.getObjFromReqBody(LWhFormOutputParam.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -70,82 +98,160 @@
* @Description 鍒楄〃鏌ヨ
*/
@ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ")
- @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam")
+ @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam",
+ paramType = "query")
@GetMapping("/list")
public ResponseValue queryFormOutputList() {
- LWhFormOutputParam param = CommonUtil.getObjFromReq(LWhFormOutputParam.class);
+ LWhFormOutputQry param = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- FinSysTenantUser sysInfo = getSysInfo();
-
- //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑鍑哄簱鍗�
- //??????
-
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ if (param.getAgencyId() == null) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
GenericPager genericPager = lWhFormOutputService.queryFormOutputList(param);
- List<LWhFormOutput> datas = genericPager.getDatas();
- ArrayList<LWhFormOutputExtend> newDatas = new ArrayList<>();
- if (!CollectionUtils.isEmpty(datas)) {
- datas.forEach(item -> {
- // 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setBusinessType(3);
- lWhProcureModel.setBusinessId(item.getId());
- List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
- LWhFormOutputExtend formProcureExtend = new LWhFormOutputExtend();
- BeanUtils.copyProperties(item, formProcureExtend);
- formProcureExtend.setModels(models);
- newDatas.add(formProcureExtend);
+ List<LWhFormOutput> data = genericPager.getDatas();
+
+ List<FormOutputVO> resultList = Lists.newArrayList();
+ if (!CollectionUtils.isEmpty(data)) {
+ data.forEach(item -> {
+ FormOutputVO formOutputVO = new FormOutputVO();
+ BeanUtils.copyProperties(item, formOutputVO);
+
+ // 鏌ヨ鐗╁搧鍨嬪彿缁熻鏁伴噺
+ 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, newDatas);
+ // fieldDatas.setAccessible(true);
+ // fieldDatas.set(genericPager, resultList);
+ ReflectUtil.setFieldValue(genericPager, fieldDatas, resultList);
} catch (Exception e) {
- e.printStackTrace();
+ logger.error("鏌ヨ鍑哄簱鍗曞垪琛ㄥけ璐�", e);
}
-// genericPager.setDatas(newDatas);
return ResponseValue.success(genericPager);
}
/**
* 鏍规嵁id鏌ヨ璇︽儏
*/
+ @ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏")
+ @ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/detail")
public ResponseValue getById(Long id) throws IllegalAccessException {
if (id == null) {
return ResponseValue.error("鍑哄簱鍗昳d涓虹┖");
}
LWhFormOutput lWhFormOutput = lWhFormOutputService.get(new LWhFormOutput(id));
- LWhFormOutputExtend formOutputExtend = new LWhFormOutputExtend();
- BeanUtils.copyProperties(lWhFormOutput, formOutputExtend);
+ LWhFormOutputExtendVO lWhFormOutputExtendVO = new LWhFormOutputExtendVO();
+ BeanUtils.copyProperties(lWhFormOutput, lWhFormOutputExtendVO);
+ lWhFormOutputExtendVO.setDoc(lWhFormOutput.getOutputDoc());
- // 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setBusinessType(3);
- lWhProcureModel.setBusinessId(id);
- List<LWhProcureModel> models = lWhFormOutputService.select(lWhProcureModel);
- formOutputExtend.setModels(models);
-
- return ResponseValue.success("鏌ヨ鎴愬姛!", formOutputExtend);
- }
-
- /**
- * @Description 鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨
- * @Author 鍗㈠簡闃�
- * @Date 2023/11/2
- */
- @GetMapping("/select/number")
- public ResponseValue selectNumber(Long warehouseId, Long baseGoodsModelsId) {
- if (warehouseId == null || baseGoodsModelsId == null) {
- return ResponseValue.error("鍙傛暟閿欒");
+ List<GoodModelInfoDTO> goodsModelList =
+ lWhProcureModelService.getGoodsModelListByBusinessId(lWhFormOutputExtendVO.getId(), null);
+ if (CollectionUtils.isEmpty(goodsModelList)) {
+ return ResponseValue.success(lWhFormOutputExtendVO);
}
- int num = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
- return ResponseValue.success(num);
+ 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")
+ @GetMapping("/detail/list")
+ public ResponseValue queryFormOutputDetailList() {
+ LWhFormOutputQry formOutputQry = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ PageUtil genericPager = lWarehouseFlowService.queryAllBusinessFlow(formOutputQry);
+ 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 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);
+
+ List<OutputExcelTemplate> exportList = lWhFormOutputService.getExportList(id);
+
+ 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();
+
+ 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);
+
+ }
}
-
--
Gitblit v1.9.1