...
|
...
|
@@ -172,9 +172,15 @@ public class LogicOperation { |
|
|
}
|
|
|
}
|
|
|
|
|
|
boolean check = logic.checkResult(growssWt, selfWt, goodsWt);
|
|
|
boolean checkMainfest = logic.checkManifest(list.getMasterList());
|
|
|
boolean checkResult = false;
|
|
|
boolean check = false;
|
|
|
boolean checkMainfest =false;
|
|
|
|
|
|
if(!"普通货".equals(list.getCocode())){
|
|
|
checkResult = true;
|
|
|
}else {
|
|
|
check = logic.checkResult(growssWt, selfWt, goodsWt);
|
|
|
checkMainfest = logic.checkManifest(list.getMasterList());
|
|
|
|
|
|
if ("E".equals(list.getTurnoverflag())) {
|
|
|
checkResult = checkMainfest || check;
|
...
|
...
|
@@ -182,9 +188,6 @@ public class LogicOperation { |
|
|
checkResult = check || checkMainfest;
|
|
|
}
|
|
|
|
|
|
if("查验货".equals(list.getCocode())){
|
|
|
checkResult = true;
|
|
|
}
|
|
|
//宽进
|
|
|
if ("I".equals(info.getIetype())) {
|
|
|
if (check == false && checkResult == false) {
|
...
|
...
|
@@ -192,6 +195,7 @@ public class LogicOperation { |
|
|
}
|
|
|
}
|
|
|
logger.info("重量校验结果:" + check + ",运单校验结果:" + checkMainfest + ",最终校验结果:" + checkResult);
|
|
|
}
|
|
|
|
|
|
if (logic.sendBw(info, checkResult)) {
|
|
|
if ("I".equals(info.getIetype())) {
|
...
|
...
|
@@ -208,6 +212,8 @@ public class LogicOperation { |
|
|
double diffVal = 0;
|
|
|
for (int i = 0; i < typeLists.size(); i++) {
|
|
|
if ("I".equals(typeLists.get(i).getTurnoverflag()) && typeLists.get(i).getEndstation().equals(list.getEndstation())) {
|
|
|
System.out.println(typeLists.get(i).getAislewt());
|
|
|
System.out.println(growssWt);
|
|
|
diffVal = typeLists.get(i).getAislewt() - growssWt;
|
|
|
break;
|
|
|
}
|
...
|
...
|
|