货运收发

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FreightReceivingDispatchingServiceImpl.java

@@ -146,7 +146,7 @@ public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightR
                 .eq("delete_flag","0"));
         if(!CollectionUtils.isEmpty(freightReceivingDispatchingList)){
             for (FreightReceivingDispatching freightReceivingDispatching:freightReceivingDispatchingList){
-                freightReceivingDispatching.setSignedFor(String.valueOf(Integer.valueOf(freightReceivingDispatching.getSignedFor()) + 1));
+                freightReceivingDispatching.setSignedFor(String.valueOf(Float.valueOf(freightReceivingDispatching.getSignedFor()) + 1));
                 this.updateById(freightReceivingDispatching);
             }
             freightReceivingDispatchingCar.setGoodsIngPayable(freightReceivingDispatchingCar.getReciveNetWeight()*freightReceivingDispatchingList.get(0).getGoodsPrice());
@@ -175,7 +175,7 @@ public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightR
         FreightReceivingDispatchingCar freightReceivingDispatchingCar1 = freightReceivingDispatchingCarService.selectById(freightReceivingDispatchingCar.getId());
         if ("0".equals(freightReceivingDispatchingCar.getFlag())){
             freightReceivingDispatchingCar1.setFreightIngPayable(freightReceivingDispatchingCar1.getFreightIngPayable()-freightReceivingDispatchingCar.getFreightDeductionAmount());
-            freightReceivingDispatchingCar1.setFreightDeductionAmount(freightReceivingDispatchingCar.getFreightDeductionAmount());
+            freightReceivingDispatchingCar1.setFreightDeductionAmount(freightReceivingDispatchingCar1.getFreightDeductionAmount()+freightReceivingDispatchingCar.getFreightDeductionAmount());
         }
         else{
             freightReceivingDispatchingCar1.setFreightIngPayable(freightReceivingDispatchingCar.getFreightIngPayable());
@@ -198,8 +198,8 @@ public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightR
         FreightReceivingDispatchingCar freightReceivingDispatchingCar1 = freightReceivingDispatchingCarService.selectById(freightReceivingDispatchingCar.getId());
         freightReceivingDispatchingCar1.setGoodsIngPayable(freightReceivingDispatchingCar.getGoodsIngPayable());
         // 付款金额 用已付这个字段  然后累加
-        freightReceivingDispatchingCar1.setFreightEdPayable(freightReceivingDispatchingCar1.getFreightEdPayable() + freightReceivingDispatchingCar.getMoney());
-        freightReceivingDispatchingCar1.setGoodsDeductionAmount(freightReceivingDispatchingCar.getGoodsDeductionAmount());
+        freightReceivingDispatchingCar1.setGoodsEdPayable(freightReceivingDispatchingCar1.getGoodsEdPayable() + freightReceivingDispatchingCar.getGoodsEdPayable());
+        freightReceivingDispatchingCar1.setGoodsDeductionAmount(freightReceivingDispatchingCar1.getGoodsDeductionAmount()+freightReceivingDispatchingCar.getGoodsDeductionAmount());
         if (freightReceivingDispatchingCar1.getGoodsIngPayable() == freightReceivingDispatchingCar1.getGoodsEdPayable()) {
             freightReceivingDispatchingCar1.setStatusFlag("5");
             freightReceivingDispatchingCar1.setStatus("已完成");
@@ -209,7 +209,7 @@ public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightR
                 .eq("delete_flag","0"));
         if(!CollectionUtils.isEmpty(freightReceivingDispatchingList)){
             for (FreightReceivingDispatching freightReceivingDispatching:freightReceivingDispatchingList){
-                freightReceivingDispatching.setToSettled(String.valueOf(Integer.valueOf(freightReceivingDispatching.getToSettled()) - 1));
+                freightReceivingDispatching.setToSettled(String.valueOf(Float.valueOf(freightReceivingDispatching.getToSettled()) - 1));
                 this.updateById(freightReceivingDispatching);
             }
         }
@@ -239,8 +239,8 @@ public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightR
                 .eq("delete_flag","0"));
         if(!CollectionUtils.isEmpty(freightReceivingDispatchingList)){
             for (FreightReceivingDispatching freightReceivingDispatching:freightReceivingDispatchingList){
-                freightReceivingDispatching.setToSettled(String.valueOf(Integer.valueOf(freightReceivingDispatching.getToSettled()) + 1));
-                freightReceivingDispatching.setSignedFor(String.valueOf(Integer.valueOf(freightReceivingDispatching.getSignedFor()) - 1));
+                freightReceivingDispatching.setToSettled(String.valueOf(Float.valueOf(freightReceivingDispatching.getToSettled()) + 1));
+                freightReceivingDispatching.setSignedFor(String.valueOf(Float.valueOf(freightReceivingDispatching.getSignedFor()) - 1));
                 this.updateById(freightReceivingDispatching);
             }
             //发货净重小