Browse Source

完成检验任务和记录接口。

master
刘忱 2 years ago
parent
commit
4bf12396ca
  1. 2
      win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java
  2. 93
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java
  3. 173
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java
  4. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java
  5. 106
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java
  6. 94
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java
  7. 149
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java
  8. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java
  9. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java
  10. 118
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java
  11. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java
  12. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java
  13. 21
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java
  14. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java
  15. 23
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java
  16. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java
  17. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java
  18. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java
  19. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java
  20. 54
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java
  21. 65
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java
  22. 76
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java
  23. 130
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java
  24. 58
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java
  25. 65
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java
  26. 56
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java
  27. 48
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java
  28. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java
  29. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java
  30. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java
  31. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java
  32. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java
  33. 40
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java
  34. 47
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java
  35. 43
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java
  36. 59
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java
  37. 14
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

2
win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java

@ -74,4 +74,6 @@ public interface DictTypeConstants {
String INSPECT_TYPE = "inspect_type";//检验类型
String NEXT_ACTION = "next_action";//下一步检验动作
String SAMPLE_METHOD = "sample_method";//抽检方式
String INSPECT_FAILED_REASON = "inspect_failed_reason";//不合格原因
String INSPECT_RESULT = "inspect_result";//检验结果
}

93
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java

@ -1,35 +1,26 @@
package com.win.module.wms.controller.inspectJob;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailRespVO;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.module.wms.service.inspectJob.InspectJobDetailService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.inspectJob.vo.*;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.service.inspectJob.InspectJobDetailService;
@Tag(name = "管理后台 - 检验任务子")
@RestController
@RequestMapping("/wms/inspect-job-detail")
@ -42,48 +33,6 @@ public class InspectJobDetailController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建检验任务子")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:create')")
public CommonResult<Long> createInspectJobDetail(@Valid @RequestBody InspectJobDetailCreateReqVO createReqVO) {
return success(inspectJobDetailService.createInspectJobDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检验任务子")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:update')")
public CommonResult<Boolean> updateInspectJobDetail(@Valid @RequestBody InspectJobDetailUpdateReqVO updateReqVO) {
inspectJobDetailService.updateInspectJobDetail(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检验任务子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:delete')")
public CommonResult<Boolean> deleteInspectJobDetail(@RequestParam("id") Long id) {
inspectJobDetailService.deleteInspectJobDetail(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检验任务子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')")
public CommonResult<InspectJobDetailRespVO> getInspectJobDetail(@RequestParam("id") Long id) {
InspectJobDetailDO inspectJobDetail = inspectJobDetailService.getInspectJobDetail(id);
return success(InspectJobDetailConvert.INSTANCE.convert(inspectJobDetail));
}
@GetMapping("/list")
@Operation(summary = "获得检验任务子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')")
public CommonResult<List<InspectJobDetailRespVO>> getInspectJobDetailList(@RequestParam("ids") Collection<Long> ids) {
List<InspectJobDetailDO> list = inspectJobDetailService.getInspectJobDetailList(ids);
return success(InspectJobDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得检验任务子分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')")
@ -105,21 +54,5 @@ public class InspectJobDetailController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检验任务子 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:export')")
@OperateLog(type = EXPORT)
public void exportInspectJobDetailExcel(@Valid InspectJobDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<InspectJobDetailDO> list = inspectJobDetailService.getInspectJobDetailList(exportReqVO);
// 导出 Excel
List<InspectJobDetailExcelVO> datas = InspectJobDetailConvert.INSTANCE.convertList02(list);
for(InspectJobDetailExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "检验任务子.xls", "数据", InspectJobDetailExcelVO.class, datas);
}
}

173
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java

@ -1,38 +1,41 @@
package com.win.module.wms.controller.inspectJob;
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.dict.core.util.DictFrameworkUtils;
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.inspectJob.vo.*;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.convert.inspectJob.InspectJobMainConvert;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.enums.job.JobStatusEnum;
import com.win.module.wms.service.inspectJob.InspectJobDetailService;
import com.win.module.wms.service.inspectJob.InspectJobMainService;
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.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import com.win.module.wms.convert.inspectJob.InspectJobMainConvert;
import com.win.module.wms.service.inspectJob.InspectJobMainService;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 检验任务主")
@RestController
@ -49,48 +52,6 @@ public class InspectJobMainController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建检验任务主")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:create')")
public CommonResult<Long> createInspectJobMain(@Valid @RequestBody InspectJobMainCreateReqVO createReqVO) {
return success(inspectJobMainService.createInspectJobMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检验任务主")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:update')")
public CommonResult<Boolean> updateInspectJobMain(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) {
inspectJobMainService.updateInspectJobMain(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检验任务主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:delete')")
public CommonResult<Boolean> deleteInspectJobMain(@RequestParam("id") Long id) {
inspectJobMainService.deleteInspectJobMain(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检验任务主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
public CommonResult<InspectJobMainRespVO> getInspectJobMain(@RequestParam("id") Long id) {
InspectJobMainDO inspectJobMain = inspectJobMainService.getInspectJobMain(id);
return success(InspectJobMainConvert.INSTANCE.convert(inspectJobMain));
}
@GetMapping("/list")
@Operation(summary = "获得检验任务主列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
public CommonResult<List<InspectJobMainRespVO>> getInspectJobMainList(@RequestParam("ids") Collection<Long> ids) {
List<InspectJobMainDO> list = inspectJobMainService.getInspectJobMainList(ids);
return success(InspectJobMainConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得检验任务主分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
@ -112,21 +73,66 @@ public class InspectJobMainController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检验任务主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectJobMainExcel(@Valid InspectJobMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
public void exportInspectJobMainExcel(@Valid InspectJobMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<InspectJobMainDO> list = inspectJobMainService.getInspectJobMainList(exportReqVO);
// 导出 Excel
List<InspectJobMainExcelVO> datas = InspectJobMainConvert.INSTANCE.convertList02(list);
for(InspectJobMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InspectJobMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, resultList, mapDropDown);
}
@GetMapping("/export-excel-senior")
@Operation(summary = "导出检验任务主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectJobMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<InspectJobMainDO> list = inspectJobMainService.getInspectJobMainList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InspectJobMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, resultList, mapDropDown);
}
private List<InspectJobMainExcelVO> getExcelVo(List<InspectJobMainDO> list, Map<Integer, String[]> mapDropDown) {
//组装vo
String[] status = JobStatusEnum.getStatusNameArray();
mapDropDown.put(6, status);
String[] transferMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRANSFER_MODE);
mapDropDown.put(6, transferMode);
String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE);
mapDropDown.put(24, inspectType);
String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION);
mapDropDown.put(25, nextAction);
String[] sampleMethod = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SAMPLE_METHOD);
mapDropDown.put(26, sampleMethod);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(27, uom);
String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
mapDropDown.put(31, trueFalse);
mapDropDown.put(32, trueFalse);
mapDropDown.put(33, trueFalse);
mapDropDown.put(34, trueFalse);
mapDropDown.put(35, trueFalse);
mapDropDown.put(36, trueFalse);
mapDropDown.put(37, trueFalse);
mapDropDown.put(38, trueFalse);
mapDropDown.put(39, trueFalse);
mapDropDown.put(40, trueFalse);
String[] inventoryStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INVENTORY_STATUS);
mapDropDown.put(43, inventoryStatus);
List<InspectJobMainExcelVO> resultList = new ArrayList<>();
// 导出
for(InspectJobMainDO mainDO : list) {
List<InspectJobDetailDO> subList = inspectJobDetailService.selectList(mainDO.getId());
for(InspectJobDetailDO detailDO : subList) {
InspectJobMainExcelVO vo = InspectJobMainConvert.INSTANCE.convert(mainDO, detailDO);
resultList.add(vo);
}
}
ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, datas);
return resultList;
}
@GetMapping("/getInspectJobById")
@ -184,4 +190,29 @@ public class InspectJobMainController {
return success(countByStatus);
}
@Operation(summary = "承接任务")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:accept')")
@PostMapping(value = "/accept/{id}")
public CommonResult<Boolean> accept(@PathVariable("id") Long id) {
int result = inspectJobMainService.accept(id);
return success(result > 0);
}
@Operation(summary = "取消承接任务")
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:cancel-accept')")
@PostMapping(value = "/cancelAccept/{id}")
public CommonResult<Boolean> cancelAccept(@PathVariable("id") Long id) {
int result = inspectJobMainService.cancelAccept(id);
return success(result > 0);
}
@PutMapping("/execute")
@Operation(summary = "执行任务")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-job-main:execute')")
public CommonResult<Boolean> excute(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) {
Integer count = inspectJobMainService.excute(updateReqVO);
return success(count > 0);
}
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java

@ -1,12 +1,13 @@
package com.win.module.wms.controller.inspectJob.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -63,4 +64,7 @@ public class InspectJobDetailPageReqVO extends PageParam {
@Schema(description = "计量单位")
private String uom;
@Schema(description = "主表ID", example = "6060")
private Long masterId;
}

106
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java

@ -1,21 +1,14 @@
package com.win.module.wms.controller.inspectJob.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.enums.job.JobStatusConverter;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -44,23 +37,12 @@ public class InspectJobMainExcelVO {
@ExcelProperty("要求截止时间")
private LocalDateTime requestDueTime;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@DictFormat("job_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@ExcelProperty(value = "状态", converter = JobStatusConverter.class)
private String status;
@ExcelProperty("过期时间")
private LocalDateTime expiredTime;
@ExcelProperty("最后更新时间")
private LocalDateTime updateTime;
@ExcelProperty("最后更新者Id")
private String updater;
@ExcelProperty(value = "状态", converter = DictConvert.class)
@DictFormat("job_stage_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String jobStageStatus;
@ExcelProperty("优先级")
private Integer priority;
@ -97,12 +79,6 @@ public class InspectJobMainExcelVO {
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者id")
private String creator;
@ExcelProperty("订单号")
private String poUmber;
@ -116,19 +92,19 @@ public class InspectJobMainExcelVO {
private String itemCode;
@ExcelProperty(value = "检验类型", converter = DictConvert.class)
@DictFormat("inspect_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.INSPECT_TYPE)
private String inspectType;
@ExcelProperty(value = "下一步检验动作", converter = DictConvert.class)
@DictFormat("next_action") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.NEXT_ACTION)
private String nextAction;
@ExcelProperty(value = "抽检方式", converter = DictConvert.class)
@DictFormat("sample_method") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.SAMPLE_METHOD)
private String sampleMethod;
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat("uom") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.UOM)
private String uom;
@ExcelProperty("收货数量")
@ -141,43 +117,83 @@ public class InspectJobMainExcelVO {
private String owner;
@ExcelProperty(value = "自动完成", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String autoComplete;
@ExcelProperty(value = "允许修改库位", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyLocation;
@ExcelProperty(value = "允许修改数量", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyQty;
@ExcelProperty(value = "允许大于推荐数量", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowBiggerQty;
@ExcelProperty(value = "允许小于推荐数量", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowSmallerQty;
@ExcelProperty(value = "允许修改库存状态", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyInventoryStatus;
@ExcelProperty(value = "允许连续扫描", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowContinuousScanning;
@ExcelProperty(value = "允许部分完成", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowPartialComplete;
@ExcelProperty(value = "允许修改批次", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyBatch;
@ExcelProperty(value = "允许修改箱码", converter = DictConvert.class)
@DictFormat("true_false") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.TRUE_FALSE)
private String allowModifyPackingNumber;
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty(value = "库存状态", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INVENTORY_STATUS)
private String inventoryStatus;
@ExcelProperty("从库位代码")
private String fromLocationCode;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itemDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("数量")
private BigDecimal qty;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者Id")
private String creator;
@ExcelProperty("最后更新时间")
private LocalDateTime updateTime;
@ExcelProperty("最后更新者Id")
private String updater;
}

94
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java

@ -1,35 +1,26 @@
package com.win.module.wms.controller.inspectRecord;
import com.win.framework.common.pojo.CommonResult;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailRespVO;
import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import com.win.module.wms.service.inspectRecord.InspectRecordDetailService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import javax.annotation.Resource;
import javax.validation.Valid;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.controller.inspectRecord.vo.*;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert;
import com.win.module.wms.service.inspectRecord.InspectRecordDetailService;
@Tag(name = "管理后台 - 检验记录子")
@RestController
@RequestMapping("/wms/inspect-record-detail")
@ -42,48 +33,6 @@ public class InspectRecordDetailController {
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建检验记录子")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:create')")
public CommonResult<Long> createInspectRecordDetail(@Valid @RequestBody InspectRecordDetailCreateReqVO createReqVO) {
return success(inspectRecordDetailService.createInspectRecordDetail(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检验记录子")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:update')")
public CommonResult<Boolean> updateInspectRecordDetail(@Valid @RequestBody InspectRecordDetailUpdateReqVO updateReqVO) {
inspectRecordDetailService.updateInspectRecordDetail(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检验记录子")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:delete')")
public CommonResult<Boolean> deleteInspectRecordDetail(@RequestParam("id") Long id) {
inspectRecordDetailService.deleteInspectRecordDetail(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检验记录子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')")
public CommonResult<InspectRecordDetailRespVO> getInspectRecordDetail(@RequestParam("id") Long id) {
InspectRecordDetailDO inspectRecordDetail = inspectRecordDetailService.getInspectRecordDetail(id);
return success(InspectRecordDetailConvert.INSTANCE.convert(inspectRecordDetail));
}
@GetMapping("/list")
@Operation(summary = "获得检验记录子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')")
public CommonResult<List<InspectRecordDetailRespVO>> getInspectRecordDetailList(@RequestParam("ids") Collection<Long> ids) {
List<InspectRecordDetailDO> list = inspectRecordDetailService.getInspectRecordDetailList(ids);
return success(InspectRecordDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得检验记录子分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')")
@ -106,21 +55,4 @@ public class InspectRecordDetailController {
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检验记录子 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:export')")
@OperateLog(type = EXPORT)
public void exportInspectRecordDetailExcel(@Valid InspectRecordDetailExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
List<InspectRecordDetailDO> list = inspectRecordDetailService.getInspectRecordDetailList(exportReqVO);
// 导出 Excel
List<InspectRecordDetailExcelVO> datas = InspectRecordDetailConvert.INSTANCE.convertList02(list);
for(InspectRecordDetailExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
}
ExcelUtils.write(response, "检验记录子.xls", "数据", InspectRecordDetailExcelVO.class, datas);
}
}

149
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java

@ -1,34 +1,40 @@
package com.win.module.wms.controller.inspectRecord;
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.dict.core.util.DictFrameworkUtils;
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.inspectRecord.vo.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExcelVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainRespVO;
import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.service.inspectRecord.InspectRecordDetailService;
import com.win.module.wms.service.inspectRecord.InspectRecordMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.common.pojo.CommonResult;
import static com.win.framework.common.pojo.CommonResult.success;
import com.win.framework.excel.core.util.ExcelUtils;
import com.win.framework.operatelog.core.annotations.OperateLog;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert;
import com.win.module.wms.service.inspectRecord.InspectRecordMainService;
import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
@Tag(name = "管理后台 - 检验记录主")
@RestController
@ -38,52 +44,12 @@ public class InspectRecordMainController {
@Resource
private InspectRecordMainService inspectRecordMainService;
@Resource
private InspectRecordDetailService inspectRecordDetailService;
@Resource
private AdminUserApi userApi;
@PostMapping("/create")
@Operation(summary = "创建检验记录主")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:create')")
public CommonResult<Long> createInspectRecordMain(@Valid @RequestBody InspectRecordMainCreateReqVO createReqVO) {
return success(inspectRecordMainService.createInspectRecordMain(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新检验记录主")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:update')")
public CommonResult<Boolean> updateInspectRecordMain(@Valid @RequestBody InspectRecordMainUpdateReqVO updateReqVO) {
inspectRecordMainService.updateInspectRecordMain(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除检验记录主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:delete')")
public CommonResult<Boolean> deleteInspectRecordMain(@RequestParam("id") Long id) {
inspectRecordMainService.deleteInspectRecordMain(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得检验记录主")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')")
public CommonResult<InspectRecordMainRespVO> getInspectRecordMain(@RequestParam("id") Long id) {
InspectRecordMainDO inspectRecordMain = inspectRecordMainService.getInspectRecordMain(id);
return success(InspectRecordMainConvert.INSTANCE.convert(inspectRecordMain));
}
@GetMapping("/list")
@Operation(summary = "获得检验记录主列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')")
public CommonResult<List<InspectRecordMainRespVO>> getInspectRecordMainList(@RequestParam("ids") Collection<Long> ids) {
List<InspectRecordMainDO> list = inspectRecordMainService.getInspectRecordMainList(ids);
return success(InspectRecordMainConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得检验记录主分页")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')")
@ -105,21 +71,60 @@ public class InspectRecordMainController {
}
return success(result);
}
@GetMapping("/export-excel")
@Operation(summary = "导出检验记录主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectRecordMainExcel(@Valid InspectRecordMainExportReqVO exportReqVO,
HttpServletResponse response) throws IOException {
public void exportInspectRecordMainExcel(@Valid InspectRecordMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException {
List<InspectRecordMainDO> list = inspectRecordMainService.getInspectRecordMainList(exportReqVO);
// 导出 Excel
List<InspectRecordMainExcelVO> datas = InspectRecordMainConvert.INSTANCE.convertList02(list);
for(InspectRecordMainExcelVO vo : datas) {
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InspectRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, resultList, mapDropDown);
}
@GetMapping("/export-excel-senior")
@Operation(summary = "导出检验记录主 Excel")
@PreAuthorize("@ss.hasPermission('wms:inspect-record-main:export')")
@OperateLog(type = EXPORT)
public void exportInspectRecordMainSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
List<InspectRecordMainDO> list = inspectRecordMainService.getInspectRecordMainList(conditions);
Map<Integer, String[]> mapDropDown = new HashMap<>();
List<InspectRecordMainExcelVO> resultList = this.getExcelVo(list, mapDropDown);
ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, resultList, mapDropDown);
}
private List<InspectRecordMainExcelVO> getExcelVo(List<InspectRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
//组装vo
String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
mapDropDown.put(11, interfaceType);
String[] inspectType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_TYPE);
mapDropDown.put(18, inspectType);
String[] nextAction = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.NEXT_ACTION);
mapDropDown.put(19, nextAction);
String[] sampleMethod = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SAMPLE_METHOD);
mapDropDown.put(20, sampleMethod);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(21, uom);
String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
mapDropDown.put(33, locationType);
String[] inspectFailedReason = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_FAILED_REASON);
mapDropDown.put(43, inspectFailedReason);
String[] inspectResult = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INSPECT_RESULT);
mapDropDown.put(46, inspectResult);
List<InspectRecordMainExcelVO> resultList = new ArrayList<>();
// 导出
for(InspectRecordMainDO mainDO : list) {
List<InspectRecordDetailDO> subList = inspectRecordDetailService.selectList(mainDO.getId());
for(InspectRecordDetailDO detailDO : subList) {
InspectRecordMainExcelVO vo = InspectRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
//后端创建个字段作为前端展示的虚拟字段
vo.setCreator(user.getNickname());
resultList.add(vo);
}
}
ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, datas);
return resultList;
}
}

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java

@ -1,13 +1,11 @@
package com.win.module.wms.controller.inspectRecord.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import java.time.LocalDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -109,4 +107,6 @@ public class InspectRecordDetailExportReqVO {
@Schema(description = "任务明细ID")
private String jobDetailId;
@Schema(description = "主表ID")
private Long masterId;
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java

@ -1,12 +1,13 @@
package com.win.module.wms.controller.inspectRecord.vo;
import lombok.*;
import java.math.BigDecimal;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.win.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -111,4 +112,6 @@ public class InspectRecordDetailPageReqVO extends PageParam {
@Schema(description = "任务明细ID")
private String jobDetailId;
@Schema(description = "主表ID")
private Long masterId;
}

118
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java

@ -1,23 +1,13 @@
package com.win.module.wms.controller.inspectRecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import com.alibaba.excel.annotation.ExcelProperty;
import com.win.framework.excel.core.annotations.DictFormat;
import com.win.framework.excel.core.convert.DictConvert;
import com.win.module.wms.enums.DictTypeConstants;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -62,7 +52,7 @@ public class InspectRecordMainExcelVO {
private String departmentCode;
@ExcelProperty(value = "接口类型", converter = DictConvert.class)
@DictFormat("interface_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.INTERFACE_TYPE)
private String interfaceType;
@ExcelProperty("单据号")
@ -71,15 +61,6 @@ public class InspectRecordMainExcelVO {
@ExcelProperty("业务类型")
private String businessType;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者Id")
private String creator;
@ExcelProperty("代码")
private String code;
@ -93,19 +74,19 @@ public class InspectRecordMainExcelVO {
private String batch;
@ExcelProperty(value = "检验类型", converter = DictConvert.class)
@DictFormat("inspect_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.INSPECT_TYPE)
private String inspectType;
@ExcelProperty(value = "下一步检验动作", converter = DictConvert.class)
@DictFormat("next_action") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.NEXT_ACTION)
private String nextAction;
@ExcelProperty(value = "抽检方式", converter = DictConvert.class)
@DictFormat("sample_method") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.SAMPLE_METHOD)
private String sampleMethod;
@ExcelProperty(value = "计量单位", converter = DictConvert.class)
@DictFormat("uom") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.UOM)
private String uom;
@ExcelProperty("收货数量")
@ -142,7 +123,84 @@ public class InspectRecordMainExcelVO {
private BigDecimal sampleQty;
@ExcelProperty(value = "从库位类型范围", converter = DictConvert.class)
@DictFormat("location_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
@DictFormat(DictTypeConstants.LOCATION_TYPE)
private String fromLocationTypes;
@ExcelProperty("包装号")
private String packingNumber;
@ExcelProperty("器具号")
private String containerNumber;
@ExcelProperty("从库位代码")
private String fromLocationCode;
@ExcelProperty("从库位组代码")
private String fromLocationGroupCode;
@ExcelProperty("从库区代码")
private String fromAreaCode;
@ExcelProperty("合格数量")
private BigDecimal goodQty;
@ExcelProperty("不合格数量")
private BigDecimal failedQty;
@ExcelProperty("破坏数量")
private BigDecimal crackQty;
@ExcelProperty("最终不合格数量")
private BigDecimal notPassedQty;
@ExcelProperty(value = "不合格原因", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INSPECT_FAILED_REASON)
private String failedReason;
@ExcelProperty("异常照片")
private String photos;
@ExcelProperty("检验人")
private String inspectUser;
@ExcelProperty(value = "检验结果", converter = DictConvert.class)
@DictFormat(DictTypeConstants.INSPECT_RESULT)
private String inspectResult;
@ExcelProperty("外观")
private String appearance;
@ExcelProperty("尺寸")
private String volume;
@ExcelProperty("重量")
private String weight;
@ExcelProperty("其他属性")
private String otherProperties;
@ExcelProperty("物品名称")
private String itemName;
@ExcelProperty("物品描述1")
private String itemDesc1;
@ExcelProperty("物品描述2")
private String itemDesc2;
@ExcelProperty("项目代码")
private String projectCode;
@ExcelProperty("任务明细ID")
private String jobDetailId;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("创建者Id")
private String creator;
}

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java

@ -11,7 +11,6 @@ import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailCon
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService;
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.validation.annotation.Validated;
@ -34,15 +33,6 @@ public class PurchasereceiptJobDetailController {
@Resource
private AdminUserApi userApi;
@GetMapping("/get")
@Operation(summary = "获得采购收货任务子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')")
public CommonResult<PurchasereceiptJobDetailRespVO> getPurchasereceiptJobDetail(@RequestParam("id") Long id) {
PurchasereceiptJobDetailDO purchasereceiptJobDetail = purchasereceiptJobDetailService.getPurchasereceiptJobDetail(id);
return success(PurchasereceiptJobDetailConvert.INSTANCE.convert(purchasereceiptJobDetail));
}
@PostMapping("/senior")
@Operation(summary = "高级搜索获得采购收货任务子信息分页")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')")

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java

@ -193,8 +193,8 @@ public class PurchasereceiptJobMainController {
@Operation(summary = "执行采购收货任务主")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:execute')")
public CommonResult<Boolean> excutePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) {
Integer count = purchasereceiptJobMainService.excutePurchasereceiptJobMain(updateReqVO);
public CommonResult<Boolean> excute(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) {
Integer count = purchasereceiptJobMainService.excute(updateReqVO);
return success(count > 0);
}

21
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java

@ -11,7 +11,6 @@ import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDet
import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordDetailService;
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.validation.annotation.Validated;
@ -19,8 +18,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
import static com.win.framework.common.pojo.CommonResult.success;
@ -36,24 +33,6 @@ public class PurchasereceiptRecordDetailController {
@Resource
private AdminUserApi userApi;
@GetMapping("/get")
@Operation(summary = "获得采购收货记录子")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')")
public CommonResult<PurchasereceiptRecordDetailRespVO> getPurchasereceiptRecordDetail(@RequestParam("id") Long id) {
PurchasereceiptRecordDetailDO purchasereceiptRecordDetail = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetail(id);
return success(PurchasereceiptRecordDetailConvert.INSTANCE.convert(purchasereceiptRecordDetail));
}
@GetMapping("/list")
@Operation(summary = "获得采购收货记录子列表")
@Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')")
public CommonResult<List<PurchasereceiptRecordDetailRespVO>> getPurchasereceiptRecordDetailList(@RequestParam("ids") Collection<Long> ids) {
List<PurchasereceiptRecordDetailDO> list = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailList(ids);
return success(PurchasereceiptRecordDetailConvert.INSTANCE.convertList(list));
}
@GetMapping("/page")
@Operation(summary = "获得采购收货记录子分页")
@PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')")

15
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java

@ -5,9 +5,12 @@ import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExcelVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import java.util.List;
@ -36,4 +39,16 @@ public interface InspectJobMainConvert {
InspectJobMainDO convert(InspectRequestMainDO bean);
@Mappings({
@Mapping(source = "mainDO.number", target = "number"),
@Mapping(source = "detailDO.itemCode", target = "itemCode"),
@Mapping(source = "detailDO.uom", target = "uom"),
@Mapping(source = "mainDO.remark", target = "remark"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
@Mapping(source = "mainDO.updateTime", target = "updateTime"),
@Mapping(source = "mainDO.updater", target = "updater"),
})
InspectJobMainExcelVO convert(InspectJobMainDO mainDO, InspectJobDetailDO detailDO);
}

23
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java

@ -1,16 +1,18 @@
package com.win.module.wms.convert.inspectRecord;
import java.util.*;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExcelVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainRespVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
import java.util.List;
/**
* 检验记录主 Convert
@ -34,4 +36,17 @@ public interface InspectRecordMainConvert {
List<InspectRecordMainExcelVO> convertList02(List<InspectRecordMainDO> list);
@Mappings({
@Mapping(source = "mainDO.number", target = "number"),
@Mapping(source = "detailDO.itemCode", target = "itemCode"),
@Mapping(source = "detailDO.sampleQty", target = "sampleQty"),
@Mapping(source = "detailDO.uom", target = "uom"),
@Mapping(source = "detailDO.code", target = "code"),
@Mapping(source = "detailDO.interfaceType", target = "interfaceType"),
@Mapping(source = "mainDO.remark", target = "remark"),
@Mapping(source = "mainDO.createTime", target = "createTime"),
@Mapping(source = "mainDO.creator", target = "creator"),
})
InspectRecordMainExcelVO convert(InspectRecordMainDO mainDO, InspectRecordDetailDO detailDO);
}

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java

@ -1,17 +1,17 @@
package com.win.module.wms.dal.mysql.inspectJob;
import java.util.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 检验任务子 Mapper
*
@ -22,6 +22,7 @@ public interface InspectJobDetailMapper extends BaseMapperX<InspectJobDetailDO>
default PageResult<InspectJobDetailDO> selectPage(InspectJobDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<InspectJobDetailDO>()
.eqIfPresent(InspectJobDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(InspectJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
.eqIfPresent(InspectJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
.eqIfPresent(InspectJobDetailDO::getInventoryStatus, reqVO.getInventoryStatus())
@ -63,4 +64,9 @@ public interface InspectJobDetailMapper extends BaseMapperX<InspectJobDetailDO>
.orderByDesc(InspectJobDetailDO::getId));
}
default List<InspectJobDetailDO> selectList(Long masterId) {
return selectList(new LambdaQueryWrapperX<InspectJobDetailDO>()
.eq(InspectJobDetailDO::getMasterId, masterId));
}
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java

@ -191,5 +191,8 @@ public interface InspectJobMainMapper extends BaseMapperX<InspectJobMainDO> {
}
default List<InspectJobMainDO> selectList(CustomConditions conditions) {
return selectList(QueryWrapperUtils.structure(conditions));
}
}

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java

@ -1,17 +1,17 @@
package com.win.module.wms.dal.mysql.inspectRecord;
import java.util.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 检验记录子 Mapper
*
@ -22,6 +22,7 @@ public interface InspectRecordDetailMapper extends BaseMapperX<InspectRecordDeta
default PageResult<InspectRecordDetailDO> selectPage(InspectRecordDetailPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<InspectRecordDetailDO>()
.eqIfPresent(InspectRecordDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(InspectRecordDetailDO::getPackingNumber, reqVO.getPackingNumber())
.eqIfPresent(InspectRecordDetailDO::getContainerNumber, reqVO.getContainerNumber())
.eqIfPresent(InspectRecordDetailDO::getFromLocationCode, reqVO.getFromLocationCode())
@ -60,6 +61,7 @@ public interface InspectRecordDetailMapper extends BaseMapperX<InspectRecordDeta
}
default List<InspectRecordDetailDO> selectList(InspectRecordDetailExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<InspectRecordDetailDO>()
.eqIfPresent(InspectRecordDetailDO::getMasterId, reqVO.getMasterId())
.eqIfPresent(InspectRecordDetailDO::getPackingNumber, reqVO.getPackingNumber())
.eqIfPresent(InspectRecordDetailDO::getContainerNumber, reqVO.getContainerNumber())
.eqIfPresent(InspectRecordDetailDO::getFromLocationCode, reqVO.getFromLocationCode())
@ -94,4 +96,9 @@ public interface InspectRecordDetailMapper extends BaseMapperX<InspectRecordDeta
.orderByDesc(InspectRecordDetailDO::getId));
}
default List<InspectRecordDetailDO> selectList(Long masterId) {
return selectList(new LambdaQueryWrapperX<InspectRecordDetailDO>()
.eq(InspectRecordDetailDO::getMasterId, masterId));
}
}

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java

@ -1,17 +1,17 @@
package com.win.module.wms.dal.mysql.inspectRecord;
import java.util.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 检验记录主 Mapper
*
@ -108,4 +108,8 @@ public interface InspectRecordMainMapper extends BaseMapperX<InspectRecordMainDO
.orderByDesc(InspectRecordMainDO::getId));
}
default List<InspectRecordMainDO> selectSeniorList(CustomConditions conditions) {
return selectList(QueryWrapperUtils.structure(conditions));
}
}

54
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java

@ -1,15 +1,12 @@
package com.win.module.wms.service.inspectJob;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.framework.common.pojo.PageResult;
import java.util.List;
/**
* 检验任务子 Service 接口
@ -18,44 +15,6 @@ import com.win.framework.common.pojo.PageResult;
*/
public interface InspectJobDetailService {
/**
* 创建检验任务子
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createInspectJobDetail(@Valid InspectJobDetailCreateReqVO createReqVO);
/**
* 更新检验任务子
*
* @param updateReqVO 更新信息
*/
void updateInspectJobDetail(@Valid InspectJobDetailUpdateReqVO updateReqVO);
/**
* 删除检验任务子
*
* @param id 编号
*/
void deleteInspectJobDetail(Long id);
/**
* 获得检验任务子
*
* @param id 编号
* @return 检验任务子
*/
InspectJobDetailDO getInspectJobDetail(Long id);
/**
* 获得检验任务子列表
*
* @param ids 编号
* @return 检验任务子列表
*/
List<InspectJobDetailDO> getInspectJobDetailList(Collection<Long> ids);
/**
* 获得检验任务子分页
*
@ -81,4 +40,11 @@ public interface InspectJobDetailService {
*/
List<InspectJobDetailDO> getInspectJobDetailList(InspectJobDetailExportReqVO exportReqVO);
/**
* 根据主表id查询检验任务
* @param masterId
* @return
*/
List<InspectJobDetailDO> selectList(Long masterId);
}

65
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java

@ -1,24 +1,16 @@
package com.win.module.wms.service.inspectJob;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailUpdateReqVO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.dal.mysql.inspectJob.InspectJobDetailMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 检验任务子 Service 实现类
@ -32,48 +24,6 @@ public class InspectJobDetailServiceImpl implements InspectJobDetailService {
@Resource
private InspectJobDetailMapper inspectJobDetailMapper;
@Override
public Long createInspectJobDetail(InspectJobDetailCreateReqVO createReqVO) {
// 插入
InspectJobDetailDO inspectJobDetail = InspectJobDetailConvert.INSTANCE.convert(createReqVO);
inspectJobDetailMapper.insert(inspectJobDetail);
// 返回
return inspectJobDetail.getId();
}
@Override
public void updateInspectJobDetail(InspectJobDetailUpdateReqVO updateReqVO) {
// 校验存在
validateInspectJobDetailExists(updateReqVO.getId());
// 更新
InspectJobDetailDO updateObj = InspectJobDetailConvert.INSTANCE.convert(updateReqVO);
inspectJobDetailMapper.updateById(updateObj);
}
@Override
public void deleteInspectJobDetail(Long id) {
// 校验存在
validateInspectJobDetailExists(id);
// 删除
inspectJobDetailMapper.deleteById(id);
}
private void validateInspectJobDetailExists(Long id) {
if (inspectJobDetailMapper.selectById(id) == null) {
throw exception(INSPECT_JOB_DETAIL_NOT_EXISTS);
}
}
@Override
public InspectJobDetailDO getInspectJobDetail(Long id) {
return inspectJobDetailMapper.selectById(id);
}
@Override
public List<InspectJobDetailDO> getInspectJobDetailList(Collection<Long> ids) {
return inspectJobDetailMapper.selectBatchIds(ids);
}
@Override
public PageResult<InspectJobDetailDO> getInspectJobDetailPage(InspectJobDetailPageReqVO pageReqVO) {
return inspectJobDetailMapper.selectPage(pageReqVO);
@ -89,4 +39,9 @@ public class InspectJobDetailServiceImpl implements InspectJobDetailService {
return inspectJobDetailMapper.selectList(exportReqVO);
}
@Override
public List<InspectJobDetailDO> selectList(Long masterId) {
return inspectJobDetailMapper.selectList(masterId);
}
}

76
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java

@ -1,14 +1,18 @@
package com.win.module.wms.service.inspectJob;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.inspectJob.vo.*;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import org.springframework.lang.Nullable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 检验任务主 Service 接口
*
@ -16,28 +20,6 @@ import org.springframework.lang.Nullable;
*/
public interface InspectJobMainService {
/**
* 创建检验任务主
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createInspectJobMain(@Valid InspectJobMainCreateReqVO createReqVO);
/**
* 更新检验任务主
*
* @param updateReqVO 更新信息
*/
void updateInspectJobMain(@Valid InspectJobMainUpdateReqVO updateReqVO);
/**
* 删除检验任务主
*
* @param id 编号
*/
void deleteInspectJobMain(Long id);
/**
* 获得检验任务主
*
@ -46,14 +28,6 @@ public interface InspectJobMainService {
*/
InspectJobMainDO getInspectJobMain(Long id);
/**
* 获得检验任务主列表
*
* @param ids 编号
* @return 检验任务主列表
*/
List<InspectJobMainDO> getInspectJobMainList(Collection<Long> ids);
/**
* 获得检验任务主分页
*
@ -78,6 +52,16 @@ public interface InspectJobMainService {
* @return 检验任务主列表
*/
List<InspectJobMainDO> getInspectJobMainList(InspectJobMainExportReqVO exportReqVO);
/**
* 获得检验任务主列表, 用于 Excel 导出
*
* @param conditions 查询条件
* @return 检验任务主列表
*/
List<InspectJobMainDO> getInspectJobMainList(CustomConditions conditions);
/**
* 校验任务状态正确
*@author chenfang
@ -100,4 +84,26 @@ public interface InspectJobMainService {
* @return
*/
Map<String,Integer> getCountByStatus(@Nullable Collection<String> types);
/**
* 承接任务
* @param id
* @return
*/
Integer accept(Long id);
/**
* 取消承接任务
* @param id
* @return
*/
Integer cancelAccept(Long id);
/**
* 执行任务
* @param inspectJobMainUpdateReqVO
* @return
*/
Integer excute(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO);
}

130
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

@ -2,21 +2,31 @@ package com.win.module.wms.service.inspectJob;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.inspectJob.vo.*;
import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.infra.api.trends.TrendsApi;
import com.win.module.infra.enums.TrendsTypeEnum;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import com.win.module.wms.dal.mysql.inspectJob.InspectJobMainMapper;
import com.win.module.wms.enums.job.JobStatusState;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.inspectJob.InspectJobMainConvert;
import com.win.module.wms.dal.mysql.inspectJob.InspectJobMainMapper;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
/**
@ -30,49 +40,16 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
@Resource
private InspectJobMainMapper inspectJobMainMapper;
@Override
public Long createInspectJobMain(InspectJobMainCreateReqVO createReqVO) {
// 插入
InspectJobMainDO inspectJobMain = InspectJobMainConvert.INSTANCE.convert(createReqVO);
inspectJobMainMapper.insert(inspectJobMain);
// 返回
return inspectJobMain.getId();
}
@Override
public void updateInspectJobMain(InspectJobMainUpdateReqVO updateReqVO) {
// 校验存在
validateInspectJobMainExists(updateReqVO.getId());
// 更新
InspectJobMainDO updateObj = InspectJobMainConvert.INSTANCE.convert(updateReqVO);
inspectJobMainMapper.updateById(updateObj);
}
@Override
public void deleteInspectJobMain(Long id) {
// 校验存在
validateInspectJobMainExists(id);
// 删除
inspectJobMainMapper.deleteById(id);
}
private void validateInspectJobMainExists(Long id) {
if (inspectJobMainMapper.selectById(id) == null) {
throw exception(INSPECT_JOB_MAIN_NOT_EXISTS);
}
}
@Resource
private AdminUserApi userApi;
@Resource
private TrendsApi trendsApi;
@Override
public InspectJobMainDO getInspectJobMain(Long id) {
return inspectJobMainMapper.selectById(id);
}
@Override
public List<InspectJobMainDO> getInspectJobMainList(Collection<Long> ids) {
return inspectJobMainMapper.selectBatchIds(ids);
}
@Override
public PageResult<InspectJobMainDO> getInspectJobMainPage(InspectJobMainPageReqVO pageReqVO) {
return inspectJobMainMapper.selectPage(pageReqVO);
@ -82,13 +59,20 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
public PageResult<InspectJobMainDO> getInspectJobMainSenior(CustomConditions conditions) {
return inspectJobMainMapper.selectSenior(conditions);
}
@Override
public List<InspectJobMainDO> getInspectJobMainList(InspectJobMainExportReqVO exportReqVO) {
return inspectJobMainMapper.selectList(exportReqVO);
}
@Override
public List<InspectJobMainDO> getInspectJobMainList(CustomConditions conditions) {
return inspectJobMainMapper.selectList(conditions);
}
@Override
public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus) {
QueryWrapper queryWrapper = new QueryWrapper();
QueryWrapper<InspectJobMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("number",pnumber);
queryWrapper.eq("status",pstatus);
InspectJobMainDO inspectJobMainDO = inspectJobMainMapper.selectOne(queryWrapper);
@ -112,4 +96,54 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
map.put("count", l.intValue());
return map;
}
@Override
@Transactional
public Integer accept(Long id) {
InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id);
JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus());
if(!jobStatusState.accept()) {
throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR);
}
Long userId = getLoginUserId();
AdminUserRespDTO userRespDTO = userApi.getUser(userId);
inspectJobMainDO.setStatus(jobStatusState.getState().getCode());
inspectJobMainDO.setAcceptUserId(String.valueOf(userId));
inspectJobMainDO.setAcceptUserName(userRespDTO.getNickname());
inspectJobMainDO.setAcceptTime(LocalDateTime.now());
trendsApi.createTrends(id, "inspectJob", "承接了到货检验任务", TrendsTypeEnum.UPDATE);
return inspectJobMainMapper.updateById(inspectJobMainDO);
}
@Override
@Transactional
public Integer cancelAccept(Long id) {
InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id);
JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus());
if(!jobStatusState.cancelAccept()) {
throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR);
}
inspectJobMainDO.setStatus(jobStatusState.getState().getCode());
inspectJobMainDO.setAcceptUserId(null);
inspectJobMainDO.setAcceptUserName(null);
inspectJobMainDO.setAcceptTime(null);
trendsApi.createTrends(id, "inspectJob", "取消了到货检验任务", TrendsTypeEnum.UPDATE);
return inspectJobMainMapper.updateById(inspectJobMainDO);
}
@Override
@Transactional
public Integer excute(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) {
return 0;
}
private InspectJobMainDO validateInspectJobMainExists(Long id) {
InspectJobMainDO inspectJobMainDO = inspectJobMainMapper.selectById(id);
if (inspectJobMainDO == null) {
throw exception(INSPECT_JOB_MAIN_NOT_EXISTS);
}
return inspectJobMainDO;
}
}

58
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java

@ -1,15 +1,11 @@
package com.win.module.wms.service.inspectRecord;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import com.win.framework.common.pojo.PageResult;
import java.util.List;
/**
* 检验记录子 Service 接口
@ -18,44 +14,6 @@ import com.win.framework.common.pojo.PageResult;
*/
public interface InspectRecordDetailService {
/**
* 创建检验记录子
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createInspectRecordDetail(@Valid InspectRecordDetailCreateReqVO createReqVO);
/**
* 更新检验记录子
*
* @param updateReqVO 更新信息
*/
void updateInspectRecordDetail(@Valid InspectRecordDetailUpdateReqVO updateReqVO);
/**
* 删除检验记录子
*
* @param id 编号
*/
void deleteInspectRecordDetail(Long id);
/**
* 获得检验记录子
*
* @param id 编号
* @return 检验记录子
*/
InspectRecordDetailDO getInspectRecordDetail(Long id);
/**
* 获得检验记录子列表
*
* @param ids 编号
* @return 检验记录子列表
*/
List<InspectRecordDetailDO> getInspectRecordDetailList(Collection<Long> ids);
/**
* 获得检验记录子分页
*
@ -72,13 +30,11 @@ public interface InspectRecordDetailService {
*/
PageResult<InspectRecordDetailDO> getInspectRecordDetailSenior(CustomConditions conditions);
/**
* 获得检验记录子列表, 用于 Excel 导出
*
* @param exportReqVO 查询条件
* @return 检验记录子列表
* 根据主表id查询检验记录
* @param masterId
* @return
*/
List<InspectRecordDetailDO> getInspectRecordDetailList(InspectRecordDetailExportReqVO exportReqVO);
List<InspectRecordDetailDO> selectList(Long masterId);
}

65
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java

@ -1,24 +1,15 @@
package com.win.module.wms.service.inspectRecord;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailUpdateReqVO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert;
import com.win.module.wms.dal.mysql.inspectRecord.InspectRecordDetailMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 检验记录子 Service 实现类
@ -32,48 +23,6 @@ public class InspectRecordDetailServiceImpl implements InspectRecordDetailServic
@Resource
private InspectRecordDetailMapper inspectRecordDetailMapper;
@Override
public Long createInspectRecordDetail(InspectRecordDetailCreateReqVO createReqVO) {
// 插入
InspectRecordDetailDO inspectRecordDetail = InspectRecordDetailConvert.INSTANCE.convert(createReqVO);
inspectRecordDetailMapper.insert(inspectRecordDetail);
// 返回
return inspectRecordDetail.getId();
}
@Override
public void updateInspectRecordDetail(InspectRecordDetailUpdateReqVO updateReqVO) {
// 校验存在
validateInspectRecordDetailExists(updateReqVO.getId());
// 更新
InspectRecordDetailDO updateObj = InspectRecordDetailConvert.INSTANCE.convert(updateReqVO);
inspectRecordDetailMapper.updateById(updateObj);
}
@Override
public void deleteInspectRecordDetail(Long id) {
// 校验存在
validateInspectRecordDetailExists(id);
// 删除
inspectRecordDetailMapper.deleteById(id);
}
private void validateInspectRecordDetailExists(Long id) {
if (inspectRecordDetailMapper.selectById(id) == null) {
throw exception(INSPECT_RECORD_DETAIL_NOT_EXISTS);
}
}
@Override
public InspectRecordDetailDO getInspectRecordDetail(Long id) {
return inspectRecordDetailMapper.selectById(id);
}
@Override
public List<InspectRecordDetailDO> getInspectRecordDetailList(Collection<Long> ids) {
return inspectRecordDetailMapper.selectBatchIds(ids);
}
@Override
public PageResult<InspectRecordDetailDO> getInspectRecordDetailPage(InspectRecordDetailPageReqVO pageReqVO) {
return inspectRecordDetailMapper.selectPage(pageReqVO);
@ -85,8 +34,8 @@ public class InspectRecordDetailServiceImpl implements InspectRecordDetailServic
}
@Override
public List<InspectRecordDetailDO> getInspectRecordDetailList(InspectRecordDetailExportReqVO exportReqVO) {
return inspectRecordDetailMapper.selectList(exportReqVO);
public List<InspectRecordDetailDO> selectList(Long masterId) {
return inspectRecordDetailMapper.selectList(masterId);
}
}

56
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java

@ -1,15 +1,13 @@
package com.win.module.wms.service.inspectRecord;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
import com.win.framework.common.pojo.PageResult;
import java.util.List;
/**
* 检验记录主 Service 接口
@ -18,44 +16,6 @@ import com.win.framework.common.pojo.PageResult;
*/
public interface InspectRecordMainService {
/**
* 创建检验记录主
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createInspectRecordMain(@Valid InspectRecordMainCreateReqVO createReqVO);
/**
* 更新检验记录主
*
* @param updateReqVO 更新信息
*/
void updateInspectRecordMain(@Valid InspectRecordMainUpdateReqVO updateReqVO);
/**
* 删除检验记录主
*
* @param id 编号
*/
void deleteInspectRecordMain(Long id);
/**
* 获得检验记录主
*
* @param id 编号
* @return 检验记录主
*/
InspectRecordMainDO getInspectRecordMain(Long id);
/**
* 获得检验记录主列表
*
* @param ids 编号
* @return 检验记录主列表
*/
List<InspectRecordMainDO> getInspectRecordMainList(Collection<Long> ids);
/**
* 获得检验记录主分页
*
@ -80,4 +40,12 @@ public interface InspectRecordMainService {
*/
List<InspectRecordMainDO> getInspectRecordMainList(InspectRecordMainExportReqVO exportReqVO);
/**
* 获得检验记录主列表, 用于 Excel 导出
*
* @param conditions 查询条件
* @return 采购收货申请主列表
*/
List<InspectRecordMainDO> getInspectRecordMainList(CustomConditions conditions);
}

48
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java

@ -5,6 +5,7 @@ import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReq
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO;
import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -32,48 +33,6 @@ public class InspectRecordMainServiceImpl implements InspectRecordMainService {
@Resource
private InspectRecordMainMapper inspectRecordMainMapper;
@Override
public Long createInspectRecordMain(InspectRecordMainCreateReqVO createReqVO) {
// 插入
InspectRecordMainDO inspectRecordMain = InspectRecordMainConvert.INSTANCE.convert(createReqVO);
inspectRecordMainMapper.insert(inspectRecordMain);
// 返回
return inspectRecordMain.getId();
}
@Override
public void updateInspectRecordMain(InspectRecordMainUpdateReqVO updateReqVO) {
// 校验存在
validateInspectRecordMainExists(updateReqVO.getId());
// 更新
InspectRecordMainDO updateObj = InspectRecordMainConvert.INSTANCE.convert(updateReqVO);
inspectRecordMainMapper.updateById(updateObj);
}
@Override
public void deleteInspectRecordMain(Long id) {
// 校验存在
validateInspectRecordMainExists(id);
// 删除
inspectRecordMainMapper.deleteById(id);
}
private void validateInspectRecordMainExists(Long id) {
if (inspectRecordMainMapper.selectById(id) == null) {
throw exception(INSPECT_RECORD_MAIN_NOT_EXISTS);
}
}
@Override
public InspectRecordMainDO getInspectRecordMain(Long id) {
return inspectRecordMainMapper.selectById(id);
}
@Override
public List<InspectRecordMainDO> getInspectRecordMainList(Collection<Long> ids) {
return inspectRecordMainMapper.selectBatchIds(ids);
}
@Override
public PageResult<InspectRecordMainDO> getInspectRecordMainPage(InspectRecordMainPageReqVO pageReqVO) {
return inspectRecordMainMapper.selectPage(pageReqVO);
@ -89,4 +48,9 @@ public class InspectRecordMainServiceImpl implements InspectRecordMainService {
return inspectRecordMainMapper.selectList(exportReqVO);
}
@Override
public List<InspectRecordMainDO> getInspectRecordMainList(CustomConditions conditions) {
return inspectRecordMainMapper.selectSeniorList(conditions);
}
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@ -23,6 +23,8 @@ import com.win.module.wms.controller.inspectRequest.vo.*;
import com.win.module.wms.controller.rule.vo.RuleRespVO;
import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
import com.win.module.wms.convert.inspectJob.InspectJobMainConvert;
import com.win.module.wms.convert.inspectRecord.InspectRecordDetailConvert;
import com.win.module.wms.convert.inspectRecord.InspectRecordMainConvert;
import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert;
import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@ -35,14 +37,14 @@ import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRe
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.mysql.inspectJob.InspectJobDetailMapper;
import com.win.module.wms.dal.mysql.inspectJob.InspectJobMainMapper;
import com.win.module.wms.dal.mysql.inspectRecord.InspectRecordDetailMapper;
import com.win.module.wms.dal.mysql.inspectRecord.InspectRecordMainMapper;
import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestDetailMapper;
import com.win.module.wms.dal.mysql.inspectRequest.InspectRequestMainMapper;
import com.win.module.wms.enums.job.JobStatusEnum;
import com.win.module.wms.enums.request.RequestStatusEnum;
import com.win.module.wms.enums.request.RequestStatusState;
import com.win.module.wms.service.expectout.ExpectoutService;
import com.win.module.wms.service.inspectRecord.InspectRecordDetailService;
import com.win.module.wms.service.inspectRecord.InspectRecordMainService;
import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService;
@ -104,9 +106,9 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
@Resource
private TrendsApi trendsApi;
@Resource
private InspectRecordMainService inspectRecordMainService;
private InspectRecordMainMapper inspectRecordMainMapper;
@Resource
private InspectRecordDetailService inspectRecordDetailService;
private InspectRecordDetailMapper inspectRecordDetailMapper;
@Resource
private ExpectoutService expectoutService;
@ -360,12 +362,12 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
//增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRecord");
inspectRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
inspectRecordMainService.createInspectRecordMain(inspectRecordMainCreateReqVO);
inspectRecordMainMapper.insert(InspectRecordMainConvert.INSTANCE.convert(inspectRecordMainCreateReqVO));
for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) {
InspectRecordDetailCreateReqVO inspectRecordDetailCreateReqVO = new InspectRecordDetailCreateReqVO();
BeanUtils.copyProperties(inspectRequestDetailDO, inspectRecordDetailCreateReqVO);
inspectRecordDetailCreateReqVO.setNumber(number);
inspectRecordDetailService.createInspectRecordDetail(inspectRecordDetailCreateReqVO);
inspectRecordDetailMapper.insert(InspectRecordDetailConvert.INSTANCE.convert(inspectRecordDetailCreateReqVO));
}
return;
}

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java

@ -22,14 +22,6 @@ public interface PurchasereceiptJobDetailService {
*/
PageResult<PurchasereceiptJobDetailDO> getPurchasereceiptJobDetailSenior(CustomConditions conditions);
/**
* 获得采购收货任务子
*
* @param id 编号
* @return 采购收货任务子
*/
PurchasereceiptJobDetailDO getPurchasereceiptJobDetail(Long id);
/**
* 获得采购收货任务子分页
*

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java

@ -33,11 +33,6 @@ public class PurchasereceiptJobDetailServiceImpl implements PurchasereceiptJobDe
return purchasereceiptJobDetailMapper.selectList(masterId);
}
@Override
public PurchasereceiptJobDetailDO getPurchasereceiptJobDetail(Long id) {
return purchasereceiptJobDetailMapper.selectById(id);
}
@Override
public PageResult<PurchasereceiptJobDetailDO> getPurchasereceiptJobDetailPage(PurchasereceiptJobDetailPageReqVO pageReqVO) {
return purchasereceiptJobDetailMapper.selectPage(pageReqVO);

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java

@ -102,9 +102,10 @@ public interface PurchasereceiptJobMainService {
Integer cancelAccept(Long id);
/**
* 执行采购收货任务
* 执行任务
* @param purchasereceiptJobMainUpdateReqVO
* @return
*/
Integer excutePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO);
Integer excute(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO);
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@ -201,7 +201,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
@Override
@Transactional
public Integer excutePurchasereceiptJobMain(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO) {
public Integer excute(PurchasereceiptJobMainUpdateReqVO purchasereceiptJobMainUpdateReqVO) {
//查询数据
PurchasereceiptJobMainDO purchasereceiptJobMainDO = this.validatePurchasereceiptJobMainExists(purchasereceiptJobMainUpdateReqVO.getId());
List<PurchasereceiptJobDetailDO> subList = purchasereceiptJobDetailService.selectList(purchasereceiptJobMainDO.getId());

40
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java

@ -2,13 +2,9 @@ package com.win.module.wms.service.purchasereceiptRecord;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
/**
@ -18,27 +14,6 @@ import java.util.List;
*/
public interface PurchasereceiptRecordDetailService {
/**
* 创建采购收货记录子
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createPurchasereceiptRecordDetail(@Valid PurchasereceiptRecordDetailCreateReqVO createReqVO);
/**
* 更新采购收货记录子
*
* @param updateReqVO 更新信息
*/
void updatePurchasereceiptRecordDetail(@Valid PurchasereceiptRecordDetailUpdateReqVO updateReqVO);
/**
* 删除采购收货记录子
*
* @param id 编号
*/
void deletePurchasereceiptRecordDetail(Long id);
/**
* 获得用高级搜索采购收货记录子分页列表
*
@ -46,21 +21,6 @@ public interface PurchasereceiptRecordDetailService {
* @return 分页列表
*/
PageResult<PurchasereceiptRecordDetailDO> getPurchasereceiptRecordDetailSenior(CustomConditions conditions);
/**
* 获得采购收货记录子
*
* @param id 编号
* @return 采购收货记录子
*/
PurchasereceiptRecordDetailDO getPurchasereceiptRecordDetail(Long id);
/**
* 获得采购收货记录子列表
*
* @param ids 编号
* @return 采购收货记录子列表
*/
List<PurchasereceiptRecordDetailDO> getPurchasereceiptRecordDetailList(Collection<Long> ids);
/**
* 获得采购收货记录子分页

47
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java

@ -2,22 +2,15 @@ package com.win.module.wms.service.purchasereceiptRecord;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailUpdateReqVO;
import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert;
import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.List;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS;
/**
* 采购收货记录子 Service 实现类
*
@ -30,50 +23,10 @@ public class PurchasereceiptRecordDetailServiceImpl implements PurchasereceiptRe
@Resource
private PurchasereceiptRecordDetailMapper purchasereceiptRecordDetailMapper;
@Override
public Long createPurchasereceiptRecordDetail(PurchasereceiptRecordDetailCreateReqVO createReqVO) {
// 插入
PurchasereceiptRecordDetailDO purchasereceiptRecordDetail = PurchasereceiptRecordDetailConvert.INSTANCE.convert(createReqVO);
purchasereceiptRecordDetailMapper.insert(purchasereceiptRecordDetail);
// 返回
return purchasereceiptRecordDetail.getId();
}
@Override
public void updatePurchasereceiptRecordDetail(PurchasereceiptRecordDetailUpdateReqVO updateReqVO) {
// 校验存在
validatePurchasereceiptRecordDetailExists(updateReqVO.getId());
// 更新
PurchasereceiptRecordDetailDO updateObj = PurchasereceiptRecordDetailConvert.INSTANCE.convert(updateReqVO);
purchasereceiptRecordDetailMapper.updateById(updateObj);
}
@Override
public PageResult<PurchasereceiptRecordDetailDO> getPurchasereceiptRecordDetailSenior(CustomConditions conditions) {
return purchasereceiptRecordDetailMapper.selectSenior(conditions);
}
@Override
public void deletePurchasereceiptRecordDetail(Long id) {
// 校验存在
validatePurchasereceiptRecordDetailExists(id);
// 删除
purchasereceiptRecordDetailMapper.deleteById(id);
}
private void validatePurchasereceiptRecordDetailExists(Long id) {
if (purchasereceiptRecordDetailMapper.selectById(id) == null) {
throw exception(PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS);
}
}
@Override
public PurchasereceiptRecordDetailDO getPurchasereceiptRecordDetail(Long id) {
return purchasereceiptRecordDetailMapper.selectById(id);
}
@Override
public List<PurchasereceiptRecordDetailDO> getPurchasereceiptRecordDetailList(Collection<Long> ids) {
return purchasereceiptRecordDetailMapper.selectBatchIds(ids);
}
@Override
public PageResult<PurchasereceiptRecordDetailDO> getPurchasereceiptRecordDetailPage(PurchasereceiptRecordDetailPageReqVO pageReqVO) {

43
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java

@ -2,15 +2,11 @@ package com.win.module.wms.service.purchasereceiptRecord;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainUpdateReqVO;
import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO;
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
/**
@ -20,20 +16,6 @@ import java.util.List;
*/
public interface PurchasereceiptRecordMainService {
/**
* 创建采购收货记录主
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createPurchasereceiptRecordMain(@Valid PurchasereceiptRecordMainCreateReqVO createReqVO);
/**
* 更新采购收货记录主
*
* @param updateReqVO 更新信息
*/
void updatePurchasereceiptRecordMain(@Valid PurchasereceiptRecordMainUpdateReqVO updateReqVO);
/**
* 获得用高级搜索采购收货记录主分页列表
*
@ -42,29 +24,6 @@ public interface PurchasereceiptRecordMainService {
*/
PageResult<PurchasereceiptRecordMainDO> getPurchasereceiptRecordMainSenior(CustomConditions conditions);
/**
* 删除采购收货记录主
*
* @param id 编号
*/
void deletePurchasereceiptRecordMain(Long id);
/**
* 获得采购收货记录主
*
* @param id 编号
* @return 采购收货记录主
*/
PurchasereceiptRecordMainDO getPurchasereceiptRecordMain(Long id);
/**
* 获得采购收货记录主列表
*
* @param ids 编号
* @return 采购收货记录主列表
*/
List<PurchasereceiptRecordMainDO> getPurchasereceiptRecordMainList(Collection<Long> ids);
/**
* 获得采购收货记录主分页
*
@ -99,5 +58,5 @@ public interface PurchasereceiptRecordMainService {
* @param pitemCode 零件号
* @return
*/
public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String psupplierCode, String pNumber,String ppoLine, String pitemCode);
PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String psupplierCode, String pNumber,String ppoLine, String pitemCode);
}

59
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java

@ -4,11 +4,8 @@ import cn.hutool.core.exceptions.UtilException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO;
import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainUpdateReqVO;
import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordMainConvert;
import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO;
import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper;
@ -17,12 +14,8 @@ import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.List;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS;
/**
* 采购收货记录主 Service 实现类
*
@ -38,50 +31,10 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco
@Resource
private PurchasereceiptRecordDetailMapper purchasereceiptRecordDetailMapper;
@Override
public Long createPurchasereceiptRecordMain(PurchasereceiptRecordMainCreateReqVO createReqVO) {
// 插入
PurchasereceiptRecordMainDO purchasereceiptRecordMain = PurchasereceiptRecordMainConvert.INSTANCE.convert(createReqVO);
purchasereceiptRecordMainMapper.insert(purchasereceiptRecordMain);
// 返回
return purchasereceiptRecordMain.getId();
}
@Override
public void updatePurchasereceiptRecordMain(PurchasereceiptRecordMainUpdateReqVO updateReqVO) {
// 校验存在
validatePurchasereceiptRecordMainExists(updateReqVO.getId());
// 更新
PurchasereceiptRecordMainDO updateObj = PurchasereceiptRecordMainConvert.INSTANCE.convert(updateReqVO);
purchasereceiptRecordMainMapper.updateById(updateObj);
}
@Override
public void deletePurchasereceiptRecordMain(Long id) {
// 校验存在
validatePurchasereceiptRecordMainExists(id);
// 删除
purchasereceiptRecordMainMapper.deleteById(id);
}
private void validatePurchasereceiptRecordMainExists(Long id) {
if (purchasereceiptRecordMainMapper.selectById(id) == null) {
throw exception(PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS);
}
}
@Override
public PageResult<PurchasereceiptRecordMainDO> getPurchasereceiptRecordMainSenior(CustomConditions conditions) {
return purchasereceiptRecordMainMapper.selectSenior(conditions);
}
@Override
public PurchasereceiptRecordMainDO getPurchasereceiptRecordMain(Long id) {
return purchasereceiptRecordMainMapper.selectById(id);
}
@Override
public List<PurchasereceiptRecordMainDO> getPurchasereceiptRecordMainList(Collection<Long> ids) {
return purchasereceiptRecordMainMapper.selectBatchIds(ids);
}
@Override
public PageResult<PurchasereceiptRecordMainDO> getPurchasereceiptRecordMainPage(PurchasereceiptRecordMainPageReqVO pageReqVO) {
@ -100,23 +53,23 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco
@Override
public PurchasereceiptRecordDetailDO selectPurchasereceiptExist(String ppoNumber,String psupplierCode,String pNumber,String ppoLine,String pitemCode){
QueryWrapper queryWrapperMain = new QueryWrapper();
QueryWrapper<PurchasereceiptRecordMainDO> queryWrapperMain = new QueryWrapper<>();
queryWrapperMain.eq("number",pNumber);
queryWrapperMain.eq("supplier_code",psupplierCode);
queryWrapperMain.eq("available","TRUE");
PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectOne(queryWrapperMain);
if(purchasereceiptRecordMainDO != null){
QueryWrapper queryWrapperDetail = new QueryWrapper();
if(purchasereceiptRecordMainDO != null) {
QueryWrapper<PurchasereceiptRecordDetailDO> queryWrapperDetail = new QueryWrapper<>();
queryWrapperDetail.eq("po_number",ppoNumber);
queryWrapperDetail.eq("po_line",ppoLine);
queryWrapperDetail.eq("item_code",pitemCode);
PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordDetailMapper.selectOne(queryWrapperDetail);
if(purchasereceiptRecordDetailDO != null){
if(purchasereceiptRecordDetailDO != null) {
return purchasereceiptRecordDetailDO;
}else {
} else {
throw new UtilException( "采购收货记录明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效");
}
}else {
} else {
throw new UtilException( "采购收货记录无效" + pNumber + "无效");
}
}

14
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

@ -21,6 +21,8 @@ import com.win.module.wms.controller.purchasereceiptRequest.vo.*;
import com.win.module.wms.controller.rule.vo.RuleRespVO;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert;
import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobMainConvert;
import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert;
import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordMainConvert;
import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert;
import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@ -33,6 +35,8 @@ import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptR
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobDetailMapper;
import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobMainMapper;
import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper;
import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordMainMapper;
import com.win.module.wms.dal.mysql.purchasereceiptRequest.PurchasereceiptRequestDetailMapper;
import com.win.module.wms.dal.mysql.purchasereceiptRequest.PurchasereceiptRequestMainMapper;
import com.win.module.wms.enums.job.JobStatusEnum;
@ -42,8 +46,6 @@ import com.win.module.wms.service.expectin.ExpectinService;
import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.itempackaging.ItempackagingService;
import com.win.module.wms.service.purchase.PurchaseMainService;
import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordDetailService;
import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService;
import com.win.module.wms.service.requestsetting.RequestsettingService;
import com.win.module.wms.service.rule.RuleService;
import com.win.module.wms.service.shift.ShiftService;
@ -105,9 +107,9 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
@Resource
private PurchaseMainService purchaseMainService;
@Resource
private PurchasereceiptRecordMainService purchasereceiptRecordMainService;
private PurchasereceiptRecordMainMapper purchasereceiptRecordMainMapper;
@Resource
private PurchasereceiptRecordDetailService purchasereceiptRecordDetailService;
private PurchasereceiptRecordDetailMapper purchasereceiptRecordDetailMapper;
@Resource
private ExpectinService expectinService;
@ -428,12 +430,12 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
//增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptRecord");
purchasereceiptRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
purchasereceiptRecordMainService.createPurchasereceiptRecordMain(purchasereceiptRecordMainCreateReqVO);
purchasereceiptRecordMainMapper.insert(PurchasereceiptRecordMainConvert.INSTANCE.convert(purchasereceiptRecordMainCreateReqVO));
for(PurchasereceiptRequestDetailDO purchasereceiptRequestDetailDO : detailDOList) {
PurchasereceiptRecordDetailCreateReqVO purchasereceiptRecordDetailCreateReqVO = new PurchasereceiptRecordDetailCreateReqVO();
BeanUtils.copyProperties(purchasereceiptRequestDetailDO, purchasereceiptRecordDetailCreateReqVO);
purchasereceiptRecordDetailCreateReqVO.setNumber(number);
purchasereceiptRecordDetailService.createPurchasereceiptRecordDetail(purchasereceiptRecordDetailCreateReqVO);
purchasereceiptRecordDetailMapper.insert(PurchasereceiptRecordDetailConvert.INSTANCE.convert(purchasereceiptRecordDetailCreateReqVO));
}
return;
}

Loading…
Cancel
Save