1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehousePositionStorageInfo.java

@@ -53,11 +53,11 @@ public class WarehousePositionStorageInfo extends BaseModel<WarehousePositionSto
     /**
      * 储存量（吨）
      */
-    private Float storage;
+    private Double storage;
     /**
      * 可用储存量（吨）
      */
-    private Float useStorage;
+    private Double useStorage;
 
 
     @Override

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

@@ -278,10 +278,11 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editInfo(PaymentManagement paymentManagement) {
+        this.updateById(paymentManagement);
         PaymentManagement paymentManagement1 = this.selectById(paymentManagement.getId());
         paymentManagement1.setSettlementDate(new Date());
         //未付
-        paymentManagement.setAmountNotPayable(paymentManagement.getAmountIngPayable() - paymentManagement1.getAmountEdPayable());
+        paymentManagement1.setAmountNotPayable(paymentManagement.getAmountIngPayable() - paymentManagement1.getAmountEdPayable());
         this.openAuditFlow(paymentManagement1);
         //查询关联流转记录
         QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
@@ -337,7 +338,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 .eq("delete_flag", "0"));
         // 判断是否有货
         if (warehousePositionStorageInfo != null) {
-            original = warehousePositionStorageInfo.getStorage();
+            original = Float.valueOf(String.valueOf(warehousePositionStorageInfo.getStorage()));
             warehousePositionStorageInfo.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
             // 更新库存量
             warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
@@ -352,7 +353,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo1.getBinNumber());
             warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo1.getGoodsName());
             warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
-            warehousePositionStorageInfo1.setStorage(Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
+            warehousePositionStorageInfo1.setStorage(warehouseInOutInfo1.getNetWeight());
             warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
         }
         WarehouseInOutDetail warehouseInOutDetail = new WarehouseInOutDetail();
@@ -437,8 +438,6 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             costManagementInfo.setStorage(net);
             costManagementInfoService.updateById(costManagementInfo);
         }
-
-        this.updateById(paymentManagement);
         return "OK";
     }
 

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

@@ -94,7 +94,7 @@ public class TurnInfoServiceImpl extends ServiceImpl<TurnInfoMapper, TurnInfo> i
                 warehousePositionStorageInfo2.setBinNumber(turnInfo.getAfterBinNo());
                 warehousePositionStorageInfo2.setGoodsNameKey(turnInfo.getAfterGoodsNameKey());
                 warehousePositionStorageInfo2.setGoodsName(turnInfo.getAfterGoodsName());
-                warehousePositionStorageInfo2.setStorage(turnInfo.getAfterWeight());
+                warehousePositionStorageInfo2.setStorage(Double.valueOf(String.valueOf(turnInfo.getAfterWeight())));
                 warehousePositionStorageInfoService.insert(warehousePositionStorageInfo2);
             }
         }

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

@@ -520,7 +520,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             Float storage = 0f;
             String detailStorage = "";
             for (WarehousePositionStorageInfo warehousePositionStorageInfo : warehousePositionStorageInfoList) {
-                storage = storage + warehousePositionStorageInfo.getStorage();
+                storage = storage + Float.valueOf(String.valueOf(warehousePositionStorageInfo.getStorage()));
                 detailStorage = detailStorage + warehousePositionStorageInfo.getGoodsName() + "(" + warehousePositionStorageInfo.getStorage() + ")  ";
             }
             warehousePositionInfo.setDetailStorage(detailStorage);
@@ -582,7 +582,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                                 .eq("position_id", warehousePositionInfo.getId()));
                         if (!CollectionUtils.isEmpty(warehousePositionStorageInfoList)) {
                             for (WarehousePositionStorageInfo warehousePositionStorageInfo : warehousePositionStorageInfoList) {
-                                residual = residual + warehousePositionStorageInfo.getStorage();
+                                residual = residual + Float.valueOf(String.valueOf(warehousePositionStorageInfo.getStorage()));
                             }
                         }
                     }

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

@@ -358,7 +358,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     .eq("delete_flag", "0"));
                             // 判断是否有货
                             if (warehousePositionStorageInfo != null) {
-                                original = warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));;
+                                original = Float.valueOf(String.valueOf(warehousePositionStorageInfo.getStorage() + warehouseInOutInfo.getNetWeight()));;
                                 // 更新库存量
                                 warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                 warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
@@ -372,7 +372,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo.getBinNumber());
                                 warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo.getGoodsName());
                                 warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
-                                warehousePositionStorageInfo1.setStorage(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                warehousePositionStorageInfo1.setStorage(warehouseInOutInfo.getNetWeight());
                                 warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
                             }
                         }
@@ -961,7 +961,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     .eq("delete_flag", "0"));
                             // 判断是否有货
                             if (warehousePositionStorageInfo != null) {
-                                original = warehousePositionStorageInfo.getStorage();
+                                original = Float.valueOf(String.valueOf(warehousePositionStorageInfo.getStorage()));
                                 // 更新库存量
                                 warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                 warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
@@ -974,7 +974,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo.getBinNumber());
                                 warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
                                 warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo.getGoodsName());
-                                warehousePositionStorageInfo1.setStorage(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                warehousePositionStorageInfo1.setStorage(warehouseInOutInfo.getNetWeight());
                                 warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
                             }
                         }
@@ -1089,7 +1089,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     .eq("delete_flag", "0"));
                             // 判断是否有货
                             if (warehousePositionStorageInfo != null) {
-                                original = warehousePositionStorageInfo.getStorage();
+                                original = Float.valueOf(String.valueOf(warehousePositionStorageInfo.getStorage()));
                                 // 更新库存量
                                 warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                 warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
@@ -1102,7 +1102,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo.getBinNumber());
                                 warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
                                 warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo.getGoodsName());
-                                warehousePositionStorageInfo1.setStorage(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                warehousePositionStorageInfo1.setStorage(warehouseInOutInfo.getNetWeight());
                                 warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
                             }
                         }

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

@@ -179,7 +179,7 @@ public class WarehouseInventoryCountInfoServiceImpl extends ServiceImpl<Warehous
                 .eq("position_id",warehouseInventoryCountInfo.getPositionId())
                 .eq("goods_name_key",warehouseInventoryCountInfo.getGoodsNameKey()));
         if (warehousePositionStorageInfo !=null){
-            warehousePositionStorageInfo.setStorage(warehouseInventoryCountInfo.getPhysicalInventory());
+            warehousePositionStorageInfo.setStorage(Double.valueOf(String.valueOf(warehouseInventoryCountInfo.getPhysicalInventory())));
             warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
         }
         boolean one = this.insert(warehouseInventoryCountInfo);