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 | 202 +++++++++++++++++++++++---------------------------
1 files changed, 92 insertions(+), 110 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 a6acc2f..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
@@ -4,12 +4,14 @@
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.LWhFormTransferParam;
-import com.consum.base.pojo.ProcureModelInfoDto;
-import com.consum.base.pojo.UseRecordDto;
-import com.consum.base.pojo.UseRecordSkuDto;
+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;
@@ -21,11 +23,9 @@
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
import com.consum.base.service.LWhProcureModelUserServiceImpl;
-import com.consum.model.po.BaseGoodsModels;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.LWhProcureModel;
import com.consum.model.po.LWhProcureModelUser;
import com.consum.model.po.LWhProcureModelUserRecord;
import com.consum.model.vo.LWhFormOutputVo;
@@ -43,6 +43,8 @@
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;
@@ -94,7 +96,7 @@
}
int result = this.lWhFormTransferService.add(param, this.getSysInfo());
if (result > 0) {
- return ResponseValue.success(1);
+ return ResponseValue.success();
}
return ResponseValue.error("鏂板澶辫触锛�");
}
@@ -146,42 +148,6 @@
formTransferVO.setFromTransferTemplateInfoList(templateInfoList);
result.add(formTransferVO);
-
-
- /*// 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- Integer businessType = item.getBusinessType();
- // TODO 璋冩嫧=0 鍒嗗彂=1 閫�鍥�=2
- switch (businessType) {
- case 0:
- lWhProcureModel.setBusinessType(2);
- break;
- case 1:
- lWhProcureModel.setBusinessType(4);
- break;
- }
- lWhProcureModel.setBusinessId(item.getId());
- List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
- List<LWhProcureModelVo> lWhProcureModelVoList = new ArrayList<>();
- if (!CollectionUtils.isEmpty(models)) {
- models.forEach(model -> {
- LWhProcureModelVo lWhProcureModelVo = new LWhProcureModelVo();
- BeanUtils.copyProperties(model, lWhProcureModelVo);
-
- Long baseGoodsModelsId = model.getBaseGoodsModelsId();
- Long businessId = model.getBusinessId();
- Long id = model.getId();
- LWhProcureModelUser lWhFormTransferUser = new LWhProcureModelUser();
- lWhFormTransferUser.setTransBusinessId(businessId);
- lWhFormTransferUser.setWhProcureModelId(id);
- lWhFormTransferUser.setBaseGoodsModelsId(baseGoodsModelsId);
- List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhFormTransferUser);
- lWhProcureModelVo.setProcureModelUsersList(procureModelUserList);
- lWhProcureModelVoList.add(lWhProcureModelVo);
- });
- }
- formTransferExtend.setModels(lWhProcureModelVoList);
- newDatas.add(formTransferExtend);*/
});
}
try {
@@ -327,55 +293,60 @@
return ResponseValue.success(transferInfoDetailsVoGenericPager);
}
- /**
- * 閮ㄩ棬鐗╁搧浣跨敤璁板綍
- *
- * @param procureModelInfoDto
- * @return
- */
+
+ @ApiOperation(value = "浣跨敤浜轰慨鏀�", notes = "浣跨敤浜轰慨鏀�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "procureModelInfoDto", value = "浣跨敤淇℃伅", required = true)
+ })
@PostMapping("/useInfo/update")
- public ResponseValue infoUpdate(@RequestBody List<ProcureModelInfoDto> procureModelInfoDto) {
+ public ResponseValue infoUpdate(@RequestBody List<ProcureModelInfoParam> procureModelInfoParam) {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- if (CollectionUtils.isEmpty(procureModelInfoDto)) {
+ if (CollectionUtils.isEmpty(procureModelInfoParam)) {
return ResponseValue.error("鍙傛暟閿欒");
}
- for (ProcureModelInfoDto procureModelInfo : procureModelInfoDto) {
+ 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();
- String transferOrderId = procureModelInfo.getTransferOrderId();
- String baseGoodModelId = procureModelInfo.getBaseGoodModelId();
+ 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);
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setBusinessId(Long.valueOf(transferOrderId));
- lWhProcureModel.setBaseGoodsModelsId(Long.valueOf(baseGoodModelId));
- // 閮ㄩ棬鍒嗗彂
- lWhProcureModel.setBusinessType(4);
- List<LWhProcureModel> lWhProcureModelList = lWhProcureModelService.select(lWhProcureModel);
- lWhProcureModelList.forEach(item -> {
- Long id = item.getId();
- LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
- lWhProcureModelUser.setWhProcureModelId(id);
- List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhProcureModelUser);
- procureModelUserList.forEach(procureModelUser -> {
- procureModelUser.setNowUserName(procureModelInfo.getUserName());
- procureModelUser.setNowUserPhone(procureModelInfo.getPhone());
+ 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);
+ }
- LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
- lWhProcureModelUserRecord.setId(IdUtil.generateId());
- lWhProcureModelUserRecord.setTransBusinessId(Long.valueOf(transferOrderId));
- FinSysTenantUser sysInfo = getSysInfo();
- lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
- lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName());
- lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);
- });
- lWhProcureModelUserService.updateBatch(procureModelUserList);
- });
+ lWhProcureModelUserService.insert(procureModelUserList);
+ }
+
}
+
return ResponseValue.success();
}
@@ -385,6 +356,10 @@
* @param transferOrderId
* @return
*/
+ @ApiOperation(value = "閮ㄩ棬鐗╁搧浣跨敤浜鸿褰�", notes = "閮ㄩ棬鐗╁搧浣跨敤浜鸿褰�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "transferOrderId", value = "璋冩嫧鍗昳d", required = true)
+ })
@GetMapping("/use/record")
public ResponseValue useRecord(Long transferOrderId) {
@@ -392,40 +367,47 @@
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
- lWhProcureModelUserRecord.setTransBusinessId(transferOrderId);
- List<LWhProcureModelUserRecord> modelUserRecords = lWhProcureModelUserRecordService.select(lWhProcureModelUserRecord);
+ 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) {
- List<UseRecordDto> result = Lists.newArrayList();
- for (LWhProcureModelUserRecord item : modelUserRecords) {
- Long id = item.getId();
- UseRecordDto useRecordDto = new UseRecordDto();
- useRecordDto.setId(id);
- useRecordDto.setUpdateUserName(item.getOperatorName());
- useRecordDto.setUpdateTime(DateUtils.toShowDate(item.getDealTime()));
+ GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
+ goodsUseRecordVO.setId(id);
+ goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
+ goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());
- LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
- lWhProcureModelUser.setWhProcureModelId(id);
- List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhProcureModelUser);
+ UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
+ useRecordSkuVO.setBaseGoodModelId(useRecordDto.getBaseGoodsModelsId());
+ useRecordSkuVO.setBaseGoodModelName(useRecordDto.getBaseGoodsModelsName());
+ useRecordSkuVO.setUnit(useRecordDto.getUnit());
+ useRecordSkuVO.setProcureModelId(useRecordDto.getProcureModelId());
- List<UseRecordSkuDto> recordSkuDtoList = Lists.newArrayList();
- procureModelUserList.forEach(procureModelUser -> {
- UseRecordSkuDto useRecordSkuDto = new UseRecordSkuDto();
-
- BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
- baseGoodsModels.setId(procureModelUser.getBaseGoodsModelsId());
- BaseGoodsModels baseGoodsModel = baseGoodsModelsService.getByModelNameAndGoodsTemplatesId(baseGoodsModels);
- String unit = baseGoodsModel.getUnit();
- useRecordSkuDto.setBaseUnit(unit);
- useRecordSkuDto.setBaseGoodModelName(baseGoodsModel.getModelName());
- useRecordSkuDto.setCount(procureModelUser.getGoodsNum());
- useRecordSkuDto.setPhone(procureModelUser.getNowUserPhone());
- useRecordSkuDto.setUserName(procureModelUser.getNowUserName());
-
- recordSkuDtoList.add(useRecordSkuDto);
- });
- useRecordDto.setRecordSkuDtoList(recordSkuDtoList);
-
+ 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);
}
--
Gitblit v1.9.1