作者 朱兆平

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

... ... @@ -16,6 +16,8 @@ public enum ChannelEnum {
ZBQ_EX_5 ("4600329012","4600010005"),
ZBQ_NEI_IN_1 ("4612199001","4612031001"),
ZBQ_NEI_EX_1 ("4612199001","4612030001"),
SF_IN_1 ("4600541001","4600011001"),
SF_EX_1 ("4600541001","4600010001"),
;
private String area;
... ...
... ... @@ -172,6 +172,7 @@ public class GatherInfoHandle implements GatherInfoService {
// 场站白名单放行验证
if (areaWhiteListCheck()){
pass();
releaseFormCheck(); //流转申请单核销
return;
}
//入区核放
... ... @@ -185,6 +186,8 @@ public class GatherInfoHandle implements GatherInfoService {
if (goodsWhiteListCheck()){ //货物类型白名单
pass();
log.info("[SPECIAL]-特殊业务出区验放通过:{}",landBusinessTypeList.getCocode());
releaseFormCheck(); //流转申请单核销
return;
}
... ... @@ -449,6 +452,7 @@ public class GatherInfoHandle implements GatherInfoService {
* 退库货物不校验运单放行.
*/
log.info("[退库业务]-重量核验通过.");
return true;
}else{
//检查运单放行
if (gatherInfoHandle.resMessageService.checkManifestRelease(info,listinfos)){
... ... @@ -466,7 +470,6 @@ public class GatherInfoHandle implements GatherInfoService {
sendBw(info,false,GROWSSEXCETION,landBusinessTypeList,listinfos);
return false;
}
break;
case "分拨业务":
if (gatherInfoHandle.weightCheckHandleService.checkAllocateOrDispatch(growssWt, selfWt, goodsWt,inWt)){
/**
... ...