修改

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

@@ -282,7 +282,7 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
                     if (purchaseReceiptReport.getAmountNotPayable() > 0) {
                         contractManagementInfo.setReportStatus("待结算");
                     }
-                    else {
+                    else{
                         contractManagementInfo.setReportStatus("已结算");
                     }
                 }

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

@@ -381,9 +381,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     purchaseReceiptReport.setPositionNumber(warehouseInOutInfo.getBinNumber());
                     purchaseReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
                     purchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
-                    purchaseReceiptReport.setProtein(warehouseInOutInfo.getProtein());
-                    purchaseReceiptReport.setWaterContent(warehouseInOutInfo.getWaterContent());
-                    purchaseReceiptReport.setUnitPrice(warehouseInOutInfo.getUnitPrice());
+                    purchaseReceiptReport.setProtein(warehouseInOutDetail.getProtein());
+                    purchaseReceiptReport.setWaterContent(warehouseInOutDetail.getWaterContent());
+                    purchaseReceiptReport.setUnitPrice(purchaseOrder.getUnitPrice());
                     purchaseReceiptReport.setDeductionAmount(Float.valueOf(warehouseInOutInfo.getDeductionAmount()));
                     purchaseReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
                     purchaseReceiptReport.setDeductionItems(warehouseInOutInfo.getDeductionItems());