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 dd9e0a5d..cad0da63 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 @@ -4,6 +4,9 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectJob.vo.*; +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 org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -39,6 +42,9 @@ public class InspectJobMainController { @Resource private InspectJobMainService inspectJobMainService; + @Resource + private InspectJobDetailService inspectJobDetailService; + @Resource private AdminUserApi userApi; @@ -122,4 +128,44 @@ public class InspectJobMainController { ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, datas); } + @GetMapping("/getInspectJobById") + @Operation(summary = "APP获得检验任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')") + public CommonResult getInspectJobById(@RequestParam("id") Long id) { + InspectJobMainDO inspectJobMain = inspectJobMainService.getInspectJobMain(id); + InspectJobMainRespVO result = InspectJobMainConvert.INSTANCE.convert(inspectJobMain); + if(result==null) { + return success(result); + }; + InspectJobDetailExportReqVO inspectJobDetailExportReqVO = new InspectJobDetailExportReqVO(); + inspectJobDetailExportReqVO.setMasterId(result.getId()); + List inspectJobDetailList = inspectJobDetailService.getInspectJobDetailList(inspectJobDetailExportReqVO); + List inspectJobDetailExcelVOS = InspectJobDetailConvert.INSTANCE.convertList02(inspectJobDetailList); + result.setSubList(inspectJobDetailExcelVOS); + return success(result); + } + + @PostMapping("/getInspectJobPageByStatusAndTime") + @Operation(summary = "APP获得检验任务主任务分页列表") + @Parameter(name = "createTime", description = "今日开始结束时间", required = false, example = "[\"1699200000000\",\"1701878400000\"]") + @Parameter(name = "types", description = "字典类型数组", required = false, example = "\"types\":[\"JOB_PENDING\",\"JOB_COMPLETED\"]") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')") + public CommonResult> getInspectJobPageByStatusAndTime(@RequestBody InspectJobMainPageReqVO inspectJobMainPageReqVO) { + PageResult inspectJobMainByStatusPage = inspectJobMainService.getInspectJobMainPage(inspectJobMainPageReqVO); + PageResult result = InspectJobMainConvert.INSTANCE.convertPage(inspectJobMainByStatusPage); + return success(result); + } + + @PostMapping("/getInspectJobMainSenior") + @Operation(summary = "APP根据发货单号和单据号查询检验任务主任务列表") + @Parameter(name = "asnNumber", description = "发货单号", required = false, example = "100") + @Parameter(name = "number", description = "单据号", required = false, example = "100") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')") + public CommonResult> getInspectJobMainSenior(@RequestBody InspectJobMainRespVO respVO) { + List inspectJobMainSenior = inspectJobMainService.getInspectJobMainSenior(respVO); + List result = InspectJobMainConvert.INSTANCE.convertList(inspectJobMainSenior); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java index 77f04537..b7e84308 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java @@ -61,4 +61,7 @@ public class InspectJobDetailExportReqVO { @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/InspectJobMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java index 2898d919..b11fb858 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java @@ -162,4 +162,6 @@ public class InspectJobMainPageReqVO extends PageParam { @Schema(description = "允许修改箱码") private String allowModifyPackingNumber; + @Schema(description = "任务状态list可以为空", requiredMode = Schema.RequiredMode.REQUIRED) + private List types; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainRespVO.java index 227a1d4f..1f45fce1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.inspectJob.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.util.List; + @Schema(description = "管理后台 - 检验任务主 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class InspectJobMainRespVO extends InspectJobMainBaseVO { + @Schema(description = "检验任务任务子表job_inspect_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; } 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 18b303a0..e43aa42c 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 @@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; 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.dal.dataobject.inspectJob.InspectJobMainDO; import org.apache.ibatis.annotations.Mapper; @@ -22,6 +23,7 @@ public interface InspectJobMainMapper extends BaseMapperX { default PageResult selectPage(InspectJobMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .inIfPresent(InspectJobMainDO::getStatus, reqVO.getStatus()) .eqIfPresent(InspectJobMainDO::getRequestNumber, reqVO.getRequestNumber()) .eqIfPresent(InspectJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber()) .eqIfPresent(InspectJobMainDO::getSupplierCode, reqVO.getSupplierCode()) @@ -126,4 +128,48 @@ public interface InspectJobMainMapper extends BaseMapperX { .orderByDesc(InspectJobMainDO::getId)); } + default List getReturnJobMainSenior(InspectJobMainRespVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(InspectJobMainDO::getRequestNumber, reqVO.getRequestNumber()) + .eqIfPresent(InspectJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber()) + .eqIfPresent(InspectJobMainDO::getSupplierCode, reqVO.getSupplierCode()) + .eqIfPresent(InspectJobMainDO::getWarehouseCode, reqVO.getWarehouseCode()) + .eqIfPresent(InspectJobMainDO::getStatus, reqVO.getStatus()) + .eqIfPresent(InspectJobMainDO::getUpdater, reqVO.getUpdater()) + .eqIfPresent(InspectJobMainDO::getJobStageStatus, reqVO.getJobStageStatus()) + .eqIfPresent(InspectJobMainDO::getPriority, reqVO.getPriority()) + .eqIfPresent(InspectJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement()) + .eqIfPresent(InspectJobMainDO::getDepartmentCode, reqVO.getDepartmentCode()) + .eqIfPresent(InspectJobMainDO::getAcceptUserId, reqVO.getAcceptUserId()) + .eqIfPresent(InspectJobMainDO::getCompleteUserId, reqVO.getCompleteUserId()) + .eqIfPresent(InspectJobMainDO::getFromLocationTypes, reqVO.getFromLocationTypes()) + .eqIfPresent(InspectJobMainDO::getToLocationTypes, reqVO.getToLocationTypes()) + .eqIfPresent(InspectJobMainDO::getNumber, reqVO.getNumber()) + .eqIfPresent(InspectJobMainDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(InspectJobMainDO::getRemark, reqVO.getRemark()) + .eqIfPresent(InspectJobMainDO::getCreator, reqVO.getCreator()) + .eqIfPresent(InspectJobMainDO::getPoUmber, reqVO.getPoUmber()) + .eqIfPresent(InspectJobMainDO::getPoLine, reqVO.getPoLine()) + .eqIfPresent(InspectJobMainDO::getBatch, reqVO.getBatch()) + .eqIfPresent(InspectJobMainDO::getItemCode, reqVO.getItemCode()) + .eqIfPresent(InspectJobMainDO::getInspectType, reqVO.getInspectType()) + .eqIfPresent(InspectJobMainDO::getNextAction, reqVO.getNextAction()) + .eqIfPresent(InspectJobMainDO::getSampleMethod, reqVO.getSampleMethod()) + .eqIfPresent(InspectJobMainDO::getUom, reqVO.getUom()) + .eqIfPresent(InspectJobMainDO::getReceiveQty, reqVO.getReceiveQty()) + .eqIfPresent(InspectJobMainDO::getSampleQty, reqVO.getSampleQty()) + .eqIfPresent(InspectJobMainDO::getOwner, reqVO.getOwner()) + .eqIfPresent(InspectJobMainDO::getAutoComplete, reqVO.getAutoComplete()) + .eqIfPresent(InspectJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation()) + .eqIfPresent(InspectJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty()) + .eqIfPresent(InspectJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty()) + .eqIfPresent(InspectJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty()) + .eqIfPresent(InspectJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus()) + .eqIfPresent(InspectJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning()) + .eqIfPresent(InspectJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete()) + .eqIfPresent(InspectJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch()) + .eqIfPresent(InspectJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) + .orderByDesc(InspectJobMainDO::getId)); + } + } 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 06d67c0c..5f314acd 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 @@ -4,10 +4,7 @@ import java.util.*; import javax.validation.*; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO; -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.InspectJobMainUpdateReqVO; +import com.win.module.wms.controller.inspectJob.vo.*; import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; import com.win.framework.common.pojo.PageResult; @@ -88,4 +85,11 @@ public interface InspectJobMainService { * @return 采购订单主列表 */ public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 高级搜索不分页 + * @param respVO + * @return + */ + List getInspectJobMainSenior(InspectJobMainRespVO respVO); } 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 5e47d566..2b5d1027 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,10 +2,8 @@ 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.InspectJobMainCreateReqVO; -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.InspectJobMainUpdateReqVO; +import com.win.module.wms.controller.inspectJob.vo.*; +import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -100,4 +98,9 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { throw exception(INSPECT_JOB_MAIN_STATUS_ERROR); } } + + @Override + public List getInspectJobMainSenior(InspectJobMainRespVO respVO) { + return inspectJobMainMapper.getReturnJobMainSenior(respVO); + } }