目的场站为综保区的调拨业务在起始场站进行关锁通知.综保区不通知.

@@ -105,7 +105,10 @@ public class CustomsLockServiceImpl implements CustomsLockService {
                     String bh_3_in1= "4604601030";
                     //北货三号卡口进通道2
                     String bh_3_in2= "4604601031";
-
+                    // 西货站出通道1
+                    String xh_1_out = "4604333312";
+                    // 西货站出通道2
+                    String xh_2_out = "4604333322";
 
                     String carEndstationList = redisService.get(info.getVename() + "_endstationList");
                     if (StringUtils.isNotEmpty(info.getVename()) && StringUtils.isNotEmpty(carEndstationList)){
@@ -123,8 +126,14 @@ public class CustomsLockServiceImpl implements CustomsLockService {
                             }
                             if ("调拨业务".equals(landBusinessTypeList.getBusinesstype())){
                                 //申请设计综保区的流转场站,除了综保区不通知,其他场站正常通知
-                                if (!info.getAreaid().equals(zbqAreaid) && !info.getAreaid().equals(zbqN3Areaid)){
-                                    log.info("[LOCK-CHECK]-调拨业务-含综保区流转业务,北货区域关锁通知,当前通道:{}",landBusinessTypeList.getEndstation());
+                                /**
+                                 *  从综保区往北货或者西货调拨时,都不进行关锁通知,因为从综保区出来没有关锁施封记录无法到北货解封.没关锁秘钥,采用人工解封
+                                 *  从西货或者北货往综保区调拨的话,进行施封通知,到综保区后不进行解封通知,采用人工解封
+                                 */
+
+
+                                if (info.getChnlno().equals(bh_3_out) ||  info.getChnlno().equals(xh_1_out) ||  info.getChnlno().equals(xh_2_out)){
+                                    log.info("[LOCK-CHECK]-含综保区调拨业务-关锁施封通知,当前通道:{}",info.getChnlno());
                                     return true;
                                 }
                             }

@@ -81,7 +81,6 @@ public class CommandClient {
         try {
             //ip+端口
             socket = new Socket("10.50.7.10", 9003);
-            socket.setSoTimeout(5000);
             log.info("socket通讯创建连接成功");
             op = socket.getOutputStream();
             //xml字节流