diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
index 46584e39c..836c3ffd8 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
@@ -17,6 +17,7 @@
package com.logpm.distribution.vo;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.logpm.distribution.entity.DistributionParcelListEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -167,4 +168,37 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
private String noteNumber;
+ /**
+ * 时间模糊查询需要的值
+ */
+ @ApiModelProperty(value = "入库开始时间")
+ @TableField(exist = false)
+ @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ private String startWarehouseEntryTimeEnd;
+
+ @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "入库结束时间")
+ @TableField(exist = false)
+ private String lastWarehouseEntryTimeEnd;
+
+ @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "装车开始时间")
+ @TableField(exist = false)
+ private String startLoadingTime;
+
+ @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "装车结束时间")
+ @TableField(exist = false)
+ private String lastLoadingTime;
+
+ @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "签收开始时间")
+ @TableField(exist = false)
+ private String startSigningTime;
+
+ @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "签收结束时间")
+ @TableField(exist = false)
+ private String lastSigningTime;
+
}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index e443fba7a..8449daa30 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -163,11 +163,11 @@
and ldr.reservation_code = #{param.reservationCode}
-
- and lddl.vehicle_name = #{param.DvehicleName}
+
+ and lddl.vehicle_name = #{param.dvehicleName}
-
- and ldl.vehicle_name = #{param.ZvehicleName}
+
+ and ldl.vehicle_name = #{param.vehicleName}
and date_format(from_unixtime(ldl.scan_time),'%Y-%m-%d') = date_format(#{param.scanTime}),'%Y-%m-%d')
@@ -253,6 +253,21 @@
and ldpl.waybill_number = #{param.waybillNumber}
+
+ and ldl.scan_user = #{param.scanUser}
+
+
+ and ldl.signing_user = #{param.signingUser}
+
+
+ and ldpl.warehouse_entry_time_end BETWEEN #{param.startWarehouseEntryTimeEnd} AND #{param.lastWarehouseEntryTimeEnd}
+
+
+ AND ldl.scan_time BETWEEN #{param.startLoadingTime} AND #{param.lastLoadingTime}
+
+
+ AND ldl.signing_time BETWEEN #{param.startSigningTime} AND #{param.lastSigningTime}
+