zhangFan / analysis_imf · 提交

转到一个项目

作者 朱兆平
提交 cc69ad2248fa32a6d45da35f800f98ea7668aaf9 1 个父辈 4a418214

多线程BUG修复

内嵌 并排对比
正在显示 1 个修改的文件 包含 13 行增加 和 13 行删除
... ... @@ -84,7 +84,7 @@ public class LiftBar {
private static String ALLOCATE_04 = "39103 分拨申请重复传输，海关审核不通过。";
//初始化装载货物重量
private static double goodsWt=0.0,inWt=0.0,diffVal=0.0,selfWt=0.0;
private double goodsWt=0.0,inWt=0.0,diffVal=0.0,selfWt=0.0;
private List<LAND_BUSINEESTYPE_LIST_INFO> listinfos;
@Autowired
... ... @@ -128,7 +128,7 @@ public class LiftBar {
//1. 若无车牌号，返回未识别错误
if (vaName.length() <= 0) {
logger.error(NO_CHEPAI+vaName);
logic.sendBw(info,false,NO_CHEPAI + vaName,new LandBusinessTypeList(),listinfos);
sendBw(info,false,NO_CHEPAI + vaName,new LandBusinessTypeList(),listinfos);
//CommandClient.Client(info, NO_CHEPAI + vaName);
return result;
}
... ... @@ -138,7 +138,7 @@ public class LiftBar {
//若无备案信息，返回车辆未备案或者识别错误
if (ve == null) {
logger.error(NORECORD+vaName);
logic.sendBw(info,false,NORECORD + vaName,new LandBusinessTypeList(),listinfos);
sendBw(info,false,NORECORD + vaName,new LandBusinessTypeList(),listinfos);
//CommandClient.Client(info, NORECORD + vaName);
return result;
}
... ... @@ -153,7 +153,7 @@ public class LiftBar {
//4. 若查询结果为null，返回无相对应进出场申请
if (list == null) {
logger.error(vaName+IEPORSE);
logic.sendBw(info,false,vaName+IEPORSE,list,listinfos);
sendBw(info,false,vaName+IEPORSE,list,listinfos);
//CommandClient.Client(info, IEPORSE);
return result;
}
... ... @@ -223,7 +223,7 @@ public class LiftBar {
checkResult=true;
}else{
logger.error("[空车业务]-出场重量未通过校验:"+GROWSSEXCETION);
logic.sendBw(info,false,GROWSSEXCETION,list,listinfos);
sendBw(info,false,GROWSSEXCETION,list,listinfos);
return false;
}
break;
... ... @@ -233,7 +233,7 @@ public class LiftBar {
checkResult=true;
}else{
logger.error("[出口送货]-出场重量未通过校验:"+GROWSSEXCETION);
logic.sendBw(info,false,GROWSSEXCETION,list,listinfos);
sendBw(info,false,GROWSSEXCETION,list,listinfos);
//CommandClient.Client(info, GROWSSEXCETION);
return false;
}
... ... @@ -254,7 +254,7 @@ public class LiftBar {
}else {
//有运单未放行
logger.error("[进口提货]-出场未通过校验:"+FANGXING+list.getMasterList());
logic.sendBw(info,false,FANGXING+list.getMasterList(),list,listinfos);
sendBw(info,false,FANGXING+list.getMasterList(),list,listinfos);
//CommandClient.Client(info, FANGXING);
return false;
}
... ... @@ -262,7 +262,7 @@ public class LiftBar {
//todo:装载运单历史数据累加超重判定
}else{
logger.error("[进口提货]-出场重量未通过校验:"+GROWSSEXCETION);
logic.sendBw(info,false,GROWSSEXCETION,list,listinfos);
sendBw(info,false,GROWSSEXCETION,list,listinfos);
//CommandClient.Client(info, GROWSSEXCETION);
return false;
}
... ... @@ -273,7 +273,7 @@ public class LiftBar {
boolean allocatCheck = checkNmmsAllocate(list.getMasterList());
if(!allocatCheck){
logger.error("[分拨业务]-分拨申请舱单未通过校验:"+FENBO);
logic.sendBw(info,false,FENBO,list,listinfos);
sendBw(info,false,FENBO,list,listinfos);
//CommandClient.Client(info, FENBO);
return false;
}
... ... @@ -281,7 +281,7 @@ public class LiftBar {
//todo:分拨运抵通知,重车入场视为运抵
}else{
logger.error("[分拨业务]-出场重量未通过校验:"+GROWSSEXCETION);
logic.sendBw(info,false,GROWSSEXCETION,list,listinfos);
sendBw(info,false,GROWSSEXCETION,list,listinfos);
//CommandClient.Client(info, GROWSSEXCETION);
return false;
}
... ... @@ -295,14 +295,14 @@ public class LiftBar {
}else {
//有运单未放行
logger.error("[调拨业务]-出场未通过校验:"+FANGXING+list.getMasterList());
logic.sendBw(info,false,FANGXING,list,listinfos);
sendBw(info,false,FANGXING,list,listinfos);
//CommandClient.Client(info, FANGXING);
return false;
}
//todo:检查ULD放行.
}else{
logger.error("[调拨业务]-出场未通过校验:"+GROWSSEXCETION);
logic.sendBw(info,false,GROWSSEXCETION,list,listinfos);
sendBw(info,false,GROWSSEXCETION,list,listinfos);
//CommandClient.Client(info, GROWSSEXCETION);
return false;
}
... ... @@ -337,7 +337,7 @@ public class LiftBar {
}
//发送抬杆指令,todo:生产环境去掉下面注释
boolean commandResult = logic.sendBw(info, checkResult,PERMITTHOUGH,list,listinfos);
boolean commandResult = sendBw(info, checkResult,PERMITTHOUGH,list,listinfos);
//fortest 正式环境删除
// boolean commandResult = true;
if(commandResult){//发送抬杆儿报文
... ...