diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java index 608066b1..a7a3a323 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java +++ b/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";//检验结果 } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java index 74e59f55..862fe35e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java +++ b/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 createInspectJobDetail(@Valid @RequestBody InspectJobDetailCreateReqVO createReqVO) { - return success(inspectJobDetailService.createInspectJobDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新检验任务子") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:update')") - public CommonResult 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 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 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> getInspectJobDetailList(@RequestParam("ids") Collection ids) { - List 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 list = inspectJobDetailService.getInspectJobDetailList(exportReqVO); - // 导出 Excel - List 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); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java index e6f1709e..23a97202 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java +++ b/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 createInspectJobMain(@Valid @RequestBody InspectJobMainCreateReqVO createReqVO) { - return success(inspectJobMainService.createInspectJobMain(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新检验任务主") - @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:update')") - public CommonResult 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 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 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> getInspectJobMainList(@RequestParam("ids") Collection ids) { - List 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 list = inspectJobMainService.getInspectJobMainList(exportReqVO); - // 导出 Excel - List datas = InspectJobMainConvert.INSTANCE.convertList02(list); - for(InspectJobMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + Map mapDropDown = new HashMap<>(); + List 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 list = inspectJobMainService.getInspectJobMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map 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 resultList = new ArrayList<>(); + // 导出 + for(InspectJobMainDO mainDO : list) { + List 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 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 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 excute(@Valid @RequestBody InspectJobMainUpdateReqVO updateReqVO) { + Integer count = inspectJobMainService.excute(updateReqVO); + return success(count > 0); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java index de2a3b05..e48fa265 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java index e7f8404b..cf6b298b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java index 2e55c7ae..05d7d0b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java +++ b/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 createInspectRecordDetail(@Valid @RequestBody InspectRecordDetailCreateReqVO createReqVO) { - return success(inspectRecordDetailService.createInspectRecordDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新检验记录子") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:update')") - public CommonResult 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 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 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> getInspectRecordDetailList(@RequestParam("ids") Collection ids) { - List list = inspectRecordDetailService.getInspectRecordDetailList(ids); - return success(InspectRecordDetailConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得检验记录子分页") @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')") @@ -105,22 +54,5 @@ 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 list = inspectRecordDetailService.getInspectRecordDetailList(exportReqVO); - // 导出 Excel - List 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); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java index 3f9753cf..e5b5ef74 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java +++ b/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 createInspectRecordMain(@Valid @RequestBody InspectRecordMainCreateReqVO createReqVO) { - return success(inspectRecordMainService.createInspectRecordMain(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新检验记录主") - @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:update')") - public CommonResult 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 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 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> getInspectRecordMainList(@RequestParam("ids") Collection ids) { - List 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 list = inspectRecordMainService.getInspectRecordMainList(exportReqVO); - // 导出 Excel - List datas = InspectRecordMainConvert.INSTANCE.convertList02(list); - for(InspectRecordMainExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + Map mapDropDown = new HashMap<>(); + List 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 list = inspectRecordMainService.getInspectRecordMainList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, resultList, mapDropDown); + } + + private List getExcelVo(List list, Map 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 resultList = new ArrayList<>(); + // 导出 + for(InspectRecordMainDO mainDO : list) { + List 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; } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java index 595bfc1f..a26591d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java index 0e4793f8..e331e518 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java index 848d4b0d..cba1b93d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java index 9131cd7a..7bcbd436 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java +++ b/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 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')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index 585ffc02..078f2dc2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/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 excutePurchasereceiptJobMain(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) { - Integer count = purchasereceiptJobMainService.excutePurchasereceiptJobMain(updateReqVO); + public CommonResult excute(@Valid @RequestBody PurchasereceiptJobMainUpdateReqVO updateReqVO) { + Integer count = purchasereceiptJobMainService.excute(updateReqVO); return success(count > 0); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java index 64165100..446891b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java +++ b/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 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> getPurchasereceiptRecordDetailList(@RequestParam("ids") Collection ids) { - List list = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailList(ids); - return success(PurchasereceiptRecordDetailConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得采购收货记录子分页") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java index b0e48c77..8f3793c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectJob/InspectJobMainConvert.java +++ b/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); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java index 3e2171ee..f16f5434 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/inspectRecord/InspectRecordMainConvert.java +++ b/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 convertList02(List 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); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java index 64a100fb..fb9499ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java +++ b/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 default PageResult selectPage(InspectJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .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 .orderByDesc(InspectJobDetailDO::getId)); } + default List selectList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(InspectJobDetailDO::getMasterId, masterId)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java index 5e04d2e2..151171ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java +++ b/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 { } + default List selectList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java index ee22d652..15939f5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java +++ b/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 selectPage(InspectRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .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 selectList(InspectRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .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 selectList(Long masterId) { + return selectList(new LambdaQueryWrapperX() + .eq(InspectRecordDetailDO::getMasterId, masterId)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java index e47c0f9e..af85be14 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java +++ b/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 selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java index e9a214f9..ddbbc180 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java +++ b/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 getInspectJobDetailList(Collection ids); - /** * 获得检验任务子分页 * @@ -81,4 +40,11 @@ public interface InspectJobDetailService { */ List getInspectJobDetailList(InspectJobDetailExportReqVO exportReqVO); + /** + * 根据主表id查询检验任务 + * @param masterId + * @return + */ + List selectList(Long masterId); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java index 3f17e55f..21ce2d3b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java +++ b/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 getInspectJobDetailList(Collection ids) { - return inspectJobDetailMapper.selectBatchIds(ids); - } - @Override public PageResult getInspectJobDetailPage(InspectJobDetailPageReqVO pageReqVO) { return inspectJobDetailMapper.selectPage(pageReqVO); @@ -89,4 +39,9 @@ public class InspectJobDetailServiceImpl implements InspectJobDetailService { return inspectJobDetailMapper.selectList(exportReqVO); } + @Override + public List selectList(Long masterId) { + return inspectJobDetailMapper.selectList(masterId); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index fdb3b904..53ea0a28 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/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 getInspectJobMainList(Collection ids); - /** * 获得检验任务主分页 * @@ -78,6 +52,16 @@ public interface InspectJobMainService { * @return 检验任务主列表 */ List getInspectJobMainList(InspectJobMainExportReqVO exportReqVO); + + + /** + * 获得检验任务主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 检验任务主列表 + */ + List getInspectJobMainList(CustomConditions conditions); + /** * 校验任务状态正确 *@author chenfang @@ -100,4 +84,26 @@ public interface InspectJobMainService { * @return */ Map getCountByStatus(@Nullable Collection types); + + /** + * 承接任务 + * @param id + * @return + */ + Integer accept(Long id); + + /** + * 取消承接任务 + * @param id + * @return + */ + Integer cancelAccept(Long id); + + /** + * 执行任务 + * @param inspectJobMainUpdateReqVO + * @return + */ + Integer excute(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index bc3502a8..1ad9daf2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/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 getInspectJobMainList(Collection ids) { - return inspectJobMainMapper.selectBatchIds(ids); - } - @Override public PageResult getInspectJobMainPage(InspectJobMainPageReqVO pageReqVO) { return inspectJobMainMapper.selectPage(pageReqVO); @@ -82,13 +59,20 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { public PageResult getInspectJobMainSenior(CustomConditions conditions) { return inspectJobMainMapper.selectSenior(conditions); } + @Override public List getInspectJobMainList(InspectJobMainExportReqVO exportReqVO) { return inspectJobMainMapper.selectList(exportReqVO); } + + @Override + public List getInspectJobMainList(CustomConditions conditions) { + return inspectJobMainMapper.selectList(conditions); + } + @Override public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper 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; + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java index 30e3934a..bf013d99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java +++ b/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 getInspectRecordDetailList(Collection ids); - /** * 获得检验记录子分页 * @@ -72,13 +30,11 @@ public interface InspectRecordDetailService { */ PageResult getInspectRecordDetailSenior(CustomConditions conditions); - /** - * 获得检验记录子列表, 用于 Excel 导出 - * - * @param exportReqVO 查询条件 - * @return 检验记录子列表 + * 根据主表id查询检验记录 + * @param masterId + * @return */ - List getInspectRecordDetailList(InspectRecordDetailExportReqVO exportReqVO); + List selectList(Long masterId); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java index 4364efbe..eb8786f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java +++ b/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 getInspectRecordDetailList(Collection ids) { - return inspectRecordDetailMapper.selectBatchIds(ids); - } - @Override public PageResult getInspectRecordDetailPage(InspectRecordDetailPageReqVO pageReqVO) { return inspectRecordDetailMapper.selectPage(pageReqVO); @@ -83,10 +32,10 @@ public class InspectRecordDetailServiceImpl implements InspectRecordDetailServic public PageResult getInspectRecordDetailSenior(CustomConditions conditions) { return inspectRecordDetailMapper.selectSenior(conditions); } - + @Override - public List getInspectRecordDetailList(InspectRecordDetailExportReqVO exportReqVO) { - return inspectRecordDetailMapper.selectList(exportReqVO); + public List selectList(Long masterId) { + return inspectRecordDetailMapper.selectList(masterId); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java index bceb9cbe..891498d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java +++ b/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 getInspectRecordMainList(Collection ids); - /** * 获得检验记录主分页 * @@ -80,4 +40,12 @@ public interface InspectRecordMainService { */ List getInspectRecordMainList(InspectRecordMainExportReqVO exportReqVO); + /** + * 获得检验记录主列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 采购收货申请主列表 + */ + List getInspectRecordMainList(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java index 1c5cf25a..cbb149aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java +++ b/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 getInspectRecordMainList(Collection ids) { - return inspectRecordMainMapper.selectBatchIds(ids); - } - @Override public PageResult getInspectRecordMainPage(InspectRecordMainPageReqVO pageReqVO) { return inspectRecordMainMapper.selectPage(pageReqVO); @@ -89,4 +48,9 @@ public class InspectRecordMainServiceImpl implements InspectRecordMainService { return inspectRecordMainMapper.selectList(exportReqVO); } + @Override + public List getInspectRecordMainList(CustomConditions conditions) { + return inspectRecordMainMapper.selectSeniorList(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index 2aefdba5..daca7761 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java index 264c3157..b16c1d4a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java +++ b/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 getPurchasereceiptJobDetailSenior(CustomConditions conditions); - /** - * 获得采购收货任务子 - * - * @param id 编号 - * @return 采购收货任务子 - */ - PurchasereceiptJobDetailDO getPurchasereceiptJobDetail(Long id); - /** * 获得采购收货任务子分页 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java index bf94c0af..fc8813c6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java +++ b/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 getPurchasereceiptJobDetailPage(PurchasereceiptJobDetailPageReqVO pageReqVO) { return purchasereceiptJobDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index cff53e2c..616bea23 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/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); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 465d1550..9757a9b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/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 subList = purchasereceiptJobDetailService.selectList(purchasereceiptJobMainDO.getId()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java index 54a11057..b63eefe5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java +++ b/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 getPurchasereceiptRecordDetailSenior(CustomConditions conditions); - /** - * 获得采购收货记录子 - * - * @param id 编号 - * @return 采购收货记录子 - */ - PurchasereceiptRecordDetailDO getPurchasereceiptRecordDetail(Long id); - - /** - * 获得采购收货记录子列表 - * - * @param ids 编号 - * @return 采购收货记录子列表 - */ - List getPurchasereceiptRecordDetailList(Collection ids); /** * 获得采购收货记录子分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java index 6075784e..556c332b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java +++ b/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 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 getPurchasereceiptRecordDetailList(Collection ids) { - return purchasereceiptRecordDetailMapper.selectBatchIds(ids); - } @Override public PageResult getPurchasereceiptRecordDetailPage(PurchasereceiptRecordDetailPageReqVO pageReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java index 52c63c8b..54e55105 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java +++ b/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 getPurchasereceiptRecordMainSenior(CustomConditions conditions); - /** - * 删除采购收货记录主 - * - * @param id 编号 - */ - void deletePurchasereceiptRecordMain(Long id); - - /** - * 获得采购收货记录主 - * - * @param id 编号 - * @return 采购收货记录主 - */ - PurchasereceiptRecordMainDO getPurchasereceiptRecordMain(Long id); - - /** - * 获得采购收货记录主列表 - * - * @param ids 编号 - * @return 采购收货记录主列表 - */ - List getPurchasereceiptRecordMainList(Collection 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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java index 7590ec25..cbe629cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java +++ b/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 getPurchasereceiptRecordMainSenior(CustomConditions conditions) { return purchasereceiptRecordMainMapper.selectSenior(conditions); } - @Override - public PurchasereceiptRecordMainDO getPurchasereceiptRecordMain(Long id) { - return purchasereceiptRecordMainMapper.selectById(id); - } - - @Override - public List getPurchasereceiptRecordMainList(Collection ids) { - return purchasereceiptRecordMainMapper.selectBatchIds(ids); - } @Override public PageResult 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 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 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 + "无效"); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index 89fc95a2..e6d6f768 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/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; }