Merge remote-tracking branch 'origin/wms_dev' into wms_dev

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java

@@ -340,4 +340,10 @@ public class StockInOrderDO extends BaseVOEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "下单日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date orderDate;
+
+    @ApiModelProperty(name = "创建时间查询条件开始日期")
+    private String createTimeStart;
+
+    @ApiModelProperty(name = "创建时间查询条件结束日期")
+    private String createTimeEnd;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java

@@ -393,4 +393,15 @@ public class StockOutOrderDO extends BaseVOEntity {
     @Excel(name = "是否需要运输")
     private String needTransportFlag;
 
+    @ApiModelProperty(name = "创建时间查询条件开始日期")
+    private String createTimeStart;
+
+    @ApiModelProperty(name = "创建时间查询条件结束日期")
+    private String createTimeEnd;
+
+    @ApiModelProperty(name = "审核时间查询条件开始日期")
+    private String auditTimeStart;
+
+    @ApiModelProperty(name = "审核时间查询条件结束日期")
+    private String auditTimeEnd;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutTaskOrder/repository/todo/StockOutTaskOrderDO.java

@@ -165,4 +165,19 @@ public class StockOutTaskOrderDO extends BaseVOEntity {
 
     @ApiModelProperty("大于指定状态值：1-待收货 2-部分收货 3-已收货 4-已关闭")
     private Integer gtStatus;
+
+    @ApiModelProperty("集货库位ID集合")
+    private List<Long> storageLocationList;
+
+    @ApiModelProperty(name = "创建时间查询条件开始日期")
+    private String createTimeStart;
+
+    @ApiModelProperty(name = "创建时间查询条件结束日期")
+    private String createTimeEnd;
+
+    @ApiModelProperty(name = "作业完成时间查询条件开始日期")
+    private String operatorsEndTimeStart;
+
+    @ApiModelProperty(name = "作业完成时间查询条件结束日期")
+    private String operatorsEndTimeEnd;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/todo/StockReceiptOrderDO.java

@@ -161,4 +161,9 @@ public class StockReceiptOrderDO extends StockInOrderBaseDO {
     @ApiModelProperty("仓库绑定的用户ID列表（用于任务下发时筛选操作人员）")
     private List<Long> warehouseUserIds;
 
+    @ApiModelProperty(name = "创建时间查询条件开始日期")
+    private String createTimeStart;
+
+    @ApiModelProperty(name = "创建时间查询条件结束日期")
+    private String createTimeEnd;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java

@@ -125,4 +125,10 @@ public class StockShelfOrderDO extends StockInOrderBaseDO {
 
     @ApiModelProperty("物料明细")
     private List<ShelfMaterialDetailDO> materialDetailList;
+
+    @ApiModelProperty(name = "创建时间查询条件开始日期")
+    private String createTimeStart;
+
+    @ApiModelProperty(name = "创建时间查询条件结束日期")
+    private String createTimeEnd;
 }