From 936bad992ac40c6f676fbbefefeea609dfdbff55 Mon Sep 17 00:00:00 2001 From: 石广澎 <shiguangpeng@163.com> Date: 星期六, 02 十二月 2023 18:41:59 +0800 Subject: [PATCH] feat: 库存盘点详情状态 --- consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 126 ++++++++++++++++++++++++++++++------------ 1 files changed, 90 insertions(+), 36 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 5d0b7c4..c025739 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,35 +1,49 @@ 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.pojo.LWhFormOutputExtend; -import com.consum.base.pojo.LWhFormOutputInsertParam; +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.excel.OutputExcelTemplate; 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.LWhGoodsService; 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import java.io.InputStream; import java.lang.reflect.Field; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; +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; @@ -49,8 +63,8 @@ private LWhFormOutputServiceImpl lWhFormOutputService; @Autowired private LWhProcureModelService lWhProcureModelService; - @Autowired - private LWhGoodsService lWhGoodsService; + @Resource + private LWarehouseFlowService lWarehouseFlowService; /** * @Description 鏂板鍑哄簱鍗� @@ -59,11 +73,11 @@ */ @ApiOperation(value = "鏂板鍑哄簱鍗�", notes = "鏂板鍑哄簱鍗�") @ApiImplicitParams({ - @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputInsertParam", paramType = "body") + @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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); @@ -87,7 +101,12 @@ if (currentUser == null) { return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); } - + /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/ + FinSysTenantUser sysInfo = this.getSysInfo(); + String tenantId = sysInfo.getTenantId(); + if (param.getAgencyId() == null) { + param.setAgencyId(Long.valueOf(tenantId)); + } GenericPager genericPager = lWhFormOutputService.queryFormOutputList(param); List<LWhFormOutput> data = genericPager.getDatas(); @@ -107,9 +126,9 @@ + "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); + List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil()); for (Map<String, Object> map : procureModelList) { - FormOutputTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), FormOutputTemplateInfoVO.class); + FormOutputTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputTemplateInfoVO.class); procureTemplateInfoList.add(procureTemplateInfoVO); } formOutputVO.setFormOutputTemplateInfoList(procureTemplateInfoList); @@ -119,8 +138,9 @@ } 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(); } @@ -139,11 +159,8 @@ } LWhFormOutput lWhFormOutput = lWhFormOutputService.get(new LWhFormOutput(id)); LWhFormOutputExtendVO lWhFormOutputExtendVO = new LWhFormOutputExtendVO(); - - LWhFormOutputExtend formOutputExtend = new LWhFormOutputExtend(); - BeanUtils.copyProperties(lWhFormOutput, formOutputExtend); - 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 " @@ -151,10 +168,10 @@ + "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); + 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(MapUtils.toReplaceKeyLow(map), FormOutputGoodsVO.class); + FormOutputGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputGoodsVO.class); // 鏌ヨ鍨嬪彿鏁伴噺 List<GoodsModelVO> goodsModelVOList = Lists.newArrayList(); @@ -162,9 +179,9 @@ + "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); + List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil()); modelList.forEach(item -> { - GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(item), GoodsModelVO.class); + GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class); goodsModelVOList.add(goodsModelVO); }); procureTemplateInfoVO.setModels(goodsModelVOList); @@ -175,24 +192,61 @@ return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormOutputExtendVO); } - /** - * @Description 鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨 - * @Author 鍗㈠簡闃� - * @Date 2023/11/2 - */ - @ApiOperation(value = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨", notes = "鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨") - @ApiImplicitParams({ - @ApiImplicitParam(name = "warehouseId", value = "浠撳簱id", required = true, dataType = "Long", paramType = "query"), - @ApiImplicitParam(name = "baseGoodsModelsId", value = "鍨嬪彿id", required = true, dataType = "Long", paramType = "query") - }) - @GetMapping("/select/number") - public ResponseValue selectNumber(Long warehouseId, Long baseGoodsModelsId) { - if (warehouseId == null || baseGoodsModelsId == null) { - return ResponseValue.error("鍙傛暟閿欒"); + + @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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); } - int num = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null); - return ResponseValue.success(num); + 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(); + int totalAmount = exportList.stream().filter(item -> item.getTotalAmount() != null).mapToInt(OutputExcelTemplate::getTotalAmount).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