From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期六, 11 五月 2024 17:26:02 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 8465516..b8d85e1 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
@@ -25,15 +25,16 @@
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.FormOutputGoodsVO;
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;
@@ -69,7 +70,7 @@
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Resource
- private LWarehouseFlowService lWarehouseFlowService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
/**
* @Description 鏂板鍑哄簱鍗�
@@ -131,8 +132,6 @@
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
- // fieldDatas.setAccessible(true);
- // fieldDatas.set(genericPager, resultList);
ReflectUtil.setFieldValue(genericPager, fieldDatas, resultList);
} catch (Exception e) {
logger.error("鏌ヨ鍑哄簱鍗曞垪琛ㄥけ璐�", e);
@@ -146,7 +145,7 @@
@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 {
+ public ResponseValue getById(Long id) throws Exception {
if (id == null) {
return ResponseValue.error("鍑哄簱鍗昳d涓虹┖");
}
@@ -156,32 +155,31 @@
lWhFormOutputExtendVO.setDoc(lWhFormOutput.getOutputDoc());
List<GoodModelInfoDTO> goodsModelList =
- lWhProcureModelService.getGoodsModelListByBusinessId(lWhFormOutputExtendVO.getId());
+ lWhProcureModelService.getGoodsModelListByBusinessId(lWhFormOutputExtendVO.getId(), null);
if (CollectionUtils.isEmpty(goodsModelList)) {
return ResponseValue.success(lWhFormOutputExtendVO);
}
Map<Long, List<GoodModelInfoDTO>> collect =
goodsModelList.stream().collect(Collectors.groupingBy(GoodModelInfoDTO::getBaseGoodsTemplateId));
- List<FormOutputGoodsVO> fromOutputGoods = Lists.newArrayList();
+ List<GoodsTemplateInfoVO> goodsTemplateInfoList = Lists.newArrayList();
for (Map.Entry<Long, List<GoodModelInfoDTO>> entry : collect.entrySet()) {
- FormOutputGoodsVO formOutputGoodsVO = getFormOutputGoodsVO(entry);
- fromOutputGoods.add(formOutputGoodsVO);
+ GoodsTemplateInfoVO goodsTemplateInfoVO = getFormOutputGoodsVO(entry);
+ goodsTemplateInfoList.add(goodsTemplateInfoVO);
}
- lWhFormOutputExtendVO.setFromOutputGoods(fromOutputGoods);
+ lWhFormOutputExtendVO.setFromOutputGoods(goodsTemplateInfoList);
return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormOutputExtendVO);
}
- private static FormOutputGoodsVO getFormOutputGoodsVO(Entry<Long, List<GoodModelInfoDTO>> entry) {
+ private GoodsTemplateInfoVO getFormOutputGoodsVO(Entry<Long, List<GoodModelInfoDTO>> entry) {
Long baseGoodsTemplateId = entry.getKey();
List<GoodModelInfoDTO> goodModelInfoDTOS = entry.getValue();
GoodModelInfoDTO goodModelInfoDTO = goodModelInfoDTOS.stream().findFirst().orElse(null);
- FormOutputGoodsVO formOutputGoodsVO = new FormOutputGoodsVO();
+ GoodsTemplateInfoVO goodsTemplateInfoVO = new GoodsTemplateInfoVO();
if (goodModelInfoDTO != null) {
- formOutputGoodsVO.setId(baseGoodsTemplateId);
- formOutputGoodsVO.setCategoryId(goodModelInfoDTO.getCategoryId());
- formOutputGoodsVO.setCategoryName(goodModelInfoDTO.getCategoryName());
- formOutputGoodsVO.setGoodsName(goodModelInfoDTO.getBaseGoodsModelsName());
+ goodsTemplateInfoVO.setId(baseGoodsTemplateId);
+ goodsTemplateInfoVO.setCategoryName(goodModelInfoDTO.getCategoryName());
+ goodsTemplateInfoVO.setGoodsName(goodModelInfoDTO.getBaseGoodsModelsName());
}
List<GoodsModelVO> goodsModelList = Lists.newArrayList();
for (GoodModelInfoDTO goodModelInfo : goodModelInfoDTOS) {
@@ -190,11 +188,11 @@
goodsModelVO.setBaseGoodsModelsName(goodModelInfo.getBaseGoodsModelsName());
goodsModelVO.setUnit(goodModelInfo.getUnit());
goodsModelVO.setCounts(goodModelInfo.getCounts());
- goodsModelVO.setTotalAmount(goodModelInfo.getTotalAmount());
+ goodsModelVO.setTotalAmount(CurrencyUtil.convertFenToYuan(goodModelInfo.getTotalAmount()));
goodsModelList.add(goodsModelVO);
}
- formOutputGoodsVO.setModels(goodsModelList);
- return formOutputGoodsVO;
+ goodsTemplateInfoVO.setModels(goodsModelList);
+ return goodsTemplateInfoVO;
}
@ApiOperation(value = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�", notes = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�")
@@ -203,18 +201,19 @@
@GetMapping("/detail/list")
public ResponseValue queryFormOutputDetailList() {
LWhFormOutputQry formOutputQry = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
- S_user_core currentUser = this.getCurrentUser();
+ FinSysTenantUser currentUser = this.getSysInfo();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- PageUtil genericPager = lWarehouseFlowService.queryAllBusinessFlow(formOutputQry);
+ formOutputQry.setAgencyId(Long.valueOf(currentUser.getTenantId()));
+ PageUtil genericPager = lWarehouseFlowServiceImpl.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 {
+ public ResponseValue export(Long id, HttpServletResponse response) throws Exception {
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -250,7 +249,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
- downLoadExcel("鍑哄簱鍗�", response, workbook);
+ String filePath = downLoadExcel("鍑哄簱鍗�", workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
--
Gitblit v1.9.1