feat(all): 配送明细报表

1 优化配送明细广播推送

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java

@@ -81,7 +81,7 @@ public class PlanReportListener implements ReportService {
 			for (ReservationVO reservationVO : reservationVOList) {
 				List<PackageData> details = reservationVO.getPackageDataList();
 				if (CollUtil.isNotEmpty(details)) {
-					totalNum = totalNum + 1;
+					totalNum = totalNum + details.size();
 				}
 			}
 			if (CollUtil.isNotEmpty(reservationCodeSet)) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -1247,7 +1247,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			if(byId.getConditions().equals(3)){
 
 				//标识零担
-				packageData.setNumber(distributionParcelListEntity.getPackageNub());
+				packageData.setNumber(distributionParcelListEntity.getLoadedNub());
 				if(Func.isNotEmpty(byId)){
 					packageData.setOrderCode(byId.getOrderCode());
 					if(Func.isEmpty(byId.getBrandName())){
@@ -1265,7 +1265,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 				packageData.setPackageCode(distributionParcelListEntity.getOrderPackageCode());
 				packageData.setPackageType(PackageTypeEnums.LTL);
-				packageData.setNumber(1);
+				// packageData.setNumber(1);
 			}else if(byId.getConditions().equals(1)){
 				// 包件
 				packageData.setPackageCode(distributionParcelListEntity.getOrderPackageCode());
@@ -6536,15 +6536,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		for (DistributionLoadscanEntity distributionLoadscanEntity : pushNodeList) {
 
 			Map<String, Object> broadcastDataByZeroOrderAndParcId = baseMapper.getBroadcastDataByZeroOrderAndParcId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getWarehouseId(), distributionLoadscanEntity.getPackageId());
-			PackageData packageData = BeanUtil.copy(broadcastDataByZeroOrderAndParcId, PackageData.class);
-			assert packageData != null;
-			packageData.setBrand(Convert.toStr(broadcastDataByZeroOrderAndParcId.get("brandName")));
-			PackageTypeEnums type = PackageTypeEnums.LTL;
-			packageData.setPackageType(type);
-			packageData.setProductName(Convert.toStr(broadcastDataByZeroOrderAndParcId.get("productName")));
-			packageData.setNumber(distributionLoadscanEntity.getLoadedNub());
-			data.add(packageData);
-
+			if(ObjectUtil.isNotEmpty(broadcastDataByZeroOrderAndParcId)){
+				PackageData packageData = BeanUtil.copy(broadcastDataByZeroOrderAndParcId, PackageData.class);
+				assert packageData != null;
+				packageData.setBrand(Convert.toStr(broadcastDataByZeroOrderAndParcId.get("brandName")));
+				PackageTypeEnums type = PackageTypeEnums.LTL;
+				packageData.setPackageType(type);
+				packageData.setProductName(Convert.toStr(broadcastDataByZeroOrderAndParcId.get("productName")));
+				packageData.setNumber(distributionLoadscanEntity.getLoadedNub());
+				data.add(packageData);
+			}
 		}
 
 		distributionLoadVO.setPackageDataList(data);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -3319,6 +3319,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					packageData.setWaybillNumber(distributionParcelListEntity1.getWaybillNumber());
 					packageData.setProductName(distributionParcelListEntity1.getFirsts());
 				}
+				data.add(packageData);
 			}
 
 
@@ -9348,6 +9349,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadscanEntity.setSigningUser(user.getNickName());
 		distributionLoadscanEntity.setVehicleName(loadscanEntity.getVehicleName());
 		distributionLoadscanEntity.setSigningUserId(user.getUserId());
+		distributionLoadscanEntity.setDriverId(loadscanEntity.getDriverId());
+		distributionLoadscanEntity.setDriverName(loadscanEntity.getDriverName());
 		distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 		distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
 		if (Objects.equals(loadscanEntity.getLoadedNub(), distributionLoadscanEntity.getReceivedQuantity())) {