西货站到综保区分拨施封通知,综保区不通知关锁可自动抬杆放行

@@ -5,7 +5,7 @@
 
 
     <groupId>com.sy</groupId>
     <groupId>com.sy</groupId>
     <artifactId>analysis_imf</artifactId>
     <artifactId>analysis_imf</artifactId>
-    <version>4.2-LOCK-SNAPSHOT</version>
+    <version>4.3-LOCK-SNAPSHOT</version>
     <packaging>jar</packaging>
     <packaging>jar</packaging>
     <name>analysis_imf</name>
     <name>analysis_imf</name>
     <description>北货集成金二抬杆指令判定</description>
     <description>北货集成金二抬杆指令判定</description>

@@ -96,6 +96,8 @@ public class CustomsLockServiceImpl implements CustomsLockService {
                     String sfAreaid = "4600541001";
                     String sfAreaid = "4600541001";
                     String zbqAreaid = "4600329012";
                     String zbqAreaid = "4600329012";
                     String zbqN3Areaid = "4612199001";
                     String zbqN3Areaid = "4612199001";
+                    String xhAreaid = "4604000000";
+
                     //北货三号卡口出通道
                     //北货三号卡口出通道
                     String bh_3_out = "4604600030";
                     String bh_3_out = "4604600030";
                     //北货三号卡口进通道1
                     //北货三号卡口进通道1
@@ -108,17 +110,23 @@ public class CustomsLockServiceImpl implements CustomsLockService {
                     if (StringUtils.isNotEmpty(info.getVename()) && StringUtils.isNotEmpty(carEndstationList)){
                     if (StringUtils.isNotEmpty(info.getVename()) && StringUtils.isNotEmpty(carEndstationList)){
                         //涉及综保区场站的申请不核验关锁业务.
                         //涉及综保区场站的申请不核验关锁业务.
                         if (carEndstationList.contains(zbqAreaid)) {
                         if (carEndstationList.contains(zbqAreaid)) {
-                            if ("分拨业务".equals(landBusinessTypeList.getBusinesstype()) && info.getChnlno().equals(bh_3_out)){
-                                log.info("[LOCK-CHECK]-分拨业务-综保区北货流转业务,北货区域关锁通知,当前通道:{}",landBusinessTypeList.getEndstation());
+                            if ("分拨业务".equals(landBusinessTypeList.getBusinesstype())){
+                                if (info.getChnlno().equals(bh_3_out)) {
+                                    log.info("[LOCK-CHECK-TRUE]-分拨业务-综保区北货流转业务,北货区域关锁通知,当前场站北货站");
+                                    return true;
+                                }
+                                if (info.getAreaid().equals(xhAreaid)) {
+                                    log.info("[LOCK-CHECK-TRUE]-分拨业务-西货综保区流转业务,西货区域关锁通知,当前场站西货站");
                                     return true;
                                     return true;
                                 }
                                 }
+                            }
 //                            if ("调拨业务".equals(landBusinessTypeList.getBusinesstype())){
 //                            if ("调拨业务".equals(landBusinessTypeList.getBusinesstype())){
 //                                if (info.getChnlno().equals(bh_3_in1) || info.getChnlno().equals(bh_3_in2)){
 //                                if (info.getChnlno().equals(bh_3_in1) || info.getChnlno().equals(bh_3_in2)){
 //                                    log.info("[LOCK-CHECK]-调拨业务-综保区北货流转业务,北货区域关锁通知,当前通道:{}",landBusinessTypeList.getEndstation());
 //                                    log.info("[LOCK-CHECK]-调拨业务-综保区北货流转业务,北货区域关锁通知,当前通道:{}",landBusinessTypeList.getEndstation());
 //                                    return true;
 //                                    return true;
 //                                }
 //                                }
 //                            }
 //                            }
-                            log.info("[LOCK-CHECK]-申报场站列表包含综保区,不处理关锁业务,当前场站:{}",landBusinessTypeList.getEndstation());
+                            log.info("[LOCK-CHECK-NOTICE]-申报场站列表包含综保区,不处理关锁业务,当前场站:{}",landBusinessTypeList.getEndstation());
                             return false;
                             return false;
                         }
                         }
 
 

@@ -282,8 +282,9 @@ public class MessageRouterX21 implements MessageRouter {
                     }
                     }
                 }
                 }
             }else {
             }else {
-                CommandClient.Client(info,"流转业务-未申请关锁号");
+                log.error("[LOCK-ERROR]-流转业务未申请关锁号");
                 record(info,false,"业务异常:流转业务-未申请关锁号",null);
                 record(info,false,"业务异常:流转业务-未申请关锁号",null);
+                CommandClient.Client(info,"流转业务-未申请关锁号");
                 //这里需要返回true,是关锁业务,但是中断,不抬杆不放行,给予关锁业务异常通知
                 //这里需要返回true,是关锁业务,但是中断,不抬杆不放行,给予关锁业务异常通知
                 return true;
                 return true;
             }
             }