From 6557589b21c34c072b9a671d268d85c52b4bf841 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 08 十二月 2023 14:47:05 +0800
Subject: [PATCH] 出入库只能查看下级
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 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 b60f2c7..e53acb8 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
@@ -38,11 +38,12 @@
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LWhFormTransferCoreService;
+import com.consum.base.service.LGoodsUserRecordCoreService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordService;
-import com.consum.base.service.LWhProcureModelUserServiceImpl;
+import com.consum.base.service.LWhProcureModelUserService;
+import com.consum.base.service.impl.LWhFormTransferCoreService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
@@ -79,11 +80,13 @@
@Autowired
private LWhFormTransferCoreService lWhFormTransferCoreService;
@Autowired
- private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
+ private LWhProcureModelUserService lWhProcureModelUserService;
@Autowired
private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;
@Autowired
private BaseWarehouseService baseWarehouseService;
+ @Autowired
+ private LGoodsUserRecordCoreService lGoodsUserRecordCoreService;
/**
* @Description 鏂板
@@ -399,9 +402,9 @@
lWhProcureModelUserService.insert(procureModelUserList);
}
-
+ // 浣跨敤浜轰慨鏀硅皟鐢�
+ lGoodsUserRecordCoreService.modifyGoodsUser(null, lWhProcureModelUserRecord.getId());
}
- // TODO 浣跨敤浜轰慨鏀硅皟鐢�
return ResponseValue.success();
}
@@ -416,59 +419,56 @@
@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> goodsUseRecordList = 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());
+ List<GoodsUseRecordVO> goodsUseRecordList = useRecordDTOList.stream()
+ .collect(Collectors.groupingBy(UseRecordDTO::getId)).entrySet().stream().map(entry -> {
+ Long id = entry.getKey();
+ List<UseRecordDTO> useRecordList = entry.getValue();
+ UseRecordDTO useRecordDto = useRecordList.get(0);
- UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
- useRecordSkuVO.setBaseGoodModelId(useRecordDto.getBaseGoodsModelsId());
- useRecordSkuVO.setBaseGoodModelName(useRecordDto.getBaseGoodsModelsName());
- useRecordSkuVO.setUnit(useRecordDto.getUnit());
- useRecordSkuVO.setProcureModelId(useRecordDto.getProcureModelId());
+ GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
+ goodsUseRecordVO.setId(id);
+ goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
+ goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());
- 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);
- goodsUseRecordList.add(goodsUseRecordVO);
- }
- }
- }
- // 鍒嗙粍涔嬪悗閲嶆柊鎺掑簭
- List<GoodsUseRecordVO> result = goodsUseRecordList
- .stream().sorted(Comparator
- .comparing(GoodsUseRecordVO::getUpdateTime, Comparator.nullsFirst(Long::compareTo)).reversed())
+ List<UseRecordSkuVO> useRecordSkuList =
+ useRecordList.stream().collect(Collectors.groupingBy(UseRecordDTO::getProcureModelId)).values()
+ .stream().map(recordList -> {
+ UseRecordDTO useRecordDTO = recordList.get(0);
+ UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
+ useRecordSkuVO.setBaseGoodModelId(useRecordDTO.getBaseGoodsModelsId());
+ useRecordSkuVO.setBaseGoodModelName(useRecordDTO.getBaseGoodsModelsName());
+ useRecordSkuVO.setUnit(useRecordDTO.getUnit());
+ useRecordSkuVO.setProcureModelId(useRecordDTO.getProcureModelId());
+
+ List<RecordUserInfoVO> recordUserInfoList = recordList.stream().map(userInfo -> {
+ RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
+ recordUserInfoVO.setUseName(userInfo.getUseName());
+ recordUserInfoVO.setPhone(userInfo.getPhone());
+ recordUserInfoVO.setNum(userInfo.getNum());
+ return recordUserInfoVO;
+ }).collect(Collectors.toList());
+
+ useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
+ return useRecordSkuVO;
+ }).collect(Collectors.toList());
+
+ goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
+ return goodsUseRecordVO;
+ }).sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime, Comparator.nullsFirst(Long::compareTo))
+ .reversed())
.collect(Collectors.toList());
- return ResponseValue.success(result);
+
+ return ResponseValue.success(goodsUseRecordList);
}
@ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
--
Gitblit v1.9.1