From c4874c0c062216f80e154861353f35e63ec7d747 Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期五, 08 十二月 2023 15:01:04 +0800 Subject: [PATCH] feat: 只查询本机构的采购单 --- consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 359 +++++++++++++++++++++++++++++------------------------------ 1 files changed, 178 insertions(+), 181 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 da51970..4b84bd2 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,225 +1,137 @@ 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.pojo.LWhFormProcureExtend; -import com.consum.base.pojo.LWhFormProcureGoodsParams; +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.LWhProcureModelParams; -import com.consum.base.service.*; -import com.consum.model.po.*; +import com.consum.base.pojo.dto.GoodModelInfoDTO; +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.LWhFormProcureGoodsService; +import com.consum.base.service.LWhFormProcureService; +import com.consum.base.service.LWhProcureModelService; +import com.consum.base.service.impl.LWhFormProcureCoreService; +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.infrastructure.utils.NumberGenerator; 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.*; /** * @ClassName LWhFormProcureController - * @Date 2023/10/27 * @Description * @Version 1.0 **/ +@Api(value = "浠撳簱琛ㄥ崟閲囪喘", tags = "浠撳簱琛ㄥ崟閲囪喘") @RestController @RequestMapping("/pc/whForm/procure") public class LWhFormProcureController extends BaseController { + @Resource private LWhFormProcureService lWhFormProcureService; @Resource - private BaseWarehouseServiceImpl baseWarehouseService; - @Resource - private FinSysTenantServiceImpl finSysTenantService; - @Resource - private CodeGeneratorService codeGeneratorService; - @Resource - private LWhFormProcureGoodsService lWhFormProcureGoodsService; + private LWhFormProcureGoodsService lWhFormProcureGoodsServiceImpl; @Resource private LWhFormProcureCoreService lWhFormProcureCoreService; @Resource - private LWhGoodsService lWhGoodsService; - @Resource - private BaseGoodsTemplateServiceImpl baseGoodsTemplateService; - @Resource private LWhProcureModelService lWhProcureModelService; - @Resource - private LOrgSupplierServiceImpl lOrgSupplierService; /** * @Description 鏂板 */ @PostMapping("/add") - public ResponseValue add(@RequestBody LWhFormProcureParam param) { - Long warehouseId = param.getWarehouseId(); + public ResponseValue add() { + LWhFormProcureParam param = CommonUtil.getObjFromReqBody(LWhFormProcureParam.class); + LWhFormProcureParam param2 = new LWhFormProcureParam(); + CommonUtil.copyProperties(param, param2); + param = param2; + return this.add(param); + } + + private ResponseValue add(LWhFormProcureParam param) { 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<LWhFormProcureGoodsParams> procureGoods = param.getProcureGoods(); + 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 = NumberGenerator.getLongSequenceNumber(); - } - long procureTime = DateUtils.getDateTimeNumber(System.currentTimeMillis()); - - Set<String> supplierList = new HashSet<>(); - - ArrayList<LWhFormProcureGoods> procureGoodList = new ArrayList<>(); - ArrayList<LWhProcureModel> whProcureModeLlist = new ArrayList<>(); - - for (int i = 0; i < procureGoods.size(); i++) { - LWhFormProcureGoodsParams 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<LWhProcureModelParams> models = procureGoodT.getModels(); - if (CollectionUtils.isEmpty(models)) { - return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�"); - } - LWhFormProcureGoods procureGood = new LWhFormProcureGoods(); - long fromProcureGoodsId = NumberGenerator.getLongSequenceNumber(); - procureGood.setId(fromProcureGoodsId); - procureGood.setWhFormProcureId(whFormProcureId); - procureGood.setBaseCategoryId(baseCategoryId); - procureGood.setBaseGoodsTemplateId(baseGoodsTemplateId); - procureGood.setGoodsTemplateName(null); - procureGood.setSupplier(supplier); - procureGood.setSort(i); - for (LWhProcureModelParams modelT : models) { - Integer counts = modelT.getCounts(); - if (counts == null || counts <= 0) { - return ResponseValue.error("鍨嬪彿鐨勯噰璐暟閲忓彧鑳戒负姝f暣鏁�"); - } - Long price = modelT.getPrice(); - if (price == null || price <= 0) { - return ResponseValue.error("鍨嬪彿鐨勯噰璐环鏍煎彧鑳戒负姝f暟"); - } - 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, (short) 1, null); - LWhProcureModel model = new LWhProcureModel(); - model.setId(NumberGenerator.getLongSequenceNumber()); - 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); - whProcureModeLlist.add(model); - } - procureGoodList.add(procureGood); - } - lWhFormProcureGoodsService.insertBatch(procureGoodList); - lWhProcureModelService.insertBatch(whProcureModeLlist); - - // 鎻掑叆 閲囪喘鍗曠墿鍝併�怢_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(NumberGenerator.getLongSequenceNumber()); - 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")}) @GetMapping("/list") - public ResponseValue queryFormProcureList(LWhFormProcureParam param) { + public ResponseValue queryFormProcureList() { + FormProcureQry param = CommonUtil.getObjFromReq(FormProcureQry.class); + FormProcureQry param2 = new FormProcureQry(); + CommonUtil.copyProperties(param, param2); + param = param2; 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)); + } + PageUtil genericPager = lWhFormProcureService.queryFormProcureList(param); + List<LWhFormProcure> data = genericPager.getDatas(); + ArrayList<FormProcureVO> result = new ArrayList<>(); + if (!CollectionUtils.isEmpty(data)) { + data.forEach(item -> { + FormProcureVO fromProcureVO = new FormProcureVO(); + BeanUtils.copyProperties(item, fromProcureVO); - //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑杩涜揣鍗� - //?????? - - GenericPager genericPager = lWhFormProcureService.queryFormProcureList(param); - List<LWhFormProcure> datas = genericPager.getDatas(); - ArrayList<LWhFormProcureExtend> newDatas = new ArrayList<>(); - if (!CollectionUtils.isEmpty(datas)) { - datas.forEach(item -> { // 鏌ヨ鍨嬪彿鏁伴噺 - LWhProcureModel lWhProcureModel = new LWhProcureModel(); - lWhProcureModel.setBusinessType(1); - lWhProcureModel.setBusinessId(item.getId()); - List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel); - LWhFormProcureExtend formProcureExtend = new LWhFormProcureExtend(); - BeanUtils.copyProperties(item, formProcureExtend); - formProcureExtend.setModels(models); - newDatas.add(formProcureExtend); + 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, newDatas); + // fieldDatas.setAccessible(true); + // fieldDatas.set(genericPager, result); + ReflectUtil.setFieldValue(genericPager, fieldDatas, result); } catch (Exception e) { e.printStackTrace(); } -// genericPager.setDatas(newDatas); + genericPager.setDatas(result); return ResponseValue.success(genericPager); } @@ -227,7 +139,11 @@ * @Description 缂栬緫 */ @PostMapping("/edit") - public ResponseValue edit(@RequestBody LWhFormProcureParam param) { + public ResponseValue edit() { + LWhFormProcureParam param = CommonUtil.getObjFromReqBody(LWhFormProcureParam.class); + LWhFormProcureParam param2 = new LWhFormProcureParam(); + CommonUtil.copyProperties(param, param2); + param = param2; ResponseValue delFlag = delById(param.getId()); if (delFlag.getCode() == ResponseValue.CODE_SUCCESS) { return this.add(param); @@ -254,7 +170,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); @@ -281,34 +197,115 @@ return ResponseValue.error("閲囪喘鍗昳d涓虹┖"); } LWhFormProcure lWhFormProcure = lWhFormProcureService.get(new LWhFormProcure(id)); - LWhFormProcureExtend formProcureExtend = new LWhFormProcureExtend(); - BeanUtils.copyProperties(lWhFormProcure, formProcureExtend); + if (lWhFormProcure == null) { + return ResponseValue.error("閲囪喘鍗曚笉瀛樺湪"); + } + LWhFormProcureExtendVO lWhFormProcureExtendVO = new LWhFormProcureExtendVO(); + BeanUtils.copyProperties(lWhFormProcure, lWhFormProcureExtendVO); // 鐗╁搧 LWhFormProcureGoods lWhFormProcureGoods = new LWhFormProcureGoods(); lWhFormProcureGoods.setWhFormProcureId(id); - List<LWhFormProcureGoods> formProcureGoods = lWhFormProcureGoodsService.select(lWhFormProcureGoods); + List<LWhFormProcureGoods> formProcureGoods = lWhFormProcureGoodsServiceImpl.select(lWhFormProcureGoods); - Field fieldModels = null; - try { - fieldModels = LWhFormProcureGoodsParams.class.getDeclaredField("models"); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - fieldModels.setAccessible(true); - ArrayList<LWhFormProcureGoodsParams> procureGoodsParams = new ArrayList<>(); + List<GoodsTemplateInfoVO> goodsTemplateInfoList = new ArrayList<>(); for (LWhFormProcureGoods formProcureGood : formProcureGoods) { - LWhFormProcureGoodsParams lWhFormProcureGoodsParams = new LWhFormProcureGoodsParams(); - BeanUtils.copyProperties(formProcureGood, lWhFormProcureGoodsParams); + GoodsTemplateInfoVO goodsTemplateInfoVO = new GoodsTemplateInfoVO(); + BeanUtils.copyProperties(formProcureGood, goodsTemplateInfoVO); - // 鏌ヨ鍨嬪彿鏁伴噺 - LWhProcureModel lWhProcureModel = new LWhProcureModel(); - lWhProcureModel.setFromProcureGoodsId(formProcureGood.getId()); - List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel); - fieldModels.set(lWhFormProcureGoodsParams, models); - procureGoodsParams.add(lWhFormProcureGoodsParams); + 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); + } + + ReflectUtil.setFieldValue(goodsTemplateInfoVO, "models", goodsModelList); + + goodsTemplateInfoList.add(goodsTemplateInfoVO); } - formProcureExtend.setProcureGoods(procureGoodsParams); - return ResponseValue.success("鏌ヨ鎴愬姛!", formProcureExtend); + 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")}) + @GetMapping("detail/list") + public ResponseValue queryFormProcureDetailList() { + FormProcureQry formProcureQry = CommonUtil.getObjFromReq(FormProcureQry.class); + FormProcureQry param2 = new FormProcureQry(); + CommonUtil.copyProperties(formProcureQry, param2); + formProcureQry = param2; + + 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")}) + @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(); + 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(); + 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