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 ba8d5cfd..21e0732a 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 @@ -3,6 +3,9 @@ package com.win.module.wms.controller.purchasereceiptJob; import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; +import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -10,22 +13,16 @@ 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 javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - 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.purchasereceiptJob.vo.*; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobMainConvert; @@ -40,6 +37,9 @@ public class PurchasereceiptJobMainController { @Resource private PurchasereceiptJobMainService purchasereceiptJobMainService; + @Resource + private PurchasereceiptJobDetailService purchasereceiptJobDetailService; + @Resource private AdminUserApi userApi; @@ -122,4 +122,42 @@ public class PurchasereceiptJobMainController { ExcelUtils.write(response, "采购收货任务主.xls", "数据", PurchasereceiptJobMainExcelVO.class, datas); } + @GetMapping("/getPurchasereceiptJobyId") + @Operation(summary = "APP获得采购收货任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')") + public CommonResult getPurchasereceiptJobyId(@RequestParam("id") Long id) { + PurchasereceiptJobMainDO purchasereceiptJobMain = purchasereceiptJobMainService.getPurchasereceiptJobMain(id); + PurchasereceiptJobMainRespVO result = PurchasereceiptJobMainConvert.INSTANCE.convert(purchasereceiptJobMain); + PurchasereceiptJobDetailExportReqVO purchasereceiptJobDetailExportReqVO = new PurchasereceiptJobDetailExportReqVO(); + purchasereceiptJobDetailExportReqVO.setMasterId(result.getId()); + List purchasereceiptJobDetailList = purchasereceiptJobDetailService.getPurchasereceiptJobDetailList(purchasereceiptJobDetailExportReqVO); + List purchasereceiptJobDetailExcelVOS = PurchasereceiptJobDetailConvert.INSTANCE.convertList02(purchasereceiptJobDetailList); + result.setSubList(purchasereceiptJobDetailExcelVOS); + return success(result); + } + + @PostMapping("/getPageByStatusAndTime") + @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:purchasereceipt-job-main:query')") + public CommonResult> getPageByStatusAndTime(@RequestBody PurchasereceiptJobMainRespTypesVO purchasereceiptJobMainRespTypesVO) { + PageResult purchasereceiptJobMainByStatusPage = purchasereceiptJobMainService.getPurchasereceiptJobMainByStatusPage(purchasereceiptJobMainRespTypesVO); + PageResult result = PurchasereceiptJobMainConvert.INSTANCE.convertPage(purchasereceiptJobMainByStatusPage); + return success(result); + } + + @PostMapping("/getPurchasereceiptJobMainSenior") + @Operation(summary = "APP根据发货单号和单据号查询采购收货任务主任务列表") + @Parameter(name = "asnNumber", description = "发货单号", required = false, example = "100") + @Parameter(name = "number", description = "单据号", required = false, example = "100") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')") + public CommonResult> getPurchasereceiptJobMainSenior(@RequestBody PurchasereceiptJobMainRespVO respVO) { + List purchasereceiptJobMainSenior = purchasereceiptJobMainService.getPurchasereceiptJobMainSenior(respVO); + List result = PurchasereceiptJobMainConvert.INSTANCE.convertList(purchasereceiptJobMainSenior); + return success(result); + } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExportReqVO.java index d7fbdc5a..c86f3d72 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExportReqVO.java @@ -109,4 +109,7 @@ public class PurchasereceiptJobDetailExportReqVO { @Schema(description = "到货主代码") private String toOwnerCode; + @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/purchasereceiptJob/vo/PurchasereceiptJobMainRespTypesVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespTypesVO.java index 37fc24bb..e6c58840 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespTypesVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespTypesVO.java @@ -5,21 +5,162 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; -@Schema(description = "管理后台 - 采购收货任务主 Response VO") +import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 采购收货任务主接收类接收多个任务状态 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class PurchasereceiptJobMainRespTypesVO extends PageParam { + @Schema(description = "申请单号") + private String requestNumber; + + @Schema(description = "发货单号") + private String asnNumber; + + @Schema(description = "要货计划单号") + private String ppNumber; + + @Schema(description = "供应商代码") + private String supplierCode; + + @Schema(description = "到月台代码") + private String toDockCode; + + @Schema(description = "承运商") + private String carrierCode; + + @Schema(description = "运输方式") + private String transferMode; + + @Schema(description = "车牌号") + private String vehiclePlateNumber; + + @Schema(description = "从仓库代码") + private String fromWarehouseCode; + + @Schema(description = "到仓库代码") + private String toWarehouseCode; + + @Schema(description = "申请时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] requestTime; + + @Schema(description = "要求截止时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] requestDueTime; + + @Schema(description = "状态") + private String status; + + @Schema(description = "过期时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] expiredTime; + + @Schema(description = "最后更新时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] updateTime; + + @Schema(description = "最后更新者Id") + private String updater; + + @Schema(description = "状态") + private String jobStageStatus; + + @Schema(description = "优先级") + private Integer priority; + + @Schema(description = "优先级增量") + private Integer priorityIncrement; + + @Schema(description = "部门") + private String departmentCode; + + @Schema(description = "岗位") + private String userPositionCode; + + @Schema(description = "承接人用户ID") + private String acceptUserId; + + @Schema(description = "承接时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] acceptTime; + + @Schema(description = "完成人用户ID") + private String completeUserId; + + @Schema(description = "完成时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] completeTime; + + @Schema(description = "从库位类型范围") + private String fromLocationTypes; + + @Schema(description = "到库位类型范围") + private String toLocationTypes; + + @Schema(description = "单据号") + private String number; + + @Schema(description = "业务类型") + private String businessType; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + @Schema(description = "创建者id") + private String creator; + + @Schema(description = "允许修改批次") + private String allowModifyBatch; + + @Schema(description = "从库区代码范围") + private String fromAreaCodes; + + @Schema(description = "到库位代码范围") + private String toAreaCodes; + + @Schema(description = "自动完成") + private String autoComplete; + + @Schema(description = "允许修改库位") + private String allowModifyLocation; + + @Schema(description = "允许修改数量") + private String allowModifyQty; + + @Schema(description = "允许大于推荐数量") + private String allowBiggerQty; + + @Schema(description = "允许小于推荐数量") + private String allowSmallerQty; + + @Schema(description = "允许修改库存状态") + private String allowModifyInventoryStatus; + + @Schema(description = "允许连续扫描") + private String allowContinuousScanning; + + @Schema(description = "允许部分完成") + private String allowPartialComplete; + + @Schema(description = "允许修改箱码") + private String allowModifyPackingNumber; + @Schema(description = "任务状态list可以为空", requiredMode = Schema.RequiredMode.REQUIRED) private List types; - @NotNull(message = "是否今日展示状态不能为空") - @Schema(description = "是否只展示今日数据ture展示false展示全部", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean today; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespVO.java index 4cf52487..00ae6ccf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespVO.java @@ -3,6 +3,7 @@ package com.win.module.wms.controller.purchasereceiptJob.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 采购收货任务主 Response VO") @Data @@ -10,4 +11,6 @@ import java.time.LocalDateTime; @ToString(callSuper = true) public class PurchasereceiptJobMainRespVO extends PurchasereceiptJobMainBaseVO { + @Schema(description = "收货任务子表job_purchasereceipt_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/purchasereceiptJob/PurchasereceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java index 683baf7e..310da04b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java @@ -7,6 +7,7 @@ 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.util.QueryWrapperUtils; +import com.win.module.wms.dal.dataobject.barcode.BarcodeDO; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; import org.apache.ibatis.annotations.Mapper; import com.win.module.wms.controller.purchasereceiptJob.vo.*; @@ -58,6 +59,7 @@ public interface PurchasereceiptJobDetailMapper extends BaseMapperX selectList(PurchasereceiptJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(PurchasereceiptJobDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(PurchasereceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(PurchasereceiptJobDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(PurchasereceiptJobDetailDO::getBatch, reqVO.getBatch()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java index 4655ec7f..58279188 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java @@ -119,4 +119,95 @@ public interface PurchasereceiptJobMainMapper extends BaseMapperX selectByStatusPage(PurchasereceiptJobMainRespTypesVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(PurchasereceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) + .eqIfPresent(PurchasereceiptJobMainDO::getAsnNumber, reqVO.getAsnNumber()) + .eqIfPresent(PurchasereceiptJobMainDO::getPpNumber, reqVO.getPpNumber()) + .eqIfPresent(PurchasereceiptJobMainDO::getSupplierCode, reqVO.getSupplierCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getToDockCode, reqVO.getToDockCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getCarrierCode, reqVO.getCarrierCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getTransferMode, reqVO.getTransferMode()) + .eqIfPresent(PurchasereceiptJobMainDO::getVehiclePlateNumber, reqVO.getVehiclePlateNumber()) + .eqIfPresent(PurchasereceiptJobMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getToWarehouseCode, reqVO.getToWarehouseCode()) + .betweenIfPresent(PurchasereceiptJobMainDO::getRequestTime, reqVO.getRequestTime()) + .betweenIfPresent(PurchasereceiptJobMainDO::getRequestDueTime, reqVO.getRequestDueTime()) + .inIfPresent(PurchasereceiptJobMainDO::getStatus, reqVO.getTypes()) + .betweenIfPresent(PurchasereceiptJobMainDO::getExpiredTime, reqVO.getExpiredTime()) + .betweenIfPresent(PurchasereceiptJobMainDO::getUpdateTime, reqVO.getUpdateTime()) + .eqIfPresent(PurchasereceiptJobMainDO::getUpdater, reqVO.getUpdater()) + .eqIfPresent(PurchasereceiptJobMainDO::getJobStageStatus, reqVO.getJobStageStatus()) + .eqIfPresent(PurchasereceiptJobMainDO::getPriority, reqVO.getPriority()) + .eqIfPresent(PurchasereceiptJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement()) + .eqIfPresent(PurchasereceiptJobMainDO::getDepartmentCode, reqVO.getDepartmentCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getUserPositionCode, reqVO.getUserPositionCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getAcceptUserId, reqVO.getAcceptUserId()) + .betweenIfPresent(PurchasereceiptJobMainDO::getAcceptTime, reqVO.getAcceptTime()) + .eqIfPresent(PurchasereceiptJobMainDO::getCompleteUserId, reqVO.getCompleteUserId()) + .betweenIfPresent(PurchasereceiptJobMainDO::getCompleteTime, reqVO.getCompleteTime()) + .eqIfPresent(PurchasereceiptJobMainDO::getFromLocationTypes, reqVO.getFromLocationTypes()) + .eqIfPresent(PurchasereceiptJobMainDO::getToLocationTypes, reqVO.getToLocationTypes()) + .eqIfPresent(PurchasereceiptJobMainDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PurchasereceiptJobMainDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(PurchasereceiptJobMainDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(PurchasereceiptJobMainDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PurchasereceiptJobMainDO::getCreator, reqVO.getCreator()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch()) + .eqIfPresent(PurchasereceiptJobMainDO::getFromAreaCodes, reqVO.getFromAreaCodes()) + .eqIfPresent(PurchasereceiptJobMainDO::getToAreaCodes, reqVO.getToAreaCodes()) + .eqIfPresent(PurchasereceiptJobMainDO::getAutoComplete, reqVO.getAutoComplete()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) + .orderByDesc(PurchasereceiptJobMainDO::getId)); + } + + default List getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(PurchasereceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) + .eqIfPresent(PurchasereceiptJobMainDO::getAsnNumber, reqVO.getAsnNumber()) + .eqIfPresent(PurchasereceiptJobMainDO::getPpNumber, reqVO.getPpNumber()) + .eqIfPresent(PurchasereceiptJobMainDO::getSupplierCode, reqVO.getSupplierCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getToDockCode, reqVO.getToDockCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getCarrierCode, reqVO.getCarrierCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getTransferMode, reqVO.getTransferMode()) + .eqIfPresent(PurchasereceiptJobMainDO::getVehiclePlateNumber, reqVO.getVehiclePlateNumber()) + .eqIfPresent(PurchasereceiptJobMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getToWarehouseCode, reqVO.getToWarehouseCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getStatus, reqVO.getStatus()) + .eqIfPresent(PurchasereceiptJobMainDO::getUpdater, reqVO.getUpdater()) + .eqIfPresent(PurchasereceiptJobMainDO::getJobStageStatus, reqVO.getJobStageStatus()) + .eqIfPresent(PurchasereceiptJobMainDO::getPriority, reqVO.getPriority()) + .eqIfPresent(PurchasereceiptJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement()) + .eqIfPresent(PurchasereceiptJobMainDO::getDepartmentCode, reqVO.getDepartmentCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getUserPositionCode, reqVO.getUserPositionCode()) + .eqIfPresent(PurchasereceiptJobMainDO::getAcceptUserId, reqVO.getAcceptUserId()) + .eqIfPresent(PurchasereceiptJobMainDO::getCompleteUserId, reqVO.getCompleteUserId()) + .eqIfPresent(PurchasereceiptJobMainDO::getFromLocationTypes, reqVO.getFromLocationTypes()) + .eqIfPresent(PurchasereceiptJobMainDO::getToLocationTypes, reqVO.getToLocationTypes()) + .eqIfPresent(PurchasereceiptJobMainDO::getNumber, reqVO.getNumber()) + .eqIfPresent(PurchasereceiptJobMainDO::getBusinessType, reqVO.getBusinessType()) + .eqIfPresent(PurchasereceiptJobMainDO::getRemark, reqVO.getRemark()) + .eqIfPresent(PurchasereceiptJobMainDO::getCreator, reqVO.getCreator()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch()) + .eqIfPresent(PurchasereceiptJobMainDO::getFromAreaCodes, reqVO.getFromAreaCodes()) + .eqIfPresent(PurchasereceiptJobMainDO::getToAreaCodes, reqVO.getToAreaCodes()) + .eqIfPresent(PurchasereceiptJobMainDO::getAutoComplete, reqVO.getAutoComplete()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete()) + .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) + .orderByDesc(PurchasereceiptJobMainDO::getId)); + } + } 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 a99916ae..43edbd22 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 @@ -82,4 +82,14 @@ public interface PurchasereceiptJobMainService { * @return 采购订单主列表 */ public PurchasereceiptJobMainDO purchasereceiptJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得采购收货任务主分页根据多个状态选择以及是否今日数据 + * + * @param pageReqVO 分页查询 + * @return 采购收货任务主分页 + */ + PageResult getPurchasereceiptJobMainByStatusPage(PurchasereceiptJobMainRespTypesVO pageReqVO); + + List getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO respVO); } 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 4be351f2..0e071d5d 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 @@ -116,4 +116,14 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR); } } + + @Override + public PageResult getPurchasereceiptJobMainByStatusPage(PurchasereceiptJobMainRespTypesVO pageReqVO) { + return purchasereceiptJobMainMapper.selectByStatusPage(pageReqVO); + } + + @Override + public List getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO respVO) { + return purchasereceiptJobMainMapper.getPurchasereceiptJobMainSenior(respVO); + } }