入库单pda查询;

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;
 }

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;
 }

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<Integer> statusList;
+
+
+    @ApiModelProperty("作业人用户ID")
+    private Long workUserId;
+
+    @ApiModelProperty("作业任务接收状态")
+    private String workTaskReceiveStatus;
+
+    @ApiModelProperty("任务下发用户ID")
+    private String taskIssueUserId;
 }

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<Integer> statusList;
+
+    @ApiModelProperty("作业人用户ID")
+    private Long workUserId;
+
+    @ApiModelProperty("作业任务接收状态")
+    private String workTaskReceiveStatus;
+
+    @ApiModelProperty("任务下发用户ID")
+    private String taskIssueUserId;
 }

mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml

@@ -342,6 +342,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+
+        <if test="statusList != null and statusList.size > 0 ">
+            and a.status in
+            <foreach collection="statusList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="queryUserId != null">
+            and a.TASK_ISSUE_USER_ID like CONCAT(#{queryUserId}, '%')
+        </if>
         <!-- 报关相关字段查询条件 -->
         <if test="to != null and to != ''">
             and a."TO" like concat('%', #{to}, '%')