修改

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

@@ -68,6 +68,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
     @Autowired
     private IStockSaleReceiptReportService stockSaleReceiptReportService;
     @Autowired
+    private IStockPurchaseReceiptReportService stockPurchaseReceiptReportService;
+    @Autowired
     private ITranTaskInfoService tranTaskInfoService;
     @Autowired
     private ITranCarInfoService tranCarInfoService;
@@ -571,14 +573,13 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     //定义出库量
                     Double outWeight = 0.0d;
                     //查询同名临时库出库量
-                    List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                    List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList = stockPurchaseReceiptReportService.selectList(new EntityWrapper<StockPurchaseReceiptReport>()
                             .eq("warehouse_name", contractManagementInfo1.getContractNo())
-                            .eq("in_out_flag", "1")
                             .eq("status_flag", "3")
                             .eq("delete_flag", "0"));
-                    if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
-                        for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                            outWeight = outWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
+                    if (!CollectionUtils.isEmpty(stockPurchaseReceiptReportList)) {
+                        for (StockPurchaseReceiptReport stockPurchaseReceiptReport : stockPurchaseReceiptReportList) {
+                            outWeight = outWeight + stockPurchaseReceiptReport.getSettlementWeight();
                         }
                     }
                     //定义退库量
@@ -601,14 +602,13 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     //定义出库量
                     Double inWeight = 0.0d;
                     //查询同合同编号入库量
-                    List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                    List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList = stockPurchaseReceiptReportService.selectList(new EntityWrapper<StockPurchaseReceiptReport>()
                             .eq("contract_no", contractManagementInfo1.getContractNo())
-                            .eq("in_out_flag", "2")
                             .eq("status_flag", "3")
                             .eq("delete_flag", "0"));
-                    if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
-                        for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                            inWeight = Double.valueOf(inWeight) + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
+                    if (!CollectionUtils.isEmpty(stockPurchaseReceiptReportList)) {
+                        for (StockPurchaseReceiptReport stockPurchaseReceiptReport : stockPurchaseReceiptReportList) {
+                            inWeight = Double.valueOf(inWeight) + stockPurchaseReceiptReport.getSettlementWeight();
                         }
                     }
                     contractManagementInfo1.setCompletedQuantity(inWeight);
@@ -625,51 +625,50 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     //定义出库量
                     Double outWeight = 0.0d;
                     //查询同合同编号出库量
-                    List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                    List<StockSaleReceiptReport> stockSaleReceiptReportList = stockSaleReceiptReportService.selectList(new EntityWrapper<StockSaleReceiptReport>()
                             .eq("contract_no", contractManagementInfo1.getContractNo())
-                            .eq("in_out_flag", "1")
                             .eq("status_flag", "3")
                             .eq("delete_flag", "0"));
-                    if (!CollectionUtils.isEmpty(warehouseInOutInfoList)) {
-                        for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList) {
-                            outWeight = outWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
+                    if (!CollectionUtils.isEmpty(stockSaleReceiptReportList)) {
+                        for (StockSaleReceiptReport stockSaleReceiptReport : stockSaleReceiptReportList) {
+                            outWeight = outWeight + stockSaleReceiptReport.getSettlementWeight();
                         }
                     }
                     //定义运输损耗
-                    Double loss = 0.0d;
-                    //查询同合同编号的运输任务
-                    TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
-                            .eq("contract_no", contractManagementInfo1.getContractNo())
-                            .eq("delete_flag", "0"));
-                    if (tranTaskInfo != null) {
-                        //定义装车净重
-                        Double loadNetWeight = 0.0d;
-                        //定义卸车净重
-                        Double unloadNetWeight = 0.0d;
-                        //查询运输车辆
-                        List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                                .eq("info_id", tranTaskInfo.getId())
-                                .eq("status_flag", "1")
-                                .eq("delete_flag", "0"));
-                        if (!CollectionUtils.isEmpty(tranCarInfoList)) {
-                            for (TranCarInfo tranCarInfo : tranCarInfoList) {
-                                loadNetWeight = loadNetWeight + tranCarInfo.getLoadNetWeight();
-                                unloadNetWeight = unloadNetWeight + tranCarInfo.getUnloadNetWeight();
-                            }
-                            loss = loadNetWeight - unloadNetWeight;
-                        }
-                    }
+//                    Double loss = 0.0d;
+//                    //查询同合同编号的运输任务
+//                    TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
+//                            .eq("contract_no", contractManagementInfo1.getContractNo())
+//                            .eq("delete_flag", "0"));
+//                    if (tranTaskInfo != null) {
+//                        //定义装车净重
+//                        Double loadNetWeight = 0.0d;
+//                        //定义卸车净重
+//                        Double unloadNetWeight = 0.0d;
+//                        //查询运输车辆
+//                        List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+//                                .eq("info_id", tranTaskInfo.getId())
+//                                .eq("status_flag", "1")
+//                                .eq("delete_flag", "0"));
+//                        if (!CollectionUtils.isEmpty(tranCarInfoList)) {
+//                            for (TranCarInfo tranCarInfo : tranCarInfoList) {
+//                                loadNetWeight = loadNetWeight + tranCarInfo.getLoadNetWeight();
+//                                unloadNetWeight = unloadNetWeight + tranCarInfo.getUnloadNetWeight();
+//                            }
+//                            loss = loadNetWeight - unloadNetWeight;
+//                        }
+//                    }
                     //定义退库量
                     Double returnWeight = 0.0d;
                     //查询同合同编号出库量
-                    List<WarehouseInOutInfo> warehouseInOutInfoList1 = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>()
+                    List<StockSaleReceiptReport> stockSaleReceiptReportList1 = stockSaleReceiptReportService.selectList(new EntityWrapper<StockSaleReceiptReport>()
                             .eq("contract_no", contractManagementInfo1.getContractNo())
-                            .eq("in_out_type", "退库")
+                            .eq("return_flag", "1")
                             .eq("status_flag", "3")
                             .eq("delete_flag", "0"));
-                    if (!CollectionUtils.isEmpty(warehouseInOutInfoList1)) {
-                        for (WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfoList1) {
-                            returnWeight = returnWeight + Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()));
+                    if (!CollectionUtils.isEmpty(stockSaleReceiptReportList1)) {
+                        for (StockSaleReceiptReport stockSaleReceiptReport : stockSaleReceiptReportList1) {
+                            returnWeight = returnWeight + stockSaleReceiptReport.getSettlementWeight();
                         }
                     }
                     //自运的销售合同
@@ -687,7 +686,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         }
                     }
                     else {
-                        contractManagementInfo1.setCompletedQuantity(outWeight - loss - returnWeight);
+                        contractManagementInfo1.setCompletedQuantity(outWeight - returnWeight);
                     }
                     contractManagementInfo1.setCompletedQuantity((double)(Math.round((contractManagementInfo1.getCompletedQuantity()!=null?contractManagementInfo1.getCompletedQuantity():0f)*1000))/1000);
                 }

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

@@ -591,19 +591,19 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 cell = rowx.createCell(4);
-                cell.setCellValue(editFloat(stockPurchaseReceiptReport1.getGrossWeight()));
+                cell.setCellValue(editDouble(stockPurchaseReceiptReport1.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(5);
-                cell.setCellValue(editFloat(stockPurchaseReceiptReport1.getTare()));
+                cell.setCellValue(editDouble(stockPurchaseReceiptReport1.getTare()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(6);
-                cell.setCellValue(editFloat(stockPurchaseReceiptReport1.getDeductionWeight()));
+                cell.setCellValue(editDouble(stockPurchaseReceiptReport1.getDeductionWeight()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(7);
-                cell.setCellValue(editFloat(stockPurchaseReceiptReport1.getNetWeight()));
+                cell.setCellValue(editDouble(stockPurchaseReceiptReport1.getNetWeight()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(8);
-                cell.setCellValue(editFloat(stockPurchaseReceiptReport1.getSettlementWeight()));
+                cell.setCellValue(editDouble(stockPurchaseReceiptReport1.getSettlementWeight()));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(9);
                 cell.setCellValue(editDouble(stockPurchaseReceiptReport1.getSettlementPrice()));

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

@@ -716,12 +716,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
                             stockPurchaseReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                             stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                            stockPurchaseReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
-                            stockPurchaseReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockPurchaseReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockPurchaseReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
+                            stockPurchaseReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                            stockPurchaseReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
-                            stockPurchaseReceiptReport.setDeductionWeight(warehouseInOutInfo.getDeductionWeight());
-                            stockPurchaseReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockPurchaseReceiptReport.setDeductionWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getDeductionWeight())));
+                            stockPurchaseReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
 
                             if(contractManagementInfo.getUnitContractPrice()!=null) {
@@ -803,12 +803,12 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     stockPurchaseReceiptReport.setContractNo(warehouseBaseInfo1.getWarehouseName());
                                     stockPurchaseReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                                     stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                                    stockPurchaseReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
-                                    stockPurchaseReceiptReport.setTare(warehouseInOutInfo.getTare());
-                                    stockPurchaseReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                    stockPurchaseReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
+                                    stockPurchaseReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                                    stockPurchaseReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                     stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
-                                    stockPurchaseReceiptReport.setDeductionWeight(warehouseInOutInfo.getDeductionWeight());
-                                    stockPurchaseReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                    stockPurchaseReceiptReport.setDeductionWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getDeductionWeight())));
+                                    stockPurchaseReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                                     if(contractManagementInfo.getUnitContractPrice()!=null) {
                                         BigDecimal cost = new BigDecimal(contractManagementInfo.getUnitContractPrice());
                                         BigDecimal deductionAmount = new BigDecimal(warehouseInOutInfo.getDeductionAmount());
@@ -1432,11 +1432,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setContractNo(contractManagementInfo.getContractNo());
                             stockPurchaseReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                             stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                            stockPurchaseReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
-                            stockPurchaseReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockPurchaseReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockPurchaseReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
+                            stockPurchaseReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                            stockPurchaseReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
-                            stockPurchaseReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockPurchaseReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                 stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
@@ -1560,11 +1560,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setContractNo(contractManagementInfo.getContractNo());
                             stockPurchaseReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                             stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                            stockPurchaseReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
-                            stockPurchaseReceiptReport.setTare(warehouseInOutInfo.getTare());
-                            stockPurchaseReceiptReport.setNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockPurchaseReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
+                            stockPurchaseReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                            stockPurchaseReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
-                            stockPurchaseReceiptReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            stockPurchaseReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
                             if(contractManagementInfo.getUnitContractPrice()!=null) {
                                 stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *