Merge branch 'dev_qinhongzhanWMS' 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;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java

@@ -30,6 +30,9 @@ public class StockInOrderAssembler {
         StockInOrderDO stockInOrderDO = new StockInOrderDO();
         // 拷贝
         BeanUtils.copyProperties(stockInOrderDTO, stockInOrderDO, IgnoreNullUtil.getNullPropertyNames(stockInOrderDTO));
+        // 确保查询条件字段被正确传递（查询条件字段需要明确传递，避免被IgnoreNullUtil忽略）
+        stockInOrderDO.setCreateTimeStart(stockInOrderDTO.getCreateTimeStart());
+        stockInOrderDO.setCreateTimeEnd(stockInOrderDTO.getCreateTimeEnd());
         return stockInOrderDO;
     }
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockOutOrder/StockOutOrderAssembler.java

@@ -30,6 +30,11 @@ public class StockOutOrderAssembler {
         StockOutOrderDO stockOutOrderDO = new StockOutOrderDO();
         // 拷贝
         BeanUtils.copyProperties(stockOutOrderDTO, stockOutOrderDO, IgnoreNullUtil.getNullPropertyNames(stockOutOrderDTO));
+        // 确保查询条件字段被正确传递（查询条件字段需要明确传递，避免被IgnoreNullUtil忽略）
+        stockOutOrderDO.setCreateTimeStart(stockOutOrderDTO.getCreateTimeStart());
+        stockOutOrderDO.setCreateTimeEnd(stockOutOrderDTO.getCreateTimeEnd());
+        stockOutOrderDO.setAuditTimeStart(stockOutOrderDTO.getAuditTimeStart());
+        stockOutOrderDO.setAuditTimeEnd(stockOutOrderDTO.getAuditTimeEnd());
         return stockOutOrderDO;
     }
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockOutTaskOrder/StockOutTaskOrderAssembler.java

@@ -32,6 +32,12 @@ public class StockOutTaskOrderAssembler {
         StockOutTaskOrderDO stockOutTaskOrderDO = new StockOutTaskOrderDO();
         // 拷贝
         BeanUtils.copyProperties(stockOutTaskOrderDTO, stockOutTaskOrderDO, IgnoreNullUtil.getNullPropertyNames(stockOutTaskOrderDTO));
+        // 确保查询条件字段被正确传递（查询条件字段需要明确传递，避免被IgnoreNullUtil忽略）
+        stockOutTaskOrderDO.setStorageLocationList(stockOutTaskOrderDTO.getStorageLocationList());
+        stockOutTaskOrderDO.setCreateTimeStart(stockOutTaskOrderDTO.getCreateTimeStart());
+        stockOutTaskOrderDO.setCreateTimeEnd(stockOutTaskOrderDTO.getCreateTimeEnd());
+        stockOutTaskOrderDO.setOperatorsEndTimeStart(stockOutTaskOrderDTO.getOperatorsEndTimeStart());
+        stockOutTaskOrderDO.setOperatorsEndTimeEnd(stockOutTaskOrderDTO.getOperatorsEndTimeEnd());
         return stockOutTaskOrderDO;
     }
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockReceiptOrder/StockReceiptOrderAssembler.java

@@ -23,6 +23,9 @@ public class StockReceiptOrderAssembler {
         StockReceiptOrderDO stockReceiptOrderDO = new StockReceiptOrderDO();
         // 拷贝
         BeanUtils.copyProperties(stockReceiptOrderDTO, stockReceiptOrderDO, IgnoreNullUtil.getNullPropertyNames(stockReceiptOrderDTO));
+        // 确保查询条件字段被正确传递（查询条件字段需要明确传递，避免被IgnoreNullUtil忽略）
+        stockReceiptOrderDO.setCreateTimeStart(stockReceiptOrderDTO.getCreateTimeStart());
+        stockReceiptOrderDO.setCreateTimeEnd(stockReceiptOrderDTO.getCreateTimeEnd());
         return stockReceiptOrderDO;
     }
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockShelfOrder/StockShelfOrderAssembler.java

@@ -23,6 +23,9 @@ public class StockShelfOrderAssembler {
         StockShelfOrderDO stockShelfOrderDO = JSONUtil.toBean(JSONUtil.toJsonStr(stockShelfOrderDTO), StockShelfOrderDO.class);
         // 拷贝
         BeanUtils.copyProperties(stockShelfOrderDTO, stockShelfOrderDO, IgnoreNullUtil.getNullPropertyNames(stockShelfOrderDTO));
+        // 确保查询条件字段被正确传递（查询条件字段需要明确传递，避免被IgnoreNullUtil忽略）
+        stockShelfOrderDO.setCreateTimeStart(stockShelfOrderDTO.getCreateTimeStart());
+        stockShelfOrderDO.setCreateTimeEnd(stockShelfOrderDTO.getCreateTimeEnd());
         return stockShelfOrderDO;
     }
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java

@@ -337,4 +337,10 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
     @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/interfaces/dto/stockOutOrder/StockOutOrderDTO.java

@@ -380,4 +380,16 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
     @ApiModelProperty("是否需要运输")
     @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/interfaces/dto/stockOutTaskOrder/StockOutTaskOrderDTO.java

@@ -159,4 +159,19 @@ public class StockOutTaskOrderDTO 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/interfaces/dto/stockReceiptOrder/StockReceiptOrderDTO.java

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

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java

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