From 39e5e7c675a9049347c4ef3e5ea16e4b920ca6e3 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 13 Feb 2025 15:05:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasharing/service/impl/LogpmDataSearchServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java index 6ac788401..5d01a94e5 100644 --- a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java +++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java @@ -432,7 +432,7 @@ 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){ + if(trunklineCarsLoadLineEntity == null || trunklineCarsLoadLineEntity.getArriveDate()== null){ return null; } From 6ff450526ad90d2af0fe020f457d7fd6598163ad Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 13 Feb 2025 15:43:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B9=B2=E7=BA=BF=E5=88=B0=E8=BE=BE=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LogpmDataSearchServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java index 5d01a94e5..4e0c2a10d 100644 --- a/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java +++ b/blade-service/logpm-data-sharing/src/main/java/com/logpm/datasharing/service/impl/LogpmDataSearchServiceImpl.java @@ -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; }