From f40ef450fb0a959485388095df6879d6381aa083 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 3 Aug 2023 11:02:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/vo/DistrilbutionBillLadingAppVO.java | 4 ++-- .../mapper/DistributionStockListMapper.xml | 10 ++-------- .../mapper/DistrilbutionBillLadingMapper.xml | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java index 0b3e984e2..88f89d92e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingAppVO.java @@ -43,8 +43,8 @@ public class DistrilbutionBillLadingAppVO extends DistrilbutionBillLadingEntity private Integer carType; private String carTypeStr; - private String condition;//提货状态 - private String conditionStr;//提货状态 + private String conditions;//提货状态 + private String conditionsStr;//提货状态 private String pickUpPlate;//车牌号 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index a1a2f4696..3a40a7a77 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -124,7 +124,7 @@ - select s.coding packageCode, s.goods_name name @@ -136,13 +136,7 @@ where ldr.is_deleted = 0 and s.id is not null and ldr.id = #{reservationId} - and ldsl.description_goods = #{descriptionGoods} - and ldsl.storage_location = #{allocation} - and ldsl.tray_name = #{pallet} - and ldsl.sku = #{sku} - and ldsl.cargo_norms = #{cargoNorms} - and ldsl.cargo_unit = #{cargoUnit} - + and ldrs.stocklist_id = #{stockListId} select lad.id billLadingId, 3 carType, - lad.`condition` `condition`, + lad.`conditions` `conditions`, lad.Pick_up_plate pickUpPlate, lad.consignee consignee, lad.create_time,