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; 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} + + AND lddl.train_number like concat('%',#{params.trainNumber},'%') + + + AND ldr.consignee like concat('%',#{params.clineName},'%') + + + AND lddl.type = #{params.type} + + + AND lddl.kind = #{params.kind} + + + AND ldds.vehicle_nub like concat('%',#{params.vehicleName},'%') + + + AND ldds.driver_name like concat('%',#{params.driverName},'%') + + + AND ldds.distribution_company like concat('%',#{params.distributionCompany},'%') + + + AND ldds.task_time like concat('%',#{params.taskTime},'%') + + + AND lddl.delivery_status =#{params.deliveryStatus} + GROUP BY lddl.id