From 0871c41fa7b957475d2a6c7963831ae5ce72e8fa Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Wed, 30 Aug 2023 11:54:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A3=85=E8=BD=A6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/vo/app/DistributionAppReservationVO.java | 5 +++++
 .../mapper/DistributionDeliveryInfoMapper.xml             | 5 +++--
 .../mapper/DistributionDeliveryListMapper.xml             | 8 ++++----
 .../mapper/DistributionDeliverySelfMapper.xml             | 4 +++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java
index 3eeeb1b6a..1b92857aa 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java
@@ -59,6 +59,11 @@ public class DistributionAppReservationVO extends DistributionReservationEntity
 	 */
 	@ApiModelProperty(value = "签收数")
 	private Integer signNub;
+	/**
+	 * 库存品数量
+	 */
+	@ApiModelProperty(value = "库存品数量")
+	private Integer inventoryNub;
 
 
 	/**
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index d309e14b9..1ee4e0f95 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -317,11 +317,12 @@
     <select id="selectAppcustomListPage" resultType="com.logpm.distribution.vo.app.DistributionAppReservationVO">
         SELECT DISTINCT ldr.id id,  ldr.consignee consignee, ldr.reservation_num reservationNum, COALESCE(lds.loaded_number + lds.loadedin_number, 0)  loadingNub,
             (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_reservation_stockarticle ldrs WHERE ldrs.reservation_id =ldr.id  and ldrs.stock_article_status in (1,3) )   ordNub,
-            COALESCE(lds.received_quantity + lds.receivedin_quantity, 0)  signNub, ldsk.stockup_area stockupArea
+            COALESCE(lds.received_quantity + lds.receivedin_quantity, 0)  signNub, ldsk.stockup_area stockupArea,COALESCE(ldrs.reservation_num , 0) inventoryNub
         FROM logpm_distribution_signfor lds
-        JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id and ldr.reservation_status != '40'
+        LEFT JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id and ldr.reservation_status != '40'
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldr.id = ldsi.reservation_id
         LEFT JOIN logpm_distribution_stockup ldsk on ldsk.id = ldsi.stockup_id
+        LEFT JOIN logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id =  ldr.id and ldrs.stock_list_status in (1,3)
         WHERE lds.is_deleted = 0 AND lds.delivery_id = #{id}
     </select>
     <select id="selectDistributionAppDeliveryInventoryPage"
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 232e81792..cd82cfe25 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
@@ -650,11 +650,11 @@
         (SELECT COALESCE (COUNT(*) ,0)
         FROM
         logpm_distribution_signfor lds
-        join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id and ldr.reservation_status != '40'
-        join logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id =ldr.id
-        WHERE lds.delivery_id = lddl.id and ldrs.stock_article_status in (1,3)
+        LEFT join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id and ldr.reservation_status != '40'
+        LEFT join logpm_distribution_reservation_stockarticle ldrs on ldrs.reservation_id =ldr.id and ldrs.stock_article_status in (1,3)
+        WHERE lds.delivery_id = lddl.id
         ) orderNumber,
-        (SELECT COALESCE (sum(ldr.reservation_num + ldr.reservation_stock_list_num) ,0)
+        (SELECT COALESCE (sum(ldr.reservation_num) ,0)
         FROM
         logpm_distribution_signfor lds
         join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml
index 9e625e067..95217c41f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml
@@ -54,7 +54,9 @@
         </where>
     </select>
     <select id="selectListcustom" resultType="com.logpm.distribution.vo.app.DistributionAppDeliverySelfVO">
-        select id id,driver_id driverId, vehicle_id vehicleId,is_master isMaster,driver_name driverName,vehicle_nub vehicleNub FROM logpm_distribution_delivery_self where delivery_id = #{deliveryId}
+        select id id,driver_id driverId, vehicle_id vehicleId,is_master isMaster,driver_name driverName,vehicle_nub vehicleNub
+        FROM logpm_distribution_delivery_self
+        where delivery_id = #{deliveryId}
     </select>
     <select id="selectdeliveryList" resultType="java.lang.Long">
         select  delivery_id from logpm_distribution_delivery_self where  driver_id = #{id}

From 0bf6792f1f5d122ac7bfa1497e548214d5b36301 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 30 Aug 2023 12:01:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=AC=A7=E6=B4=BE=E6=8E=A8=E9=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/oupai/vo/OuPaiDataPushVO.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java
index 3d1d57fc4..f24b7c58e 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java
@@ -1,5 +1,6 @@
 package com.logpm.factory.oupai.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
@@ -8,11 +9,13 @@ public class OuPaiDataPushVO {
 	/**
 	 * 仓库名称
 	 */
-	private String WarehouseName;
+	@JsonProperty("WarehouseName")
+	private String warehouseName;
 	/**
 	 * 对象实体的名称
 	 */
-	private String TypeName;
+	@JsonProperty("TypeName")
+	private String typeName;
 	/**
 	 * 0：收货单开始收货
 	 * 1：收货单完成收货
@@ -22,19 +25,23 @@ public class OuPaiDataPushVO {
 	 * 5：签收单签收
 	 * 6：签收单部分签收
 	 */
-	private int Event;
+	@JsonProperty("Event")
+	private int event;
 	/**
 	 * 相关单号
 	 */
-	private String OrderCode;
+	@JsonProperty("OrderCode")
+	private String orderCode;
 	/**
 	 * 对象key值，Type实体对象对应的OID值（唯一
 	 */
-	private String Key;
+	@JsonProperty("Key")
+	private String key;
 
 	/**
 	 * 签名，暂时为空
 	 */
-	private String Sign;
+	@JsonProperty("Sign")
+	private String sign;
 
 }