增加入场重量比对

@@ -5,7 +5,7 @@
 
 
     <groupId>com.sy</groupId>
     <groupId>com.sy</groupId>
     <artifactId>analysis_imf</artifactId>
     <artifactId>analysis_imf</artifactId>
-    <version>4.8-LOCK-SNAPSHOT</version>
+    <version>4.9-LOCK-SNAPSHOT</version>
     <packaging>jar</packaging>
     <packaging>jar</packaging>
     <name>analysis_imf</name>
     <name>analysis_imf</name>
     <description>北货集成金二抬杆指令判定</description>
     <description>北货集成金二抬杆指令判定</description>

@@ -161,8 +161,8 @@ public class WeightCheckHandleServiceImpl implements WeightCheckHandleService {
             log.info("[WEIGHT-CHECK]-实际离场拉货重量:{},申请离场拉货重量:{},货重差值:{},货重误差:{}",grossWt-inWt,goodsWt,grossWt-inWt-goodsWt,goodCheckResult);
             log.info("[WEIGHT-CHECK]-实际离场拉货重量:{},申请离场拉货重量:{},货重差值:{},货重误差:{}",grossWt-inWt,goodsWt,grossWt-inWt-goodsWt,goodCheckResult);
             log.info("[WEIGHT-CHECK]-进出场比对差值:{},提货离场差值:{},进出场比对重量差:{}",result,result1,Math.abs(inWt  - grossWt));
             log.info("[WEIGHT-CHECK]-进出场比对差值:{},提货离场差值:{},进出场比对重量差:{}",result,result1,Math.abs(inWt  - grossWt));
 
 
-            if (result <= range
-//                    || goodCheckResult<=range
+            if (goodCheckResult<=range
+//                    || result <= range
             ) {
             ) {
 
 
                 flag = true;
                 flag = true;
@@ -207,14 +207,15 @@ public class WeightCheckHandleServiceImpl implements WeightCheckHandleService {
 
 
         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((grossWt-inWt-goodsWt)) / goodsWt));
             //带货出,用车辆备案重量对碰,车辆备案重量+带货重量 = 离场重量
             //带货出,用车辆备案重量对碰,车辆备案重量+带货重量 = 离场重量
 //            result4 = Double.parseDouble(df.format(Math.abs((wt + goodsWt - grossWt)) / grossWt));
 //            result4 = Double.parseDouble(df.format(Math.abs((wt + goodsWt - grossWt)) / grossWt));
             result4 = Double.parseDouble(df.format(Math.abs((grossWt-wt-goodsWt)) / goodsWt));
             result4 = Double.parseDouble(df.format(Math.abs((grossWt-wt-goodsWt)) / goodsWt));
             //空车出,过磅重量 = 车辆备案重量
             //空车出,过磅重量 = 车辆备案重量
             result2 = Double.parseDouble(df.format(Math.abs((grossWt-wt)) / wt));
             result2 = Double.parseDouble(df.format(Math.abs((grossWt-wt)) / wt));
             //卸货出,入场重量-卸货重量 = 离场重量
             //卸货出,入场重量-卸货重量 = 离场重量
-            result3 = Double.parseDouble(df.format(Math.abs((inWt - goodsWt - grossWt)) / grossWt));
+            result3 = Double.parseDouble(df.format(Math.abs((inWt - goodsWt - grossWt)) / goodsWt));
+
             System.out.println("进场提货离场差值:"+result);
             System.out.println("进场提货离场差值:"+result);
             System.out.println("空车离场差值:"+result2);
             System.out.println("空车离场差值:"+result2);
             System.out.println("进场卸货离场差值:"+result3);
             System.out.println("进场卸货离场差值:"+result3);
@@ -222,8 +223,8 @@ public class WeightCheckHandleServiceImpl implements WeightCheckHandleService {
         }
         }
         double range = valueDob();
         double range = valueDob();
         if (result2 <= range
         if (result2 <= range
-//                ||  result <= range
-//                ||  result3 <= range
+                ||  result <= range
+                ||  result3 <= range
                 ||  result4 <= range
                 ||  result4 <= range
         ) {
         ) {
             flag = true;
             flag = true;