From f73aae4db5b294ac7f3521cbc5a455ec36298fa9 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 9 Oct 2023 17:05:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=9B=B6=E6=8B=85=E6=95=B0=E6=8D=AE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=90=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java   | 1 +
 .../com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml    | 2 ++
 .../com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml     | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java
index b09addf4d..7d87669ac 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java
@@ -11,6 +11,7 @@ public class TrayTypeDataListVO implements Serializable {
 
 	private Long trayGoodsId;//id
 	private Long dataId;//id
+	private String waybillNo;//运单号
 	private String dataCode;//编码
 	private String dataName;//名称
 	private String sku;//sku
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
index c2cae2b7b..0d4bb0911 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
@@ -50,6 +50,7 @@
     <select id="getZeroListByTrayTypeId" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
         select lwtg.id trayGoodsId,
                ldsa.id dataId,
+               ldsa.waybill_number waybillNo,
                ldsa.order_code dataCode,
                lwtg.num scanNum,
                ldsa.total_number orderTotalNum,
@@ -63,6 +64,7 @@
 
     <select id="getZeroUpListByTrayTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
         select ldsa.order_code orderCode,
+               ldsa.waybill_number waybillNo,
                lwtg.tray_code trayCode,
                2 goodsType,
                lwtg.num shelfNum,
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
index db51cc139..3d457720e 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
@@ -60,7 +60,8 @@
 
     <select id="getZeroOrderByWaybillCode" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
         select ldsa.id dataId,
-                ldsa.order_code dataCode,
+               ldsa.waybill_number waybillNo,
+               ldsa.order_code dataCode,
                ldsa.hand_quantity orderTotalNum
         from logpm_distribution_stock_article ldsa
         where ldsa.is_deleted = 0