From 1707d15796d7dc78812f19b9c34868c8cb38a714 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期日, 15 十月 2023 17:56:57 +0800
Subject: [PATCH] broker 卡车公司端
---
src/main/java/com/stylefeng/guns/modular/system/utils/PortUtil/FortyNineUtil.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/utils/PortUtil/FortyNineUtil.java b/src/main/java/com/stylefeng/guns/modular/system/utils/PortUtil/FortyNineUtil.java
index c3082f6..60d960d 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/utils/PortUtil/FortyNineUtil.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/utils/PortUtil/FortyNineUtil.java
@@ -9,6 +9,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
@@ -137,17 +138,20 @@
terminaleDataWarpper.setCtf(CTF);
}
}
- if("PENDING".equals(terminaleDataWarpper.getLineHold()) && ToolUtil.isNotEmpty(lfd)){
+ if("PENDING".equals(terminaleDataWarpper.getLineHold()) && !"null".equals(lfd)){
terminaleDataWarpper.setLineHold("RELEASE");
}
- if("PENDING".equals(terminaleDataWarpper.getCustomHold()) && ToolUtil.isNotEmpty(lfd)){
+ if("PENDING".equals(terminaleDataWarpper.getCustomHold()) && !"null".equals(lfd)){
terminaleDataWarpper.setCustomHold("RELEASE");
}
- if("PENDING".equals(terminaleDataWarpper.getPierpass()) && ToolUtil.isNotEmpty(lfd)){
+ if("PENDING".equals(terminaleDataWarpper.getPierpass()) && !"null".equals(lfd)){
terminaleDataWarpper.setPierpass("RELEASE");
}
- if("PENDING".equals(terminaleDataWarpper.getCtf()) && ToolUtil.isNotEmpty(lfd)){
+ if("PENDING".equals(terminaleDataWarpper.getCtf()) && !"null".equals(lfd)){
terminaleDataWarpper.setCtf("RELEASE");
+ }
+ if(ToolUtil.isEmpty(location) && "null".equals(lfd)){
+ terminaleDataWarpper.setClosedArea("ON VESSEL");
}
break;
}
@@ -169,4 +173,5 @@
String format = new SimpleDateFormat("dd/MM/yyyy").format(parse);
return format;
}
+
}
--
Gitblit v1.7.1