From 3be9cfcb6b59366b936821966d20a998a6895f9f Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 30 四月 2024 14:38:13 +0800
Subject: [PATCH] bug41、42修改
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 424 ++++++++++++++++++++++++-----------------------------
1 files changed, 192 insertions(+), 232 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 d9bc273..e6538a8 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,61 +1,16 @@
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.IdUtil;
-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.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.FormProcureVO;
-import com.consum.base.pojo.response.FromProcureTemplateInfoVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.LWhFormProcureExtendVO;
-import com.consum.base.pojo.response.LWhFormProcureGoodsVO;
-import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LOrgSupplierServiceImpl;
-import com.consum.base.service.LWhFormProcureCoreService;
-import com.consum.base.service.LWhFormProcureGoodsService;
-import com.consum.base.service.LWhFormProcureService;
-import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LOrgSupplier;
-import com.consum.model.po.LWhFormProcure;
-import com.consum.model.po.LWhFormProcureGoods;
-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.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.IOException;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
+
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.compress.utils.Lists;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
@@ -64,6 +19,48 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.excel.EasyExcelFactory;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.exception.ExcelDataConvertException;
+import com.consum.base.BaseController;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
+import com.consum.base.pojo.LWhFormProcureParam;
+import com.consum.base.pojo.dto.GoodModelInfoDTO;
+import com.consum.base.pojo.excel.ImportProcureOrderTemplate;
+import com.consum.base.pojo.excel.ProcureExcelTemplate;
+import com.consum.base.pojo.query.FormProcureQry;
+import com.consum.base.pojo.response.FormProcureVO;
+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.LWhFormProcureExtendVO;
+import com.consum.base.service.BaseCategoryService;
+import com.consum.base.service.LWhFormProcureGoodsService;
+import com.consum.base.service.LWhFormProcureService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.base.service.core.LWhFormProcureCoreService;
+import com.consum.model.po.BaseCategory;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhFormProcureGoods;
+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;
/**
* @ClassName LWhFormProcureController
@@ -79,21 +76,13 @@
@Resource
private LWhFormProcureService lWhFormProcureService;
@Resource
- private BaseWarehouseService baseWarehouseService;
- @Resource
- private CodeGeneratorService codeGeneratorService;
- @Resource
- private LWhFormProcureGoodsService lWhFormProcureGoodsService;
+ private LWhFormProcureGoodsService lWhFormProcureGoodsServiceImpl;
@Resource
private LWhFormProcureCoreService lWhFormProcureCoreService;
@Resource
- private LWhGoodsService lWhGoodsService;
- @Resource
- private BaseGoodsTemplateService baseGoodsTemplateService;
- @Resource
private LWhProcureModelService lWhProcureModelService;
@Resource
- private LOrgSupplierServiceImpl lOrgSupplierService;
+ private BaseCategoryService baseCategoryService;
/**
* @Description 鏂板
@@ -108,134 +97,26 @@
}
private ResponseValue add(LWhFormProcureParam param) {
- Long warehouseId = param.getWarehouseId();
if (param.getWarehouseId() == null) {
return ResponseValue.error("浠撳簱ID涓嶈兘涓虹┖");
}
- BaseWarehouse baseWarehouse = baseWarehouseService.getById(warehouseId);
- FinSysTenantUser sysTenantUser = this.getSysInfo();
- String tenantId = sysTenantUser.getTenantId();
- String tenantName = sysTenantUser.getTenantName();
List<LWhFormProcureGoodsInfoParam> procureGoods = param.getProcureGoods();
if (CollectionUtils.isEmpty(procureGoods)) {
return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
}
-
+ FinSysTenantUser sysTenantUser = this.getSysInfo();
S_user_core currentUser = this.getCurrentUser();
- // 閲囪喘鍗昳d
- Long whFormProcureId = param.getId();
- if (whFormProcureId == null) {
- whFormProcureId = IdUtil.generateId();
- }
- long procureTime = Long.valueOf(param.getProcureTime());
-
- Set<String> supplierList = new HashSet<>();
-
- ArrayList<LWhFormProcureGoods> procureGoodList = new ArrayList<>();
- ArrayList<LWhProcureModel> procureModelList = new ArrayList<>();
-
- for (int i = 0; i < procureGoods.size(); i++) {
- LWhFormProcureGoodsInfoParam procureGoodT = procureGoods.get(i);
- Long baseCategoryId = procureGoodT.getBaseCategoryId();
- Long baseGoodsTemplateId = procureGoodT.getBaseGoodsTemplateId();
- String supplier = procureGoodT.getSupplier();
- // 鍒ゆ柇褰撳墠渚涘簲鍟嗘槸鍚﹀凡瀛樺湪
- if (!supplierList.contains(supplier) && !lOrgSupplierService.supplierIsContain(tenantId, supplier)) {
- supplierList.add(supplier);
- }
-
- List<LWhProcureModelParam> models = procureGoodT.getModels();
- if (CollectionUtils.isEmpty(models)) {
- return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
- }
- LWhFormProcureGoods procureGood = new LWhFormProcureGoods();
- long fromProcureGoodsId = IdUtil.generateId();
- procureGood.setId(fromProcureGoodsId);
- procureGood.setWhFormProcureId(whFormProcureId);
- procureGood.setBaseCategoryId(baseCategoryId);
- procureGood.setBaseGoodsTemplateId(baseGoodsTemplateId);
- // TODO 鐗╁搧鍘嗗彶鐗堟湰
- procureGood.setGoodsTemplateName(procureGoodT.getGoodsTemplateName());
- procureGood.setSupplier(supplier);
- procureGood.setSort(i);
- for (LWhProcureModelParam modelT : models) {
- Integer counts = modelT.getCounts();
- if (counts == null || counts <= 0) {
- return ResponseValue.error("鍨嬪彿鐨勯噰璐暟閲忓彧鑳戒负姝ｆ暣鏁�");
- }
- Long price = modelT.getPrice();
- if (price == null || price <= 0) {
- return ResponseValue.error("鍨嬪彿鐨勯噰璐环鏍煎彧鑳戒负姝ｆ暟");
- }
- Long baseGoodsModelsId = modelT.getBaseGoodsModelsId();
- if (baseGoodsModelsId == null) {
- return ResponseValue.error("閲囪喘鐨勪环鍨嬪彿鏈壘鍒�");
- }
- //鏌ヨ鍨嬪彿淇℃伅
- Map<String, Object> tempGoodsInfo = baseGoodsTemplateService.queryGoodsInfoByModelId(baseGoodsModelsId);
- if (tempGoodsInfo == null) {
- return ResponseValue.error("閲囪喘鐨勪环鍨嬪彿鏈壘鍒�");
- }
- String modelName = (String) tempGoodsInfo.get("modelname");
- // 鏌ヨ鍨嬪彿搴撳瓨
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
- LWhProcureModel model = new LWhProcureModel();
- model.setId(IdUtil.generateId());
- model.setFromProcureGoodsId(fromProcureGoodsId);
- model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
- model.setBusinessId(whFormProcureId);
- model.setBaseGoodsModelsId(baseGoodsModelsId);
- model.setBaseGoodsModelsName(modelName);
- model.setPrice(price);
- model.setCounts(counts);
- model.setWorehouseCount(goodsModelNum);
- model.setSupplier(supplier);
- model.setTotalAmount(price * counts);
- procureModelList.add(model);
- }
- procureGoodList.add(procureGood);
- }
- lWhFormProcureGoodsService.insertBatch(procureGoodList);
- lWhProcureModelService.insertBatch(procureModelList);
-
- // 鎻掑叆 閲囪喘鍗曠墿鍝併�怢_WH_FORM_PROCURE_GOODS銆�
- LWhFormProcure lWhFormProcure = new LWhFormProcure();
- lWhFormProcure.setId(whFormProcureId);
- lWhFormProcure.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Procure_Warehouse));
- lWhFormProcure.setWarehouseId(warehouseId);
- lWhFormProcure.setWarehouseName(baseWarehouse.getWarehouseName());
- lWhFormProcure.setBuyerId(currentUser.getId());
- lWhFormProcure.setBuyerName(currentUser.getNick_name());
- lWhFormProcure.setProcureTime(procureTime);
- lWhFormProcure.setProcureDoc(param.getProcureDoc());
- lWhFormProcure.setBuyType(param.getBuyType());
- lWhFormProcure.setStates(1);
- lWhFormProcure.setAgencyId(baseWarehouse.getAgencyId());
- lWhFormProcure.setAgencyName(baseWarehouse.getAgencyName());
- int result = lWhFormProcureService.insert(lWhFormProcure);
-
- supplierList.forEach(supplier -> {
- LOrgSupplier lOrgSupplier = new LOrgSupplier();
- lOrgSupplier.setId(IdUtil.generateId());
- lOrgSupplier.setAgencyId(tenantId);
- lOrgSupplier.setAgencyName(tenantName);
- lOrgSupplier.setSupplier(supplier);
- lOrgSupplierService.insert(lOrgSupplier);
- });
- if (result > 0) {
- return ResponseValue.success(1);
- }
- return ResponseValue.error("鏂板澶辫触锛�");
+ lWhFormProcureService.add(param, sysTenantUser, currentUser);
+ return ResponseValue.success();
}
/**
* @Description 鍒楄〃鏌ヨ
*/
@ApiOperation(value = "閲囪喘鍗曞垪琛ㄦ煡璇�", notes = "閲囪喘鍗曞垪琛ㄦ煡璇�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true,
+ dataType = "FormProcureQryDto", paramType = "query")})
@GetMapping("/list")
public ResponseValue queryFormProcureList() {
FormProcureQry param = CommonUtil.getObjFromReq(FormProcureQry.class);
@@ -257,31 +138,19 @@
ArrayList<FormProcureVO> result = new ArrayList<>();
if (!CollectionUtils.isEmpty(data)) {
data.forEach(item -> {
-
FormProcureVO fromProcureVO = new FormProcureVO();
BeanUtils.copyProperties(item, fromProcureVO);
- List<FromProcureTemplateInfoVO> procureTemplateInfoList = Lists.newArrayList();
// 鏌ヨ鍨嬪彿鏁伴噺
- 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";
- 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) {
- FromProcureTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FromProcureTemplateInfoVO.class);
- procureTemplateInfoList.add(procureTemplateInfoVO);
- }
- fromProcureVO.setFromProcureTemplateInfoList(procureTemplateInfoList);
+ List<GoodsTemplateCountVO> procureCount =
+ lWhProcureModelService.getProcureCountByBusinessId(item.getId());
+ fromProcureVO.setFromProcureTemplateInfoList(procureCount);
result.add(fromProcureVO);
});
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-// fieldDatas.setAccessible(true);
-// fieldDatas.set(genericPager, result);
ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
} catch (Exception e) {
e.printStackTrace();
@@ -325,7 +194,7 @@
if (num == 0) {
return ResponseValue.error("鍒犻櫎澶辫触锛�");
}
- lWhFormProcureGoodsService.update("delete from L_WH_FORM_PROCURE_GOODS where WH_FORM_PROCURE_ID=" + id);
+ lWhFormProcureGoodsServiceImpl.update("delete from L_WH_FORM_PROCURE_GOODS where WH_FORM_PROCURE_ID=" + id);
lWhProcureModelService.update("delete from L_WH_PROCURE_MODEL where BUSINESS_TYPE =1 and BUSINESS_ID=" + id);
return ResponseValue.success(1);
@@ -347,7 +216,7 @@
* 鏍规嵁id鏌ヨ璇︽儏
*/
@GetMapping("/detail")
- public ResponseValue getById(Long id) throws IllegalAccessException {
+ public ResponseValue getById(Long id) throws Exception {
if (id == null) {
return ResponseValue.error("閲囪喘鍗昳d涓虹┖");
}
@@ -361,49 +230,54 @@
// 鐗╁搧
LWhFormProcureGoods lWhFormProcureGoods = new LWhFormProcureGoods();
lWhFormProcureGoods.setWhFormProcureId(id);
- List<LWhFormProcureGoods> formProcureGoods = lWhFormProcureGoodsService.select(lWhFormProcureGoods);
+ List<LWhFormProcureGoods> formProcureGoods = lWhFormProcureGoodsServiceImpl.select(lWhFormProcureGoods);
-// Field fieldModels = null;
-// try {
-// fieldModels = LWhFormProcureGoodsVO.class.getDeclaredField("models");
-// } catch (NoSuchFieldException e) {
-// e.printStackTrace();
-// }
-// fieldModels.setAccessible(true);
- ArrayList<LWhFormProcureGoodsVO> procureGoodsVOList = new ArrayList<>();
+ List<GoodsTemplateInfoVO> goodsTemplateInfoList = new ArrayList<>();
for (LWhFormProcureGoods formProcureGood : formProcureGoods) {
- LWhFormProcureGoodsVO lWhFormProcureGoodsVO = new LWhFormProcureGoodsVO();
- BeanUtils.copyProperties(formProcureGood, lWhFormProcureGoodsVO);
+ GoodsTemplateInfoVO goodsTemplateInfoVO = new GoodsTemplateInfoVO();
+ BeanUtils.copyProperties(formProcureGood, goodsTemplateInfoVO);
- Long baseGoodsTemplateId = formProcureGood.getBaseGoodsTemplateId();
- BaseGoodsTemplate queryEntity = new BaseGoodsTemplate();
- queryEntity.setId(baseGoodsTemplateId);
- BaseGoodsTemplate baseGoodsTemplate = baseGoodsTemplateService.get(queryEntity);
- lWhFormProcureGoodsVO.setBaseCategoryName(baseGoodsTemplate.getCategoryName());
- // 鏌ヨ鍨嬪彿鏁伴噺
- 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";
- List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
- List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
- procureModelList.forEach(item -> {
- GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
- goodsModelVOList.add(goodsModelVO);
- });
-// fieldModels.set(lWhFormProcureGoodsVO, goodsModelVOList);
- ReflectUtil.setFieldValue(lWhFormProcureGoodsVO, "models", goodsModelVOList);
+ List<GoodModelInfoDTO> goodsModelInfoList =
+ lWhProcureModelService.getGoodsModelListByBusinessId(null, formProcureGood.getId());
+ if (CollectionUtils.isEmpty(goodsModelInfoList)) {
+ continue;
+ }
+ GoodModelInfoDTO goodModelInfoDTO = goodsModelInfoList.stream().findFirst().orElse(null);
+ if (goodModelInfoDTO != null) {
+ goodsTemplateInfoVO.setBaseCategoryName(goodModelInfoDTO.getCategoryName());
+ }
+ List<GoodsModelVO> goodsModelList = Lists.newArrayList();
+ for (GoodModelInfoDTO goodModelInfo : goodsModelInfoList) {
+ GoodsModelVO goodsModelVO = getGoodsModelVO(goodModelInfo);
+ goodsModelList.add(goodsModelVO);
+ }
- procureGoodsVOList.add(lWhFormProcureGoodsVO);
+ ReflectUtil.setFieldValue(goodsTemplateInfoVO, "models", goodsModelList);
+
+ goodsTemplateInfoList.add(goodsTemplateInfoVO);
}
- lWhFormProcureExtendVO.setProcureGoods(procureGoodsVOList);
+ lWhFormProcureExtendVO.setProcureGoods(goodsTemplateInfoList);
return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormProcureExtendVO);
}
+ private GoodsModelVO getGoodsModelVO(GoodModelInfoDTO goodModelInfo) {
+ GoodsModelVO goodsModelVO = new GoodsModelVO();
+
+ goodsModelVO.setId(goodModelInfo.getId());
+ goodsModelVO.setBaseGoodsModelsName(goodModelInfo.getBaseGoodsModelsName());
+ goodsModelVO.setUnit(goodModelInfo.getUnit());
+ goodsModelVO.setCounts(goodModelInfo.getCounts());
+ goodsModelVO.setTotalAmount(
+ goodModelInfo.getTotalAmount() != null ? goodModelInfo.getTotalAmount().doubleValue() : null);
+ goodsModelVO.setWorehouseCount(goodModelInfo.getWorehouseCount());
+ goodsModelVO.setPrice(goodModelInfo.getPrice());
+ goodsModelVO.setBaseGoodsModelsId(goodModelInfo.getBaseGoodsModelsId());
+ return goodsModelVO;
+ }
@ApiOperation(value = "閲囪喘鍗曟槑缁嗘煡璇�", notes = "閲囪喘鍗曟槑缁嗘煡璇�")
- @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "閲囪喘鍗曟槑缁嗘煡璇�", required = true, dataType = "FormProcureQryDto", paramType = "query")})
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "閲囪喘鍗曟槑缁嗘煡璇�", required = true,
+ dataType = "FormProcureQryDto", paramType = "query")})
@GetMapping("detail/list")
public ResponseValue queryFormProcureDetailList() {
FormProcureQry formProcureQry = CommonUtil.getObjFromReq(FormProcureQry.class);
@@ -411,23 +285,21 @@
CommonUtil.copyProperties(formProcureQry, param2);
formProcureQry = param2;
- S_user_core currentUser = this.getCurrentUser();
- if (currentUser == null) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
-
+ // formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
return ResponseValue.success(genericPager);
}
@ApiOperation(value = "閲囪喘鍗曞鍑�", notes = "閲囪喘鍗曞鍑�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "閲囪喘鍗昳d", required = true, dataType = "Long", paramType = "query")
- })
+ @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");
+ public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
+ TemplateExportParams params = new TemplateExportParams("import/閲囪喘鍏ュ簱鍗�.xls");
params.setHeadingStartRow(2);
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
@@ -439,8 +311,10 @@
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();
+ int countNum =
+ exportList.stream().filter(item -> item.getNum() != null).mapToInt(ProcureExcelTemplate::getNum).sum();
+ double totalAmount = exportList.stream().filter(export -> export.getTotalAmount() != null)
+ .mapToDouble(ProcureExcelTemplate::getAmount).sum();
Optional<ProcureExcelTemplate> first = exportList.stream().findFirst();
ProcureExcelTemplate templateExcelExport = first.get();
String businessFormCode = templateExcelExport.getBusinessFormCode();
@@ -455,7 +329,93 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, ProcureExcelTemplate.class, exportList, map);
- downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+ String filePath = downLoadExcel("閲囪喘鍏ュ簱鍗�", workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
+
+ @ApiOperation(value = "閲囪喘鍗曞鍏�", notes = "閲囪喘鍗曞鍏�")
+ @PostMapping("/import")
+ public ResponseValue upload(MultipartFile file) throws IOException {
+ String originalFilename = file.getOriginalFilename();
+ if (!".xls".endsWith(originalFilename)) {
+ return ResponseValue.error("鏂囦欢鏍煎紡鏈夎!");
+ }
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("褰撳墠鐧诲綍鐢ㄦ埛涓虹┖");
+ }
+ EasyExcelFactory.read(file.getInputStream(), ImportProcureOrderTemplate.class,
+ new AnalysisEventListener<ImportProcureOrderTemplate>() {
+ List<LWhFormProcureParam> list = Lists.newArrayList();
+
+ @Override
+ public void invoke(ImportProcureOrderTemplate data, AnalysisContext analysisContext) {
+ String categoryOne = data.getCategoryOne();
+ String categoryTwo = data.getCategoryTwo();
+ String categoryThree = data.getCategoryThree();
+ String goodsName = data.getGoodsName();
+ String goodModelName = data.getGoodModelName();
+ String unit = data.getUnit();
+ String type = data.getType();
+ String agencyName = data.getAgencyName();
+ String warehouseName = data.getWarehouseName();
+ String supplierName = data.getSupplierName();
+ String price = data.getPrice();
+ String num = data.getNum();
+
+ BaseCategory baseCategory = baseCategoryService.getByCategoryByName(categoryThree);
+ Long categoryId = baseCategory.getId();
+
+ // Optional<BaseGoodsTemplateParam> optional =
+ // list.stream().filter(item -> item.getCategoryId().equals(categoryId)).findFirst();
+ //
+ // if (optional.isPresent()) {
+ // BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
+ // baseGoodsModels.setModelName(goodModelName);
+ // baseGoodsModels.setUnit(unit);
+ // optional.get().getModels().add(baseGoodsModels);
+ // } else {
+ // BaseGoodsTemplateParam baseGoodsTemplate = new BaseGoodsTemplateParam();
+ // baseGoodsTemplate.setCategoryId(categoryId);
+ // baseGoodsTemplate.setGoodsName(goodsName);
+ // baseGoodsTemplate.setStates(1);
+ // FinSysTenant finSysTenant = finSysTenantService.selectByName(agencyName);
+ // baseGoodsTemplate.setAgencyId(finSysTenant.getId());
+ // baseGoodsTemplate.setAgencyName(agencyName);
+ //
+ // List<BaseGoodsModels> models = new ArrayList<>();
+ // BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
+ // baseGoodsModels.setModelName(goodModelName);
+ // baseGoodsModels.setUnit(unit);
+ // models.add(baseGoodsModels);
+ // baseGoodsTemplate.setModels(models);
+ //
+ // list.add(baseGoodsTemplate);
+ // }
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ for (LWhFormProcureParam procureParam : list) {
+ // lWhFormProcureService.add(procureParam, null);
+ }
+ }
+
+ @Override
+ public void onException(Exception exception, AnalysisContext analysisContext) throws Exception {
+ if (exception instanceof ExcelDataConvertException) {
+ ExcelDataConvertException excelDataConvertException = (ExcelDataConvertException)exception;
+ Integer row = excelDataConvertException.getRowIndex() + 1;
+ Integer column = excelDataConvertException.getColumnIndex() + 1;
+ throw new RuntimeException("绗�" + row + "琛岋紝绗�" + column + "鍒楄В鏋愬紓甯革紝璇锋纭～鍐�");
+ } else {
+ throw new RuntimeException(exception.getMessage());
+ }
+ }
+ }).sheet(0).doRead();
+
+ return ResponseValue.success("瀵煎叆鎴愬姛!");
+ }
+
}
--
Gitblit v1.9.1