Merge branch 'dev' into pre-production

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

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())) {