更新

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

@@ -681,29 +681,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                         }
 
-                        //现货采购入库报表
-                        StockPurchaseReceiptReport stockPurchaseReceiptReport = new StockPurchaseReceiptReport();
-                        stockPurchaseReceiptReport.setId(IdGenerator.generateUUID());
-                        stockPurchaseReceiptReport.setCompId(warehouseBaseInfo.getCompId());
-                        stockPurchaseReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
-                        stockPurchaseReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-                        stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-                        stockPurchaseReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
-                        stockPurchaseReceiptReport.setTare(warehouseInOutInfo.getTare());
-                        stockPurchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
-                        stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
-                        stockPurchaseReceiptReport.setDeductionWeight(warehouseInOutInfo.getDeductionWeight());
-                        stockPurchaseReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-                        ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("delete_flag","0"));
-                        stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
-                                (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())) - Float.valueOf(warehouseInOutInfo.getDeductionAmount())));
-                        stockPurchaseReceiptReport.setAmountEdPayable(0.0f);
-                        stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());
-                        stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
-                        stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
 
-                        stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
                     }
                     //更新库存量
                     float original = 0f;
@@ -948,7 +926,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         StockPurchaseReceiptReport stockPurchaseReceiptReport = new StockPurchaseReceiptReport();
                         stockPurchaseReceiptReport.setId(IdGenerator.generateUUID());
                         stockPurchaseReceiptReport.setCompId(warehouseBaseInfo.getCompId());
-                        stockPurchaseReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
+                        stockPurchaseReceiptReport.setContractNo(contractManagementInfo.getContractNo());
                         stockPurchaseReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
                         stockPurchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                         stockPurchaseReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
@@ -964,7 +942,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                         stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
                         ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("delete_flag","0"));
+                                .eq("contract_no", contractManagementInfo.getContractNo()).eq("delete_flag","0"));
                         if(contractManagementInfo1 == null){
                             throw new YException(YExceptionEnum.CONTRACT_NO_NOT_EXSITS_ERROR);
                         }