12

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -314,7 +314,7 @@ public class BiInfoController {
                         .eq("delete_flag", "0"));
                 if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                     for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                        outWeight = outWeight + warehouseInOutInfo.getNetWeight();
+                        outWeight = outWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                     }
                 }
                 //定义退库量
@@ -327,7 +327,7 @@ public class BiInfoController {
                         .eq("delete_flag", "0"));
                 if (!CollectionUtils.isEmpty(warehouseInOutInfoList1)) {
                     for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList1) {
-                        returnWeight = returnWeight + warehouseInOutInfo.getNetWeight();
+                        returnWeight = returnWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                     }
                 }
                 completedQuantity = completedQuantity + outWeight - returnWeight;
@@ -344,7 +344,7 @@ public class BiInfoController {
                         .eq("delete_flag", "0"));
                 if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                     for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                        inWeight = Float.valueOf(inWeight) + warehouseInOutInfo.getNetWeight();
+                        inWeight = Float.valueOf(inWeight) + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                     }
                 }
                 completedQuantity = completedQuantity + inWeight;
@@ -447,7 +447,7 @@ public class BiInfoController {
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                    outWeight = outWeight + warehouseInOutInfo.getNetWeight();
+                    outWeight = outWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             //定义运输损耗
@@ -484,7 +484,7 @@ public class BiInfoController {
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList1)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList1) {
-                    returnWeight = returnWeight + warehouseInOutInfo.getNetWeight();
+                    returnWeight = returnWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             //自运的销售合同

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

@@ -105,7 +105,7 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
     /**
      * 净重（吨）
      */
-    private Float netWeight;
+    private Double netWeight;
     /**
      * 单价（元/吨）
      */

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

@@ -144,7 +144,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             warehouseInOutInfo.setStatusFlag("3");
             warehouseInOutInfo.setInOutFlag(NumberConstant.CONSTANT2);
             warehouseInOutInfo.setContractNo(contractManagementInfo.getContractNo());
-            warehouseInOutInfo.setNetWeight(contractManagementInfo.getFinalTradingVolume());
+            warehouseInOutInfo.setNetWeight(Double.valueOf(contractManagementInfo.getFinalTradingVolume()));
             warehouseInOutInfo.setGoodsName(contractManagementInfo.getContractGoodsInfo().getGoodsName());
             warehouseInOutInfo.setGoodsNameKey(contractManagementInfo.getContractGoodsInfo().getGoodsNameKey());
             warehouseInOutInfo.setGrade(contractManagementInfo.getContractGoodsInfo().getGrade());
@@ -391,7 +391,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                    outWeight = outWeight + warehouseInOutInfo.getNetWeight();
+                    outWeight = outWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             //定义退库量
@@ -404,7 +404,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList1)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList1) {
-                    returnWeight = returnWeight + warehouseInOutInfo.getNetWeight();
+                    returnWeight = returnWeight +Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             contractManagementInfo.setCompletedQuantity(outWeight - returnWeight);
@@ -421,7 +421,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                    inWeight = Float.valueOf(inWeight) + warehouseInOutInfo.getNetWeight();
+                    inWeight = Float.valueOf(inWeight) +Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             contractManagementInfo.setCompletedQuantity(inWeight);
@@ -438,7 +438,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                    outWeight = outWeight + warehouseInOutInfo.getNetWeight();
+                    outWeight = outWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             //定义运输损耗
@@ -475,7 +475,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList1)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList1) {
-                    returnWeight = returnWeight + warehouseInOutInfo.getNetWeight();
+                    returnWeight = returnWeight +Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             contractManagementInfo.setCompletedQuantity(outWeight - loss - returnWeight);
@@ -535,7 +535,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                             .eq("delete_flag", "0"));
                     if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                         for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                            outWeight = outWeight + warehouseInOutInfo.getNetWeight();
+                            outWeight = outWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                         }
                     }
                     //定义退库量
@@ -548,7 +548,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                             .eq("delete_flag", "0"));
                     if (!CollectionUtils.isEmpty(warehouseInOutInfoList1)) {
                         for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList1) {
-                            returnWeight = returnWeight + warehouseInOutInfo.getNetWeight();
+                            returnWeight = returnWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                         }
                     }
                     contractManagementInfo1.setCompletedQuantity(outWeight - returnWeight);
@@ -565,7 +565,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                             .eq("delete_flag", "0"));
                     if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                         for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                            inWeight = Float.valueOf(inWeight) + warehouseInOutInfo.getNetWeight();
+                            inWeight = Float.valueOf(inWeight) + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                         }
                     }
                     contractManagementInfo1.setCompletedQuantity(inWeight);
@@ -589,7 +589,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                             .eq("delete_flag", "0"));
                     if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                         for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                            outWeight = outWeight + warehouseInOutInfo.getNetWeight();
+                            outWeight = outWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                         }
                     }
                     //定义运输损耗
@@ -626,7 +626,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                             .eq("delete_flag", "0"));
                     if (!CollectionUtils.isEmpty(warehouseInOutInfoList1)) {
                         for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList1) {
-                            returnWeight = returnWeight + warehouseInOutInfo.getNetWeight();
+                            returnWeight = returnWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                         }
                     }
                     //自运的销售合同

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

@@ -375,7 +375,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                     Float netWeight = 0f;
                     for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
                         //潮粮累计纯重，干粮累计净重
-                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
+                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():Float.valueOf(String.valueOf(warehouse.getNetWeight())));
                     }
                     inNetWeight = inNetWeight + netWeight;
                     inOutWarehouseTaska.setStorageVolume(inNetWeight);
@@ -389,7 +389,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                     Float netWeight = 0f;
                     for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList1) {
                         //潮粮累计纯重，干粮累计净重
-                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
+                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():Float.valueOf(String.valueOf(warehouse.getNetWeight())));
                     }
                     outNetWeight = outNetWeight + netWeight;
                     inOutWarehouseTaska.setDeliveryVolume(outNetWeight);
@@ -403,7 +403,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                     Float netWeight = 0f;
                     for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList2) {
                         //潮粮累计纯重，干粮累计净重
-                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():warehouse.getNetWeight());
+                        netWeight = netWeight + (warehouse.getPureWeight()!=null?warehouse.getPureWeight():Float.valueOf(String.valueOf(warehouse.getNetWeight())));
                     }
                     stockReturnCount = stockReturnCount + netWeight;
                     inOutWarehouseTaska.setStockReturnCount(stockReturnCount);

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

@@ -320,7 +320,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         if(paymentManagement.getPureWeight() != null){
             warehouseInOutInfo1.setPureWeight(paymentManagement.getPureWeight() / 1000);
         }
-        warehouseInOutInfo1.setNetWeight(paymentManagement.getNetWeight() / 1000);
+        warehouseInOutInfo1.setNetWeight(Double.valueOf(paymentManagement.getNetWeight() / 1000));
         warehouseInOutInfo1.setStatusFlag("3");
         warehouseInOutInfo1.setDeductionWeight(paymentManagement.getWeightDeduction());
         warehouseInOutInfoService.insert(warehouseInOutInfo1);
@@ -335,7 +335,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             original = warehousePositionStorageInfo.getStorage();
             warehousePositionStorageInfo.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
             // 更新库存量
-            warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + warehouseInOutInfo1.getNetWeight());
+            warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
             warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
         }
         // 没有货
@@ -347,7 +347,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo1.getBinNumber());
             warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo1.getGoodsName());
             warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo1.getGoodsNameKey());
-            warehousePositionStorageInfo1.setStorage(warehouseInOutInfo1.getNetWeight());
+            warehousePositionStorageInfo1.setStorage(Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
             warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
         }
         WarehouseInOutDetail warehouseInOutDetail = new WarehouseInOutDetail();
@@ -371,7 +371,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         weightedDetails.setGrainType(warehouseInOutInfo1.getType());
         weightedDetails.setInTypeKey(warehouseInOutInfo1.getInOutTypeKey());
         weightedDetails.setInType(warehouseInOutInfo1.getInOutType());
-        weightedDetails.setNetWeight(warehouseInOutInfo1.getNetWeight());
+        weightedDetails.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())));
         weightedDetails.setPureWeight(warehouseInOutInfo1.getPureWeight());
         weightedDetails.setUnitPrice(warehouseInOutInfo1.getCost());
         weightedDetails.setDeductionAmount(warehouseInOutInfo1.getDeductionAmount());
@@ -386,7 +386,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             weightedDetails.setCostBefore(weightedDetailsList.get(0).getCostBefore());
         }
         // 计算新加权成本
-        Float newCost = (paymentManagement.getGrainMoney() + original * weightedDetails.getCostBefore()) / (warehouseInOutInfo1.getNetWeight() + original);
+        Float newCost = (paymentManagement.getGrainMoney() + original * weightedDetails.getCostBefore()) / (Float.valueOf(String.valueOf(warehouseInOutInfo1.getNetWeight())) + original);
 
         weightedDetails.setCostAfter(newCost);
 

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

@@ -348,7 +348,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
                         .eq("delete_flag", "0"));
                 if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                     for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                        stockInQuantity = stockInQuantity + Float.valueOf(warehouseInOutInfo.getNetWeight());
+                        stockInQuantity = stockInQuantity + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                     }
                 }
                 //查询改价记录

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

@@ -388,7 +388,7 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                    stockInQuantity = stockInQuantity + Float.valueOf(warehouseInOutInfo.getNetWeight());
+                    stockInQuantity = stockInQuantity + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             purchaseOrder.setStockInQuantity(stockInQuantity);

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

@@ -401,7 +401,7 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
                         .eq("delete_flag", "0"));
                 if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                     for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                        stockOutQuantity = stockOutQuantity + Float.valueOf(warehouseInOutInfo.getNetWeight());
+                        stockOutQuantity = stockOutQuantity + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                     }
                 }
                 //查询出库报表记录

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

@@ -341,7 +341,7 @@ public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryRep
                     .eq("delete_flag", "0"));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                    stockOutQuantity = stockOutQuantity + Float.valueOf(warehouseInOutInfo.getNetWeight());
+                    stockOutQuantity = stockOutQuantity + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             saleOrder.setStockOutQuantity(stockOutQuantity);

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

@@ -64,7 +64,7 @@ public class TurnInfoServiceImpl extends ServiceImpl<TurnInfoMapper, TurnInfo> i
         warehouseInOutInfo.setInOutFlag("1");
         warehouseInOutInfo.setGoodsName(turnInfo.getBeforeGoodsName());
         warehouseInOutInfo.setGoodsNameKey(turnInfo.getBeforeGoodsNameKey());
-        warehouseInOutInfo.setNetWeight(turnInfo.getBeforeWeight());
+        warehouseInOutInfo.setNetWeight(Double.valueOf(turnInfo.getBeforeWeight()));
         warehouseInOutInfo.setAgent(turnInfo.getBackOffice());
         warehouseInOutInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
         warehouseInOutInfo.setStatus(StatusEnum.SUBMITTED.getName());
@@ -107,7 +107,7 @@ public class TurnInfoServiceImpl extends ServiceImpl<TurnInfoMapper, TurnInfo> i
         warehouseInOutInfo1.setInOutFlag("2");
         warehouseInOutInfo1.setGoodsName(turnInfo.getAfterGoodsName());
         warehouseInOutInfo1.setGoodsNameKey(turnInfo.getAfterGoodsNameKey());
-        warehouseInOutInfo1.setNetWeight(turnInfo.getAfterWeight());
+        warehouseInOutInfo1.setNetWeight(Double.valueOf(turnInfo.getAfterWeight()));
         warehouseInOutInfo1.setAgent(turnInfo.getBackOffice());
         warehouseInOutInfo1.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
         warehouseInOutInfo1.setStatus(StatusEnum.SUBMITTED.getName());
@@ -169,7 +169,7 @@ public class TurnInfoServiceImpl extends ServiceImpl<TurnInfoMapper, TurnInfo> i
                     if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                         Float netWeight = 0f;
                         for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                            netWeight = Float.valueOf(netWeight) + Float.valueOf(warehouse.getNetWeight());
+                            netWeight = Float.valueOf(netWeight) + Float.valueOf(String.valueOf(warehouse.getNetWeight()));
                         }
                         warehouseNumView.setGoodsName(warehouseInOutInfoAllList.get(0).getGoodsName());
                         warehouseNumView.setGoodsNameKey(warehouseInOutInfoAllList.get(0).getGoodsNameKey());
@@ -198,7 +198,7 @@ public class TurnInfoServiceImpl extends ServiceImpl<TurnInfoMapper, TurnInfo> i
                             .eq("base_id", id).eq("in_out_flag", "1").eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
                     if (!CollectionUtils.isEmpty(warehouseInOutInfoAllList)) {
                         for (WarehouseInOutInfo warehouse : warehouseInOutInfoAllList) {
-                            netWeight = Float.valueOf(netWeight) + Float.valueOf(warehouse.getNetWeight());
+                            netWeight = Float.valueOf(netWeight) +Float.valueOf(String.valueOf(warehouse.getNetWeight()));
                         }
                         if (StringUtils.isEmpty(outNetWeight)) {
                             outNetWeight = "0";

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

@@ -598,7 +598,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         Float netWeight = 0f;
                         for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
                             // 查询入库数量
-                            netWeight = netWeight + warehouseInOutInfo.getNetWeight();
+                            netWeight = netWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));;
                             if (StringUtils.isEmpty(inNetWeight)) {
                                 inNetWeight = "0";
                             }
@@ -614,7 +614,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
                         Float netWeight = 0f;
                         for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
-                            netWeight = netWeight + warehouseInOutInfo.getNetWeight();
+                            netWeight = netWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                             if (StringUtils.isEmpty(outNetWeight)) {
                                 outNetWeight = "0";
                             }

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

@@ -271,7 +271,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             overNeight=inOutWarehouseTask.getWeight()*0.08f;
                         }
                     }
-                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+warehouseInOutInfo.getNetWeight());
+                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                     if (inOutWarehouseTask.getCompletedQuantity()>inOutWarehouseTask.getWeight()+overNeight){
                         throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
                     }
@@ -312,7 +312,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             overNeight=inOutWarehouseTask.getWeight()*0.08f;
                         }
                     }
-                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+warehouseInOutInfo.getNetWeight());
+                    inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                     if (inOutWarehouseTask.getCompletedQuantity()>inOutWarehouseTask.getWeight()+overNeight){
                         throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
                     }
@@ -358,9 +358,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     .eq("delete_flag", "0"));
                             // 判断是否有货
                             if (warehousePositionStorageInfo != null) {
-                                original = warehousePositionStorageInfo.getStorage() + warehouseInOutInfo.getNetWeight();
+                                original = warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));;
                                 // 更新库存量
-                                warehousePositionStorageInfo.setStorage(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(warehouseInOutInfo.getNetWeight());
+                                warehousePositionStorageInfo1.setStorage(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                 warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
                             }
                         }
@@ -456,7 +456,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         purchaseReceiptReport.setProtein(warehouseInOutDetail.getProtein());
                         purchaseReceiptReport.setWaterContent(warehouseInOutDetail.getWaterContent());
                         purchaseReceiptReport.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
-                        purchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                        purchaseReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                         purchaseReceiptReport.setDeductionItems(warehouseInOutInfo.getDeductionItems());
                         purchaseReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                         purchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
@@ -483,7 +483,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             purchaseReceiptReport.setAmountNotPayable(purchaseReceiptReport.getAmountIngPayable());
                             if (tranCarInfo != null) {
                                 //将到货数据同步到派车表
-                                tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
+                                tranCarInfo.setUnloadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                 tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
                                 tranCarInfo.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
                                 tranCarInfo.setDeductionItems(warehouseInOutInfo.getDeductionItems());
@@ -573,7 +573,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             if (warehousePositionStorageInfo != null) {
                                 if (warehouseInOutInfo.getNetWeight() <= warehousePositionStorageInfo.getStorage()) {
                                     // 更新库存量
-                                    warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - warehouseInOutInfo.getNetWeight());
+                                    warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                     warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
                                 }
                                 //出库量大于库存量
@@ -605,7 +605,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
                         tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
                         tranCarInfo.setTranCarNo(warehouseInOutInfo.getTranCarNo());
-                        tranCarInfo.setLoadNetWeight(warehouseInOutInfo.getNetWeight());
+                        tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                         tranCarInfo.setLoadPoundImg(warehouseInOutInfo.getAddressUrl());
                         tranCarInfo.setConfirmFlag(StatusEnum.NOT_CONFIRM.getFlag());
                         // 期货销售出库统计
@@ -621,7 +621,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         salesDeliveryReport.setRetrievalDate(warehouseInOutInfo.getInOutDate());
                         salesDeliveryReport.setProtein(warehouseInOutDetail.getProtein());
                         salesDeliveryReport.setWaterContent(warehouseInOutDetail.getWaterContent());
-                        salesDeliveryReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                        salesDeliveryReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                         salesDeliveryReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                         salesDeliveryReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                         salesDeliveryReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
@@ -718,10 +718,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                             stockPurchaseReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
                             stockPurchaseReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockPurchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                            stockPurchaseReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
                             stockPurchaseReceiptReport.setDeductionWeight(warehouseInOutInfo.getDeductionWeight());
-                            stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
+                            stockPurchaseReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
 
                             if(contractManagementInfo.getUnitContractPrice()!=null) {
@@ -805,10 +805,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                                     stockPurchaseReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
                                     stockPurchaseReceiptReport.setTare(warehouseInOutInfo.getTare());
-                                    stockPurchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                                    stockPurchaseReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                     stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
                                     stockPurchaseReceiptReport.setDeductionWeight(warehouseInOutInfo.getDeductionWeight());
-                                    stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
+                                    stockPurchaseReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                     if(contractManagementInfo.getUnitContractPrice()!=null) {
                                         BigDecimal cost = new BigDecimal(contractManagementInfo.getUnitContractPrice());
                                         BigDecimal deductionAmount = new BigDecimal(warehouseInOutInfo.getDeductionAmount());
@@ -873,11 +873,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                             stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
                             stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockSaleReceiptReport.setNetWeight(-warehouseInOutInfo.getNetWeight());
+                            stockSaleReceiptReport.setNetWeight(-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
                             stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
                             stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * contractManagementInfo.getUnitContractPrice());
-                            stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
+                            stockSaleReceiptReport.setSettlementWeight(-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockSaleReceiptReport.setReturnFlag("1");
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                             stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
@@ -903,10 +903,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setTitleNo(warehouseInOutInfo.getTitleNo());
                             stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
                             stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockSaleReceiptReport.setNetWeight(-warehouseInOutInfo.getNetWeight());
+                            stockSaleReceiptReport.setNetWeight(-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
                             stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * contractManagementInfo1.getUnitContractPrice());
-                            stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
+                            stockSaleReceiptReport.setSettlementWeight(-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockSaleReceiptReport.setReturnFlag("1");
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                             stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
@@ -921,7 +921,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
                     if (tranCarInfo != null) {
                         //将到货数据同步到派车表
-                        tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
+                        tranCarInfo.setUnloadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                         if (warehouseInOutInfo.getAddressUrl()!=null) {
                             tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
                         }
@@ -949,7 +949,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             if (warehousePositionStorageInfo != null) {
                                 original = warehousePositionStorageInfo.getStorage();
                                 // 更新库存量
-                                warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + warehouseInOutInfo.getNetWeight());
+                                warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                 warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
                             }
                             // 没有货
@@ -960,7 +960,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo.getBinNumber());
                                 warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
                                 warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo.getGoodsName());
-                                warehousePositionStorageInfo1.setStorage(warehouseInOutInfo.getNetWeight());
+                                warehousePositionStorageInfo1.setStorage(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                 warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
                             }
                         }
@@ -977,7 +977,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     weightedDetails.setGrainType(warehouseInOutInfo.getType());
                     weightedDetails.setInTypeKey(warehouseInOutInfo.getInOutTypeKey());
                     weightedDetails.setInType(warehouseInOutInfo.getInOutType());
-                    weightedDetails.setNetWeight(warehouseInOutInfo.getNetWeight());
+                    weightedDetails.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                     weightedDetails.setPureWeight(warehouseInOutInfo.getPureWeight());
                     weightedDetails.setUnitPrice(warehouseInOutInfo.getCost());
                     weightedDetails.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
@@ -994,10 +994,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     // 计算新加权成本
                     float newCost = 0f;
                     if ("干粮".equals(warehouseInOutInfo.getType())) {
-                        newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * warehouseInOutInfo.getNetWeight() + original * weightedDetails.getCostBefore()) / (warehouseInOutInfo.getNetWeight() + original);
+                        newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original * weightedDetails.getCostBefore()) / (Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original);
 
                     } else {
-                        newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * warehouseInOutInfo.getNetWeight() + original * weightedDetails.getCostBefore()) / (warehouseInOutInfo.getPureWeight() + original);
+                        newCost = ((warehouseInOutInfo.getCost() + warehouseInOutInfo.getFreight()) * Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())) + original * weightedDetails.getCostBefore()) / (warehouseInOutInfo.getPureWeight() + original);
 
                     }
                     weightedDetails.setCostAfter(newCost);
@@ -1062,7 +1062,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             if (warehousePositionStorageInfo != null) {
                                 original = warehousePositionStorageInfo.getStorage();
                                 // 更新库存量
-                                warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + warehouseInOutInfo.getNetWeight());
+                                warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                 warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
                             }
                             // 没有货
@@ -1073,7 +1073,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo.getBinNumber());
                                 warehousePositionStorageInfo1.setGoodsNameKey(warehouseInOutInfo.getGoodsNameKey());
                                 warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo.getGoodsName());
-                                warehousePositionStorageInfo1.setStorage(warehouseInOutInfo.getNetWeight());
+                                warehousePositionStorageInfo1.setStorage(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                 warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
                             }
                         }
@@ -1118,7 +1118,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     tranCarInfo.setTranType("4");
                                     tranCarInfo.setSubmit("1");
                                     tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
-                                    tranCarInfo.setLoadNetWeight(warehouseInOutInfo.getNetWeight());
+                                    tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                     tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                                     tranCarInfo.setStatus(StatusEnum.LOADED.getName());
                                     if("汽运".equals(warehouseInOutInfo.getOutType())){
@@ -1163,11 +1163,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                             stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
                             stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockSaleReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                            stockSaleReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
                             //按出库重量结算时
                             if("1".equals(contractManagementInfo.getSettlementWeightMethod())) {
-                                stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
+                                stockSaleReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             }
                             stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
                             stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getNetWeight() *
@@ -1259,12 +1259,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                             stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
                             stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockSaleReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                            stockSaleReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
-                            stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
+                            stockSaleReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             //按出库重量结算时
                             if("1".equals(contractManagementInfo1.getSettlementWeightMethod())){
-                                stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
+                                stockSaleReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                 //定价销售
                                 if(contractManagementInfo1.getUnitContractPrice()!=null) {
                                     stockSaleReceiptReport.setSettlementPrice(contractManagementInfo1.getUnitContractPrice());
@@ -1333,7 +1333,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                     if (tranCarInfo != null) {
                         //将发货数据同步到派车表
-                        tranCarInfo.setLoadNetWeight(warehouseInOutInfo.getNetWeight());
+                        tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                         if (warehouseInOutInfo.getAddressUrl()!=null) {
                             tranCarInfo.setLoadPoundImg(warehouseInOutInfo.getAddressUrl());
                         }
@@ -1362,7 +1362,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             if (warehousePositionStorageInfo != null) {
                                 if (warehouseInOutInfo.getNetWeight() <= warehousePositionStorageInfo.getStorage()) {
                                     // 更新库存量
-                                    warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - warehouseInOutInfo.getNetWeight());
+                                    warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                     warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
                                 }
                                 //出库量大于库存量
@@ -1417,9 +1417,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                             stockPurchaseReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
                             stockPurchaseReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockPurchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                            stockPurchaseReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
-                            stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
+                            stockPurchaseReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                 stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
@@ -1509,7 +1509,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
                         if (tranCarInfo != null) {
                             //将发货数据同步到派车表
-                            tranCarInfo.setLoadNetWeight(warehouseInOutInfo.getNetWeight());
+                            tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             if (warehouseInOutInfo.getAddressUrl()!=null) {
                                 tranCarInfo.setLoadPoundImg(warehouseInOutInfo.getAddressUrl());
                             }
@@ -1545,9 +1545,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                             stockPurchaseReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
                             stockPurchaseReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockPurchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
+                            stockPurchaseReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
-                            stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
+                            stockPurchaseReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                 stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
@@ -1594,7 +1594,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
                         if (tranCarInfo != null) {
                             //将发货数据同步到派车表
-                            tranCarInfo.setLoadNetWeight(warehouseInOutInfo.getNetWeight());
+                            tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             if (warehouseInOutInfo.getAddressUrl()!=null) {
                                 tranCarInfo.setLoadPoundImg(warehouseInOutInfo.getAddressUrl());
                             }
@@ -1638,7 +1638,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranCarInfo.setCompId(warehouseBaseInfo.getCompId());
                             tranCarInfo.setTranType("1");
                             tranCarInfo.setSubmit("1");
-                            tranCarInfo.setLoadNetWeight(warehouseInOutInfo.getNetWeight());
+                            tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             tranCarInfo.setLoadingDate(new Date());
                             tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
                             String tranCarNo="";

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

@@ -102,7 +102,7 @@ public class WarehouseInventoryCountInfoServiceImpl extends ServiceImpl<Warehous
                     .eq("goods_name_key",warehouseInventoryCountInfo1.getGoodsNameKey()));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                    inNetWeight = inNetWeight + warehouseInOutInfo.getNetWeight();
+                    inNetWeight = inNetWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             warehouseInventoryCountInfoCopy.setCumulativeStockIn(inNetWeight + physicalInventory);
@@ -118,7 +118,7 @@ public class WarehouseInventoryCountInfoServiceImpl extends ServiceImpl<Warehous
                     .eq("goods_name_key",warehouseInventoryCountInfo1.getGoodsNameKey()));
             if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
-                        outNetWeight = outNetWeight + warehouseInOutInfo.getNetWeight();
+                        outNetWeight = outNetWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             warehouseInventoryCountInfoCopy.setCumulativeStockOut(outNetWeight);
@@ -137,7 +137,7 @@ public class WarehouseInventoryCountInfoServiceImpl extends ServiceImpl<Warehous
                     .eq("goods_name_key",warehouseInventoryCountInfo.getGoodsNameKey()));
             if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                    inNetWeight = inNetWeight + warehouseInOutInfo.getNetWeight();
+                    inNetWeight = inNetWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             warehouseInventoryCountInfoCopy.setCumulativeStockIn(inNetWeight);
@@ -152,7 +152,7 @@ public class WarehouseInventoryCountInfoServiceImpl extends ServiceImpl<Warehous
                     .eq("goods_name_key",warehouseInventoryCountInfo.getGoodsNameKey()));
             if (!CollectionUtils.isEmpty(warehouseInOutInfos)) {
                 for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos) {
-                    outNetWeight = outNetWeight + warehouseInOutInfo.getNetWeight();
+                    outNetWeight = outNetWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             warehouseInventoryCountInfoCopy.setCumulativeStockOut(outNetWeight);