fix:增加定制品备货非空的判断条件

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -282,22 +282,29 @@ public class DistributionStockupAppController extends BladeController {
 
 				if (!list.isEmpty()) {
 					for (DistributionStockupOrderListVO vo : list) {
-						planNum = planNum + vo.getPlanNum();
-						scanNum = scanNum + vo.getScanNum();
-						trayNum = trayNum + vo.getAllocationNumber();
 
-//					Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId());
-//					Boolean aBoolean = distributionReservationPackageService.selectClientStockupState(reservationId, vo.getStockArticleId());
-//					vo.setTrayLean(aBoolean);
-//						if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.getPallet().contains(",") && !vo.isCompleteStact() && ObjectUtils.isNotNull( vo.getAllocationId()) ) {
-						if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.isCompleteStact()) {
-							List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList(vo.getTrayId());
-							if (ObjectUtils.isNotNull(trayEntityList) && ObjectUtils.isNotNull(trayEntityList.get(0))) {
-								vo.setTrayLeanName(trayEntityList.stream().map(BasicdataTrayEntity::getPalletName).collect(Collectors.joining(",")));
+						log.info(" 定制品备货 信息 DistributionStockupOrderListVO {}",vo);
+						if(ObjectUtils.isNotNull(vo)){
+							if(ObjectUtils.isNotNull(vo.getPlanNum())){
+								planNum = planNum + vo.getPlanNum();
+							}
+							if(ObjectUtils.isNotNull(vo.getScanNum())){
+								scanNum = scanNum + vo.getScanNum();
+							}
+							if(ObjectUtils.isNotNull(vo.getAllocationNumber())){
+								trayNum = trayNum + vo.getAllocationNumber();
+							}
+
+							if (ObjectUtils.isNotNull(vo.getTrayId()) && !vo.isCompleteStact()) {
+								List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList(vo.getTrayId());
+								if (ObjectUtils.isNotNull(trayEntityList) && ObjectUtils.isNotNull(trayEntityList.get(0))) {
+									vo.setTrayLeanName(trayEntityList.stream().map(BasicdataTrayEntity::getPalletName).collect(Collectors.joining(",")));
+								}
+								//有没有可用整托配货的数据
+								vo.setTrayLean(distributionStockupService.getTrayBoot(vo, stockupDTO.getTypeService()));
 							}
-							//有没有可用整托配货的数据
-							vo.setTrayLean(distributionStockupService.getTrayBoot(vo, stockupDTO.getTypeService()));
 						}
+
 					}
 					if (IsOrNoConstant.yes.getValue().equals(stockupDTO.getIsZero())){
 						//查询客户零担计划数量