From 50732a9650aff95a76c4808f27c9dd5ad976db91 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 5 Mar 2024 10:29:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9E=E4=BD=93=E6=98=A0=E5=B0=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=A4=B1=E8=B4=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/oldproject/entity/InventoryDetailEntity.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/InventoryDetailEntity.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/InventoryDetailEntity.java
index bd48602c7..6d5af0e1a 100644
--- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/InventoryDetailEntity.java
+++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/InventoryDetailEntity.java
@@ -1,6 +1,7 @@
 package com.logpm.oldproject.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -21,9 +22,11 @@ public class InventoryDetailEntity {
 	private Integer id;
 
 	@JsonProperty("unitNo")
+	@TableField(value = "unitNo")
 	private String unitNo;
 
 	@JsonProperty("orderSelfNum")
+	@TableField(value = "orderSelfNum")
 	private String orderSelfNum;
 
 	private Integer abnormalStatus;

From 1ddd6e2edff8d27e16a1c17c465d523f6afb09f8 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 5 Mar 2024 10:50:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionDeliveryListMapper.xml | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index 697de38ea..c346fb26e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -366,6 +366,33 @@
                    #{item}
                </foreach>
            </if>
+           <if test=" params.trainNumber != '' and params.trainNumber != null">
+               AND lddl.train_number like concat('%',#{params.trainNumber},'%')
+           </if>
+           <if test=" params.clineName != '' and params.clineName != null">
+               AND ldr.consignee like concat('%',#{params.clineName},'%')
+           </if>
+           <if test=" params.type != '' and params.type != null">
+               AND lddl.type = #{params.type}
+           </if>
+           <if test=" params.kind != '' and params.kind != null">
+               AND lddl.kind = #{params.kind}
+           </if>
+           <if test=" params.vehicleName != '' and params.vehicleName != null">
+               AND ldds.vehicle_nub like  concat('%',#{params.vehicleName},'%')
+           </if>
+           <if test=" params.driverName != '' and params.driverName != null">
+               AND ldds.driver_name like  concat('%',#{params.driverName},'%')
+           </if>
+           <if test=" params.distributionCompany != '' and params.distributionCompany != null">
+               AND ldds.distribution_company like  concat('%',#{params.distributionCompany},'%')
+           </if>
+           <if test=" params.taskTime != '' and params.taskTime != null">
+               AND ldds.task_time like  concat('%',#{params.taskTime},'%')
+           </if>
+           <if test=" params.deliveryStatus != '' and params.deliveryStatus != null">
+               AND lddl.delivery_status =#{params.deliveryStatus}
+           </if>
        </where>
         GROUP BY
         lddl.id