|
|
|
@ -430,17 +430,17 @@ public class LogpmDataSearchServiceImpl implements ILogpmDataSearchService {
|
|
|
|
|
|
|
|
|
|
// 判断该卸车作业节点
|
|
|
|
|
TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity = collect.get(0); |
|
|
|
|
TrunklineCarsLoadLineEntity trunklineCarsLoadLineEntity = listByLoadId.stream().filter(t -> t.getNodeName().equals(trunklineCarsLoadScanEntity.getUnloadNodeName())).findFirst().orElse(null); |
|
|
|
|
|
|
|
|
|
if(trunklineCarsLoadLineEntity == null || trunklineCarsLoadLineEntity.getArriveDate()== null){ |
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
// TrunklineCarsLoadLineEntity trunklineCarsLoadLineEntity = listByLoadId.stream().filter(t -> t.getNodeName().equals(trunklineCarsLoadScanEntity.getUnloadNodeName())).findFirst().orElse(null);
|
|
|
|
|
//
|
|
|
|
|
// if(trunklineCarsLoadLineEntity == null || trunklineCarsLoadLineEntity.getArriveDate()== null){
|
|
|
|
|
// return null;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
NodeInfoVO nodeInfoVO = new NodeInfoVO(); |
|
|
|
|
nodeInfoVO.setOperateName("干线到达"); |
|
|
|
|
nodeInfoVO.setOperateNumber(collect.size() + ""); |
|
|
|
|
nodeInfoVO.setOperateWarehouseName(trunklineCarsLoadScanEntity.getUnloadNodeName()); |
|
|
|
|
nodeInfoVO.setOperateTime(trunklineCarsLoadLineEntity.getArriveDate()); |
|
|
|
|
nodeInfoVO.setOperateTime(trunklineCarsLoadScanEntity.getUnloadTime()); |
|
|
|
|
return nodeInfoVO; |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|