作者 朱兆平

修复特殊货物类型[退库货物/快件货物]没走二维码核销验放功能,修复特殊白名单场站不走二维码核销验放功能.

@@ -16,6 +16,8 @@ public enum ChannelEnum { @@ -16,6 +16,8 @@ public enum ChannelEnum {
16 ZBQ_EX_5 ("4600329012","4600010005"), 16 ZBQ_EX_5 ("4600329012","4600010005"),
17 ZBQ_NEI_IN_1 ("4612199001","4612031001"), 17 ZBQ_NEI_IN_1 ("4612199001","4612031001"),
18 ZBQ_NEI_EX_1 ("4612199001","4612030001"), 18 ZBQ_NEI_EX_1 ("4612199001","4612030001"),
  19 + SF_IN_1 ("4600541001","4600011001"),
  20 + SF_EX_1 ("4600541001","4600010001"),
19 ; 21 ;
20 22
21 private String area; 23 private String area;
@@ -172,6 +172,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -172,6 +172,7 @@ public class GatherInfoHandle implements GatherInfoService {
172 // 场站白名单放行验证 172 // 场站白名单放行验证
173 if (areaWhiteListCheck()){ 173 if (areaWhiteListCheck()){
174 pass(); 174 pass();
  175 + releaseFormCheck(); //流转申请单核销
175 return; 176 return;
176 } 177 }
177 //入区核放 178 //入区核放
@@ -185,6 +186,8 @@ public class GatherInfoHandle implements GatherInfoService { @@ -185,6 +186,8 @@ public class GatherInfoHandle implements GatherInfoService {
185 186
186 if (goodsWhiteListCheck()){ //货物类型白名单 187 if (goodsWhiteListCheck()){ //货物类型白名单
187 pass(); 188 pass();
  189 + log.info("[SPECIAL]-特殊业务出区验放通过:{}",landBusinessTypeList.getCocode());
  190 + releaseFormCheck(); //流转申请单核销
188 return; 191 return;
189 } 192 }
190 193
@@ -449,6 +452,7 @@ public class GatherInfoHandle implements GatherInfoService { @@ -449,6 +452,7 @@ public class GatherInfoHandle implements GatherInfoService {
449 * 退库货物不校验运单放行. 452 * 退库货物不校验运单放行.
450 */ 453 */
451 log.info("[退库业务]-重量核验通过."); 454 log.info("[退库业务]-重量核验通过.");
  455 + return true;
452 }else{ 456 }else{
453 //检查运单放行 457 //检查运单放行
454 if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){ 458 if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){
@@ -466,7 +470,6 @@ public class GatherInfoHandle implements GatherInfoService { @@ -466,7 +470,6 @@ public class GatherInfoHandle implements GatherInfoService {
466 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos); 470 sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos);
467 return false; 471 return false;
468 } 472 }
469 - break;  
470 case "分拨业务": 473 case "分拨业务":
471 if (gatherInfoHandle.weightCheckHandleService.checkAllocateOrDispatch(growssWt, selfWt, goodsWt,inWt)){ 474 if (gatherInfoHandle.weightCheckHandleService.checkAllocateOrDispatch(growssWt, selfWt, goodsWt,inWt)){
472 /** 475 /**