修改市配打印不对

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

@@ -58,7 +58,6 @@ import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.delivery.DeliveryLoadingStatusConstant;
 import org.springblade.common.constant.delivery.DeliveryStatusConstant;
-import org.springblade.common.constant.loading.LoadScanSigningStatusConstant;
 import org.springblade.common.constant.loading.LoadingAbnormalAuditingStatusConstant;
 import org.springblade.common.constant.loading.LoadingIsInsertConstant;
 import org.springblade.common.constant.loading.LoadingStatusConstant;
@@ -94,6 +93,7 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -4387,9 +4387,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 				// 通过预约单查询预约下面的订单 --1 或者 库存品 --2
 				List<Map<String, Object>> spaclStockList = buildSpaclOrders(distributionReservationEntity, 2);
-
-				map.put("库存品集合", spaclStockList);
-				map.put("库存品合计", spaclStockList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum());
+				if(spaclStockList.size() > 0 && !spaclStockList.isEmpty()){
+					map.put("库存品集合", spaclStockList);
+					map.put("库存品合计", spaclStockList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum());
+				}
 
 
 				map.put("备注", distributionReservationEntity.getRemarks());
@@ -4524,7 +4525,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			case 2:
 				distributionReservationStocklistEntities = distributionReservationStocklistService.lambdaQuery().eq(DistributionReservationStocklistEntity::getReservationId, distributionReservationEntity.getId()).list();
 				if(distributionReservationStocklistEntities.isEmpty()){
-					return null;
+					return result;
 				}
 				// 取值
 				for (DistributionReservationStocklistEntity reservationStocklistEntity : distributionReservationStocklistEntities) {
@@ -4583,7 +4584,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private String getUnit(Long stockArticleId){
 		List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, stockArticleId));
 		if(!list.isEmpty()){
-			return list.stream().map(ii -> ii.getMaterialUnit()).collect(Collectors.joining(","));
+			StringBuffer str = new StringBuffer();
+			list.forEach( i ->{
+				if(ObjectUtils.isNotNull(i.getMaterialUnit())){
+					str.append(i.getMaterialUnit());
+				}
+			});
+			return str.toString();
 		}else {
 			return "无";
 		}