zhangyuewww 2 rokov pred
rodič
commit
82d5494963

+ 1 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/InOutWarehouseTask.java

@@ -140,7 +140,7 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
     /**
      * 已完成量(吨)
      */
-    private Float completedQuantity;
+    private Double completedQuantity;
     /**
      * 运输损耗(吨)
      */

+ 5 - 5
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -317,7 +317,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             overNeight = inOutWarehouseTask.getWeight() * 0.08f;
                         }
                     }
-                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
                     if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
                         throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
                     } else {
@@ -356,7 +356,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             overNeight = inOutWarehouseTask.getWeight() * 0.08f;
                         }
                     }
-                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
                     if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
                         throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
                     } else {
@@ -1901,7 +1901,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         InOutWarehouseTask inOutWarehouseTask = inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                 .eq("in_out_task_no", warehouseInOutInfo1.getInOutTaskNo()));
         if (inOutWarehouseTask != null) {
-            inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() - Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
+            inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() - warehouseInOutInfo1.getNetWeight());
         }
         return "OK";
 
@@ -2539,7 +2539,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             overNeight = inOutWarehouseTask.getWeight() * 0.08f;
                         }
                     }
-                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
                     if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
                         throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
                     } else {
@@ -2592,7 +2592,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             overNeight = inOutWarehouseTask.getWeight() * 0.08f;
                         }
                     }
-                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity() + warehouseInOutInfo.getNetWeight());
                     if (inOutWarehouseTask.getCompletedQuantity() > inOutWarehouseTask.getWeight() + overNeight) {
                         throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
                     } else {