BASF接口

@@ -78,12 +78,12 @@ public class BasfDataInterface {
 
 
         //2、TODO 校验主单
-        /*sw.start("checkMawb");
+        sw.start("checkBasfMawb");
         result=basfService.checkBasfMawb(saveMawbBasfResult);
         if(!result.getSuccess()){
             return result;
         }
-        sw.stop();*/
+        sw.stop();
 
 //        //3、TODO 校验子单
 //        sw.start("checkMawbDetail");

@@ -240,7 +240,7 @@ public class ChmConsignmentService {
             //运单号
             result.setConsignmentCode(mawb.getBillNo());
             //运单类型
-            DictionaryEntries consType = Constant.dictionaryEntriesCache.get(Constant.MSG_TYPE_C);
+            DictionaryEntries consType = Constant.dictionaryEntriesCache.get(Constant.consType_C);
             if(consType != null){
                 result.setConsTypeId(consType);
                 result.setConsType(consType.getChineseName());
@@ -586,10 +586,10 @@ public class ChmConsignmentService {
                 }
                 //更新：
                 //如果有数据并且满足条件后才能更新数据
-                //条件1、状态为 待申报海关
+                //条件1、状态为 C类待申报
                 //条件2、本次推送时间 > 上次推送的时间
             }else if(!Objects.equals(chmConsignmentDB,null)
-                    && Objects.equals(chmConsignmentDB.getConsStatusDic().getCode(),"transferWaybillStatus_5")
+                    && Objects.equals(chmConsignmentDB.getConsStatusDic().getCode(),"transferWaybillStatus_16")
                     //TODO 提交时需要打开
                     && pushTime.getTime()>chmConsignmentDB.getUpdateTime().getTime()
             ){