更新

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

@@ -627,7 +627,6 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     //查询同合同编号出库量
                     List<StockSaleReceiptReport> stockSaleReceiptReportList = stockSaleReceiptReportService.selectList(new EntityWrapper<StockSaleReceiptReport>()
                             .eq("contract_no", contractManagementInfo1.getContractNo())
-                            .ge("status_flag", "8")
                             .eq("delete_flag", "0"));
                     if (!CollectionUtils.isEmpty(stockSaleReceiptReportList)) {
                         for (StockSaleReceiptReport stockSaleReceiptReport : stockSaleReceiptReportList) {
@@ -672,22 +671,23 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         }
                     }
                     //自运的销售合同
-                    if ("1".equals(contractManagementInfo1.getDeliverType())){
-                        //已完货的粮款结算阶段
-//                        TranProcessInfo tranProcessInfo=tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
-//                                .eq("end_flag","1")
-//                                .eq("contract_no",contractManagementInfo1.getContractNo())
-//                                .eq("receiving_status_flag","1"));
-                        StockSaleReceiptReport stockSaleReceiptReport =stockSaleReceiptReportService.selectOne(new EntityWrapper<StockSaleReceiptReport>()
-                        .eq("contract_no",contractManagementInfo1.getContractNo()));
-                        if (stockSaleReceiptReport!=null){
-                            //完成量等于完货净重
-                            contractManagementInfo1.setCompletedQuantity(Double.valueOf(stockSaleReceiptReport.getNetWeight()));
-                        }
-                    }
-                    else {
-                        contractManagementInfo1.setCompletedQuantity(outWeight - returnWeight);
-                    }
+//                    if ("1".equals(contractManagementInfo1.getDeliverType())){
+//                        //已完货的粮款结算阶段
+////                        TranProcessInfo tranProcessInfo=tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
+////                                .eq("end_flag","1")
+////                                .eq("contract_no",contractManagementInfo1.getContractNo())
+////                                .eq("receiving_status_flag","1"));
+//                        StockSaleReceiptReport stockSaleReceiptReport =stockSaleReceiptReportService.selectOne(new EntityWrapper<StockSaleReceiptReport>()
+//                        .eq("contract_no",contractManagementInfo1.getContractNo()));
+//                        if (stockSaleReceiptReport!=null){
+//                            //完成量等于完货净重
+//                            contractManagementInfo1.setCompletedQuantity(Double.valueOf(stockSaleReceiptReport.getNetWeight()));
+//                        }
+//                    }
+//                    else {
+//                        contractManagementInfo1.setCompletedQuantity(outWeight - returnWeight);
+//                    }
+                    contractManagementInfo1.setCompletedQuantity(outWeight - returnWeight);
                     contractManagementInfo1.setCompletedQuantity((double)(Math.round((contractManagementInfo1.getCompletedQuantity()!=null?contractManagementInfo1.getCompletedQuantity():0f)*1000))/1000);
                 }
             }