涉及综保区调拨业务的关锁通知及所有货物类型的重量验放,综保区不通知关锁可自动抬杆放行,同时白名单货物不进行放行验放

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

@@ -306,6 +306,9 @@ public class GatherInfoHandle implements GatherInfoService {
                         }
                         }
 
 
                     case "调拨业务":
                     case "调拨业务":
+                        if (goodsWhiteListCheck()){
+                            return true;
+                        }else {
                             //检查运单放行,拉板可出
                             //检查运单放行,拉板可出
                             if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){
                             if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){
                                 return true;
                                 return true;
@@ -315,6 +318,8 @@ public class GatherInfoHandle implements GatherInfoService {
                                 sendBw(info,false,FANGXING,landBusinessTypeList,listinfos);
                                 sendBw(info,false,FANGXING,landBusinessTypeList,listinfos);
                                 return false;
                                 return false;
                             }
                             }
+                        }
+
                     default:
                     default:
                         return true;
                         return true;
                 }
                 }
@@ -612,6 +617,11 @@ public class GatherInfoHandle implements GatherInfoService {
                         log.info("[调拨-空车]-{}空车离场",info.getVename());
                         log.info("[调拨-空车]-{}空车离场",info.getVename());
                         return true;
                         return true;
                     }
                     }
+
+                    //白名单货物不检查放行
+                    if (goodsWhiteListCheck()) {
+                        return true;
+                    }else{
                         //检查运单放行,拉板可出
                         //检查运单放行,拉板可出
                         if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){
                         if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){
                             return true;
                             return true;
@@ -622,6 +632,8 @@ public class GatherInfoHandle implements GatherInfoService {
                             return false;
                             return false;
                         }
                         }
                         //todo:检查ULD放行.
                         //todo:检查ULD放行.
+                    }
+
                 }else{
                 }else{
                     log.error("[调拨业务]-出场未通过校验:"+GROWSSEXCETION);
                     log.error("[调拨业务]-出场未通过校验:"+GROWSSEXCETION);
                     sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos);
                     sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos);