xxjProject/low-consum-manage.git

			@@ -7,11 +7,13 @@
			import java.util.List;
			import java.util.Map;
			import java.util.Optional;
			import java.util.Set;
			import java.util.stream.Collectors;

			import javax.servlet.http.HttpServletResponse;

			import org.apache.commons.compress.utils.Lists;
			import org.apache.commons.lang3.ObjectUtils;
			import org.apache.poi.ss.usermodel.Workbook;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -21,12 +23,15 @@
			import org.springframework.web.bind.annotation.RestController;

			import com.consum.base.BaseController;
			import com.consum.base.core.WhBusinessEnum;
			import com.consum.base.core.type.StatesType;
			import com.consum.base.core.utils.CommonUtil;
			import com.consum.base.core.utils.IdUtil;
			import com.consum.base.pojo.GoodsUseRecordVO;
			import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;
			import com.consum.base.pojo.RecordUserInfoVO;
			import com.consum.base.pojo.UseRecordSkuVO;
			import com.consum.base.pojo.dto.GoodsInfoDTO;
			import com.consum.base.pojo.dto.UseRecordDTO;
			import com.consum.base.pojo.excel.TransferExcelTemplate;
			import com.consum.base.pojo.query.TransferQry;
			@@ -38,14 +43,17 @@
			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.LWhGoodsService;
			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;
			import com.consum.model.po.LWhProcureModel;
			import com.consum.model.po.LWhProcureModelUser;
			import com.consum.model.po.LWhProcureModelUserRecord;
			import com.iplatform.model.po.S_user_core;
			@@ -79,9 +87,13 @@
			@Autowired
			private LWhFormTransferCoreService lWhFormTransferCoreService;
			@Autowired
			private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
			private LWhProcureModelUserService lWhProcureModelUserService;
			@Autowired
			private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;
			@Autowired
			private LGoodsUserRecordCoreService lGoodsUserRecordCoreService;
			@Autowired
			private LWhGoodsService lWhGoodsService;
			@Autowired
			private BaseWarehouseService baseWarehouseService;

			@@ -112,23 +124,31 @@
			if (transferBusinessType == 1) {
			// 先出库，再入库
			// 出库前设置出库仓库
			List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.BUMENFENFA, id);
			Set<Long> baseModelIds =
			modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());

			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("机构无默认仓库！");
			baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
			Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
			// 通过调拨单中的型号id查询出该型号物品所在的仓库位置
			List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
			GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
			if (ObjectUtils.isEmpty(goodsInfoDTO)) {
			return ResponseValue.error("该型号没有库存可使用");
			}
			BaseWarehouse baseWarehouse = baseWarehouseList.get(0);
			Long wareHouseId = baseWarehouse.getId();
			String warehouseName = baseWarehouse.getWarehouseName();

			Long wareHouseId = goodsInfoDTO.getWarehouseId();
			String warehouseName = goodsInfoDTO.getWarehouseName();
			LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
			lWhFormTransfer.setOutWarehouseId(wareHouseId);
			lWhFormTransfer.setOutWarehouseName(warehouseName);
			lWhFormTransferService.update(lWhFormTransfer);
			lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());

			lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
			lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), param.getOperatorName());
			}

			return ResponseValue.success();
			@@ -248,7 +268,7 @@
			@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),})
			@PostMapping("/income")
			public ResponseValue income(Long id) {
			lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
			lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), null);
			return ResponseValue.success();
			}

			@@ -261,22 +281,31 @@
			@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),})
			@PostMapping("/output")
			public ResponseValue output(Long id) {
			// 出库前设置出库仓库

			List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
			Set<Long> baseModelIds =
			modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());

			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("机构无默认仓库！");
			baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
			Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());

			// 通过调拨单中的型号id查询出该型号物品所在的仓库位置
			List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds);
			GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
			if (ObjectUtils.isEmpty(goodsInfoDTO)) {
			return ResponseValue.error("该型号没有库存可使用");
			}
			BaseWarehouse baseWarehouse = baseWarehouseList.get(0);
			Long wareHouseId = baseWarehouse.getId();
			String warehouseName = baseWarehouse.getWarehouseName();
			Long wareHouseId = goodsInfoDTO.getWarehouseId();
			String warehouseName = goodsInfoDTO.getWarehouseName();
			LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
			lWhFormTransfer.setOutWarehouseId(wareHouseId);
			lWhFormTransfer.setOutWarehouseName(warehouseName);
			lWhFormTransferService.update(lWhFormTransfer);
			lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
			// lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
			lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser());
			return ResponseValue.success();
			}

			@@ -284,7 +313,7 @@
			@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),
			@ApiImplicitParam(name = "type", value = "导出类型 1 入库 2 出库", required = true, dataType = "Integer"),})
			@GetMapping("/list/export")
			public void export(Long id, Integer type, HttpServletResponse response) throws Exception {
			public ResponseValue<String> export(Long id, Integer type, HttpServletResponse response) throws Exception {

			TemplateExportParams params;
			String fileName;
			@@ -318,7 +347,8 @@
			map.put("totalAmount", totalAmount);

			Workbook workbook = ExcelExportUtil.exportExcel(params, TransferExcelTemplate.class, export, map);
			downLoadExcel(fileName, response, workbook);
			String filePath = downLoadExcel(fileName, response, workbook);
			return ResponseValue.success("导出成功", filePath);

			}

			@@ -337,9 +367,13 @@
			CommonUtil.copyProperties(param, param2);
			param = param2;

			S_user_core currentUser = this.getCurrentUser();
			if (currentUser == null) {
			FinSysTenantUser sysInfo = this.getSysInfo();
			if (sysInfo == null) {
			return ResponseValue.error("登录用户信息不存在");
			}
			String tenantId = sysInfo.getTenantId();
			if (param.getOutAgencyId() == null) {
			param.setOutAgencyId(Long.valueOf(tenantId));
			}
			GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager =
			this.lWhFormTransferService.queryTransferInfo(param);
			@@ -394,14 +428,20 @@
			lWhProcureModelUser.setNowUserPhone(item.getPhone());
			lWhProcureModelUser.setNowUserName(item.getUserName());
			lWhProcureModelUser.setGoodsNum(item.getCount());

			// 设置一下在用数量
			Long oldProcureModelId = item.getOldProcureModelId();
			LWhProcureModelUser oldInfo =
			lWhProcureModelUserService.get(new LWhProcureModelUser(oldProcureModelId));
			lWhProcureModelUser.setUseCount(oldInfo.getUseCount());
			procureModelUserList.add(lWhProcureModelUser);
			}

			lWhProcureModelUserService.insert(procureModelUserList);
			}

			// 使用人修改调用
			lGoodsUserRecordCoreService.modifyGoodsUser(null, lWhProcureModelUserRecord.getId());
			}
			// TODO 使用人修改调用

			return ResponseValue.success();
			}
			@@ -416,59 +456,58 @@
			@ApiImplicitParams({@ApiImplicitParam(name = "transferOrderId", value = "调拨单id", 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)));
			// 开始循环collect
			for (Map.Entry<Long, Map<Long, List<UseRecordDTO>>> entry : collect.entrySet()) {
			Long id = entry.getKey();
			Map<Long, List<UseRecordDTO>> value = entry.getValue();
			// 开始循环value
			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.setOldProcureModelId(userInfo.getOldProcureModelId());
			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 = "查询部门下的分发单")