From f1c3868216b85e9f856ded5f4e1f7e17aeb4f9b2 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Thu, 3 Aug 2023 19:12:09 +0800
Subject: [PATCH] =?UTF-8?q?deliveryStatus=E5=AD=97=E6=AE=B5=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionDeliveryListMapper.xml | 75 ++++++++-----------
 1 file changed, 33 insertions(+), 42 deletions(-)

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 a9475bb40..fba5d059f 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
@@ -29,7 +29,7 @@
         <result column="driver_id" property="driverId"/>
         <result column="driver_name" property="driverName"/>
         <result column="distribution_company" property="distributionCompany"/>
-        <result column="delivery_state" property="deliveryState"/>
+        <result column="delivery_status" property="deliveryStatus"/>
         <result column="customers_number" property="customersNumber"/>
         <result column="price" property="price"/>
         <result column="added_services_id" property="addedServicesId"/>
@@ -64,7 +64,7 @@
         lddl.vehicle_id vehicleId,
         lddl.driver_id driverId,
         lddl.distribution_company distributionCompany,
-        lddl.delivery_state deliveryState,
+        lddl.delivery_status deliveryStatus,
         (SELECT GROUP_CONCAT(DISTINCT ldsu.forklift_name SEPARATOR ',')  FROM
         logpm_distribution_signfor lds
         join logpm_distribution_reservation ldr on lds.reservation_id   =ldr.id
@@ -135,8 +135,8 @@
             <if test="param.type != null and param.type!=''">
                 and lddl.type = #{param.type}
             </if>
-            <if test="param.deliveryState != null and param.deliveryState!=''">
-                and lddl.delivery_state = #{param.deliveryState}
+            <if test="param.state != null and param.state!=''">
+                and lddl.state = #{param.state}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
                 and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
@@ -193,8 +193,8 @@
             <if test="param.distributionCompany != null and param.distributionCompany!=''">
                 and lddl.distribution_company = #{param.distributionCompany}
             </if>
-            <if test="param.deliveryState != null and param.deliveryState!=''">
-                and lddl.delivery_state = #{param.deliveryState}
+            <if test="param.deliveryStatus != null and param.deliveryStatus!=''">
+                and lddl.delivery_status = #{param.deliveryStatus}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
                 and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
@@ -232,8 +232,8 @@
             <if test="param.distributionCompany != null and param.distributionCompany!=''">
                 and lddl.distribution_company = #{param.distributionCompany}
             </if>
-            <if test="param.deliveryState != null and param.deliveryState!=''">
-                and lddl.delivery_state = #{param.deliveryState}
+            <if test="param.deliveryStatus != null and param.deliveryStatus!=''">
+                and lddl.delivery_status = #{param.state}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
                 and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
@@ -269,8 +269,8 @@
                 and lddl.distribution_company = #{param.distributionCompany}
             </if>
 
-            <if test="param.deliveryState != null and param.deliveryState!=''">
-                and lddl.delivery_state = #{param.deliveryState}
+            <if test="param.state != null and param.state!=''">
+                and lddl.state = #{param.state}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
                 and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
@@ -308,8 +308,8 @@
             <if test="param.distributionCompany != null and param.distributionCompany!=''">
                 and lddl.distribution_company = #{param.distributionCompany}
             </if>
-            <if test="param.deliveryState != null and param.deliveryState!=''">
-                and lddl.delivery_state = #{param.deliveryState}
+            <if test="param.state != null and param.state!=''">
+                and lddl.state = #{param.state}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
                 and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
@@ -326,7 +326,7 @@
         SELECT
             ldpl.id packageId,
             ldrs.stock_article_id orderId,
-            ldpl.order_package_code orderPackageCode,
+            ldpl.packet_bar_code packetBarCode,
             lds.reservation_id reservationId,
             ldpl.quantity   packageNub,
             lddl.id  deliveryId,
@@ -338,14 +338,14 @@
             JOIN logpm_distribution_delivery_list lddl on  lddl.id = lds.delivery_id
             join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
        where
-             lds.is_deleted =0 and lddl.id = #{deliveryId} and   ldpl.order_package_code =#{barcode}
+             lds.is_deleted =0 and lddl.id = #{deliveryId} and   ldpl.packet_bar_code =#{barcode}
     </select>
 
     <select id="selectdeliverypallet" resultType="com.logpm.distribution.entity.DistributionLoadscanEntity">
         SELECT
             ldpl.id packageId,
             ldrs.stock_article_id orderId,
-            ldpl.order_package_code orderPackageCode,
+            ldpl.packet_bar_code packetBarCode,
             lds.reservation_id reservationId,
             ldpl.quantity   packageNub,
             lddl.id  deliveryId,
@@ -390,7 +390,7 @@
     <select id="selectOrderpallet" resultType="com.logpm.distribution.entity.DistributionLoadscanEntity">
         SELECT
             ldsa.id orderId,
-            ldsa.stock_article_code orderPackageCode,
+            ldsa.stock_article_code packetBarCode,
             lds.reservation_id reservationId,
             ldsa.total_number  packageNub,
             ldsa.total_number  loadedNub,
@@ -407,7 +407,7 @@
         SELECT
             ldpl.id packageId,
             ldrs.stock_article_id orderId,
-            ldpl.order_package_code orderPackageCode,
+            ldpl.packet_bar_code packetBarCode,
             lds.reservation_id reservationId,
             ldpl.quantity   packageNub,
             lddl.id  deliveryId,
@@ -425,7 +425,7 @@
         SELECT
             ldpl.id packageId,
             ldrs.stock_article_id orderId,
-            ldpl.order_package_code orderPackageCode,
+            ldpl.packet_bar_code packetBarCode,
             lds.reservation_id reservationId,
             ldpl.quantity   packageNub,
             lddl.id  deliveryId,
@@ -437,12 +437,12 @@
                 JOIN logpm_distribution_delivery_list lddl on  lddl.id = lds.delivery_id
                 join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
         where
-            lds.is_deleted =0 and   lds.reservation_id =#{reservationId}
+            lds.is_deleted =0 and lddl.id = #{deliveryId} and   lds.reservation_id =#{reservationId}
     </select>
     <select id="selectdeliverOneNo" resultType="com.logpm.distribution.entity.DistributionLoadscanEntity">
         SELECT
             ldsa.id orderId,
-            ldsa.stock_article_code orderPackageCode,
+            ldsa.stock_article_code packetBarCode,
             lds.reservation_id reservationId,
             ldsa.total_number  packageNub,
             ldsa.total_number  loadedNub,
@@ -468,7 +468,7 @@
     <select id="selectdeliveryworkVn" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
         SELECT
             ldsl.id inventoryId,
-            ldsl.order_package_code  orderPackageCode,
+            ldsl.packet_bar_code packetBarCode,
             lds.reservation_id reservationId,
             lddl.id deliveryId,
             lddl.train_number trainNumber
@@ -483,7 +483,7 @@
     <select id="selectdeliveryworkVnId" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
         SELECT
             ldsl.id inventoryId,
-            ldsl.order_package_code orderPackageCode,
+            ldsl.packet_bar_code packetBarCode,
             lds.reservation_id reservationId,
             lddl.id deliveryId,
             lddl.train_number trainNumber
@@ -498,7 +498,7 @@
     <select id="selectdeliverOnevn" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
         SELECT
             ldsl.id inventoryId,
-            ldsl.stock_list_code orderPackageCode,
+            ldsl.packet_bar_code packetBarCode,
             lds.reservation_id reservationId,
             lddl.id deliveryId,
             lddl.train_number trainNumber
@@ -514,7 +514,7 @@
         SELECT
             ldpl.id packageId,
             ldpl.stock_article_id orderId,
-            ldpl.order_package_code orderPackageCode,
+            ldpl.packet_bar_code packetBarCode,
             lds.reservation_id reservationId,
             ldpl.quantity   packageNub,
             lddl.id  deliveryId,
@@ -526,13 +526,13 @@
                 JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id
                 join logpm_distribution_parcel_list ldpl on ldsl.parcel_list_id =ldpl.id
         WHERE
-            lds.is_deleted = 0 and lds.reservation_id = #{reservationId} and    ldpl.order_package_code  =#{barcode}
+            lds.is_deleted = 0 and lds.reservation_id = #{reservationId} and    ldpl.packet_bar_code  =#{barcode}
     </select>
     <select id="selectdeliveryworkVnScanStock" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
         SELECT
             lds.id packageId,
             lds.stock_article orderId,
-            lds.coding orderPackageCode,
+            lds.coding packetBarCode,
             lds.reservation_id reservationId,
             1 packageNub,
             lddl.id deliveryId,
@@ -543,16 +543,7 @@
             logpm_distribution_signfor ldsf on lddl.id = ldsf.delivery_id
             join
             logpm_distribution_stock lds on lds.reservation_id = ldsf.reservation_id
-        <where>
-            lds.coding  =#{barcode}
-            <if test="reservationId!=null and reservationId!=''">
-              and  ldsf.reservation_id = #{reservationId}
-            </if>
-             <if test="deliveryId!=null and deliveryId!=''">
-              and  ldsf.delivery_id = #{deliveryId}
-            </if>
-        </where>
-
+        where lddl.reservation_id = #{reservationId} and    lds.coding  =#{barcode}
     </select>
     <select id="selectDistributionAppDeliveryListPage" resultType="com.logpm.distribution.vo.app.DistributionAppDeliveryListVO">
         SELECT
@@ -566,7 +557,7 @@
         lddl.driver_name driverName,
         lddl.vehicle_id vehicleId,
         lddl.driver_id driverId,
-        lddl.delivery_state deliveryState,
+        lddl.state state,
         lddl.preparation_time preparationTime,
 --         lddl.distribution_company distributionCompany,
 --         lddl.state state,
@@ -665,8 +656,8 @@
             <if test="param.distributionCompany != null and param.distributionCompany!=''">
                 and lddl.distribution_company = #{param.distributionCompany}
             </if>
-            <if test="param.deliveryState != null and param.deliveryState!=''">
-                and lddl.delivery_state = #{param.deliveryState}
+            <if test="param.deliveryStatus != null and param.deliveryStatus!=''">
+                and lddl.delivery_status = #{param.state}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
                 and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
@@ -704,8 +695,8 @@
             <if test="param.distributionCompany != null and param.distributionCompany!=''">
                 and lddl.distribution_company = #{param.distributionCompany}
             </if>
-            <if test="param.deliveryState != null and param.deliveryState!=''">
-                and lddl.delivery_state = #{param.deliveryState}
+            <if test="param.deliveryStatus != null and param.deliveryStatus!=''">
+                and lddl.delivery_status = #{param.deliveryStatus}
             </if>
             <if test="param.createTime_query!=null and param.createTime_query!=''">
                 and lddl.date_format(create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
@@ -731,7 +722,7 @@
     </select>
     <select id="selectDistributionAppDeliveryOrder" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
         SELECT
-            ldsa.order_self_numbering orderSelfNumbering,
+            ldsa.order_code orderCode,
             ldsa.complete_set completeSet,
             ldrs.reservation_num reservationNum,
             (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 ) loadingNub