Merge remote-tracking branch 'origin/dev' into pre-production

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

@@ -182,13 +182,14 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 			int signNum = signListByWaybillNumber.stream().filter(e-> e.getSignNum()!=null).mapToInt(QualityDeliverEntity::getSignNum).sum();
 
 			// 配送装车
-			QualityDeliverEntity qualityDeliverEntity = signListByWaybillNumber.get(0);
 			if (loadNum != 0) {
+				QualityDeliverEntity qualityDeliverEntity = signListByWaybillNumber.stream().filter(e -> e.getLoadTime() != null).findFirst().orElse(null);
+				if(qualityDeliverEntity != null){
 					nodeInfoVO = new NodeInfoVO();
 					nodeInfoVO.setOperateName("配送装车");
 					nodeInfoVO.setOperateNumber(loadNum + "");
 					nodeInfoVO.setOperateWarehouseName(qualityDeliverEntity.getWarehouseName());
-				nodeInfoVO.setOperateTime(qualityDeliverEntity.getCreateTime());
+					nodeInfoVO.setOperateTime(qualityDeliverEntity.getLoadTime());
 					// 增加网点电话
 					BasicdataWarehouseEntity entityWarehouseId = basicdataWarehouseClient.getEntityWarehouseId(qualityDeliverEntity.getWarehouseId());
 					if (entityWarehouseId != null) {
@@ -198,12 +199,18 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 					nodeInfoVOList.add(nodeInfoVO);
 				}
 
-			if (planNum != 0) {
+			}
+
+			if (signNum != 0) {
+
+				QualityDeliverEntity qualityDeliverEntity = signListByWaybillNumber.stream().filter(e -> e.getSignTime() != null).findFirst().orElse(null);
+
+				if(qualityDeliverEntity != null){
 					nodeInfoVO = new NodeInfoVO();
 					nodeInfoVO.setOperateName("配送签收");
 					nodeInfoVO.setOperateNumber(signNum + "/" + loadNum);
 					nodeInfoVO.setOperateWarehouseName(qualityDeliverEntity.getWarehouseName());
-				nodeInfoVO.setOperateTime(qualityDeliverEntity.getCreateTime());
+					nodeInfoVO.setOperateTime(qualityDeliverEntity.getSignTime());
 					// 增加网点电话
 					BasicdataWarehouseEntity entityWarehouseId = basicdataWarehouseClient.getEntityWarehouseId(qualityDeliverEntity.getWarehouseId());
 					if (entityWarehouseId != null) {
@@ -212,6 +219,8 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
 					nodeInfoVOList.add(nodeInfoVO);
 				}
 
+			}
+
 
 		}
 		//对nodeInfoVOList集合中的作业时间 按照 时间倒序排序