From 9e2f6d0adffc6cce29ecdd19b48e08ab85eefd62 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Wed, 6 Sep 2023 20:09:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/vo/DistributionBillOrderPackVO.java  | 5 +++++
 .../com/logpm/distribution/vo/DistributionBillOrderVO.java  | 4 ++++
 .../distribution/mapper/DistrilbutionBillLadingMapper.xml   | 4 ++--
 .../distribution/mapper/DistrilbutionBillStockMapper.xml    | 6 ++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java
index ab943a3e3..94cbba3fd 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java
@@ -19,4 +19,9 @@ public class DistributionBillOrderPackVO {
 	private String materialName;
 	private String pallet;
 	private String goodsAllocation;
+	private String serviceNumber; //服务号
+	private String waybillNumber; //运单号
+	private String trainNumber; //客户车次号
+	private String sendWarehouseName; //客户车次号
+	private String orderCode; //始发仓
 }
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java
index 4e0690f90..d67432a20 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderVO.java
@@ -19,5 +19,9 @@ public class DistributionBillOrderVO {
 	private String preparedQuantity;
 	private String goodsAllocation;
 	private String pallet;
+	private String serviceNumber; //服务号
+	private String waybillNumber; //运单号
+	private String trainNumber; //客户车次号
+	private String sendWarehouseName; //始发仓
 
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index c20714e0c..95f4bc279 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -214,14 +214,14 @@
         select DISTINCT (select count(conditions)
                 from logpm_distrilbution_bill_lading
                 <where>
-                      conditions IN (1, 2, 3,4,5) and  is_deleted = '0'
+                      conditions IN (10) and  is_deleted = '0'
                     <if test="param.startDate != null">and pick_up_time between #{param.startDate} and #{param.entDate}</if>
                     <if test="param.startDate == null">and  DATE(pick_up_time) = CURDATE() </if>
                 </where>)  treatNum,
             (select count(conditions)
         from logpm_distrilbution_bill_lading
         <where>
-            conditions IN (6, 7, 8) and  is_deleted = '0'
+            conditions IN (20) and  is_deleted = '0'
             <if test="param.startDate != null">and pick_up_time between #{param.startDate} and #{param.entDate}</if>
             <if test="param.startDate == null">and  DATE(pick_up_time) = CURDATE() </if>
         </where> ) stopNum
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
index bdc37c02b..4d0466b54 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
@@ -68,7 +68,8 @@
                 where  ldpl.pallet is not null and ldpl.stock_article_id = ldbs.stock_article_id) pallet ,
                (select GROUP_CONCAT(IFNULL(ldpl.goods_allocation , '') SEPARATOR ', ')
                 from logpm_distribution_parcel_list ldpl
-                where  ldpl.goods_allocation is not null and ldpl.stock_article_id = ldbs.stock_article_id)  goodsAllocation
+                where  ldpl.goods_allocation is not null and ldpl.stock_article_id = ldbs.stock_article_id)  goodsAllocation,
+        ldsa.service_number serviceNumber,ldsa.waybill_number waybillNumber,ldsa.train_number trainNumber,ldsa.send_warehouse_name sendWarehouseName
 
         from logpm_distrilbution_bill_stock ldbs
                  LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id
@@ -80,7 +81,8 @@
     </select>
     <select id="getBillOrderPack" resultType="com.logpm.distribution.vo.DistributionBillOrderPackVO">
         select ldpl.order_package_code orderPackageCode,ldpl.warehouse ,ldpl.firsts ,ldpl.second ,ldpl.third_product thirdProduct,
-               ldpl.material_code materialCode,ldpl.material_name materialName,ldpl.pallet ,ldpl.goods_allocation goodsAllocation
+               ldpl.material_code materialCode,ldpl.material_name materialName,ldpl.pallet ,ldpl.goods_allocation goodsAllocation,
+               ldpl.waybill_number waybillNumber,ldpl.send_warehouse_name sendWarehouseName,ldpl.order_code orderCode,ldpl.service_number serviceNumber
         from logpm_distrilbution_bill_stock ldbs
                  LEFT JOIN logpm_distribution_parcel_list ldpl on ldbs.stock_article_id = ldpl.stock_article_id
         <where>