Browse Source

采购收货任务

添加查询空数据返回
简化根据类型list以及时间查询主任务分页数据方法
master
songguoqiang 2 years ago
parent
commit
8da95baa54
  1. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java
  2. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainPageReqVO.java
  3. 166
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespTypesVO.java
  4. 50
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java
  5. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java
  6. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

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

@ -129,6 +129,9 @@ public class PurchasereceiptJobMainController {
public CommonResult<PurchasereceiptJobMainRespVO> getPurchasereceiptJobyId(@RequestParam("id") Long id) {
PurchasereceiptJobMainDO purchasereceiptJobMain = purchasereceiptJobMainService.getPurchasereceiptJobMain(id);
PurchasereceiptJobMainRespVO result = PurchasereceiptJobMainConvert.INSTANCE.convert(purchasereceiptJobMain);
if(result==null) {
return success(result);
};
PurchasereceiptJobDetailExportReqVO purchasereceiptJobDetailExportReqVO = new PurchasereceiptJobDetailExportReqVO();
purchasereceiptJobDetailExportReqVO.setMasterId(result.getId());
List<PurchasereceiptJobDetailDO> purchasereceiptJobDetailList = purchasereceiptJobDetailService.getPurchasereceiptJobDetailList(purchasereceiptJobDetailExportReqVO);
@ -142,8 +145,8 @@ public class PurchasereceiptJobMainController {
@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<PageResult<PurchasereceiptJobMainRespVO>> getPageByStatusAndTime(@RequestBody PurchasereceiptJobMainRespTypesVO purchasereceiptJobMainRespTypesVO) {
PageResult<PurchasereceiptJobMainDO> purchasereceiptJobMainByStatusPage = purchasereceiptJobMainService.getPurchasereceiptJobMainByStatusPage(purchasereceiptJobMainRespTypesVO);
public CommonResult<PageResult<PurchasereceiptJobMainRespVO>> getPageByStatusAndTime(@RequestBody PurchasereceiptJobMainPageReqVO purchasereceiptJobMainPageReqVO) {
PageResult<PurchasereceiptJobMainDO> purchasereceiptJobMainByStatusPage = purchasereceiptJobMainService.getPurchasereceiptJobMainPage(purchasereceiptJobMainPageReqVO);
PageResult<PurchasereceiptJobMainRespVO> result = PurchasereceiptJobMainConvert.INSTANCE.convertPage(purchasereceiptJobMainByStatusPage);
return success(result);
}

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainPageReqVO.java

@ -154,4 +154,7 @@ public class PurchasereceiptJobMainPageReqVO extends PageParam {
@Schema(description = "允许修改箱码")
private String allowModifyPackingNumber;
@Schema(description = "任务状态list可以为空", requiredMode = Schema.RequiredMode.REQUIRED)
private List types;
}

166
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainRespTypesVO.java

@ -1,166 +0,0 @@
package com.win.module.wms.controller.purchasereceiptJob.vo;
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 javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
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;
}

50
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java

@ -21,6 +21,7 @@ public interface PurchasereceiptJobMainMapper extends BaseMapperX<Purchasereceip
default PageResult<PurchasereceiptJobMainDO> selectPage(PurchasereceiptJobMainPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereceiptJobMainDO>()
.inIfPresent(PurchasereceiptJobMainDO::getStatus,reqVO.getTypes())
.eqIfPresent(PurchasereceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber())
.eqIfPresent(PurchasereceiptJobMainDO::getAsnNumber, reqVO.getAsnNumber())
.eqIfPresent(PurchasereceiptJobMainDO::getPpNumber, reqVO.getPpNumber())
@ -119,55 +120,6 @@ public interface PurchasereceiptJobMainMapper extends BaseMapperX<Purchasereceip
.orderByDesc(PurchasereceiptJobMainDO::getId));
}
default PageResult<PurchasereceiptJobMainDO> selectByStatusPage(PurchasereceiptJobMainRespTypesVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereceiptJobMainDO>()
.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<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO reqVO) {
return selectList(new LambdaQueryWrapperX<PurchasereceiptJobMainDO>()
.eqIfPresent(PurchasereceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber())

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

@ -83,13 +83,5 @@ public interface PurchasereceiptJobMainService {
*/
public PurchasereceiptJobMainDO purchasereceiptJobMainDoStatusRight(String pnumber, String pstatus);
/**
* 获得采购收货任务主分页根据多个状态选择以及是否今日数据
*
* @param pageReqVO 分页查询
* @return 采购收货任务主分页
*/
PageResult<PurchasereceiptJobMainDO> getPurchasereceiptJobMainByStatusPage(PurchasereceiptJobMainRespTypesVO pageReqVO);
List<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO respVO);
}

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

@ -117,11 +117,6 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
}
}
@Override
public PageResult<PurchasereceiptJobMainDO> getPurchasereceiptJobMainByStatusPage(PurchasereceiptJobMainRespTypesVO pageReqVO) {
return purchasereceiptJobMainMapper.selectByStatusPage(pageReqVO);
}
@Override
public List<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO respVO) {
return purchasereceiptJobMainMapper.getPurchasereceiptJobMainSenior(respVO);

Loading…
Cancel
Save