From 7261ee93908d61a2c714645f19501aee9a7aba7b Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期五, 24 十一月 2023 17:35:51 +0800 Subject: [PATCH] --部门物品分发 --- consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 393 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 350 insertions(+), 43 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java index bfd5da1..a78ab43 100644 --- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java +++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java @@ -1,121 +1,428 @@ package com.consum.base.controller; 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.*; -import com.consum.base.service.*; -import com.consum.model.po.*; -import com.consum.model.vo.LWhFormTransferVo; +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.pojo.GoodsUseRecordVO; +import com.consum.base.pojo.LWhFormTransferGoodsInfoParam; +import com.consum.base.pojo.request.ProcureModelInfoParam; +import com.consum.base.pojo.RecordUserInfoVO; +import com.consum.base.pojo.UseRecordSkuVO; +import com.consum.base.pojo.dto.UseRecordDTO; +import com.consum.base.pojo.query.TransferQry; +import com.consum.base.pojo.request.LWhFormTransferParam; +import com.consum.base.pojo.response.FormTransferVO; +import com.consum.base.pojo.response.FromTransferTemplateInfoVO; +import com.consum.base.pojo.response.LWHFromTransferExtendVO; +import com.consum.base.pojo.response.TransferInfoVO; +import com.consum.base.service.BaseGoodsModelsServiceImpl; +import com.consum.base.service.BaseWarehouseServiceImpl; +import com.consum.base.service.LWhFormTransferCoreService; +import com.consum.base.service.LWhFormTransferServiceImpl; +import com.consum.base.service.LWhProcureModelService; +import com.consum.base.service.LWhProcureModelUserRecordServiceImpl; +import com.consum.base.service.LWhProcureModelUserServiceImpl; +import com.consum.model.po.BaseWarehouse; +import com.consum.model.po.FinSysTenantUser; +import com.consum.model.po.LWhFormTransfer; +import com.consum.model.po.LWhProcureModelUser; +import com.consum.model.po.LWhProcureModelUserRecord; +import com.consum.model.vo.LWhFormOutputVo; 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 org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; +import org.apache.commons.compress.utils.Lists; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** - * @Description 璋冩嫧绠$悊 + * @Description 璋冩嫧绠$悊 * @Author 鍗㈠簡闃� * @Date 2023/10/30 */ @RestController @RequestMapping("/pc/l/wh/form/transfer") +@Api(value = "璋冩嫧鍒嗗彂绠$悊", tags = "璋冩嫧鍒嗗彂绠$悊") public class LWhFormTransferController extends BaseController { @Autowired private LWhFormTransferServiceImpl lWhFormTransferService; @Autowired - private BaseWarehouseServiceImpl baseWarehouseService; - @Autowired private LWhProcureModelService lWhProcureModelService; + @Autowired + private LWhFormTransferCoreService lWhFormTransferCoreService; + @Autowired + private LWhProcureModelUserServiceImpl lWhProcureModelUserService; + @Autowired + private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService; + @Autowired + private BaseGoodsModelsServiceImpl baseGoodsModelsService; + @Autowired + private BaseWarehouseServiceImpl baseWarehouseService; /** * @Description 鏂板 */ + @ApiOperation(value = "鍗曟嵁鏂板", notes = "鍗曟嵁鏂板") + @ApiImplicitParam(name = "param", value = "鍗曟嵁鏂板", required = true, dataType = "LWhFormTransferParam") @PostMapping("/add") - public ResponseValue add(@RequestBody LWhFormTransferParam param) { + public ResponseValue add(@RequestBody LWhFormTransferParam param) throws Exception { S_user_core currentUser = this.getCurrentUser(); if (currentUser == null) { return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); } - List<LWhProcureModelParams> transferGoods = param.getModels(); + List<LWhFormTransferGoodsInfoParam> transferGoods = param.getTransferGoods(); if (CollectionUtils.isEmpty(transferGoods)) { return ResponseValue.error("璋冩嫧鍗曚笉鑳戒负绌�"); } - int result = this.lWhFormTransferService.add(param, currentUser,this.getSysInfo()); - if (result > 0) return ResponseValue.success(1); + int result = this.lWhFormTransferService.add(param, this.getSysInfo()); + if (result > 0) { + return ResponseValue.success(); + } return ResponseValue.error("鏂板澶辫触锛�"); } /** - * @Description 鍒楄〃鏌ヨ + * @Description 鍒楄〃鏌ヨ(璋冩嫧鏄庣粏) * @Author 鍗㈠簡闃� * @Date 2023/10/30 + * <p> + * 1.鏌ヨ璋冩嫧鍗� + * <p> + * 2.鏌ヨ鐗╁搧鍨嬪彿 */ -// 1.鏌ヨ璋冩嫧鍗� -// 2.鏌ヨ鐗╁搧鍨嬪彿 + @ApiOperation(value = "鍗曟嵁鍒楄〃鏌ヨ", notes = "鍗曟嵁鍒楄〃鏌ヨ") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "椤电爜", required = true, dataType = "int"), + @ApiImplicitParam(name = "size", value = "姣忛〉鏉℃暟", required = true, dataType = "int"), + @ApiImplicitParam(name = "param", value = "鏉′欢鍙傛暟", required = true, dataType = "TransferQry"), + }) @GetMapping("/list") - public ResponseValue queryFormTransferList(LWhFormTransferParam param) { + public ResponseValue queryFormTransferList(TransferQry param) { S_user_core currentUser = this.getCurrentUser(); if (currentUser == null) { return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); } - FinSysTenantUser sysInfo = getSysInfo(); - - //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑杩涜揣鍗� - //?????? - + /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/ GenericPager genericPager = lWhFormTransferService.queryFormTransferList(param); List<LWhFormTransfer> datas = genericPager.getDatas(); - ArrayList<LWhFormProcureExtend> newDatas = new ArrayList<>(); + ArrayList<FormTransferVO> result = new ArrayList<>(); if (!CollectionUtils.isEmpty(datas)) { datas.forEach(item -> { + FormTransferVO formTransferVO = new FormTransferVO(); + BeanUtils.copyProperties(item, formTransferVO); + + List<FromTransferTemplateInfoVO> templateInfoList = Lists.newArrayList(); + // 鏌ヨ鍨嬪彿鏁伴噺 - LWhProcureModel lWhProcureModel = new LWhProcureModel(); - lWhProcureModel.setBusinessType(2); - lWhProcureModel.setBusinessId(item.getId()); - List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel); - LWhFormProcureExtend formProcureExtend = new LWhFormProcureExtend(); - BeanUtils.copyProperties(item, formProcureExtend); - formProcureExtend.setModels(models); - newDatas.add(formProcureExtend); + String sql = "SELECT bgt.id,bgm.GOODS_TEMPLATES_ID,GOODS_NAME,sum( counts ) count FROM " + + "l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id " + + "LEFT JOIN base_goods_template bgt ON bgm.GOODS_TEMPLATES_ID = bgt.id " + + "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, new MapperUtil()); + for (Map<String, Object> map : procureModelList) { + FromTransferTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FromTransferTemplateInfoVO.class); + templateInfoList.add(procureTemplateInfoVO); + } + formTransferVO.setFromTransferTemplateInfoList(templateInfoList); + + result.add(formTransferVO); }); } try { Field fieldDatas = GenericPager.class.getDeclaredField("datas"); fieldDatas.setAccessible(true); - fieldDatas.set(genericPager, newDatas); + fieldDatas.set(genericPager, result); } catch (Exception e) { e.printStackTrace(); } -// genericPager.setDatas(newDatas); return ResponseValue.success(genericPager); } /** - * @Description 鏍规嵁id鏌ヨ璇︽儏 + * @Description 鏍规嵁id鏌ヨ璇︽儏 * @Author 鍗㈠簡闃� * @Date 2023/10/30 */ + @ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"), + }) @GetMapping("/detail") - public ResponseValue getById(Long id) throws IllegalAccessException { + public ResponseValue getById(Long id) { if (id == null) { return ResponseValue.error("璋冩嫧鍗昳d涓虹┖"); } - LWhFormTransferVo vo = this.lWhFormTransferService.getById(id); + LWHFromTransferExtendVO vo = this.lWhFormTransferService.getById(id); + return ResponseValue.success(vo); + } + + @ApiOperation(value = "璋冩嫧鏄庣粏鍒楄〃", notes = "璋冩嫧鏄庣粏鍒楄〃") + @ApiImplicitParams({ + @ApiImplicitParam(name = "param", value = "鏉′欢", required = true, dataType = "TransferQry"), + }) + @GetMapping("/detail/list") + public ResponseValue queryFormTransferDetailList(TransferQry param) { + FinSysTenantUser sysInfo = this.getSysInfo(); + if (sysInfo == null) { + return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); + } + GenericPager<Map<String, Object>> mapGenericPager = lWhFormTransferService.queryFormTransferDetailList(param); + + return ResponseValue.success(mapGenericPager); + } + + /** + * 鎾ら攢 + * + * @author 鍗㈠簡闃� + * @date 2023/10/31 + */ + @ApiOperation(value = "鎾ら攢", notes = "鎾ら攢") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"), + }) + @PostMapping("/updStatus") + public ResponseValue updateStatus(Long id) { + if (id == null) { + return ResponseValue.error("鍙傛暟閿欒"); + } + + int num = this.lWhFormTransferService.updateStatus(id); + return num > 0 ? ResponseValue.success(1) : ResponseValue.error("淇敼澶辫触锛�"); + } + + /** + * @Description 璋冩嫧鍏ュ簱 + * @Author 鍗㈠簡闃� + * @Date 2023/10/31 + */ + @ApiOperation(value = "璋冩嫧鍏ュ簱", notes = "璋冩嫧鍏ュ簱") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"), + }) + @PostMapping("/income") + public ResponseValue income(Long id) { + lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser()); + return ResponseValue.success(); + } + + /** + * @Description 璋冩嫧鍑哄簱 + * @Author 鍗㈠簡闃� + * @Date 2023/10/31 + */ + @ApiOperation(value = "璋冩嫧鍑哄簱", notes = "璋冩嫧鍑哄簱") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"), + }) + @PostMapping("/output") + public ResponseValue output(Long id) { + // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱 + FinSysTenantUser sysTenantUser = this.getSysInfo(); + String agencyId = sysTenantUser.getTenantId(); + List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short) 1, (short) 1); + if (CollectionUtils.isEmpty(baseWarehouseList)) { + return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒"); + } + BaseWarehouse baseWarehouse = baseWarehouseList.get(0); + Long wareHouseId = baseWarehouse.getId(); + String warehouseName = baseWarehouse.getWarehouseName(); + LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id); + lWhFormTransfer.setOutWarehouseId(wareHouseId); + lWhFormTransfer.setOutWarehouseName(warehouseName); + lWhFormTransferService.update(lWhFormTransfer); + lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser()); + return ResponseValue.success(); + } + + /** + * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗� + * @Author 鍗㈠簡闃� + * @Date 2023/10/31 + */ + @GetMapping("/export") + public ResponseValue export(Long id) { + if (id == null) { + return ResponseValue.error("璋冩嫧鍗昳d涓虹┖"); + } + LWhFormOutputVo vo = this.lWhFormTransferService.export(id, this.getCurrentUser()); return ResponseValue.success(vo); } + /** + * 閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏 + * + * @param transferQry + * @return + */ + @ApiOperation(value = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏", notes = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏") + @ApiImplicitParams({ + @ApiImplicitParam(name = "transferQryDto", value = "璋冩嫧鍗曟煡璇㈡潯浠�", required = true) + }) + @GetMapping("/department/list") + public ResponseValue departmentTransferList(TransferQry transferQry) { + + S_user_core currentUser = this.getCurrentUser(); + if (currentUser == null) { + return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); + } + GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(transferQry); + return ResponseValue.success(transferInfoDetailsVoGenericPager); + } + + + @ApiOperation(value = "浣跨敤浜轰慨鏀�", notes = "浣跨敤浜轰慨鏀�") + @ApiImplicitParams({ + @ApiImplicitParam(name = "procureModelInfoDto", value = "浣跨敤淇℃伅", required = true) + }) + @PostMapping("/useInfo/update") + public ResponseValue infoUpdate(@RequestBody List<ProcureModelInfoParam> procureModelInfoParam) { + + S_user_core currentUser = this.getCurrentUser(); + if (currentUser == null) { + return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); + } + if (CollectionUtils.isEmpty(procureModelInfoParam)) { + return ResponseValue.error("鍙傛暟閿欒"); + } + + Map<Long, List<ProcureModelInfoParam>> collect = procureModelInfoParam.stream() + .collect(Collectors.groupingBy(ProcureModelInfoParam::getBaseGoodModelId)); + for (Map.Entry<Long, List<ProcureModelInfoParam>> entry : collect.entrySet()) { + Long baseGoodModelId = entry.getKey(); + + List<ProcureModelInfoParam> procureModelInfoList = entry.getValue(); + Optional<ProcureModelInfoParam> first = procureModelInfoList.stream().findFirst(); + ProcureModelInfoParam procureModelInf = first.get(); + Long businessId = procureModelInf.getBusinessId(); + LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord(); + lWhProcureModelUserRecord.setId(IdUtil.generateId()); + lWhProcureModelUserRecord.setTransBusinessId(businessId); + FinSysTenantUser sysInfo = getSysInfo(); + lWhProcureModelUserRecord.setOperatorId(sysInfo.getId()); + lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName()); + lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis())); + lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord); + + List<LWhProcureModelUser> procureModelUserList = Lists.newArrayList(); + if (CollectionUtils.isEmpty(procureModelInfoList)) { + for (ProcureModelInfoParam item : procureModelInfoList) { + LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser(); + lWhProcureModelUser.setId(IdUtil.generateId()); + lWhProcureModelUser.setTransBusinessId(businessId); + lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId()); + lWhProcureModelUser.setWhProcureModelId(procureModelInf.getProcureModelId()); + lWhProcureModelUser.setBaseGoodsModelsId(baseGoodModelId); + lWhProcureModelUser.setNowUserPhone(item.getPhone()); + lWhProcureModelUser.setNowUserName(item.getUserName()); + lWhProcureModelUser.setGoodsNum(item.getCount()); + procureModelUserList.add(lWhProcureModelUser); + } + + lWhProcureModelUserService.insert(procureModelUserList); + } + + } + + return ResponseValue.success(); + } + + /** + * 閮ㄩ棬鐗╁搧浣跨敤璁板綍 + * + * @param transferOrderId + * @return + */ + @ApiOperation(value = "閮ㄩ棬鐗╁搧浣跨敤浜鸿褰�", notes = "閮ㄩ棬鐗╁搧浣跨敤浜鸿褰�") + @ApiImplicitParams({ + @ApiImplicitParam(name = "transferOrderId", value = "璋冩嫧鍗昳d", required = true) + }) + @GetMapping("/use/record") + public ResponseValue useRecord(Long transferOrderId) { + + S_user_core currentUser = this.getCurrentUser(); + if (currentUser == null) { + return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); + } + List<UseRecordDTO> useRecordDTOList = lWhProcureModelUserService.selectUseRecord(transferOrderId); + if (CollectionUtils.isEmpty(useRecordDTOList)) { + return ResponseValue.error("鏈煡璇㈠埌浣跨敤璁板綍"); + } + List<GoodsUseRecordVO> result = Lists.newArrayList(); + //鍒嗙粍 + Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream() + .collect(Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId))); + //寮�濮嬪惊鐜痗ollect + for (Map.Entry<Long, Map<Long, List<UseRecordDTO>>> entry : collect.entrySet()) { + Long id = entry.getKey(); + Map<Long, List<UseRecordDTO>> value = entry.getValue(); + //寮�濮嬪惊鐜痸alue + List<UseRecordSkuVO> useRecordSkuList = Lists.newArrayList(); + for (Map.Entry<Long, List<UseRecordDTO>> item : value.entrySet()) { + List<UseRecordDTO> list = item.getValue(); + List<RecordUserInfoVO> recordUserInfoList = Lists.newArrayList(); + for (UseRecordDTO useRecordDto : list) { + + GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO(); + goodsUseRecordVO.setId(id); + goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName()); + goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime()); + + UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO(); + useRecordSkuVO.setBaseGoodModelId(useRecordDto.getBaseGoodsModelsId()); + useRecordSkuVO.setBaseGoodModelName(useRecordDto.getBaseGoodsModelsName()); + useRecordSkuVO.setUnit(useRecordDto.getUnit()); + useRecordSkuVO.setProcureModelId(useRecordDto.getProcureModelId()); + + RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO(); + recordUserInfoVO.setUseName(useRecordDto.getUseName()); + recordUserInfoVO.setPhone(useRecordDto.getPhone()); + recordUserInfoVO.setNum(useRecordDto.getNum()); + recordUserInfoList.add(recordUserInfoVO); + useRecordSkuVO.setRecordUserInfos(recordUserInfoList); + useRecordSkuList.add(useRecordSkuVO); + goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList); + result.add(goodsUseRecordVO); + } + } + } + return ResponseValue.success(result); + } + + + @ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�") + @ApiImplicitParams({ + @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query") + }) + @GetMapping("/query/detail") + public ResponseValue queryDepartmentTransferOrder(Long agencyId) { + + TransferInfoVO transferInfoVO = new TransferInfoVO(); + + lWhFormTransferService.queryDepartmentTransferOrder(); + return ResponseValue.success(transferInfoVO); + } } -- Gitblit v1.9.1