diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java index 0da6467d4..efae4e032 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java @@ -382,4 +382,13 @@ public class StockInOrder extends BaseVOEntity { @ApiModelProperty("推送人姓名") private String pushByName; + + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java index 19a78ed27..ebdb794b0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java @@ -444,4 +444,12 @@ public class StockInOrderPO extends BaseVOEntity { private String pushByName; private String khdm; + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java index 4f131966d..ab930d976 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java @@ -428,4 +428,20 @@ public class StockInOrderDO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTimeTo; + + //仓码pda查询参数 + @ApiModelProperty("pda查询用户ID") + private Long queryUserId; + @ApiModelProperty("状态列表") + private List statusList; + + + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java index ad6b20d0f..e30c47148 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java @@ -426,4 +426,19 @@ public class StockInOrderDTO extends StockInOrderBaseDTO { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTimeTo; + + //仓码pda查询参数 + @ApiModelProperty("pda查询用户ID") + private Long queryUserId; + @ApiModelProperty("状态列表") + private List statusList; + + @ApiModelProperty("作业人用户ID") + private Long workUserId; + + @ApiModelProperty("作业任务接收状态") + private String workTaskReceiveStatus; + + @ApiModelProperty("任务下发用户ID") + private String taskIssueUserId; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index a1a04ed25..952183fd7 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -342,6 +342,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + + + and a.status in + + #{item} + + + + and a.TASK_ISSUE_USER_ID like CONCAT(#{queryUserId}, '%') + and a."TO" like concat('%', #{to}, '%')