合同已完成量

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

@@ -330,7 +330,7 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 已完成量
      */
     @TableField(exist = false)
-    private Float completedQuantity;
+    private Double completedQuantity;
     /**
      * 合同价格/移库任务价格
      */

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

@@ -382,7 +382,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         //现货自运采购合同
         if ("1".equals(contractManagementInfo.getGoodsType()) && "1".equals(contractManagementInfo.getDeliverType()) && "2".equals(contractManagementInfo.getContractType())) {
             //定义出库量
-            Float outWeight = 0.0f;
+            Double outWeight = 0.0d;
             //查询同名临时库出库量
             List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                     .eq("warehouse_name", contractManagementInfo.getContractNo())
@@ -395,7 +395,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 }
             }
             //定义退库量
-            Float returnWeight = 0.0f;
+            Double returnWeight = 0.0d;
             //查询同名临时库出库量
             List<WarehouseInOutInfo> warehouseInOutInfoList1 = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                     .eq("warehouse_name", contractManagementInfo.getContractNo())
@@ -412,7 +412,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         //现货他运采购合同
         else if ("1".equals(contractManagementInfo.getGoodsType()) && "2".equals(contractManagementInfo.getDeliverType()) && "2".equals(contractManagementInfo.getContractType())) {
             //定义出库量
-            Float inWeight = 0.0f;
+            Double inWeight = 0.0d;
             //查询同合同编号入库量
             List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                     .eq("contract_no", contractManagementInfo.getContractNo())
@@ -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) +Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
+                    inWeight = Double.valueOf(inWeight) +Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                 }
             }
             contractManagementInfo.setCompletedQuantity(inWeight);
@@ -429,7 +429,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         //销售合同
         else {
             //定义出库量
-            Float outWeight = 0.0f;
+            Double outWeight = 0.0d;
             //查询同合同编号出库量
             List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                     .eq("contract_no", contractManagementInfo.getContractNo())
@@ -442,16 +442,16 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 }
             }
             //定义运输损耗
-            Float loss = 0.0f;
+            Double loss = 0.0d;
             //查询同合同编号的运输任务
             TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
                     .eq("contract_no", contractManagementInfo.getContractNo())
                     .eq("delete_flag", "0"));
             if (tranTaskInfo != null) {
                 //定义装车净重
-                Float loadNetWeight = 0.0f;
+                Double loadNetWeight = 0.0d;
                 //定义卸车净重
-                Float unloadNetWeight = 0.0f;
+                Double unloadNetWeight = 0.0d;
                 //查询运输车辆
                 List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
                         .eq("info_id", tranTaskInfo.getId())
@@ -466,7 +466,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 }
             }
             //定义退库量
-            Float returnWeight = 0.0f;
+            Double returnWeight = 0.0d;
             //查询同合同编号出库量
             List<WarehouseInOutInfo> warehouseInOutInfoList1 = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                     .eq("contract_no", contractManagementInfo.getContractNo())
@@ -527,7 +527,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 //现货自运采购合同
                 if ("1".equals(contractManagementInfo1.getGoodsType()) && "1".equals(contractManagementInfo1.getDeliverType()) && "2".equals(contractManagementInfo1.getContractType())) {
                     //定义出库量
-                    Float outWeight = 0.0f;
+                    Double outWeight = 0.0d;
                     //查询同名临时库出库量
                     List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                             .eq("warehouse_name", contractManagementInfo1.getContractNo())
@@ -540,7 +540,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         }
                     }
                     //定义退库量
-                    Float returnWeight = 0.0f;
+                    Double returnWeight = 0.0d;
                     //查询同名临时库出库量
                     List<WarehouseInOutInfo> warehouseInOutInfoList1 = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                             .eq("warehouse_name", contractManagementInfo1.getContractNo())
@@ -557,7 +557,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 //现货他运采购合同
                 else if ("1".equals(contractManagementInfo1.getGoodsType()) && "2".equals(contractManagementInfo1.getDeliverType()) && "2".equals(contractManagementInfo1.getContractType())) {
                     //定义出库量
-                    Float inWeight = 0.0f;
+                    Double inWeight = 0.0d;
                     //查询同合同编号入库量
                     List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                             .eq("contract_no", contractManagementInfo1.getContractNo())
@@ -566,7 +566,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                             .eq("delete_flag", "0"));
                     if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
                         for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                            inWeight = Float.valueOf(inWeight) + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
+                            inWeight = Double.valueOf(inWeight) + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
                         }
                     }
                     contractManagementInfo1.setCompletedQuantity(inWeight);
@@ -581,7 +581,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 //销售合同
                 else {
                     //定义出库量
-                    Float outWeight = 0.0f;
+                    Double outWeight = 0.0d;
                     //查询同合同编号出库量
                     List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                             .eq("contract_no", contractManagementInfo1.getContractNo())
@@ -594,16 +594,16 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         }
                     }
                     //定义运输损耗
-                    Float loss = 0.0f;
+                    Double loss = 0.0d;
                     //查询同合同编号的运输任务
                     TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
                             .eq("contract_no", contractManagementInfo1.getContractNo())
                             .eq("delete_flag", "0"));
                     if (tranTaskInfo != null) {
                         //定义装车净重
-                        Float loadNetWeight = 0.0f;
+                        Double loadNetWeight = 0.0d;
                         //定义卸车净重
-                        Float unloadNetWeight = 0.0f;
+                        Double unloadNetWeight = 0.0d;
                         //查询运输车辆
                         List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
                                 .eq("info_id", tranTaskInfo.getId())
@@ -618,7 +618,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         }
                     }
                     //定义退库量
-                    Float returnWeight = 0.0f;
+                    Double returnWeight = 0.0d;
                     //查询同合同编号出库量
                     List<WarehouseInOutInfo> warehouseInOutInfoList1 = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
                             .eq("contract_no", contractManagementInfo1.getContractNo())
@@ -641,13 +641,13 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         .eq("contract_no",contractManagementInfo1.getContractNo()));
                         if (stockSaleReceiptReport!=null){
                             //完成量等于完货净重
-                            contractManagementInfo1.setCompletedQuantity(stockSaleReceiptReport.getNetWeight());
+                            contractManagementInfo1.setCompletedQuantity(Double.valueOf(stockSaleReceiptReport.getNetWeight()));
                         }
                     }
                     else {
                         contractManagementInfo1.setCompletedQuantity(outWeight - loss - returnWeight);
                     }
-                    contractManagementInfo1.setCompletedQuantity((float)(Math.round((contractManagementInfo1.getCompletedQuantity()!=null?contractManagementInfo1.getCompletedQuantity():0f)*1000))/1000);
+                    contractManagementInfo1.setCompletedQuantity((double)(Math.round((contractManagementInfo1.getCompletedQuantity()!=null?contractManagementInfo1.getCompletedQuantity():0f)*1000))/1000);
                 }
             }
         }
@@ -1516,7 +1516,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 HSSFDataFormat format1 = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(format1.getFormat("0.00"));
                 cell = rowx.createCell(7);
-                cell.setCellValue(editFloat(contractManagementInfo.getCompletedQuantity()));
+                cell.setCellValue(editDouble(contractManagementInfo.getCompletedQuantity()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(8);
                 cell.setCellValue(editDouble(contractManagementInfo.getGrainMoney()));
@@ -1956,7 +1956,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
 //                contextstyle.setDataFormat(df.getBuiltinFormat("#,###0.000"));//保留两位小数点
                 contextstyle.setDataFormat(format.getFormat("0.000"));
                 cell = rowx.createCell(10);
-                cell.setCellValue(editFloat(contractManagementInfo.getCompletedQuantity()));
+                cell.setCellValue(editDouble(contractManagementInfo.getCompletedQuantity()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(11);
                 cell.setCellValue(editString(contractManagementInfo.getStatus()!=null?contractManagementInfo.getStatus():contractManagementInfo.getApproveStatus()));