综保区特殊监管区-特殊处理

朱兆平
config/config.properties
pom.xml
src/main/java/com/sy/controller/CustomsLockController.java
src/main/java/com/sy/service/impl/GatherInfoHandle.java
src/main/java/com/sy/service/impl/ResMessageServiceImpl.java
src/main/java/com/sy/service/lock/CustomsLockServiceImpl.java
--- a/config/config.properties
查看文件 @e161682
+++ b/config/config.properties
查看文件 @e161682
@@ -17,7 +17,9 @@ STYP=CARM
 #\u8F7D\u91CD\u4E0E\u79F0\u91CD\u7684\u53EF\u63A7\u8303\u56F4 ?%
 grossWt=5%
-station=4600329012
+#白名单场站列表,用逗号隔开
+station=4600329012,4612199001
+#顺丰白名单场站列表
 stationsf=4600541001
 #\u4E8C\u7EF4\u7801\u5B58\u653E\u8DEF\u5F84\uFF0C\u9879\u76EE\u542F\u52A8\u65F6\u8BBE\u7F6E\uFF0C\u540E\u671F\u4E0D\u80FD\u66F4\u6539\u3002
--- a/pom.xml
查看文件 @e161682
+++ b/pom.xml
查看文件 @e161682
@@ -5,7 +5,7 @@
     <groupId>com.sy</groupId>
     <artifactId>analysis_imf</artifactId>
-    <version>3.0-G2-SNAPSHOT</version>
+    <version>4.0-LOCK-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>analysis_imf</name>
     <description>北货集成金二抬杆指令判定</description>
--- a/src/main/java/com/sy/controller/CustomsLockController.java
查看文件 @e161682
+++ b/src/main/java/com/sy/controller/CustomsLockController.java
查看文件 @e161682
@@ -32,16 +32,15 @@ public class CustomsLockController {
     @PostMapping("response")
     public ResultJson lockResponse(@RequestBody LockFeedBack feedBack){
-
+        try{
+            log.info("收到关锁通知:{}",feedBack.toString());
             if (StringUtils.isEmpty(feedBack.barcode)){
                 return  new ResultJson("400","缺少二维码信息","缺少二维码信息");
             }
-
-        log.info("收到关锁通知:{}",feedBack.toString());
             StringBuilder sb = new StringBuilder();
 //        sb.append("施解封时间:").append(feedBack.locktime).append("\n")
 //                .append("关锁秘钥:").append(feedBack.secret).append("\n")
-//                .append("施解封内容:").append(feedBack.feedbackconten).append("\n")
+                sb.append("施解封内容:").append(feedBack.feedbackconten).append("\n");
 //                .append("施解封状态:").append(feedBack.feedbackcode).append("\n");
             String LOCK_TYPE_UNLOCK = "2";
@@ -82,6 +81,7 @@ public class CustomsLockController {
                     gatherInfo.setGrosswt(new BigDecimal(0));
                     commandLogService.commandlog(gatherInfo,false,sb.toString(),null,null,0.0,0.0,0.0,0.0);
                     log.info("[LOCK-RSP]-关锁缓存信息读取失败");
+                    return  new ResultJson("400","关锁缓存信息读取失败");
                 }
             }else {
                 sb.append("关锁施解封失败");
@@ -91,8 +91,12 @@ public class CustomsLockController {
                 commandLogService.commandlog(gatherInfo,false,sb.toString(),null,null,0.0,0.0,0.0,0.0);
                 log.info("[LOCK-RSP]-关锁施解封失败");
+
             }
             return  new ResultJson("200","success");
+        }catch (Exception e){
+            return  new ResultJson("500",e.toString());
+        }
     }
 }
--- a/src/main/java/com/sy/service/impl/GatherInfoHandle.java
查看文件 @e161682
+++ b/src/main/java/com/sy/service/impl/GatherInfoHandle.java
查看文件 @e161682
@@ -188,7 +188,7 @@ public class GatherInfoHandle implements GatherInfoService {
                                 log.info("[X21-SUCCESS]:[IN]-进口提货放行");
                             }else{
                                 sendBw(info,false,CHECKINNOEMPTY,landBusinessTypeList,listinfos);
-                                log.info("[X21-ERR]:[IN]-进口提货-费空车驶入");
+                                log.info("[X21-ERR]:[IN]-进口提货-非空车驶入");
                             }
                             break;
                         default:
@@ -261,17 +261,72 @@ public class GatherInfoHandle implements GatherInfoService {
     /**
      * 一.
-     * 场站白名单
+     * 场站白名单,顺丰
      * @return 白名单 true. 其他走校验
      */
     private boolean areaWhiteListCheck(){
         if(FileTool.readProperties("stationsf").equals(info.getAreaid())) {
             return true;
         }
+        if (zbqAreaWhiteListCheck()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 一.
+     * 场站白名单,综保区白名单特殊验放
+     * 综保区不做重量验放,但是还要进行单证放行验放
+     * @return 白名单 true. 其他走校验
+     */
+    private boolean zbqAreaWhiteListCheck(){
+        if(FileTool.readProperties("station").contains(info.getAreaid())) {
+            log.info("[ZBQ]-综保区核验放行");
+            if ("E".equals(info.getIetype())){
+
+                inStationInfo();            //入场信息获取
+                setListinfos();             //流转申请表体获取
+
+                //业务类型及放行判定
+                switch (landBusinessTypeList.getBusinesstype()){
+                    case "进口提货":
+                        if ("退库货物".equals(landBusinessTypeList.getCocode()) || "换单货物".equals(landBusinessTypeList.getCocode())){
+                            return true;
+                        }else {
+                            //检查运单放行
+                            if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){
+                                return true;
+                            }else {
+                                //有运单未放行
+                                log.error("[进口提货]-出场未通过校验:"+FANGXING+landBusinessTypeList.getMasterList());
+                                sendBw(info,false,FANGXING,landBusinessTypeList,listinfos);
+                                return false;
+                            }
+                        }
+
+                    case "调拨业务":
+                        //检查运单放行,拉板可出
+                        if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){
+                            return true;
+                        }else {
+                            //有运单未放行
+                            log.error("[调拨业务]-出场未通过校验:"+FANGXING+landBusinessTypeList.getMasterList());
+                            sendBw(info,false,FANGXING,landBusinessTypeList,listinfos);
+                            return false;
+                        }
+                    default:
+                        return true;
+                }
+            }
+            return true;
+        }
         return false;
     }
+
+
     /**
      * 1. 车牌信息校验
      */
@@ -696,9 +751,6 @@ public class GatherInfoHandle implements GatherInfoService {
         log.info("[流转缓存]-{}缓存已核销",vaName);
         //核销记录
         releaseRecord();
-
-        //总业务车次计数
-        gatherInfoHandle.redisService.incr("kako-barcode-total",1);
     }
     /**
--- a/src/main/java/com/sy/service/impl/ResMessageServiceImpl.java
查看文件 @e161682
+++ b/src/main/java/com/sy/service/impl/ResMessageServiceImpl.java
查看文件 @e161682
@@ -52,7 +52,11 @@ public class ResMessageServiceImpl implements ResMessageService {
     @Override
     public boolean checkManifestRelease(GatherInfo info, List<LAND_BUSINEESTYPE_LIST_INFO> list_infos) {
         List<String> noRelease = new Vector<>();
-        if (list_infos.size() < 1) {
+        if (list_infos==null){
+            CommandClient.Client(info, AWB_EMPTY);
+            return false;
+        }
+        if (list_infos.isEmpty()) {
             CommandClient.Client(info, AWB_EMPTY);
             return false;
         }
--- a/src/main/java/com/sy/service/lock/CustomsLockServiceImpl.java
查看文件 @e161682
+++ b/src/main/java/com/sy/service/lock/CustomsLockServiceImpl.java
查看文件 @e161682
@@ -11,6 +11,7 @@ import com.sy.service.CustomsLockService;
 import com.sy.service.LandBusListService;
 import com.sy.service.RedisService;
 import com.sy.service.impl.GatherInfoHandle;
+import com.sy.utils.FileTool;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,6 +82,8 @@ public class CustomsLockServiceImpl implements CustomsLockService {
     @Override
     public boolean lockNoticeCheck(GatherInfo info) {
         if (info!=null && StringUtils.isNotEmpty(info.getBarcode())) {
+            //todo:这里后期判定可以复用场站白名单验证
+//            FileTool.readProperties("station").contains(info.getAreaid());
             /**
              * 申请业务类型检查
              * 调拨业务及分拨业务装载货物为单证的,必须有关锁号