From 01df89fa28f4daa289578526dda7def83c754000 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 24 May 2024 11:17:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E6=97=A0=E4=B8=BB=E5=8F=B8=E6=9C=BABUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 35a9fc745..1cfc18620 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -3631,6 +3631,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		} else {
 			StringBuilder driverNames = new StringBuilder();
 			StringBuilder vehicleNubs = new StringBuilder();
+			if (Func.isEmpty(deliveryListDTO.getMasterDriverName()) || Func.isEmpty(deliveryListDTO.getMasterVehicleNub())){
+				//检测无主司机  进行随机赋予主司机
+				deliveryListDTO.setMasterDriverName(allocationInfo.get(0).getDriverName());
+				deliveryListDTO.setMasterVehicleNub(allocationInfo.get(0).getVehicleNub());
+			}
 			//自主配送
 			allocationInfo.forEach(a -> {
 				DistributionDeliverySelfEntity deliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class);
@@ -4047,6 +4052,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			StringBuilder driverNames = new StringBuilder();
 			StringBuilder vehicleNubs = new StringBuilder();
 			//自主配送
+			if (Func.isEmpty(deliveryListDTO.getMasterDriverName()) || Func.isEmpty(deliveryListDTO.getMasterVehicleNub())){
+				//检测无主司机  进行随机赋予主司机
+				deliveryListDTO.setMasterDriverName(allocationInfo.get(0).getDriverName());
+				deliveryListDTO.setMasterVehicleNub(allocationInfo.get(0).getVehicleNub());
+			}
 			allocationInfo.forEach(a -> {
 				DistributionDeliverySelfEntity deliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class);
 				if (a.getDriverName().equals(deliveryListDTO.getMasterDriverName()) && a.getVehicleNub().equals(deliveryListDTO.getMasterVehicleNub())) {

From 0878376b37cbcb7f40a2c3ec5ce53fe5c8c66f73 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 24 May 2024 13:55:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=98=E7=9B=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
index a6100efd3..3ff0cfc9a 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
@@ -185,7 +185,7 @@
         lwtg.create_user operateUser
         FROM
         logpm_warehouse_tray_goods lwtg
-        JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id
+        JOIN logpm_distribution_stock_list ldsl ON lwtg.association_id = ldsl.material_id AND lwtg.incoming_batch = ldsl.incoming_batch
         LEFT JOIN logpm_warehouse_tary_allocation AS lwta ON lwtg.tray_id = lwta.tray_id
         LEFT JOIN logpm_warehouse_updown_goods AS lwug ON lwta.allocation_id = lwug.allocation_id
         LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwga.id = lwug.allocation_id