zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

库存移动申请/任务/记录 前端展示创建者名称

master
chenfang 2 years ago
parent
21bfcf933c
commit
73fb454284
20 changed files with 94 additions and 66 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. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java
  2. 28
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java
  3. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java
  4. 19
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java
  5. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java
  6. 33
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java
  7. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java
  8. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java
  9. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java
  10. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java
  11. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java
  12. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java
  13. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java
  14. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java
  15. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java
  16. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java
  17. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java
  18. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java
  19. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java
  20. 1
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java
View File

@ -3,6 +3,7 @@ package com.win.module.wms.controller.inventorymoveJob;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -88,7 +89,12 @@ public class InventorymoveJobDetailController {
@PreAuthorize("@ss.hasPermission('wms:inventorymove-job-detail:query')")
public CommonResult<PageResult<InventorymoveJobDetailRespVO>> getInventorymoveJobDetailPage(@Valid InventorymoveJobDetailPageReqVO pageVO) {
PageResult<InventorymoveJobDetailDO> pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailPage(pageVO);
return success(InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult));
PageResult<InventorymoveJobDetailRespVO> result = InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveJobDetailRespVO vo : result.getList()) {
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
}
return success(result);
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得库存转移任务子分页")

28
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java
View File

@ -107,9 +107,9 @@ public class InventorymoveJobMainController {
PageResult<InventorymoveJobMainRespVO> result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveJobMainRespVO vo : result.getList()) {
//后端创建个字段作为前端展示的虚拟字段
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
}
return success(result);
}
@ -122,9 +122,9 @@ public class InventorymoveJobMainController {
PageResult<InventorymoveJobMainRespVO> result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveJobMainRespVO vo : result.getList()) {
//后端创建个字段作为前端展示的虚拟字段
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
}
return success(result);
}
@ -154,16 +154,17 @@ public class InventorymoveJobMainController {
}
private List<InventorymoveJobMainExcelVO> getExcelVo(List<InventorymoveJobMainDO> list, Map<Integer, String[]> mapDropDown) {
String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_STATUS);
mapDropDown.put(8, requestStatus);
String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(2, trueFalse);
String[] requestStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.JOB_STATUS);
mapDropDown.put(6, requestStatus);
String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
mapDropDown.put(12, locationType);
mapDropDown.put(15, locationType);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(27, inventoryStatus);
mapDropDown.put(33, inventoryStatus);
mapDropDown.put(17, locationType);
mapDropDown.put(18, locationType);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(42, uom);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(49, inventoryStatus);
List<InventorymoveJobMainExcelVO> resultList = new ArrayList<>();
// 导出
for(InventorymoveJobMainDO mainDO : list) {
@ -172,8 +173,13 @@ public class InventorymoveJobMainController {
InventorymoveJobMainExcelVO vo = InventorymoveJobMainConvert.INSTANCE.convert(mainDO, detailDO);
vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname());
vo.setUpdater(userApi.getUser(Long.valueOf(mainDO.getUpdater())).getNickname());
vo.setAcceptUserId(userApi.getUser(Long.valueOf(mainDO.getAcceptUserId())).getNickname());
vo.setCompleteUserId(userApi.getUser(Long.valueOf(mainDO.getCompleteUserId())).getNickname());
if(!"".equals(mainDO.getAcceptUserId()) && mainDO.getAcceptUserId() != null){
vo.setAcceptUserId(userApi.getUser(Long.valueOf(mainDO.getAcceptUserId())).getNickname());
}
if(!"".equals(mainDO.getCompleteUserId()) && mainDO.getCompleteUserId() != null){
vo.setCompleteUserId(userApi.getUser(Long.valueOf(mainDO.getCompleteUserId())).getNickname());
}
vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname());
resultList.add(vo);
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java
View File

@ -48,7 +48,7 @@ public class InventorymoveJobDetailExcelVO {
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createtime;
private LocalDateTime createTime;
@ExcelProperty("创建者Id")
private String creator;

19
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java
View File

@ -28,6 +28,9 @@ import com.win.framework.excel.core.convert.DictConvert;
public class InventorymoveJobMainExcelVO {
//主表数据
@ExcelProperty("单据号")
private String number;
@ExcelProperty("申请单号")
private String requestNumber;
@ -61,9 +64,10 @@ public class InventorymoveJobMainExcelVO {
@ExcelProperty("最后更新者Id")
private String updater;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String jobStageStatus;
//TODO 该字段为弃用字段后续再进行整体清理
// @ExcelProperty(value = "状态", converter = DictConvert.class)
// @DictFormat("job_stage_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
// private String jobStageStatus;
@ExcelProperty("优先级")
private Integer priority;
@ -96,9 +100,6 @@ public class InventorymoveJobMainExcelVO {
@DictFormat("location_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String toLocationTypes;
@ExcelProperty("单据号")
private String number;
@ExcelProperty("业务类型")
private String businessType;
@ -111,9 +112,9 @@ public class InventorymoveJobMainExcelVO {
@ExcelProperty("创建者id")
private String creator;
@ExcelProperty("创建者用户名")
private String creatorName;
//TODO 该字段为弃用字段后续再进行整体清理
// @ExcelProperty("创建者用户名")
// private String creatorName;
@ExcelProperty("到仓库代码")
private String toWarehouseCode;

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java
View File

@ -91,7 +91,13 @@ public class InventorymoveRecordDetailController {
@PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:query')")
public CommonResult<PageResult<InventorymoveRecordDetailRespVO>> getInventorymoveRecordDetailPage(@Valid InventorymoveRecordDetailPageReqVO pageVO) {
PageResult<InventorymoveRecordDetailDO> pageResult = inventorymoveRecordDetailService.getInventorymoveRecordDetailPage(pageVO);
return success(InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult));
PageResult<InventorymoveRecordDetailRespVO> result = InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveRecordDetailRespVO vo : result.getList()) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
return success(result);
}
@PostMapping("/senior")

33
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java
View File

@ -107,8 +107,8 @@ public class InventorymoveRecordMainController {
PageResult<InventorymoveRecordMainRespVO> result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveRecordMainRespVO vo : result.getList()) {
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
}
return success(result);
}
@ -121,8 +121,8 @@ public class InventorymoveRecordMainController {
PageResult<InventorymoveRecordMainRespVO> result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveRecordMainRespVO vo : result.getList()) {
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
}
return success(result);
}
@ -134,17 +134,14 @@ public class InventorymoveRecordMainController {
HttpServletResponse response) throws IOException {
List<InventorymoveRecordMainDO> list = inventorymoveRecordMainService.getInventorymoveRecordMainList(exportReqVO);
// 导出 Excel
List<InventorymoveRecordMainExcelVO> datas = InventorymoveRecordMainConvert.INSTANCE.convertList02(list);
for(InventorymoveRecordMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "库存转移记录主.xls", "数据", InventorymoveRecordMainExcelVO.class, datas);
//组装vo
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InventorymoveRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "库存转移申请.xlsx", "库存转移申请数据", InventorymoveRecordMainExcelVO.class, resultList, mapDropDown);
}
@GetMapping("/export-excel-senior")
@Operation(summary = "导出库存转移申请 Excel")
@Operation(summary = "导出库存转移记录主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:export')")
@OperateLog(type = EXPORT)
public void exportInventorymoveRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
@ -158,27 +155,27 @@ public class InventorymoveRecordMainController {
private List<InventorymoveRecordMainExcelVO> getExcelVo(List<InventorymoveRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(3, trueFalse);
mapDropDown.put(23, trueFalse);
mapDropDown.put(22, trueFalse);
String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
mapDropDown.put(11, interfaceType);
mapDropDown.put(48, interfaceType);
mapDropDown.put(46, interfaceType);
String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
mapDropDown.put(18, locationType);
mapDropDown.put(21, locationType);
mapDropDown.put(17, locationType);
mapDropDown.put(20, locationType);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(32, inventoryStatus);
mapDropDown.put(40, inventoryStatus);
mapDropDown.put(31, inventoryStatus);
mapDropDown.put(39, inventoryStatus);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(46, uom);
mapDropDown.put(45, uom);
List<InventorymoveRecordMainExcelVO> resultList = new ArrayList<>();
// 导出
for(InventorymoveRecordMainDO mainDO : list) {
List<InventorymoveRecordDetailDO> subList = inventorymoveRecordDetailService.selectList(mainDO.getId());
for(InventorymoveRecordDetailDO detailDO : subList) {
InventorymoveRecordMainExcelVO vo = InventorymoveRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname());
vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname());
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
resultList.add(vo);
}
}

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

@ -90,9 +90,9 @@ public class InventorymoveRecordDetailExcelVO {
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String uom;
@ExcelProperty("代码")
private String code;
//TODO 弃用字段后续统一清理
// @ExcelProperty("代码")
// private String code;
@ExcelProperty(value = "接口类型", converter = DictConvert.class)
@DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java
View File

@ -109,4 +109,6 @@ public class InventorymoveRecordDetailExportReqVO {
@Schema(description = "任务明细ID")
private String jobDetailId;
@Schema(description = "主表ID")
private String masterId;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java
View File

@ -111,4 +111,6 @@ public class InventorymoveRecordDetailPageReqVO extends PageParam {
@Schema(description = "任务明细ID")
private String jobDetailId;
@Schema(description = "主表ID")
private String masterId;
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java
View File

@ -66,9 +66,9 @@ public class InventorymoveRecordMainExcelVO {
@ExcelProperty(value = "接口类型", converter = DictConvert.class)
@DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String interfaceType;
@ExcelProperty("代码")
private String code;
//TODO 弃用字段后续统一清理
// @ExcelProperty("代码")
// private String code;
@ExcelProperty("业务类型")
private String businessType;
@ -178,9 +178,9 @@ public class InventorymoveRecordMainExcelVO {
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
private String uom;
@ExcelProperty("代码")
private String codeDetail;
//TODO 弃用字段后续统一清理
// @ExcelProperty("代码")
// private String codeDetail;
@ExcelProperty(value = "接口类型", converter = DictConvert.class)
@DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java
View File

@ -102,9 +102,9 @@ public class InventorymoveRequestMainController {
PageResult<InventorymoveRequestMainRespVO> result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveRequestMainRespVO vo : result.getList()) {
//后端创建个字段作为前端展示的虚拟字段
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
}
return success(result);
}
@ -117,9 +117,9 @@ public class InventorymoveRequestMainController {
PageResult<InventorymoveRequestMainRespVO> result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult);
for(InventorymoveRequestMainRespVO vo : result.getList()) {
//后端创建个字段作为前端展示的虚拟字段
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
}
return success(result);
}
@ -165,11 +165,11 @@ public class InventorymoveRequestMainController {
List<InventorymoveRequestDetailDO> subList = inventorymoveRequestDetailService.selectList(mainDO.getId());
for(InventorymoveRequestDetailDO detailDO : subList) {
InventorymoveRequestMainExcelVO vo = InventorymoveRequestMainConvert.INSTANCE.convert(mainDO, detailDO);
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname());
vo.setUpdater(userApi.getUser(Long.valueOf(mainDO.getUpdater())).getNickname());
vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname());
vo.setUpdaterDetail(userApi.getUser(Long.valueOf(detailDO.getUpdater())).getNickname());
vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
resultList.add(vo);
}
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveJob/InventorymoveJobMainConvert.java
View File

@ -44,10 +44,10 @@ public interface InventorymoveJobMainConvert {
@Mapping(source = "mainDO.remark", target = "remark"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
@Mapping(source = "mainDO.creatorName", target = "creatorName"),
@Mapping(source = "mainDO.updateTime", target = "updateTime"),
@Mapping(source = "mainDO.updater", target = "updater"),
@Mapping(source = "detailDO.creator", target = "creatorDetail"),
@Mapping(source = "detailDO.createTime", target = "createTimeDetail"),
})
InventorymoveJobMainExcelVO convert(InventorymoveJobMainDO mainDO, InventorymoveJobDetailDO detailDO);
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inventorymoveRecord/InventorymoveRecordMainConvert.java
View File

@ -42,7 +42,8 @@ public interface InventorymoveRecordMainConvert {
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
@Mapping(source = "mainDO.interfaceType", target = "interfaceType"),
@Mapping(source = "mainDO.code", target = "code"),
@Mapping(source = "detailDO.interfaceType", target = "interfaceTypeDetail"),
@Mapping(source = "detailDO.createTime", target = "createTimeDetail"),
})
InventorymoveRecordMainExcelVO convert(InventorymoveRecordMainDO mainDO, InventorymoveRecordDetailDO detailDO);
}

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java
View File

@ -1,5 +1,6 @@
package com.win.module.wms.dal.dataobject.inventorymoveJob;
import com.sun.xml.bind.v2.TODO;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java
View File

@ -1,5 +1,6 @@
package com.win.module.wms.dal.dataobject.inventorymoveRecord;
import com.sun.xml.bind.v2.TODO;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordMainDO.java
View File

@ -146,9 +146,4 @@ public class InventorymoveRecordMainDO extends BaseDO {
* 是否可用
*/
private String available;
/**
* 主表id
*/
private String masterId;
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java
View File

@ -23,6 +23,7 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX<Inventorymo
default PageResult<InventorymoveRecordDetailDO> selectPage(InventorymoveRecordDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<InventorymoveRecordDetailDO>()
.eqIfPresent(InventorymoveRecordDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode())
.eqIfPresent(InventorymoveRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
.eqIfPresent(InventorymoveRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
@ -61,6 +62,7 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX<Inventorymo
}
default List<InventorymoveRecordDetailDO> selectList(InventorymoveRecordDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<InventorymoveRecordDetailDO>()
.eqIfPresent(InventorymoveRecordDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode())
.eqIfPresent(InventorymoveRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
.eqIfPresent(InventorymoveRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java
View File

@ -10,7 +10,6 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO;
import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO;
import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO;
import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO;
import org.apache.ibatis.annotations.Mapper;
/**
@ -24,7 +23,6 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX<Inventorymove
default PageResult<InventorymoveRecordMainDO> selectPage(InventorymoveRecordMainPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<InventorymoveRecordMainDO>()
.eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber())
.eqIfPresent(InventorymoveRecordMainDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(InventorymoveRecordMainDO::getJobNumber, reqVO.getJobNumber())
.eqIfPresent(InventorymoveRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation())
.eqIfPresent(InventorymoveRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType())
@ -55,7 +53,6 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX<Inventorymove
}
default List<InventorymoveRecordMainDO> selectList(InventorymoveRecordMainExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<InventorymoveRecordMainDO>()
.eqIfPresent(InventorymoveRecordMainDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber())
.eqIfPresent(InventorymoveRecordMainDO::getJobNumber, reqVO.getJobNumber())
.eqIfPresent(InventorymoveRecordMainDO::getUseOnTheWayLocation, reqVO.getUseOnTheWayLocation())

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java
View File

@ -18,6 +18,7 @@ import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetail
import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO;
import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO;
import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO;
import com.win.module.wms.dal.dataobject.location.LocationDO;
import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO;
import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
import com.win.module.wms.dal.mysql.inventorymoveJob.InventorymoveJobDetailMapper;
@ -27,6 +28,7 @@ import com.win.module.wms.enums.job.JobStatusEnum;
import com.win.module.wms.enums.job.JobStatusState;
import com.win.module.wms.service.expectin.ExpectinService;
import com.win.module.wms.service.expectout.ExpectoutService;
import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.recordsetting.RecordsettingService;
import com.win.module.wms.service.transaction.TransactionService;
import com.win.module.wms.util.JobUtils;
@ -87,6 +89,8 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
private ExpectinService expectinService;
@Resource
private TransactionService transactionService;
@Resource
private LocationService locationService;
@Override
public Long createInventorymoveJobMain(InventorymoveJobMainCreateReqVO createReqVO) {
@ -244,12 +248,13 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
inventorymoveJobMainDO.setCompleteUserId(String.valueOf(userRespDTO.getId()));
inventorymoveJobMainDO.setCompleteUserName(userRespDTO.getNickname());
//更新任务表状态
int result = inventorymoveJobMainMapper.updateById(inventorymoveJobMainDO);
inventorymoveJobMainMapper.updateById(inventorymoveJobMainDO);
//创建客户收货记录主表
InventorymoveRecordMainDO inventorymoveRecordMainDO = new InventorymoveRecordMainDO();
BeanUtils.copyProperties(inventorymoveJobMainDO, inventorymoveRecordMainDO);
inventorymoveRecordMainDO.setJobNumber(inventorymoveJobMainDO.getNumber());
inventorymoveRecordMainDO.setId(null);
inventorymoveRecordMainDO.setCreateTime(null);
inventorymoveRecordMainDO.setAvailable("TRUE");
inventorymoveRecordMainDO.setExecuteTime(LocalDateTime.now());
inventorymoveRecordMainDO.setActiveDate(LocalDateTime.now());
@ -295,7 +300,7 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
inventorymoveRecordDetailDO.setJobDetailId(DetailUpdateItem.getId().toString());
inventorymoveRecordDetailDO.setId(null);
inventorymoveRecordDetailDO.setCreator(null);
inventorymoveRecordDetailDO.setCreateTime(null);
inventorymoveRecordDetailDO.setCreateTime(LocalDateTime.now());
inventorymoveRecordDetailDO.setUpdater(null);
inventorymoveRecordDetailDO.setUpdateTime(null);
inventorymoveRecordDetailDO.setNumber(inventorymoveRecordMainDO.getNumber());
@ -306,12 +311,19 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
inventorymoveRecordDetailDO.setToContainerNumber(recordLstItem.get("toContainerNumber")==null?"":recordLstItem.get("toContainerNumber"));
inventorymoveRecordDetailDO.setToBatch(recordLstItem.get("toBatch")==null?"":recordLstItem.get("toBatch"));
inventorymoveRecordDetailDO.setToLocationCode(recordLstItem.get("toLocationCode"));
LocationDO toLocationDO = locationService.selectLocation(recordLstItem.get("toLocationCode"));
inventorymoveRecordDetailDO.setToAreaCode(toLocationDO.getAreaCode());
inventorymoveRecordDetailDO.setToLocationGroupCode(toLocationDO.getLocationGroupCode());
LocationDO fromLocationDO = locationService.selectLocation(inventorymoveRecordDetailDO.getFromLocationCode());
inventorymoveRecordDetailDO.setFromAreaCode(fromLocationDO.getAreaCode());
inventorymoveRecordDetailDO.setFromLocationGroupCode(fromLocationDO.getLocationGroupCode());
inventorymoveRecordDetailDO.setToInventoryStatus(recordLstItem.get("toInventoryStatus"));
inventorymoveRecordDetailDO.setFromPackingNumber(DetailUpdateItem.getPackingNumber());
inventorymoveRecordDetailDO.setFromContainerNumber(DetailUpdateItem.getContainerNumber());
inventorymoveRecordDetailDO.setFromAreaCode(inventorymoveJobMainDO.getFromAreaCodes());
inventorymoveRecordDetailDO.setToAreaCode(inventorymoveJobMainDO.getToAreaCodes());
inventorymoveRecordDetailDO.setFromBatch(DetailUpdateItem.getBatch());
inventorymoveRecordDetailDO.setInterfaceType(inventorymoveRecordMainDO.getInterfaceType());
inventorymoveRecordDetailDO.setFromInventoryStatus(DetailUpdateItem.getInventoryStatus());
inventorymoveRecordDetailDOList.add(inventorymoveRecordDetailDO);
//添加库存事务list

1
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java
View File

@ -87,7 +87,6 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest
private InventorymoveJobDetailMapper inventorymoveJobDetailMapper;
@Resource
private Validator validator;
@Resource
private ItembasicService itembasicService;
@Resource

Write Preview
Loading…
Cancel
Save