sfms3.0
/
sfms3.0
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

HL-5987 1.报废出库申请，新增明细的报废原因，输入超长字符报异常，应加字符限制；2.报废出库任务，页面承接人、完成人、部门应显示中文 > 部门删除 承接人 完成人直接去Name 业务类型不变 +导出

hella_online_20240924
李达明 10 months ago
parent
7788e4a006
commit
66a24626e3
9 changed files with 186 additions and 227 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java
  2. 59
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java
  3. 22
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java
  4. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobMainExcelVO.java
  5. 27
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java
  6. 48
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java
  7. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordMainExcelVO.java
  8. 65
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java
  9. 61
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java
View File

@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@ -98,11 +99,9 @@ public class DeliverRecordDetailController {
PageResult<DeliverRecordDetailDO> pageResult = deliverRecordDetailService.getDeliverRecordDetailPage(pageVO);
PageResult<DeliverRecordDetailRespVO> result = DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult);
if(pageResult.getList().size() > 0){
Set<Long> masterIdSet = new HashSet<>();
for(DeliverRecordDetailDO deliverRecordDetailDO:pageResult.getList()){
masterIdSet.add(deliverRecordDetailDO.getMasterId());
}
Set<Long> masterIdSet = pageResult.getList().stream().map(DeliverRecordDetailDO::getMasterId).collect(Collectors.toSet());
Map<Long, DeliverRecordMainDO> mainMap = deliverRecordMainMapper.queryMainListToMap(masterIdSet);
CopyOptions options = CopyOptions.create().setIgnoreNullValue(true);
for(DeliverRecordDetailRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));

59
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java
View File

@ -5,16 +5,15 @@ import cn.hutool.core.bean.copier.CopyOptions;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.util.collection.CollectionUtils;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailRespVO;
import com.win.module.wms.controller.scrapJob.vo.*;
import com.win.module.wms.convert.scrapJob.ScrapJobDetailConvert;
import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobDetailDO;
import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobMainDO;
import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobDetailDO;
import com.win.module.wms.dal.mysql.scrapJob.ScrapJobMainMapper;
import com.win.module.wms.service.scrapJob.ScrapJobDetailService;
import io.swagger.v3.oas.annotations.Operation;
@ -29,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@ -46,7 +46,6 @@ public class ScrapJobDetailController {
@Resource
private ScrapJobMainMapper scrapJobMainMapper;
@PostMapping("/create")
@Operation(summary = "创建报废出库任务子")
@PreAuthorize("@ss.hasPermission('wms:scrap-job-detail:create')")
@ -91,17 +90,26 @@ public class ScrapJobDetailController {
@Operation(summary = "获得报废出库任务子分页")
public CommonResult<PageResult<ScrapJobDetailRespVO>> getScrapJobDetailPage(@Valid ScrapJobDetailPageReqVO pageVO) {
PageResult<ScrapJobDetailDO> pageResult = scrapJobDetailService.getScrapJobDetailPage(pageVO);
PageResult<ScrapJobDetailRespVO> result = getScrapJobDetailRespVOPageResult(pageResult);
return success(result);
}
private PageResult<ScrapJobDetailRespVO> getScrapJobDetailRespVOPageResult(PageResult<ScrapJobDetailDO> pageResult) {
PageResult<ScrapJobDetailRespVO> result = ScrapJobDetailConvert.INSTANCE.convertPage(pageResult);
if (pageResult.getList().size() > 0) {
Set<Long> masterIdSet = new HashSet<>();
for(ScrapJobDetailDO scrapJobDetailDO:pageResult.getList()){
masterIdSet.add(scrapJobDetailDO.getMasterId());
}
//主
Set<Long> masterIdSet = pageResult.getList().stream().map(ScrapJobDetailDO::getMasterId).collect(Collectors.toSet());
Map<Long, ScrapJobMainDO> mainMap = scrapJobMainMapper.queryMainListToMap(masterIdSet);
//用户
Set<String> userIdSet = pageResult.getList().stream().map(ScrapJobDetailDO::getCreator).collect(Collectors.toSet());
userIdSet.addAll(pageResult.getList().stream().map(ScrapJobDetailDO::getUpdater).collect(Collectors.toSet()));
Map<String, String> userNicknameMap = userApi.getUserNicknameToString(userIdSet);
CopyOptions options = CopyOptions.create().setIgnoreNullValue(true);
for(ScrapJobDetailRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
result.getList().stream().iterator().forEachRemaining(vo -> {
vo.setCreator(Optional.ofNullable(userNicknameMap.get(vo.getCreator())).orElse(""));
vo.setUpdater(Optional.ofNullable(userNicknameMap.get(vo.getUpdater())).orElse(""));
ScrapJobMainDO scrapJobMainDO = mainMap.get(vo.getMasterId());
if (scrapJobMainDO != null) {
scrapJobMainDO.setId(null);
@ -115,41 +123,16 @@ public class ScrapJobDetailController {
vo.setRemarkMain(remarkMain);
vo.setRemark(remarkSub);
}
});
}
}
return success(result);
return result;
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得物料基本信息分页")
public CommonResult<PageResult<ScrapJobDetailRespVO>> getScrapJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<ScrapJobDetailDO> pageResult = scrapJobDetailService.getScrapJobDetailSenior(conditions);
PageResult<ScrapJobDetailRespVO> result = ScrapJobDetailConvert.INSTANCE.convertPage(pageResult);
if(pageResult.getList().size() > 0){
Set<Long> masterIdSet = new HashSet<>();
for(ScrapJobDetailDO scrapJobDetailDO:pageResult.getList()){
masterIdSet.add(scrapJobDetailDO.getMasterId());
}
Map<Long, ScrapJobMainDO> mainMap = scrapJobMainMapper.queryMainListToMap(masterIdSet);
CopyOptions options = CopyOptions.create().setIgnoreNullValue(true);
for(ScrapJobDetailRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
ScrapJobMainDO scrapJobMainDO = mainMap.get(vo.getMasterId());
if(scrapJobMainDO != null){
scrapJobMainDO.setId(null);
scrapJobMainDO.setCreator(null);
scrapJobMainDO.setCreateTime(null);
scrapJobMainDO.setUpdateTime(null);
scrapJobMainDO.setUpdater(null);
String remarkMain =Optional.ofNullable(scrapJobMainDO.getRemark()).orElse("");
String remarkSub=Optional.ofNullable(vo.getRemark()).orElse("");
BeanUtil.copyProperties(scrapJobMainDO,vo,options);
vo.setRemarkMain(remarkMain);
vo.setRemark(remarkSub);
}
}
}
PageResult<ScrapJobDetailRespVO> result = getScrapJobDetailRespVOPageResult(pageResult);
return success(result);
}

22
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java
View File

@ -18,7 +18,6 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jodd.util.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
@ -30,6 +29,7 @@ import javax.validation.Valid;
import java.io.IOException;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@ -143,25 +143,24 @@ public class ScrapJobMainController {
private List<ScrapJobMainExcelVO> getExcelVo(List<ScrapJobDetailDO> detailDOList) {
List<ScrapJobMainExcelVO> resultList = new ArrayList<>();
if (!CollectionUtils.isEmpty(detailDOList)) {
Set<Long> masterIdSet = new HashSet<>();
for (ScrapJobDetailDO detailDO : detailDOList) {
masterIdSet.add(detailDO.getMasterId());
}
Set<Long> masterIdSet = detailDOList.stream().map(ScrapJobDetailDO::getMasterId).collect(Collectors.toSet());
Map<Long, ScrapJobMainDO> mainMap = scrapJobMainMapper.queryMainListToMap(masterIdSet);
for (ScrapJobDetailDO detailDO : detailDOList) {
Set<String> userIdSet = detailDOList.stream().map(ScrapJobDetailDO::getCreator).collect(Collectors.toSet());
Map<String, String> userNicknameMap = userApi.getUserNicknameToString(userIdSet);
detailDOList.stream().iterator().forEachRemaining(detailDO -> {
ScrapJobMainDO mainDO = mainMap.get(detailDO.getMasterId());
ScrapJobMainExcelVO vo = ScrapJobMainConvert.INSTANCE.convert(mainDO, detailDO);
// if(mainDO != null ){
// vo.setRemarkMain(mainDO.getRemark());
// }
if(StringUtils.isNotEmpty(vo.getCreator())){
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
}
vo.setCreator(Optional.ofNullable(userNicknameMap.get(vo.getCreator())).orElse(""));
if (vo.getQty() != null) {
vo.setQty(vo.getQty().setScale(2, RoundingMode.HALF_UP));
}
resultList.add(vo);
}
});
}
return resultList;
}
@ -174,7 +173,8 @@ public class ScrapJobMainController {
ScrapJobMainRespVO result = ScrapJobMainConvert.INSTANCE.convert(scrapJobMain);
if (result == null) {
return success(result);
} ;
}
;
ScrapJobDetailExportReqVO reqVO = new ScrapJobDetailExportReqVO();
reqVO.setMasterId(result.getId());
List<ScrapJobDetailDO> scrapJobDetailList = scrapJobDetailService.getScrapJobDetailList(reqVO);

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobMainExcelVO.java
View File

@ -118,9 +118,9 @@ public class ScrapJobMainExcelVO {
@Colour(IndexedColors.LIGHT_YELLOW)
private String businessType;
@ExcelProperty("部门")
@Colour(IndexedColors.LIGHT_YELLOW)
private String departmentCode;
// @ExcelProperty("部门")
// @Colour(IndexedColors.LIGHT_YELLOW)
// private String departmentCode;
// @ExcelProperty("通知单描述")
// @Colour(IndexedColors.LIGHT_YELLOW)
@ -183,7 +183,7 @@ public class ScrapJobMainExcelVO {
@ExcelProperty("承接人")
@Colour(IndexedColors.LIGHT_YELLOW)
private String acceptUserId;
private String acceptUserName;
@ExcelProperty("完成时间")
@ColumnWidth(value = 16)
@ -192,7 +192,7 @@ public class ScrapJobMainExcelVO {
@ExcelProperty("完成人")
@Colour(IndexedColors.LIGHT_YELLOW)
private String completeUserId;
private String completeUserName;
@ExcelProperty("物料代码")
private String itemCode;

27
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java
View File

@ -10,6 +10,7 @@ import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.wms.controller.scrapRecord.vo.*;
import com.win.module.wms.convert.scrapRecord.ScrapRecordDetailConvert;
import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobDetailDO;
import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordDetailDO;
import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordMainDO;
import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordMainMapper;
@ -27,6 +28,7 @@ import javax.validation.Valid;
import java.io.IOException;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@ -88,17 +90,24 @@ public class ScrapRecordDetailController {
@Operation(summary = "获得报废出库记录子分页")
public CommonResult<PageResult<ScrapRecordDetailRespVO>> getScrapRecordDetailPage(@Valid ScrapRecordDetailPageReqVO pageVO) {
PageResult<ScrapRecordDetailDO> pageResult = scrapRecordDetailService.getScrapRecordDetailPage(pageVO);
PageResult<ScrapRecordDetailRespVO> result = getScrapRecordDetailRespVOPageResult(pageResult);
return success(result);
}
private PageResult<ScrapRecordDetailRespVO> getScrapRecordDetailRespVOPageResult(PageResult<ScrapRecordDetailDO> pageResult) {
PageResult<ScrapRecordDetailRespVO> result = ScrapRecordDetailConvert.INSTANCE.convertPage(pageResult);
if (pageResult.getList().size() > 0) {
Set<Long> masterIdSet = new HashSet<>();
for(ScrapRecordDetailDO scrapRecordDetailDO:pageResult.getList()){
masterIdSet.add(scrapRecordDetailDO.getMasterId());
}
Set<Long> masterIdSet = pageResult.getList().stream().map(ScrapRecordDetailDO::getMasterId).collect(Collectors.toSet());
Map<Long, ScrapRecordMainDO> mainMap = scrapRecordMainMapper.queryMainListToMap(masterIdSet);
//用户
Set<String> userIdSet = pageResult.getList().stream().map(ScrapRecordDetailDO::getCreator).collect(Collectors.toSet());
userIdSet.addAll(pageResult.getList().stream().map(ScrapRecordDetailDO::getUpdater).collect(Collectors.toSet()));
Map<String, String> userNicknameMap = userApi.getUserNicknameToString(userIdSet);
CopyOptions options = CopyOptions.create().setIgnoreNullValue(true);
for(ScrapRecordDetailRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
result.getList().stream().iterator().forEachRemaining(vo -> {
vo.setCreator(Optional.ofNullable(userNicknameMap.get(vo.getCreator())).orElse(""));
vo.setUpdater(Optional.ofNullable(userNicknameMap.get(vo.getUpdater())).orElse(""));
ScrapRecordMainDO scrapRecordMainDO = mainMap.get(vo.getMasterId());
if (scrapRecordMainDO != null) {
scrapRecordMainDO.setId(null);
@ -121,9 +130,9 @@ public class ScrapRecordDetailController {
vo.setRemarkMain(remarkMain);
vo.setRemark(remarkSub);
}
});
}
}
return success(result);
return result;
}
@PostMapping("/senior")

48
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java
View File

@ -1,21 +1,5 @@
package com.win.module.wms.controller.scrapRecord;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
import java.io.IOException;
import java.math.RoundingMode;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
@ -29,10 +13,24 @@ import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordMainDO;
import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordMainMapper;
import com.win.module.wms.service.scrapRecord.ScrapRecordDetailService;
import com.win.module.wms.service.scrapRecord.ScrapRecordMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 报废出库记录主")
@RestController
@ -109,6 +107,7 @@ public class ScrapRecordMainController {
public CommonResult<PageResult<ScrapRecordMainRespVO>> getScrapRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<ScrapRecordMainDO> pageResult = scrapRecordMainService.getScrapRecordMainSenior(conditions);
PageResult<ScrapRecordMainRespVO> result = ScrapRecordMainConvert.INSTANCE.convertPage(pageResult);
for (ScrapRecordMainRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
@ -142,15 +141,16 @@ public class ScrapRecordMainController {
private List<ScrapRecordMainExcelVO> getExcelVo(List<ScrapRecordDetailDO> detailDOList) {
List<ScrapRecordMainExcelVO> resultList = new ArrayList<>();
if (!CollectionUtils.isEmpty(detailDOList)) {
Set<Long> masterIdSet = new HashSet<>();
for (ScrapRecordDetailDO detailDO : detailDOList) {
masterIdSet.add(detailDO.getMasterId());
}
Set<Long> masterIdSet = detailDOList.stream().map(ScrapRecordDetailDO::getMasterId).collect(Collectors.toSet());
Map<Long, ScrapRecordMainDO> mainMap = scrapRecordMainMapper.queryMainListToMap(masterIdSet);
for (ScrapRecordDetailDO detailDO : detailDOList) {
Set<String> userIdSet = detailDOList.stream().map(ScrapRecordDetailDO::getCreator).collect(Collectors.toSet());
Map<String, String> userNicknameMap = userApi.getUserNicknameToString(userIdSet);
detailDOList.stream().iterator().forEachRemaining(detailDO -> {
ScrapRecordMainDO mainDO = mainMap.get(detailDO.getMasterId());
ScrapRecordMainExcelVO vo = ScrapRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
vo.setCreator(userApi.getUserNickname(vo.getCreator(),true));
vo.setCreator(Optional.ofNullable(userNicknameMap.get(vo.getCreator())).orElse(""));
// if(mainDO != null ){
// vo.setRemarkMain(mainDO.getRemark());
// }
@ -164,7 +164,7 @@ public class ScrapRecordMainController {
vo.setAmount(vo.getAmount().setScale(2, RoundingMode.HALF_UP));
}
resultList.add(vo);
}
});
}
return resultList;
}

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordMainExcelVO.java
View File

@ -117,9 +117,9 @@ public class ScrapRecordMainExcelVO {
@Colour(IndexedColors.LIGHT_YELLOW)
private String businessType;
@ExcelProperty("部门")
@Colour(IndexedColors.LIGHT_YELLOW)
private String departmentCode;
// @ExcelProperty("部门")
// @Colour(IndexedColors.LIGHT_YELLOW)
// private String departmentCode;
// @ExcelProperty("单据备注")
// @Colour(IndexedColors.LIGHT_YELLOW)

65
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java
View File

@ -8,13 +8,10 @@ import com.win.framework.common.pojo.PageResult;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailRespVO;
import com.win.module.wms.controller.scrapRequest.vo.*;
import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert;
import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO;
import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO;
import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO;
import com.win.module.wms.dal.mysql.scrapRequest.ScrapRequestMainMapper;
import com.win.module.wms.service.scrapRequest.ScrapRequestDetailService;
import io.swagger.v3.oas.annotations.Operation;
@ -30,6 +27,7 @@ import javax.validation.Valid;
import java.io.IOException;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@ -91,17 +89,24 @@ public class ScrapRequestDetailController {
@Operation(summary = "获得报废出库申请子分页")
public CommonResult<PageResult<ScrapRequestDetailRespVO>> getScrapRequestDetailPage(@Valid ScrapRequestDetailPageReqVO pageVO) {
PageResult<ScrapRequestDetailDO> pageResult = scrapRequestDetailService.getScrapRequestDetailPage(pageVO);
PageResult<ScrapRequestDetailRespVO> result = getScrapRequestDetailRespVOPageResult(pageResult);
return success(result);
}
private PageResult<ScrapRequestDetailRespVO> getScrapRequestDetailRespVOPageResult(PageResult<ScrapRequestDetailDO> pageResult) {
PageResult<ScrapRequestDetailRespVO> result = ScrapRequestDetailConvert.INSTANCE.convertPage(pageResult);
if (pageResult.getList().size() > 0) {
Set<Long> masterIdSet = new HashSet<>();
for(ScrapRequestDetailDO scrapRequestDetailDO:pageResult.getList()){
masterIdSet.add(scrapRequestDetailDO.getMasterId());
}
Set<Long> masterIdSet = pageResult.getList().stream().map(ScrapRequestDetailDO::getMasterId).collect(Collectors.toSet());
Map<Long, ScrapRequestMainDO> mainMap = scrapRequestMainMapper.queryMainListToMap(masterIdSet);
//用户
Set<String> userIdSet = pageResult.getList().stream().map(ScrapRequestDetailDO::getCreator).collect(Collectors.toSet());
userIdSet.addAll(pageResult.getList().stream().map(ScrapRequestDetailDO::getCreator).collect(Collectors.toSet()));
Map<String, String> userNicknameMap = userApi.getUserNicknameToString(userIdSet);
CopyOptions options = CopyOptions.create().setIgnoreNullValue(true);
for(ScrapRequestDetailRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
result.getList().stream().iterator().forEachRemaining(vo -> {
vo.setCreator(Optional.ofNullable(userNicknameMap.get(vo.getCreator())).orElse(""));
vo.setUpdater(Optional.ofNullable(userNicknameMap.get(vo.getUpdater())).orElse(""));
ScrapRequestMainDO scrapRequestMainDO = mainMap.get(vo.getMasterId());
if (scrapRequestMainDO != null) {
scrapRequestMainDO.setId(null);
@ -124,50 +129,16 @@ public class ScrapRequestDetailController {
vo.setRemarkMain(remarkMain);
vo.setRemark(remarkSub);
}
});
}
}
return success(result);
return result;
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得物料基本信息分页")
public CommonResult<PageResult<ScrapRequestDetailRespVO>> getScrapRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
PageResult<ScrapRequestDetailDO> pageResult = scrapRequestDetailService.getScrapRequestDetailSenior(conditions);
PageResult<ScrapRequestDetailRespVO> result = ScrapRequestDetailConvert.INSTANCE.convertPage(pageResult);
if(pageResult.getList().size() > 0){
Set<Long> masterIdSet = new HashSet<>();
for(ScrapRequestDetailDO scrapRequestDetailDO:pageResult.getList()){
masterIdSet.add(scrapRequestDetailDO.getMasterId());
}
Map<Long, ScrapRequestMainDO> mainMap = scrapRequestMainMapper.queryMainListToMap(masterIdSet);
CopyOptions options = CopyOptions.create().setIgnoreNullValue(true);
for(ScrapRequestDetailRespVO vo : result.getList()) {
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
ScrapRequestMainDO scrapRequestMainDO = mainMap.get(vo.getMasterId());
if(scrapRequestMainDO != null){
scrapRequestMainDO.setId(null);
scrapRequestMainDO.setCreator(null);
scrapRequestMainDO.setCreateTime(null);
scrapRequestMainDO.setUpdateTime(null);
scrapRequestMainDO.setUpdater(null);
String remarkMain =Optional.ofNullable(scrapRequestMainDO.getRemark()).orElse("");
String remarkSub=Optional.ofNullable(vo.getRemark()).orElse("");
BeanUtil.copyProperties(scrapRequestMainDO,vo,options);
if(vo.getQty() != null){
vo.setQty(vo.getQty().setScale(2, RoundingMode.HALF_UP));
}
if(vo.getSinglePrice() != null){
vo.setSinglePrice(vo.getSinglePrice().setScale(2,RoundingMode.HALF_UP));
}
if(vo.getAmount() != null){
vo.setAmount(vo.getAmount().setScale(2,RoundingMode.HALF_UP));
}
vo.setRemarkMain(remarkMain);
vo.setRemark(remarkSub);
}
}
}
PageResult<ScrapRequestDetailRespVO> result = getScrapRequestDetailRespVOPageResult(pageResult);
return success(result);
}

61
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java
View File

@ -1,26 +1,5 @@
package com.win.module.wms.controller.scrapRequest;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
import java.io.IOException;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
@ -38,11 +17,29 @@ import com.win.module.wms.dal.mysql.scrapRequest.ScrapRequestMainMapper;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.scrapRequest.ScrapRequestDetailService;
import com.win.module.wms.service.scrapRequest.ScrapRequestMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.*;
import java.util.stream.Collectors;
import static com.win.framework.common.pojo.CommonResult.success;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 报废出库申请主")
@RestController
@ -183,20 +180,19 @@ public class ScrapRequestMainController {
private List<ScrapRequestMainExcelVO> getExcelVo(List<ScrapRequestDetailDO> detailDOList) {
List<ScrapRequestMainExcelVO> resultList = new ArrayList<>();
if (!CollectionUtils.isEmpty(detailDOList)) {
Set<Long> masterIdSet = new HashSet<>();
for (ScrapRequestDetailDO detailDO : detailDOList) {
masterIdSet.add(detailDO.getMasterId());
}
Set<Long> masterIdSet = detailDOList.stream().map(ScrapRequestDetailDO::getMasterId).collect(Collectors.toSet());
Map<Long, ScrapRequestMainDO> mainMap = scrapRequestMainMapper.queryMainListToMap(masterIdSet);
for (ScrapRequestDetailDO detailDO : detailDOList) {
Set<String> userIdSet = detailDOList.stream().map(ScrapRequestDetailDO::getCreator).collect(Collectors.toSet());
Map<String, String> userNicknameMap = userApi.getUserNicknameToString(userIdSet);
detailDOList.stream().iterator().forEachRemaining(detailDO -> {
ScrapRequestMainDO mainDO = mainMap.get(detailDO.getMasterId());
ScrapRequestMainExcelVO vo = ScrapRequestMainConvert.INSTANCE.convert(mainDO, detailDO);
// if(mainDO != null ){
// vo.setRemarkMain(mainDO.getRemark());
// }
if(StringUtils.isNotEmpty(vo.getCreator())){
vo.setCreator(userApi.getUserNickname(vo.getCreator()));
}
vo.setCreator(Optional.ofNullable(userNicknameMap.get(vo.getCreator())).orElse(""));
if (vo.getQty() != null) {
vo.setQty(vo.getQty().setScale(2, RoundingMode.HALF_UP));
}
@ -207,7 +203,7 @@ public class ScrapRequestMainController {
vo.setAmount(vo.getAmount().setScale(2, RoundingMode.HALF_UP));
}
resultList.add(vo);
}
});
}
return resultList;
}
@ -220,7 +216,8 @@ public class ScrapRequestMainController {
ScrapRequestMainRespVO result = ScrapRequestMainConvert.INSTANCE.convert(scrapRequestMain);
if (result == null) {
return success(result);
} ;
}
;
ScrapRequestDetailExportReqVO reqVO = new ScrapRequestDetailExportReqVO();
reqVO.setMasterId(result.getId());
List<ScrapRequestDetailDO> list = scrapRequestDetailService.getScrapRequestDetailList(reqVO);

Write Preview
Loading…
Cancel
Save