调拨业务增加离场重量比对条件,车辆备案重量+装载重量=过磅重量的条件

@@ -164,17 +164,24 @@ public class WeightCheckHandleServiceImpl implements WeightCheckHandleService {
 
 
         //卸货离场判定
         //卸货离场判定
         double result3= 0.00;
         double result3= 0.00;
+        double result4= 0.00;
 
 
         if(Double.doubleToLongBits(grossWt)>Double.doubleToLongBits(0)){
         if(Double.doubleToLongBits(grossWt)>Double.doubleToLongBits(0)){
+            //带货出,入场重量+带货重量 = 离场重量
             result = Double.parseDouble(df.format(Math.abs((inWt + goodsWt - grossWt)) / grossWt));
             result = Double.parseDouble(df.format(Math.abs((inWt + goodsWt - grossWt)) / grossWt));
+            //带货出,用车辆备案重量对碰,车辆备案重量+带货重量 = 离场重量
+            result4 = Double.parseDouble(df.format(Math.abs((wt + goodsWt - grossWt)) / grossWt));
+            //空车出,过磅重量 = 车辆备案重量
             result2 = Double.parseDouble(df.format(Math.abs((grossWt-wt)) / grossWt));
             result2 = Double.parseDouble(df.format(Math.abs((grossWt-wt)) / grossWt));
+            //卸货出,入场重量-卸货重量 = 离场重量
             result3 = Double.parseDouble(df.format(Math.abs((inWt - goodsWt - grossWt)) / grossWt));
             result3 = Double.parseDouble(df.format(Math.abs((inWt - goodsWt - grossWt)) / grossWt));
             System.out.println("进场提货离场差值:"+result);
             System.out.println("进场提货离场差值:"+result);
             System.out.println("空车离场差值:"+result2);
             System.out.println("空车离场差值:"+result2);
             System.out.println("进场卸货离场差值:"+result3);
             System.out.println("进场卸货离场差值:"+result3);
+            System.out.println("备案重量进场装载货物离场差值:"+result4);
         }
         }
         double range = valueDob();
         double range = valueDob();
-        if (result <= range ||  result2 <= range ||  result3 <= range ) {
+        if (result <= range ||  result2 <= range ||  result3 <= range ||  result4 <= range) {
             flag = true;
             flag = true;
         }
         }
         return flag;
         return flag;