北货三号口分拨施封通知,综保区不通知关锁可自动抬杆放行

@@ -871,6 +871,9 @@ public class GatherInfoHandle implements GatherInfoService {
         if (waybill.length() < 1) {
         if (waybill.length() < 1) {
             return false;
             return false;
         }
         }
+        if (gatherInfoHandle.debug){
+            return true;
+        }
         waybill = waybill.replace("-", "");
         waybill = waybill.replace("-", "");
         //中文逗号替换
         //中文逗号替换
         waybill = waybill.replace("，", ",");
         waybill = waybill.replace("，", ",");

@@ -96,13 +96,28 @@ public class CustomsLockServiceImpl implements CustomsLockService {
                     String sfAreaid = "4600541001";
                     String sfAreaid = "4600541001";
                     String zbqAreaid = "4600329012";
                     String zbqAreaid = "4600329012";
                     String zbqN3Areaid = "4612199001";
                     String zbqN3Areaid = "4612199001";
+                    //北货三号卡口出通道
+                    String bh_3_out = "4604600030";
+                    //北货三号卡口进通道1
+                    String bh_3_in1= "4604601030";
+                    //北货三号卡口进通道2
+                    String bh_3_in2= "4604601031";
 
 
 
 
                     String carEndstationList = redisService.get(info.getVename() + "_endstationList");
                     String carEndstationList = redisService.get(info.getVename() + "_endstationList");
                     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());
+                                return true;
+                            }
+//                            if ("调拨业务".equals(landBusinessTypeList.getBusinesstype())){
+//                                if (info.getChnlno().equals(bh_3_in1) || info.getChnlno().equals(bh_3_in2)){
+//                                    log.info("[LOCK-CHECK]-调拨业务-综保区北货流转业务,北货区域关锁通知,当前通道:{}",landBusinessTypeList.getEndstation());
+//                                    return true;
+//                                }
+//                            }
                             log.info("[LOCK-CHECK]-申报场站列表包含综保区,不处理关锁业务,当前场站:{}",landBusinessTypeList.getEndstation());
                             log.info("[LOCK-CHECK]-申报场站列表包含综保区,不处理关锁业务,当前场站:{}",landBusinessTypeList.getEndstation());
                             return false;
                             return false;
                         }
                         }