zhangFan / analysis_imf · 提交

转到一个项目

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

多线程BUG修复

内嵌 并排对比
正在显示 1 个修改的文件 包含 13 行增加 和 13 行删除
@@ -84,7 +84,7 @@ public class LiftBar { @@ -84,7 +84,7 @@ public class LiftBar {
84 private static String ALLOCATE_04 = "39103 分拨申请重复传输，海关审核不通过。"; 84 private static String ALLOCATE_04 = "39103 分拨申请重复传输，海关审核不通过。";
85 85
86 //初始化装载货物重量 86 //初始化装载货物重量
87 - private static double goodsWt=0.0,inWt=0.0,diffVal=0.0,selfWt=0.0; 87 + private double goodsWt=0.0,inWt=0.0,diffVal=0.0,selfWt=0.0;
88 private List<LAND_BUSINEESTYPE_LIST_INFO> listinfos; 88 private List<LAND_BUSINEESTYPE_LIST_INFO> listinfos;
89 89
90 @Autowired 90 @Autowired
@@ -128,7 +128,7 @@ public class LiftBar { @@ -128,7 +128,7 @@ public class LiftBar {
128 //1. 若无车牌号，返回未识别错误 128 //1. 若无车牌号，返回未识别错误
129 if (vaName.length() <= 0) { 129 if (vaName.length() <= 0) {
130 logger.error(NO_CHEPAI+vaName); 130 logger.error(NO_CHEPAI+vaName);
131 - logic.sendBw(info,false,NO_CHEPAI + vaName,new LandBusinessTypeList(),listinfos); 131 + sendBw(info,false,NO_CHEPAI + vaName,new LandBusinessTypeList(),listinfos);
132 //CommandClient.Client(info, NO_CHEPAI + vaName); 132 //CommandClient.Client(info, NO_CHEPAI + vaName);
133 return result; 133 return result;
134 } 134 }
@@ -138,7 +138,7 @@ public class LiftBar { @@ -138,7 +138,7 @@ public class LiftBar {
138 //若无备案信息，返回车辆未备案或者识别错误 138 //若无备案信息，返回车辆未备案或者识别错误
139 if (ve == null) { 139 if (ve == null) {
140 logger.error(NORECORD+vaName); 140 logger.error(NORECORD+vaName);
141 - logic.sendBw(info,false,NORECORD + vaName,new LandBusinessTypeList(),listinfos); 141 + sendBw(info,false,NORECORD + vaName,new LandBusinessTypeList(),listinfos);
142 //CommandClient.Client(info, NORECORD + vaName); 142 //CommandClient.Client(info, NORECORD + vaName);
143 return result; 143 return result;
144 } 144 }
@@ -153,7 +153,7 @@ public class LiftBar { @@ -153,7 +153,7 @@ public class LiftBar {
153 //4. 若查询结果为null，返回无相对应进出场申请 153 //4. 若查询结果为null，返回无相对应进出场申请
154 if (list == null) { 154 if (list == null) {
155 logger.error(vaName+IEPORSE); 155 logger.error(vaName+IEPORSE);
156 - logic.sendBw(info,false,vaName+IEPORSE,list,listinfos); 156 + sendBw(info,false,vaName+IEPORSE,list,listinfos);
157 //CommandClient.Client(info, IEPORSE); 157 //CommandClient.Client(info, IEPORSE);
158 return result; 158 return result;
159 } 159 }
@@ -223,7 +223,7 @@ public class LiftBar { @@ -223,7 +223,7 @@ public class LiftBar {
223 checkResult=true; 223 checkResult=true;
224 }else{ 224 }else{
225 logger.error("[空车业务]-出场重量未通过校验:"+GROWSSEXCETION); 225 logger.error("[空车业务]-出场重量未通过校验:"+GROWSSEXCETION);
226 - logic.sendBw(info,false,GROWSSEXCETION,list,listinfos); 226 + sendBw(info,false,GROWSSEXCETION,list,listinfos);
227 return false; 227 return false;
228 } 228 }
229 break; 229 break;
@@ -233,7 +233,7 @@ public class LiftBar { @@ -233,7 +233,7 @@ public class LiftBar {
233 checkResult=true; 233 checkResult=true;
234 }else{ 234 }else{
235 logger.error("[出口送货]-出场重量未通过校验:"+GROWSSEXCETION); 235 logger.error("[出口送货]-出场重量未通过校验:"+GROWSSEXCETION);
236 - logic.sendBw(info,false,GROWSSEXCETION,list,listinfos); 236 + sendBw(info,false,GROWSSEXCETION,list,listinfos);
237 //CommandClient.Client(info, GROWSSEXCETION); 237 //CommandClient.Client(info, GROWSSEXCETION);
238 return false; 238 return false;
239 } 239 }
@@ -254,7 +254,7 @@ public class LiftBar { @@ -254,7 +254,7 @@ public class LiftBar {
254 }else { 254 }else {
255 //有运单未放行 255 //有运单未放行
256 logger.error("[进口提货]-出场未通过校验:"+FANGXING+list.getMasterList()); 256 logger.error("[进口提货]-出场未通过校验:"+FANGXING+list.getMasterList());
257 - logic.sendBw(info,false,FANGXING+list.getMasterList(),list,listinfos); 257 + sendBw(info,false,FANGXING+list.getMasterList(),list,listinfos);
258 //CommandClient.Client(info, FANGXING); 258 //CommandClient.Client(info, FANGXING);
259 return false; 259 return false;
260 } 260 }
@@ -262,7 +262,7 @@ public class LiftBar { @@ -262,7 +262,7 @@ public class LiftBar {
262 //todo:装载运单历史数据累加超重判定 262 //todo:装载运单历史数据累加超重判定
263 }else{ 263 }else{
264 logger.error("[进口提货]-出场重量未通过校验:"+GROWSSEXCETION); 264 logger.error("[进口提货]-出场重量未通过校验:"+GROWSSEXCETION);
265 - logic.sendBw(info,false,GROWSSEXCETION,list,listinfos); 265 + sendBw(info,false,GROWSSEXCETION,list,listinfos);
266 //CommandClient.Client(info, GROWSSEXCETION); 266 //CommandClient.Client(info, GROWSSEXCETION);
267 return false; 267 return false;
268 } 268 }
@@ -273,7 +273,7 @@ public class LiftBar { @@ -273,7 +273,7 @@ public class LiftBar {
273 boolean allocatCheck = checkNmmsAllocate(list.getMasterList()); 273 boolean allocatCheck = checkNmmsAllocate(list.getMasterList());
274 if(!allocatCheck){ 274 if(!allocatCheck){
275 logger.error("[分拨业务]-分拨申请舱单未通过校验:"+FENBO); 275 logger.error("[分拨业务]-分拨申请舱单未通过校验:"+FENBO);
276 - logic.sendBw(info,false,FENBO,list,listinfos); 276 + sendBw(info,false,FENBO,list,listinfos);
277 //CommandClient.Client(info, FENBO); 277 //CommandClient.Client(info, FENBO);
278 return false; 278 return false;
279 } 279 }
@@ -281,7 +281,7 @@ public class LiftBar { @@ -281,7 +281,7 @@ public class LiftBar {
281 //todo:分拨运抵通知,重车入场视为运抵 281 //todo:分拨运抵通知,重车入场视为运抵
282 }else{ 282 }else{
283 logger.error("[分拨业务]-出场重量未通过校验:"+GROWSSEXCETION); 283 logger.error("[分拨业务]-出场重量未通过校验:"+GROWSSEXCETION);
284 - logic.sendBw(info,false,GROWSSEXCETION,list,listinfos); 284 + sendBw(info,false,GROWSSEXCETION,list,listinfos);
285 //CommandClient.Client(info, GROWSSEXCETION); 285 //CommandClient.Client(info, GROWSSEXCETION);
286 return false; 286 return false;
287 } 287 }
@@ -295,14 +295,14 @@ public class LiftBar { @@ -295,14 +295,14 @@ public class LiftBar {
295 }else { 295 }else {
296 //有运单未放行 296 //有运单未放行
297 logger.error("[调拨业务]-出场未通过校验:"+FANGXING+list.getMasterList()); 297 logger.error("[调拨业务]-出场未通过校验:"+FANGXING+list.getMasterList());
298 - logic.sendBw(info,false,FANGXING,list,listinfos); 298 + sendBw(info,false,FANGXING,list,listinfos);
299 //CommandClient.Client(info, FANGXING); 299 //CommandClient.Client(info, FANGXING);
300 return false; 300 return false;
301 } 301 }
302 //todo:检查ULD放行. 302 //todo:检查ULD放行.
303 }else{ 303 }else{
304 logger.error("[调拨业务]-出场未通过校验:"+GROWSSEXCETION); 304 logger.error("[调拨业务]-出场未通过校验:"+GROWSSEXCETION);
305 - logic.sendBw(info,false,GROWSSEXCETION,list,listinfos); 305 + sendBw(info,false,GROWSSEXCETION,list,listinfos);
306 //CommandClient.Client(info, GROWSSEXCETION); 306 //CommandClient.Client(info, GROWSSEXCETION);
307 return false; 307 return false;
308 } 308 }
@@ -337,7 +337,7 @@ public class LiftBar { @@ -337,7 +337,7 @@ public class LiftBar {
337 } 337 }
338 338
339 //发送抬杆指令,todo:生产环境去掉下面注释 339 //发送抬杆指令,todo:生产环境去掉下面注释
340 - boolean commandResult = logic.sendBw(info, checkResult,PERMITTHOUGH,list,listinfos); 340 + boolean commandResult = sendBw(info, checkResult,PERMITTHOUGH,list,listinfos);
341 //fortest 正式环境删除 341 //fortest 正式环境删除
342 // boolean commandResult = true; 342 // boolean commandResult = true;
343 if(commandResult){//发送抬杆儿报文 343 if(commandResult){//发送抬杆儿报文