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

mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml

@@ -59,10 +59,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.warehouse_name like concat('%', #{warehouseName}, '%')
         </if>
         <if test="orderNumber != null and orderNumber != '' ">
-            and a.order_number = #{orderNumber}
+            and a.order_number like concat('%', #{orderNumber}, '%')
         </if>
         <if test="pickingOrderNumber != null  and pickingOrderNumber != ''">
-            and a.picking_order_number = #{pickingOrderNumber}
+            and a.picking_order_number like concat('%', #{pickingOrderNumber}, '%')
         </if>
         <if test="status != null ">
             and a.status = #{status}

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

@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and b.notice_number = #{noticeNumber}
         </if>
         <if test="inOrderNumber != null  and inOrderNumber != ''">
-            and b.in_order_number = #{inOrderNumber}
+            and b.in_order_number like concat('%', #{inOrderNumber}, '%')
         </if>
         <if test="warehouseId != null ">
             and b.warehouse_id = #{warehouseId}
@@ -363,6 +363,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="orderDate != null">
             and a.ORDER_DATE = #{orderDate}
         </if>
+        <if test="createTimeStart != null and createTimeStart != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
+        </if>
+        <if test="createTimeEnd != null and createTimeEnd != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
+        </if>
         <choose>
             <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
             <otherwise> and a.del_flag = 1 </otherwise>

mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml

@@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.notice_number = #{noticeNumber}
         </if>
         <if test="outOrderNumber != null  and outOrderNumber != ''">
-            and a.out_order_number = #{outOrderNumber}
+            and a.out_order_number like concat('%', #{outOrderNumber}, '%')
         </if>
         <!-- 出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 -->
         <if test="status != null ">
@@ -151,6 +151,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="auditRemark != null  and auditRemark != ''">
             and a.audit_remark = #{auditRemark}
         </if>
+        <if test="checkTaskDistribution != null ">
+            and a.check_task_distribution = #{checkTaskDistribution}
+        </if>
         <if test="auditBy != null ">
             and a.audit_by = #{auditBy}
         </if>
@@ -265,6 +268,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="createTimeStart != null and createTimeStart != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
+        </if>
+        <if test="createTimeEnd != null and createTimeEnd != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
+        </if>
+        <if test="auditTimeStart != null and auditTimeStart != ''">
+            and date_format(a.audit_time,'%Y-%m-%d') &gt;= #{auditTimeStart}
+        </if>
+        <if test="auditTimeEnd != null and auditTimeEnd != ''">
+            and date_format(a.audit_time,'%Y-%m-%d') &lt;= #{auditTimeEnd}
+        </if>
         <choose>
             <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
             <otherwise> and a.del_flag = 1 </otherwise>

mhd_wms/src/main/resources/mapper/stockOutTaskOrder/StockOutTaskOrderMapper.xml

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.serial_number = #{serialNumber}
         </if>
         <if test="taskNumber != null  and taskNumber != ''">
-            and a.task_number = #{taskNumber}
+            and a.task_number like concat('%', #{taskNumber}, '%')
         </if>
         <if test="status != null ">
             and a.status = #{status}
@@ -86,10 +86,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.shipper_name like concat('%', #{shipperName}, '%')
         </if>
         <if test="orderNumber != null  and orderNumber != ''">
-            and a.order_number = #{orderNumber}
+            and a.order_number like concat('%', #{orderNumber}, '%')
         </if>
         <if test="pickingOrderNumber != null  and pickingOrderNumber != ''">
-            and a.picking_order_number = #{pickingOrderNumber}
+            and a.picking_order_number like concat('%', #{pickingOrderNumber}, '%')
         </if>
         <if test="abnormal != null ">
             and a.abnormal = #{abnormal}
@@ -100,6 +100,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="operatorsName != null  and operatorsName != ''">
             and a.operators_name like concat('%', #{operatorsName}, '%')
         </if>
+        <if test="pickingQuantity != null ">
+            and a.picking_quantity = #{pickingQuantity}
+        </if>
         <if test="operatorsEndTime != null ">
             and a.operators_end_time = #{operatorsEndTime}
         </if>
@@ -109,6 +112,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="updateByName != null  and updateByName != ''">
             and a.update_by_name like concat('%', #{updateByName}, '%')
         </if>
+        <if test="storageLocationId != null ">
+            and a.storage_location_id = #{storageLocationId}
+        </if>
+        <if test="storageLocationList != null and storageLocationList.size > 0 ">
+            and a.storage_location_id in
+            <foreach collection="storageLocationList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="createTimeStart != null and createTimeStart != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
+        </if>
+        <if test="createTimeEnd != null and createTimeEnd != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
+        </if>
+        <if test="operatorsEndTimeStart != null and operatorsEndTimeStart != ''">
+            and date_format(a.operators_end_time,'%Y-%m-%d') &gt;= #{operatorsEndTimeStart}
+        </if>
+        <if test="operatorsEndTimeEnd != null and operatorsEndTimeEnd != ''">
+            and date_format(a.operators_end_time,'%Y-%m-%d') &lt;= #{operatorsEndTimeEnd}
+        </if>
         <choose>
             <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
             <otherwise> and a.del_flag = 1 </otherwise>

mhd_wms/src/main/resources/mapper/stockReceiptOrder/StockReceiptOrderMapper.xml

@@ -60,11 +60,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.top_organization_id = #{topOrganizationId}
         </if>
         <if test="inOrderNumber != null and inOrderNumber != '' ">
-            and a.in_order_number = #{inOrderNumber}
+            and a.in_order_number like concat('%', #{inOrderNumber}, '%')
         </if>
         <if test="receiptOrderNumber != null  and receiptOrderNumber != ''">
             and a.receipt_order_number like concat('%', #{receiptOrderNumber}, '%')
         </if>
+--         taskDistributionMerge
+        <if test="taskDistributionMerge != null ">
+            and a.task_distribution_merge = #{taskDistributionMerge}
+        </if>
         <if test="status != null ">
             and a.status = #{status}
         </if>
@@ -119,6 +123,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="createTimeStart != null and createTimeStart != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
+        </if>
+        <if test="createTimeEnd != null and createTimeEnd != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
+        </if>
         <choose>
             <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
             <otherwise> and a.del_flag = 1 </otherwise>

mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml

@@ -93,6 +93,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="createTimeStart != null and createTimeStart != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
+        </if>
+        <if test="createTimeEnd != null and createTimeEnd != ''">
+            and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
+        </if>
         <choose>
             <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
             <otherwise> and a.del_flag = 1 </otherwise>