Merge branch 'refs/heads/dev' into chenglong

blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java

@@ -317,13 +317,13 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 		if (signListByWaybillNumber != null && !signListByWaybillNumber.isEmpty()) {
 
 			//统计装车数量load_num
-			int loadNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getLoadNum).sum();
+			int loadNum = signListByWaybillNumber.stream().filter(t-> t.getLoadNum()!=null).mapToInt(QualityDeliverEntity::getLoadNum).sum();
 
 			// 计划配送数 plan_num
-			int planNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getPlanNum).sum();
+			int planNum = signListByWaybillNumber.stream().filter(t-> t.getPlanNum()!=null).mapToInt(QualityDeliverEntity::getPlanNum).sum();
 
 			// 计算签收数量sign_num
-			int signNum = signListByWaybillNumber.stream().mapToInt(QualityDeliverEntity::getSignNum).sum();
+			int signNum = signListByWaybillNumber.stream().filter(t-> t.getSignNum()!=null).mapToInt(QualityDeliverEntity::getSignNum).sum();
 
 			// 配送装车
 			QualityDeliverEntity qualityDeliverEntity = signListByWaybillNumber.get(0);
@@ -412,6 +412,10 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 		nodeInfoVO.setOperateName("入库");
 		nodeInfoVO.setOperateWarehouseName(departureWarehouseName);
 		List<DistributionParcelListEntity> distributionParcelListEntities = groupedByWarehouse.get(departureWarehouseName);
+		if(distributionParcelListEntities==null || distributionParcelListEntities.isEmpty()){
+			return null;
+		}
+
 		// 获取第一个时间
 		nodeInfoVO.setOperateTime(distributionParcelListEntities.get(0).getCreateTime());
 		nodeInfoVO.setOperateNumber(distributionParcelListEntities.size() + "/" + totalCount);

blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/service/impl/FactoryDataServiceImpl.java

@@ -122,6 +122,7 @@ public class FactoryDataServiceImpl implements FactoryDataService {
 					orderInfoEntity.setDeliveryNoteId(vo.getId().toString());
 					orderInfoEntity.setTenantCode(AuthUtil.getTenantId());
 					orderInfoEntity.setOrderType(vo.getOrderType());
+					orderInfoEntity.setOrderFull("N");
 					infoEntities.add(orderInfoEntity);
 				}
 				orderInfoService.saveBatch(infoEntities);