1

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

@@ -103,7 +103,8 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                     Float ton = 0f;
                                     if (!CollectionUtils.isEmpty(salesDeliveryReports1)) {
                                         for (int j = 0; j < salesDeliveryReports1.size(); j++) {
-                                            ton = ton + salesDeliveryReports1.get(i).getNetWeight();
+                                            ton = ton + Float.valueOf(String.valueOf(salesDeliveryReports1.get(i).getNetWeight()));
+
                                         }
 
                                     }
@@ -135,7 +136,7 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                     Float ton = 0f;
                                     if (!CollectionUtils.isEmpty(salesDeliveryReports1)) {
                                         for (int j = 0; j < salesDeliveryReports1.size(); j++) {
-                                            ton = ton + salesDeliveryReports1.get(i).getNetWeight();
+                                            ton = ton + Float.valueOf(String.valueOf(salesDeliveryReports1.get(i).getNetWeight()));
                                         }
 
                                     }
@@ -197,7 +198,7 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                     Float ton = 0f;
                                     if (!CollectionUtils.isEmpty(salesDeliveryReports1)) {
                                         for (int j = 0; j < salesDeliveryReports1.size(); j++) {
-                                            ton = ton + salesDeliveryReports1.get(i).getNetWeight();
+                                            ton = ton + Float.valueOf(String.valueOf(salesDeliveryReports1.get(i).getNetWeight()));
                                         }
 
                                     }
@@ -229,7 +230,7 @@ public class StorageFeeRecordServiceImpl extends ServiceImpl<StorageFeeRecordMap
                                     Float ton = 0f;
                                     if (!CollectionUtils.isEmpty(salesDeliveryReports1)) {
                                         for (int j = 0; j < salesDeliveryReports1.size(); j++) {
-                                            ton = ton + salesDeliveryReports1.get(i).getNetWeight();
+                                            ton = ton + Float.valueOf(String.valueOf(salesDeliveryReports1.get(i).getNetWeight()));
                                         }
 
                                     }

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

@@ -501,10 +501,10 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         //现货销售出库报表
                                         stockSaleReceiptReport.setFeedbackPerson(commonStaff.getStaffName());
                                         stockSaleReceiptReport.setFeedbackDate(new Date());
-                                        stockSaleReceiptReport.setFeedbackWeight(tranCarInfo.getUnloadNetWeight());
+                                        stockSaleReceiptReport.setFeedbackWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                                         //按收货重量结算时
                                         if("2".equals(contractManagementInfo.getSettlementWeightMethod())){
-                                            stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
+                                            stockSaleReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                                             //定价销售
                                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                                 stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
@@ -544,10 +544,10 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         //现货销售出库报表
                                         stockSaleReceiptReport.setFeedbackPerson(commonStaff.getStaffName());
                                         stockSaleReceiptReport.setFeedbackDate(new Date());
-                                        stockSaleReceiptReport.setFeedbackWeight(tranCarInfo.getUnloadNetWeight());
+                                        stockSaleReceiptReport.setFeedbackWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                                         //按收货重量结算时
                                         if("1".equals(contractManagementInfo.getSettlementWeightMethod())){
-                                            stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
+                                            stockSaleReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                                             //定价销售
                                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                                 stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
@@ -587,10 +587,10 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         //现货销售出库报表
                                         stockSaleReceiptReport.setFeedbackPerson(commonStaff.getStaffName());
                                         stockSaleReceiptReport.setFeedbackDate(new Date());
-                                        stockSaleReceiptReport.setFeedbackWeight(tranCarInfo.getUnloadNetWeight());
+                                        stockSaleReceiptReport.setFeedbackWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                                         //按收货重量结算时
                                         if("1".equals(contractManagementInfo.getSettlementWeightMethod())){
-                                            stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
+                                            stockSaleReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                                             //定价销售
                                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                                 stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
@@ -630,10 +630,10 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         //现货销售出库报表
                                         stockSaleReceiptReport.setFeedbackPerson(commonStaff.getStaffName());
                                         stockSaleReceiptReport.setFeedbackDate(new Date());
-                                        stockSaleReceiptReport.setFeedbackWeight(tranCarInfo.getUnloadNetWeight());
+                                        stockSaleReceiptReport.setFeedbackWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                                         //按收货重量结算时
                                         if("1".equals(contractManagementInfo.getSettlementWeightMethod())){
-                                            stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
+                                            stockSaleReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                                             //定价销售
                                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                                 stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
@@ -1028,7 +1028,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             .eq("process_id",tranProcessInfo.getId())
                             .eq("car_no",tranCarInfo.getCarNo()));
                     if (stockSaleReceiptReport != null){
-                        stockSaleReceiptReport.setFeedbackWeight(tranCarInfo.getUnloadNetWeight());
+                        stockSaleReceiptReport.setFeedbackWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                         stockSaleReceiptReport.setFeedbackDate(tranCarInfo.getUnloadingDate());
                         stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
                     }
@@ -1045,7 +1045,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             .eq("car_no",tranCarInfo.getCarNo())
                             .eq("box_no",tranCarInfo.getBoxNo()));
                     if (stockSaleReceiptReport != null){
-                        stockSaleReceiptReport.setFeedbackWeight(tranCarInfo.getUnloadNetWeight());
+                        stockSaleReceiptReport.setFeedbackWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                         stockSaleReceiptReport.setFeedbackDate(tranCarInfo.getUnloadingDate());
                         stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
                     }
@@ -1062,7 +1062,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             .eq("ship_name",tranCarInfo.getShipName())
                             .eq("ship_no",tranCarInfo.getShipNo()));
                     if (stockSaleReceiptReport != null){
-                        stockSaleReceiptReport.setFeedbackWeight(tranCarInfo.getUnloadNetWeight());
+                        stockSaleReceiptReport.setFeedbackWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                         stockSaleReceiptReport.setFeedbackDate(tranCarInfo.getUnloadingDate());
                         stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
                     }
@@ -1079,7 +1079,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             .eq("case_no",tranCarInfo.getCaseNo())
                             .eq("title_no",tranCarInfo.getTitleNo()));
                     if (stockSaleReceiptReport != null){
-                        stockSaleReceiptReport.setFeedbackWeight(tranCarInfo.getUnloadNetWeight());
+                        stockSaleReceiptReport.setFeedbackWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                         stockSaleReceiptReport.setFeedbackDate(tranCarInfo.getUnloadingDate());
                         stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
                     }

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

@@ -871,13 +871,13 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
                             stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                             stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                            stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
-                            stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockSaleReceiptReport.setNetWeight(-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
+                            stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                            stockSaleReceiptReport.setNetWeight(-warehouseInOutInfo.getNetWeight());
                             stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
                             stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
                             stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * contractManagementInfo.getUnitContractPrice());
-                            stockSaleReceiptReport.setSettlementWeight(-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
                             stockSaleReceiptReport.setReturnFlag("1");
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                             stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
@@ -901,12 +901,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
                             stockSaleReceiptReport.setCaseNo(warehouseInOutInfo.getBoxNo()+","+warehouseInOutInfo.getBoxNoOther());
                             stockSaleReceiptReport.setTitleNo(warehouseInOutInfo.getTitleNo());
-                            stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
-                            stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockSaleReceiptReport.setNetWeight(-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
+                            stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                            stockSaleReceiptReport.setNetWeight(-warehouseInOutInfo.getNetWeight());
                             stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
                             stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * contractManagementInfo1.getUnitContractPrice());
-                            stockSaleReceiptReport.setSettlementWeight(-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
                             stockSaleReceiptReport.setReturnFlag("1");
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                             stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
@@ -1178,13 +1178,13 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                             stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
                             stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-                            stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
-                            stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockSaleReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
+                            stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                            stockSaleReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                             stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
                             //按出库重量结算时
                             if("1".equals(contractManagementInfo.getSettlementWeightMethod())) {
-                                stockSaleReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
                             }
                             stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
                             stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getNetWeight() *
@@ -1274,14 +1274,14 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                             stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
                             stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-                            stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
-                            stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockSaleReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
+                            stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                            stockSaleReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                             stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
-                            stockSaleReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
                             //按出库重量结算时
                             if("1".equals(contractManagementInfo1.getSettlementWeightMethod())){
-                                stockSaleReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
                                 //定价销售
                                 if(contractManagementInfo1.getUnitContractPrice()!=null) {
                                     stockSaleReceiptReport.setSettlementPrice(contractManagementInfo1.getUnitContractPrice());