fix : ui changes and data

android/app/build.gradle.kts

@@ -43,7 +43,6 @@ android {
             excludes += "META-INF/DEPENDENCIES"
         }
     }
-/*
     signingConfigs {
         create("release") {
             keyAlias = keystoreProperties["keyAlias"] as String?
@@ -52,22 +51,25 @@ android {
             storePassword = keystoreProperties["storePassword"] as String?
         }
     }
-*/
-    buildTypes {
+/*    buildTypes {
         release {
             signingConfig = signingConfigs.getByName("debug")
         }
-    }
-   /* buildTypes {
+    }*/
+    buildTypes {
         release {
             signingConfig = signingConfigs.getByName("release")
             isMinifyEnabled = true
             isShrinkResources = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
         debug {
             signingConfig = signingConfigs.getByName("debug")
         }
-    }*/
+    }
 }
 
 flutter {

android/app/proguard-rules.pro

@@ -0,0 +1,8 @@
+# Suppress warnings for OkHttp classes
+-dontwarn okhttp3.Call
+-dontwarn okhttp3.Dispatcher
+-dontwarn okhttp3.OkHttpClient
+-dontwarn okhttp3.Request$Builder
+-dontwarn okhttp3.Request
+-dontwarn okhttp3.Response
+-dontwarn okhttp3.ResponseBody

packages/chicken/lib/data/models/response/hatching_report/hatching_report.dart

@@ -10,25 +10,24 @@ abstract class HatchingReport with _$HatchingReport {
     PoultryScience? poultryScience,
     Hatching? hatching,
     String? key,
-    String? createDate,
-    String? modifyDate,
+    User? user,
+    DateTime? createDate,
+    DateTime? modifyDate,
     bool? trash,
-    String? date,
+    DateTime? date,
     List<String>? image,
     double? lat,
     double? log,
     String? reporterFullname,
     String? reporterMobile,
-    String? createdBy,
-    String? modifiedBy,
-    String? messageRegistererRole,
-    String? messageRegistererMobile,
-    String? messageRegistererFullname,
-    String? message,
-    String? messageAi,
-    int? realQuantity,
-    int? realQuantityAi,
     String? state,
+    double? realQuantityAi,
+    String? messageAi,
+    double? realQuantity,
+    String? message,
+    String? messageRegistererFullname,
+    String? messageRegistererMobile,
+    String? messageRegistererRole,
   }) = _HatchingReport;
 
   factory HatchingReport.fromJson(Map<String, dynamic> json) => _$HatchingReportFromJson(json);
@@ -40,8 +39,8 @@ abstract class PoultryScience with _$PoultryScience {
     int? id,
     User? user,
     String? key,
-    String? createDate,
-    String? modifyDate,
+    DateTime? createDate,
+    DateTime? modifyDate,
     bool? trash,
     String? createdBy,
     String? modifiedBy,
@@ -53,7 +52,10 @@ abstract class PoultryScience with _$PoultryScience {
 
 @freezed
 abstract  class User with _$User {
-  const factory User({String? fullname, String? mobile}) = _User;
+  const factory User({
+    String? fullname,
+    String? mobile,
+  }) = _User;
 
   factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
 }
@@ -61,70 +63,339 @@ abstract class User with _$User {
 @freezed
 abstract  class Hatching with _$Hatching {
   const factory Hatching({
+    int? id,
     Poultry? poultry,
-    GeneralInfo? generalInfo,
-    String? chickenBreed,
-    String? date,
-    int? quantity,
-    int? leftOver,
-    int? period,
-    int? losses,
-    bool? violation,
-    String? licenceNumber,
-    int? chickenAge,
+    ChainCompany? chainCompany,
+    int? age,
+    String? inspectionLosses,
     VetFarm? vetFarm,
+    ActiveKill? activeKill,
+    KillingInfo? killingInfo,
+    FreeGovernmentalInfo? freeGovernmentalInfo,
+    ReportInfo? reportInfo,
+    String? key,
+    DateTime? createDate,
+    DateTime? modifyDate,
+    bool? trash,
+    bool? hasChainCompany,
+    String? poultryIdForeignKey,
+    String? poultryHatchingIdKey,
+    int? quantity,
+    int? losses,
+    int? leftOver,
+    int? killedQuantity,
+    int? extraKilledQuantity,
+    double? governmentalKilledQuantity,
+    double? governmentalQuantity,
+    double? freeKilledQuantity,
+    double? freeQuantity,
+    double? chainKilledQuantity,
+    double? chainKilledWeight,
+    double? outProvinceKilledWeight,
+    double? outProvinceKilledQuantity,
+    double? exportKilledWeight,
+    double? exportKilledQuantity,
+    double? totalCommitment,
+    String? commitmentType,
+    double? totalCommitmentQuantity,
+    double? totalFreeCommitmentQuantity,
+    double? totalFreeCommitmentWeight,
+    double? totalKilledWeight,
+    double? totalAverageKilledWeight,
+    int? requestLeftOver,
+    int? hall,
+    DateTime? date,
+    String? predicateDate,
+    String? chickenBreed,
+    int? period,
+    String? allowHatching,
+    String? state,
+    bool? archive,
+    bool? violation,
+    String? message,
+    Registrar? registrar,
+    List<Breed>? breed,
+    int? cityNumber,
+    String? cityName,
+    int? provinceNumber,
+    String? provinceName,
+    LastChange? lastChange,
+    int? chickenAge,
+    int? nowAge,
+    LatestHatchingChange? latestHatchingChange,
+    String? violationReport,
+    String? violationMessage,
+    List<String>? violationImage,
+    String? violationReporter,
+    DateTime? violationReportDate,
+    String? violationReportEditor,
+    DateTime? violationReportEditDate,
+    int? totalLosses,
+    int? directLosses,
+    String? directLossesInputer,
+    String? directLossesDate,
+    String? directLossesEditor,
+    String? directLossesLastEditDate,
+    String? endPeriodLossesInputer,
+    String? endPeriodLossesDate,
+    String? endPeriodLossesEditor,
+    String? endPeriodLossesLastEditDate,
+    String? breedingUniqueId,
+    String? licenceNumber,
+    bool? temporaryTrash,
+    bool? temporaryDeleted,
+    String? firstDateInputArchive,
+    String? secondDateInputArchive,
+    String? inputArchiver,
+    String? outputArchiveDate,
+    String? outputArchiver,
+    double? barDifferenceRequestWeight,
+    double? barDifferenceRequestQuantity,
+    String? healthCertificate,
+    double? samasatDischargePercentage,
+    String? personTypeName,
+    String? interactTypeName,
+    String? unionTypeName,
+    String? certId,
+    int? increaseQuantity,
+    String? tenantFullname,
+    String? tenantNationalCode,
+    String? tenantMobile,
+    String? tenantCity,
+    bool? hasTenant,
+    String? archiveDate,
+    String? createdBy,
+    String? modifiedBy,
   }) = _Hatching;
 
   factory Hatching.fromJson(Map<String, dynamic> json) => _$HatchingFromJson(json);
 }
-
-
 @freezed
-abstract class VetFarm with _$VetFarm {
-  const factory VetFarm({
-    String? vetFarmFullname,
-    String? vetFarmMobile,
-  }) = _VetFarm;
+abstract class LastChange with _$LastChange {
+  const factory LastChange({
+    DateTime? date,
+    String? role,
+    String? type,
+    String? fullName,
+  }) = _LastChange;
 
-  factory VetFarm.fromJson(Map<String, dynamic> json) => _$VetFarmFromJson(json);
+  factory LastChange.fromJson(Map<String, dynamic> json) => _$LastChangeFromJson(json);
 }
 
 
+@freezed
+abstract class Registrar with _$Registrar {
+  const factory Registrar({
+    DateTime? date,
+    String? role,
+    String? fullname,
+  }) = _Registrar;
+
+  factory Registrar.fromJson(Map<String, dynamic> json) => _$RegistrarFromJson(json);
+}
+
 @freezed
 abstract class Poultry with _$Poultry {
   const factory Poultry({
+    int? id,
+    User? user,
+    Address? address,
     String? key,
-    String? fullname,
-    String? mobile,
-    int? city,
+    bool? trash,
+    int? ownerIdForeignKey,
+    int? userIdForeignKey,
+    int? addressIdForeignKey,
+    bool? hasChainCompany,
+    String? cityOperator,
     String? unitName,
+    String? gisCode,
+    int? operatingLicenceCapacity,
+    int? numberOfHalls,
+    bool? tenant,
+    bool? hasTenant,
+    String? personType,
+    String? economicCode,
+    String? systemCode,
+    String? epidemiologicalCode,
+    String? breedingUniqueId,
+    int? totalCapacity,
+    String? licenceNumber,
+    String? healthCertificateNumber,
+    int? numberOfRequests,
+    DateTime? hatchingDate,
+    DateTime? lastPartyDate,
+    int? numberOfIncubators,
+    int? herdAgeByDay,
+    int? herdAgeByWeek,
+    int? numberOfParty,
+    String? communicationType,
+    String? cooperative,
+    DateTime? dateOfRegister,
+    String? unitStatus,
+    bool? active,
+    String? identityDocuments,
+    String? samasatUserCode,
+    String? baseOrder,
+    DateTime? incubationDate,
+    double? walletAmount,
+    int? city,
+    int? cityNumber,
+    String? cityName,
+    int? provinceNumber,
+    String? provinceName,
+    double? lat,
+    double? long,
+    String? date,
     int? killingAveAge,
-    int? activeLeftOver,
+    double? activeLeftOver,
     int? killingAveCount,
+    double? killingAveWeight,
+    double? killingLiveWeight,
+    double? killingCarcassesWeight,
+    double? killingLossWeightPercent,
     double? realKillingAveWeight,
     double? realKillingLiveWeight,
     double? realKillingCarcassesWeight,
     double? realKillingLossWeightPercent,
+    String? interestLicenceId,
+    bool? orderLimit,
+    int? owner,
+    int? userBankInfo,
+    int? wallet,
   }) = _Poultry;
 
   factory Poultry.fromJson(Map<String, dynamic> json) => _$PoultryFromJson(json);
 }
 
 @freezed
-abstract class GeneralInfo with _$GeneralInfo {
-  const factory GeneralInfo({
-    int? aveAge,
-    int? age,
-    double? aveWeight,
+abstract class ChainCompany with _$ChainCompany {
+  const factory ChainCompany({
+    User? user,
+    String? userBankInfo,
+    String? key,
+    bool? trash,
+    String? name,
+    String? city,
+    String? province,
+    String? postalCode,
+    String? address,
+    int? wallet,
+  }) = _ChainCompany;
+
+  factory ChainCompany.fromJson(Map<String, dynamic> json) => _$ChainCompanyFromJson(json);
+}
+
+@freezed
+abstract class VetFarm with _$VetFarm {
+  const factory VetFarm({
+    String? vetFarmFullName,
+    String? vetFarmMobile,
+  }) = _VetFarm;
+
+  factory VetFarm.fromJson(Map<String, dynamic> json) => _$VetFarmFromJson(json);
+}
+
+@freezed
+abstract class ActiveKill with _$ActiveKill {
+  const factory ActiveKill({
+    bool? activeKill,
+    int? countOfRequest,
+  }) = _ActiveKill;
+
+  factory ActiveKill.fromJson(Map<String, dynamic> json) => _$ActiveKillFromJson(json);
+}
+
+@freezed
+abstract class KillingInfo with _$KillingInfo {
+  const factory KillingInfo({
+    String? violationMessage,
     int? provinceKillRequests,
     int? provinceKillRequestsQuantity,
-    double? provinceKillRequestsWeight,
-    int? killHouseRequestsQuantity,
+    int? provinceKillRequestsWeight,
     int? killHouseRequests,
-    double? killHouseRequestsWeight,
-    int? totalQuantity,
-    double? totalWeight,
-  }) = _GeneralInfo;
+    int? killHouseRequestsFirstQuantity,
+    int? killHouseRequestsFirstWeight,
+    int? barCompleteWithKillHouse,
+    int? acceptedRealQuantityFinal,
+    int? acceptedRealWightFinal,
+  }) = _KillingInfo;
 
-  factory GeneralInfo.fromJson(Map<String, dynamic> json) => _$GeneralInfoFromJson(json);
+  factory KillingInfo.fromJson(Map<String, dynamic> json) => _$KillingInfoFromJson(json);
+}
+
+@freezed
+abstract class FreeGovernmentalInfo with _$FreeGovernmentalInfo {
+  const factory FreeGovernmentalInfo({
+    int? governmentalAllocatedQuantity,
+    double? totalCommitmentQuantity,
+    int? freeAllocatedQuantity,
+    double? totalFreeCommitmentQuantity,
+    int? leftTotalFreeCommitmentQuantity,
+  }) = _FreeGovernmentalInfo;
+
+  factory FreeGovernmentalInfo.fromJson(Map<String, dynamic> json) => _$FreeGovernmentalInfoFromJson(json);
+}
+
+@freezed
+abstract class ReportInfo with _$ReportInfo {
+  const factory ReportInfo({
+    bool? poultryScience,
+    bool? image,
+  }) = _ReportInfo;
+
+  factory ReportInfo.fromJson(Map<String, dynamic> json) => _$ReportInfoFromJson(json);
+}
+
+@freezed
+abstract class LatestHatchingChange with _$LatestHatchingChange {
+  const factory LatestHatchingChange({
+    DateTime? date,
+    String? role,
+    String? fullName,
+  }) = _LatestHatchingChange;
+
+  factory LatestHatchingChange.fromJson(Map<String, dynamic> json) => _$LatestHatchingChangeFromJson(json);
+}
+
+@freezed
+abstract class Breed with _$Breed {
+  const factory Breed({
+    String? breed,
+    int? mainQuantity,
+    int? remainQuantity,
+  }) = _Breed;
+
+  factory Breed.fromJson(Map<String, dynamic> json) => _$BreedFromJson(json);
+}
+
+@freezed
+abstract class Address with _$Address {
+  const factory Address({
+    Province? province,
+    City? city,
+    String? address,
+    String? postalCode,
+  }) = _Address;
+
+  factory Address.fromJson(Map<String, dynamic> json) => _$AddressFromJson(json);
+}
+
+@freezed
+abstract class Province with _$Province {
+  const factory Province({
+    String? key,
+    String? name,
+  }) = _Province;
+
+  factory Province.fromJson(Map<String, dynamic> json) => _$ProvinceFromJson(json);
+}
+
+@freezed
+abstract class City with _$City {
+  const factory City({
+    String? key,
+    String? name,
+  }) = _City;
+
+  factory City.fromJson(Map<String, dynamic> json) => _$CityFromJson(json);
 }

packages/chicken/lib/data/models/response/hatching_report/hatching_report.g.dart

@@ -6,8 +6,9 @@ part of 'hatching_report.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_HatchingReport _$HatchingReportFromJson(Map<String, dynamic> json) =>
-    _HatchingReport(
+_HatchingReport _$HatchingReportFromJson(
+  Map<String, dynamic> json,
+) => _HatchingReport(
   id: (json['id'] as num?)?.toInt(),
   poultryScience: json['poultry_science'] == null
       ? null
@@ -18,28 +19,31 @@ _HatchingReport _$HatchingReportFromJson(Map<String, dynamic> json) =>
       ? null
       : Hatching.fromJson(json['hatching'] as Map<String, dynamic>),
   key: json['key'] as String?,
-      createDate: json['create_date'] as String?,
-      modifyDate: json['modify_date'] as String?,
+  user: json['user'] == null
+      ? null
+      : User.fromJson(json['user'] as Map<String, dynamic>),
+  createDate: json['create_date'] == null
+      ? null
+      : DateTime.parse(json['create_date'] as String),
+  modifyDate: json['modify_date'] == null
+      ? null
+      : DateTime.parse(json['modify_date'] as String),
   trash: json['trash'] as bool?,
-      date: json['date'] as String?,
-      image: (json['image'] as List<dynamic>?)
-          ?.map((e) => e as String)
-          .toList(),
+  date: json['date'] == null ? null : DateTime.parse(json['date'] as String),
+  image: (json['image'] as List<dynamic>?)?.map((e) => e as String).toList(),
   lat: (json['lat'] as num?)?.toDouble(),
   log: (json['log'] as num?)?.toDouble(),
   reporterFullname: json['reporter_fullname'] as String?,
   reporterMobile: json['reporter_mobile'] as String?,
-      createdBy: json['created_by'] as String?,
-      modifiedBy: json['modified_by'] as String?,
-      messageRegistererRole: json['message_registerer_role'] as String?,
-      messageRegistererMobile: json['message_registerer_mobile'] as String?,
-      messageRegistererFullname: json['message_registerer_fullname'] as String?,
-      message: json['message'] as String?,
-      messageAi: json['message_ai'] as String?,
-      realQuantity: (json['real_quantity'] as num?)?.toInt(),
-      realQuantityAi: (json['real_quantity_ai'] as num?)?.toInt(),
   state: json['state'] as String?,
-    );
+  realQuantityAi: (json['real_quantity_ai'] as num?)?.toDouble(),
+  messageAi: json['message_ai'] as String?,
+  realQuantity: (json['real_quantity'] as num?)?.toDouble(),
+  message: json['message'] as String?,
+  messageRegistererFullname: json['message_registerer_fullname'] as String?,
+  messageRegistererMobile: json['message_registerer_mobile'] as String?,
+  messageRegistererRole: json['message_registerer_role'] as String?,
+);
 
 Map<String, dynamic> _$HatchingReportToJson(_HatchingReport instance) =>
     <String, dynamic>{
@@ -47,25 +51,24 @@ Map<String, dynamic> _$HatchingReportToJson(_HatchingReport instance) =>
       'poultry_science': instance.poultryScience,
       'hatching': instance.hatching,
       'key': instance.key,
-      'create_date': instance.createDate,
-      'modify_date': instance.modifyDate,
+      'user': instance.user,
+      'create_date': instance.createDate?.toIso8601String(),
+      'modify_date': instance.modifyDate?.toIso8601String(),
       'trash': instance.trash,
-      'date': instance.date,
+      'date': instance.date?.toIso8601String(),
       'image': instance.image,
       'lat': instance.lat,
       'log': instance.log,
       'reporter_fullname': instance.reporterFullname,
       'reporter_mobile': instance.reporterMobile,
-      'created_by': instance.createdBy,
-      'modified_by': instance.modifiedBy,
-      'message_registerer_role': instance.messageRegistererRole,
-      'message_registerer_mobile': instance.messageRegistererMobile,
-      'message_registerer_fullname': instance.messageRegistererFullname,
-      'message': instance.message,
+      'state': instance.state,
+      'real_quantity_ai': instance.realQuantityAi,
       'message_ai': instance.messageAi,
       'real_quantity': instance.realQuantity,
-      'real_quantity_ai': instance.realQuantityAi,
-      'state': instance.state,
+      'message': instance.message,
+      'message_registerer_fullname': instance.messageRegistererFullname,
+      'message_registerer_mobile': instance.messageRegistererMobile,
+      'message_registerer_role': instance.messageRegistererRole,
     };
 
 _PoultryScience _$PoultryScienceFromJson(Map<String, dynamic> json) =>
@@ -75,8 +78,12 @@ _PoultryScience _$PoultryScienceFromJson(Map<String, dynamic> json) =>
           ? null
           : User.fromJson(json['user'] as Map<String, dynamic>),
       key: json['key'] as String?,
-      createDate: json['create_date'] as String?,
-      modifyDate: json['modify_date'] as String?,
+      createDate: json['create_date'] == null
+          ? null
+          : DateTime.parse(json['create_date'] as String),
+      modifyDate: json['modify_date'] == null
+          ? null
+          : DateTime.parse(json['modify_date'] as String),
       trash: json['trash'] as bool?,
       createdBy: json['created_by'] as String?,
       modifiedBy: json['modified_by'] as String?,
@@ -90,8 +97,8 @@ Map<String, dynamic> _$PoultryScienceToJson(_PoultryScience instance) =>
       'id': instance.id,
       'user': instance.user,
       'key': instance.key,
-      'create_date': instance.createDate,
-      'modify_date': instance.modifyDate,
+      'create_date': instance.createDate?.toIso8601String(),
+      'modify_date': instance.modifyDate?.toIso8601String(),
       'trash': instance.trash,
       'created_by': instance.createdBy,
       'modified_by': instance.modifiedBy,
@@ -109,112 +116,625 @@ Map<String, dynamic> _$UserToJson(_User instance) => <String, dynamic>{
 };
 
 _Hatching _$HatchingFromJson(Map<String, dynamic> json) => _Hatching(
+  id: (json['id'] as num?)?.toInt(),
   poultry: json['poultry'] == null
       ? null
       : Poultry.fromJson(json['poultry'] as Map<String, dynamic>),
-  generalInfo: json['general_info'] == null
+  chainCompany: json['chain_company'] == null
       ? null
-      : GeneralInfo.fromJson(json['general_info'] as Map<String, dynamic>),
-  chickenBreed: json['chicken_breed'] as String?,
-  date: json['date'] as String?,
-  quantity: (json['quantity'] as num?)?.toInt(),
-  leftOver: (json['left_over'] as num?)?.toInt(),
-  period: (json['period'] as num?)?.toInt(),
-  losses: (json['losses'] as num?)?.toInt(),
-  violation: json['violation'] as bool?,
-  licenceNumber: json['licence_number'] as String?,
-  chickenAge: (json['chicken_age'] as num?)?.toInt(),
+      : ChainCompany.fromJson(json['chain_company'] as Map<String, dynamic>),
+  age: (json['age'] as num?)?.toInt(),
+  inspectionLosses: json['inspection_losses'] as String?,
   vetFarm: json['vet_farm'] == null
       ? null
       : VetFarm.fromJson(json['vet_farm'] as Map<String, dynamic>),
+  activeKill: json['active_kill'] == null
+      ? null
+      : ActiveKill.fromJson(json['active_kill'] as Map<String, dynamic>),
+  killingInfo: json['killing_info'] == null
+      ? null
+      : KillingInfo.fromJson(json['killing_info'] as Map<String, dynamic>),
+  freeGovernmentalInfo: json['free_governmental_info'] == null
+      ? null
+      : FreeGovernmentalInfo.fromJson(
+          json['free_governmental_info'] as Map<String, dynamic>,
+        ),
+  reportInfo: json['report_info'] == null
+      ? null
+      : ReportInfo.fromJson(json['report_info'] as Map<String, dynamic>),
+  key: json['key'] as String?,
+  createDate: json['create_date'] == null
+      ? null
+      : DateTime.parse(json['create_date'] as String),
+  modifyDate: json['modify_date'] == null
+      ? null
+      : DateTime.parse(json['modify_date'] as String),
+  trash: json['trash'] as bool?,
+  hasChainCompany: json['has_chain_company'] as bool?,
+  poultryIdForeignKey: json['poultry_id_foreign_key'] as String?,
+  poultryHatchingIdKey: json['poultry_hatching_id_key'] as String?,
+  quantity: (json['quantity'] as num?)?.toInt(),
+  losses: (json['losses'] as num?)?.toInt(),
+  leftOver: (json['left_over'] as num?)?.toInt(),
+  killedQuantity: (json['killed_quantity'] as num?)?.toInt(),
+  extraKilledQuantity: (json['extra_killed_quantity'] as num?)?.toInt(),
+  governmentalKilledQuantity: (json['governmental_killed_quantity'] as num?)
+      ?.toDouble(),
+  governmentalQuantity: (json['governmental_quantity'] as num?)?.toDouble(),
+  freeKilledQuantity: (json['free_killed_quantity'] as num?)?.toDouble(),
+  freeQuantity: (json['free_quantity'] as num?)?.toDouble(),
+  chainKilledQuantity: (json['chain_killed_quantity'] as num?)?.toDouble(),
+  chainKilledWeight: (json['chain_killed_weight'] as num?)?.toDouble(),
+  outProvinceKilledWeight: (json['out_province_killed_weight'] as num?)
+      ?.toDouble(),
+  outProvinceKilledQuantity: (json['out_province_killed_quantity'] as num?)
+      ?.toDouble(),
+  exportKilledWeight: (json['export_killed_weight'] as num?)?.toDouble(),
+  exportKilledQuantity: (json['export_killed_quantity'] as num?)?.toDouble(),
+  totalCommitment: (json['total_commitment'] as num?)?.toDouble(),
+  commitmentType: json['commitment_type'] as String?,
+  totalCommitmentQuantity: (json['total_commitment_quantity'] as num?)
+      ?.toDouble(),
+  totalFreeCommitmentQuantity: (json['total_free_commitment_quantity'] as num?)
+      ?.toDouble(),
+  totalFreeCommitmentWeight: (json['total_free_commitment_weight'] as num?)
+      ?.toDouble(),
+  totalKilledWeight: (json['total_killed_weight'] as num?)?.toDouble(),
+  totalAverageKilledWeight: (json['total_average_killed_weight'] as num?)
+      ?.toDouble(),
+  requestLeftOver: (json['request_left_over'] as num?)?.toInt(),
+  hall: (json['hall'] as num?)?.toInt(),
+  date: json['date'] == null ? null : DateTime.parse(json['date'] as String),
+  predicateDate: json['predicate_date'] as String?,
+  chickenBreed: json['chicken_breed'] as String?,
+  period: (json['period'] as num?)?.toInt(),
+  allowHatching: json['allow_hatching'] as String?,
+  state: json['state'] as String?,
+  archive: json['archive'] as bool?,
+  violation: json['violation'] as bool?,
+  message: json['message'] as String?,
+  registrar: json['registrar'] == null
+      ? null
+      : Registrar.fromJson(json['registrar'] as Map<String, dynamic>),
+  breed: (json['breed'] as List<dynamic>?)
+      ?.map((e) => Breed.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  cityNumber: (json['city_number'] as num?)?.toInt(),
+  cityName: json['city_name'] as String?,
+  provinceNumber: (json['province_number'] as num?)?.toInt(),
+  provinceName: json['province_name'] as String?,
+  lastChange: json['last_change'] == null
+      ? null
+      : LastChange.fromJson(json['last_change'] as Map<String, dynamic>),
+  chickenAge: (json['chicken_age'] as num?)?.toInt(),
+  nowAge: (json['now_age'] as num?)?.toInt(),
+  latestHatchingChange: json['latest_hatching_change'] == null
+      ? null
+      : LatestHatchingChange.fromJson(
+          json['latest_hatching_change'] as Map<String, dynamic>,
+        ),
+  violationReport: json['violation_report'] as String?,
+  violationMessage: json['violation_message'] as String?,
+  violationImage: (json['violation_image'] as List<dynamic>?)
+      ?.map((e) => e as String)
+      .toList(),
+  violationReporter: json['violation_reporter'] as String?,
+  violationReportDate: json['violation_report_date'] == null
+      ? null
+      : DateTime.parse(json['violation_report_date'] as String),
+  violationReportEditor: json['violation_report_editor'] as String?,
+  violationReportEditDate: json['violation_report_edit_date'] == null
+      ? null
+      : DateTime.parse(json['violation_report_edit_date'] as String),
+  totalLosses: (json['total_losses'] as num?)?.toInt(),
+  directLosses: (json['direct_losses'] as num?)?.toInt(),
+  directLossesInputer: json['direct_losses_inputer'] as String?,
+  directLossesDate: json['direct_losses_date'] as String?,
+  directLossesEditor: json['direct_losses_editor'] as String?,
+  directLossesLastEditDate: json['direct_losses_last_edit_date'] as String?,
+  endPeriodLossesInputer: json['end_period_losses_inputer'] as String?,
+  endPeriodLossesDate: json['end_period_losses_date'] as String?,
+  endPeriodLossesEditor: json['end_period_losses_editor'] as String?,
+  endPeriodLossesLastEditDate:
+      json['end_period_losses_last_edit_date'] as String?,
+  breedingUniqueId: json['breeding_unique_id'] as String?,
+  licenceNumber: json['licence_number'] as String?,
+  temporaryTrash: json['temporary_trash'] as bool?,
+  temporaryDeleted: json['temporary_deleted'] as bool?,
+  firstDateInputArchive: json['first_date_input_archive'] as String?,
+  secondDateInputArchive: json['second_date_input_archive'] as String?,
+  inputArchiver: json['input_archiver'] as String?,
+  outputArchiveDate: json['output_archive_date'] as String?,
+  outputArchiver: json['output_archiver'] as String?,
+  barDifferenceRequestWeight: (json['bar_difference_request_weight'] as num?)
+      ?.toDouble(),
+  barDifferenceRequestQuantity:
+      (json['bar_difference_request_quantity'] as num?)?.toDouble(),
+  healthCertificate: json['health_certificate'] as String?,
+  samasatDischargePercentage: (json['samasat_discharge_percentage'] as num?)
+      ?.toDouble(),
+  personTypeName: json['person_type_name'] as String?,
+  interactTypeName: json['interact_type_name'] as String?,
+  unionTypeName: json['union_type_name'] as String?,
+  certId: json['cert_id'] as String?,
+  increaseQuantity: (json['increase_quantity'] as num?)?.toInt(),
+  tenantFullname: json['tenant_fullname'] as String?,
+  tenantNationalCode: json['tenant_national_code'] as String?,
+  tenantMobile: json['tenant_mobile'] as String?,
+  tenantCity: json['tenant_city'] as String?,
+  hasTenant: json['has_tenant'] as bool?,
+  archiveDate: json['archive_date'] as String?,
+  createdBy: json['created_by'] as String?,
+  modifiedBy: json['modified_by'] as String?,
 );
 
 Map<String, dynamic> _$HatchingToJson(_Hatching instance) => <String, dynamic>{
+  'id': instance.id,
   'poultry': instance.poultry,
-  'general_info': instance.generalInfo,
-  'chicken_breed': instance.chickenBreed,
-  'date': instance.date,
-  'quantity': instance.quantity,
-  'left_over': instance.leftOver,
-  'period': instance.period,
-  'losses': instance.losses,
-  'violation': instance.violation,
-  'licence_number': instance.licenceNumber,
-  'chicken_age': instance.chickenAge,
+  'chain_company': instance.chainCompany,
+  'age': instance.age,
+  'inspection_losses': instance.inspectionLosses,
   'vet_farm': instance.vetFarm,
+  'active_kill': instance.activeKill,
+  'killing_info': instance.killingInfo,
+  'free_governmental_info': instance.freeGovernmentalInfo,
+  'report_info': instance.reportInfo,
+  'key': instance.key,
+  'create_date': instance.createDate?.toIso8601String(),
+  'modify_date': instance.modifyDate?.toIso8601String(),
+  'trash': instance.trash,
+  'has_chain_company': instance.hasChainCompany,
+  'poultry_id_foreign_key': instance.poultryIdForeignKey,
+  'poultry_hatching_id_key': instance.poultryHatchingIdKey,
+  'quantity': instance.quantity,
+  'losses': instance.losses,
+  'left_over': instance.leftOver,
+  'killed_quantity': instance.killedQuantity,
+  'extra_killed_quantity': instance.extraKilledQuantity,
+  'governmental_killed_quantity': instance.governmentalKilledQuantity,
+  'governmental_quantity': instance.governmentalQuantity,
+  'free_killed_quantity': instance.freeKilledQuantity,
+  'free_quantity': instance.freeQuantity,
+  'chain_killed_quantity': instance.chainKilledQuantity,
+  'chain_killed_weight': instance.chainKilledWeight,
+  'out_province_killed_weight': instance.outProvinceKilledWeight,
+  'out_province_killed_quantity': instance.outProvinceKilledQuantity,
+  'export_killed_weight': instance.exportKilledWeight,
+  'export_killed_quantity': instance.exportKilledQuantity,
+  'total_commitment': instance.totalCommitment,
+  'commitment_type': instance.commitmentType,
+  'total_commitment_quantity': instance.totalCommitmentQuantity,
+  'total_free_commitment_quantity': instance.totalFreeCommitmentQuantity,
+  'total_free_commitment_weight': instance.totalFreeCommitmentWeight,
+  'total_killed_weight': instance.totalKilledWeight,
+  'total_average_killed_weight': instance.totalAverageKilledWeight,
+  'request_left_over': instance.requestLeftOver,
+  'hall': instance.hall,
+  'date': instance.date?.toIso8601String(),
+  'predicate_date': instance.predicateDate,
+  'chicken_breed': instance.chickenBreed,
+  'period': instance.period,
+  'allow_hatching': instance.allowHatching,
+  'state': instance.state,
+  'archive': instance.archive,
+  'violation': instance.violation,
+  'message': instance.message,
+  'registrar': instance.registrar,
+  'breed': instance.breed,
+  'city_number': instance.cityNumber,
+  'city_name': instance.cityName,
+  'province_number': instance.provinceNumber,
+  'province_name': instance.provinceName,
+  'last_change': instance.lastChange,
+  'chicken_age': instance.chickenAge,
+  'now_age': instance.nowAge,
+  'latest_hatching_change': instance.latestHatchingChange,
+  'violation_report': instance.violationReport,
+  'violation_message': instance.violationMessage,
+  'violation_image': instance.violationImage,
+  'violation_reporter': instance.violationReporter,
+  'violation_report_date': instance.violationReportDate?.toIso8601String(),
+  'violation_report_editor': instance.violationReportEditor,
+  'violation_report_edit_date': instance.violationReportEditDate
+      ?.toIso8601String(),
+  'total_losses': instance.totalLosses,
+  'direct_losses': instance.directLosses,
+  'direct_losses_inputer': instance.directLossesInputer,
+  'direct_losses_date': instance.directLossesDate,
+  'direct_losses_editor': instance.directLossesEditor,
+  'direct_losses_last_edit_date': instance.directLossesLastEditDate,
+  'end_period_losses_inputer': instance.endPeriodLossesInputer,
+  'end_period_losses_date': instance.endPeriodLossesDate,
+  'end_period_losses_editor': instance.endPeriodLossesEditor,
+  'end_period_losses_last_edit_date': instance.endPeriodLossesLastEditDate,
+  'breeding_unique_id': instance.breedingUniqueId,
+  'licence_number': instance.licenceNumber,
+  'temporary_trash': instance.temporaryTrash,
+  'temporary_deleted': instance.temporaryDeleted,
+  'first_date_input_archive': instance.firstDateInputArchive,
+  'second_date_input_archive': instance.secondDateInputArchive,
+  'input_archiver': instance.inputArchiver,
+  'output_archive_date': instance.outputArchiveDate,
+  'output_archiver': instance.outputArchiver,
+  'bar_difference_request_weight': instance.barDifferenceRequestWeight,
+  'bar_difference_request_quantity': instance.barDifferenceRequestQuantity,
+  'health_certificate': instance.healthCertificate,
+  'samasat_discharge_percentage': instance.samasatDischargePercentage,
+  'person_type_name': instance.personTypeName,
+  'interact_type_name': instance.interactTypeName,
+  'union_type_name': instance.unionTypeName,
+  'cert_id': instance.certId,
+  'increase_quantity': instance.increaseQuantity,
+  'tenant_fullname': instance.tenantFullname,
+  'tenant_national_code': instance.tenantNationalCode,
+  'tenant_mobile': instance.tenantMobile,
+  'tenant_city': instance.tenantCity,
+  'has_tenant': instance.hasTenant,
+  'archive_date': instance.archiveDate,
+  'created_by': instance.createdBy,
+  'modified_by': instance.modifiedBy,
 };
 
-_VetFarm _$VetFarmFromJson(Map<String, dynamic> json) => _VetFarm(
-  vetFarmFullname: json['vet_farm_fullname'] as String?,
-  vetFarmMobile: json['vet_farm_mobile'] as String?,
+_LastChange _$LastChangeFromJson(Map<String, dynamic> json) => _LastChange(
+  date: json['date'] == null ? null : DateTime.parse(json['date'] as String),
+  role: json['role'] as String?,
+  type: json['type'] as String?,
+  fullName: json['full_name'] as String?,
 );
 
-Map<String, dynamic> _$VetFarmToJson(_VetFarm instance) => <String, dynamic>{
-  'vet_farm_fullname': instance.vetFarmFullname,
-  'vet_farm_mobile': instance.vetFarmMobile,
-};
+Map<String, dynamic> _$LastChangeToJson(_LastChange instance) =>
+    <String, dynamic>{
+      'date': instance.date?.toIso8601String(),
+      'role': instance.role,
+      'type': instance.type,
+      'full_name': instance.fullName,
+    };
+
+_Registrar _$RegistrarFromJson(Map<String, dynamic> json) => _Registrar(
+  date: json['date'] == null ? null : DateTime.parse(json['date'] as String),
+  role: json['role'] as String?,
+  fullname: json['fullname'] as String?,
+);
+
+Map<String, dynamic> _$RegistrarToJson(_Registrar instance) =>
+    <String, dynamic>{
+      'date': instance.date?.toIso8601String(),
+      'role': instance.role,
+      'fullname': instance.fullname,
+    };
 
 _Poultry _$PoultryFromJson(Map<String, dynamic> json) => _Poultry(
+  id: (json['id'] as num?)?.toInt(),
+  user: json['user'] == null
+      ? null
+      : User.fromJson(json['user'] as Map<String, dynamic>),
+  address: json['address'] == null
+      ? null
+      : Address.fromJson(json['address'] as Map<String, dynamic>),
   key: json['key'] as String?,
-  fullname: json['fullname'] as String?,
-  mobile: json['mobile'] as String?,
-  city: (json['city'] as num?)?.toInt(),
+  trash: json['trash'] as bool?,
+  ownerIdForeignKey: (json['owner_id_foreign_key'] as num?)?.toInt(),
+  userIdForeignKey: (json['user_id_foreign_key'] as num?)?.toInt(),
+  addressIdForeignKey: (json['address_id_foreign_key'] as num?)?.toInt(),
+  hasChainCompany: json['has_chain_company'] as bool?,
+  cityOperator: json['city_operator'] as String?,
   unitName: json['unit_name'] as String?,
+  gisCode: json['gis_code'] as String?,
+  operatingLicenceCapacity: (json['operating_licence_capacity'] as num?)
+      ?.toInt(),
+  numberOfHalls: (json['number_of_halls'] as num?)?.toInt(),
+  tenant: json['tenant'] as bool?,
+  hasTenant: json['has_tenant'] as bool?,
+  personType: json['person_type'] as String?,
+  economicCode: json['economic_code'] as String?,
+  systemCode: json['system_code'] as String?,
+  epidemiologicalCode: json['epidemiological_code'] as String?,
+  breedingUniqueId: json['breeding_unique_id'] as String?,
+  totalCapacity: (json['total_capacity'] as num?)?.toInt(),
+  licenceNumber: json['licence_number'] as String?,
+  healthCertificateNumber: json['health_certificate_number'] as String?,
+  numberOfRequests: (json['number_of_requests'] as num?)?.toInt(),
+  hatchingDate: json['hatching_date'] == null
+      ? null
+      : DateTime.parse(json['hatching_date'] as String),
+  lastPartyDate: json['last_party_date'] == null
+      ? null
+      : DateTime.parse(json['last_party_date'] as String),
+  numberOfIncubators: (json['number_of_incubators'] as num?)?.toInt(),
+  herdAgeByDay: (json['herd_age_by_day'] as num?)?.toInt(),
+  herdAgeByWeek: (json['herd_age_by_week'] as num?)?.toInt(),
+  numberOfParty: (json['number_of_party'] as num?)?.toInt(),
+  communicationType: json['communication_type'] as String?,
+  cooperative: json['cooperative'] as String?,
+  dateOfRegister: json['date_of_register'] == null
+      ? null
+      : DateTime.parse(json['date_of_register'] as String),
+  unitStatus: json['unit_status'] as String?,
+  active: json['active'] as bool?,
+  identityDocuments: json['identity_documents'] as String?,
+  samasatUserCode: json['samasat_user_code'] as String?,
+  baseOrder: json['base_order'] as String?,
+  incubationDate: json['incubation_date'] == null
+      ? null
+      : DateTime.parse(json['incubation_date'] as String),
+  walletAmount: (json['wallet_amount'] as num?)?.toDouble(),
+  city: (json['city'] as num?)?.toInt(),
+  cityNumber: (json['city_number'] as num?)?.toInt(),
+  cityName: json['city_name'] as String?,
+  provinceNumber: (json['province_number'] as num?)?.toInt(),
+  provinceName: json['province_name'] as String?,
+  lat: (json['lat'] as num?)?.toDouble(),
+  long: (json['long'] as num?)?.toDouble(),
+  date: json['date'] as String?,
   killingAveAge: (json['killing_ave_age'] as num?)?.toInt(),
-  activeLeftOver: (json['active_left_over'] as num?)?.toInt(),
+  activeLeftOver: (json['active_left_over'] as num?)?.toDouble(),
   killingAveCount: (json['killing_ave_count'] as num?)?.toInt(),
+  killingAveWeight: (json['killing_ave_weight'] as num?)?.toDouble(),
+  killingLiveWeight: (json['killing_live_weight'] as num?)?.toDouble(),
+  killingCarcassesWeight: (json['killing_carcasses_weight'] as num?)
+      ?.toDouble(),
+  killingLossWeightPercent: (json['killing_loss_weight_percent'] as num?)
+      ?.toDouble(),
   realKillingAveWeight: (json['real_killing_ave_weight'] as num?)?.toDouble(),
   realKillingLiveWeight: (json['real_killing_live_weight'] as num?)?.toDouble(),
   realKillingCarcassesWeight: (json['real_killing_carcasses_weight'] as num?)
       ?.toDouble(),
   realKillingLossWeightPercent:
       (json['real_killing_loss_weight_percent'] as num?)?.toDouble(),
+  interestLicenceId: json['interest_licence_id'] as String?,
+  orderLimit: json['order_limit'] as bool?,
+  owner: (json['owner'] as num?)?.toInt(),
+  userBankInfo: (json['user_bank_info'] as num?)?.toInt(),
+  wallet: (json['wallet'] as num?)?.toInt(),
 );
 
 Map<String, dynamic> _$PoultryToJson(_Poultry instance) => <String, dynamic>{
+  'id': instance.id,
+  'user': instance.user,
+  'address': instance.address,
   'key': instance.key,
-  'fullname': instance.fullname,
-  'mobile': instance.mobile,
-  'city': instance.city,
+  'trash': instance.trash,
+  'owner_id_foreign_key': instance.ownerIdForeignKey,
+  'user_id_foreign_key': instance.userIdForeignKey,
+  'address_id_foreign_key': instance.addressIdForeignKey,
+  'has_chain_company': instance.hasChainCompany,
+  'city_operator': instance.cityOperator,
   'unit_name': instance.unitName,
+  'gis_code': instance.gisCode,
+  'operating_licence_capacity': instance.operatingLicenceCapacity,
+  'number_of_halls': instance.numberOfHalls,
+  'tenant': instance.tenant,
+  'has_tenant': instance.hasTenant,
+  'person_type': instance.personType,
+  'economic_code': instance.economicCode,
+  'system_code': instance.systemCode,
+  'epidemiological_code': instance.epidemiologicalCode,
+  'breeding_unique_id': instance.breedingUniqueId,
+  'total_capacity': instance.totalCapacity,
+  'licence_number': instance.licenceNumber,
+  'health_certificate_number': instance.healthCertificateNumber,
+  'number_of_requests': instance.numberOfRequests,
+  'hatching_date': instance.hatchingDate?.toIso8601String(),
+  'last_party_date': instance.lastPartyDate?.toIso8601String(),
+  'number_of_incubators': instance.numberOfIncubators,
+  'herd_age_by_day': instance.herdAgeByDay,
+  'herd_age_by_week': instance.herdAgeByWeek,
+  'number_of_party': instance.numberOfParty,
+  'communication_type': instance.communicationType,
+  'cooperative': instance.cooperative,
+  'date_of_register': instance.dateOfRegister?.toIso8601String(),
+  'unit_status': instance.unitStatus,
+  'active': instance.active,
+  'identity_documents': instance.identityDocuments,
+  'samasat_user_code': instance.samasatUserCode,
+  'base_order': instance.baseOrder,
+  'incubation_date': instance.incubationDate?.toIso8601String(),
+  'wallet_amount': instance.walletAmount,
+  'city': instance.city,
+  'city_number': instance.cityNumber,
+  'city_name': instance.cityName,
+  'province_number': instance.provinceNumber,
+  'province_name': instance.provinceName,
+  'lat': instance.lat,
+  'long': instance.long,
+  'date': instance.date,
   'killing_ave_age': instance.killingAveAge,
   'active_left_over': instance.activeLeftOver,
   'killing_ave_count': instance.killingAveCount,
+  'killing_ave_weight': instance.killingAveWeight,
+  'killing_live_weight': instance.killingLiveWeight,
+  'killing_carcasses_weight': instance.killingCarcassesWeight,
+  'killing_loss_weight_percent': instance.killingLossWeightPercent,
   'real_killing_ave_weight': instance.realKillingAveWeight,
   'real_killing_live_weight': instance.realKillingLiveWeight,
   'real_killing_carcasses_weight': instance.realKillingCarcassesWeight,
   'real_killing_loss_weight_percent': instance.realKillingLossWeightPercent,
+  'interest_licence_id': instance.interestLicenceId,
+  'order_limit': instance.orderLimit,
+  'owner': instance.owner,
+  'user_bank_info': instance.userBankInfo,
+  'wallet': instance.wallet,
 };
 
-_GeneralInfo _$GeneralInfoFromJson(Map<String, dynamic> json) => _GeneralInfo(
-  aveAge: (json['ave_age'] as num?)?.toInt(),
-  age: (json['age'] as num?)?.toInt(),
-  aveWeight: (json['ave_weight'] as num?)?.toDouble(),
+_ChainCompany _$ChainCompanyFromJson(Map<String, dynamic> json) =>
+    _ChainCompany(
+      user: json['user'] == null
+          ? null
+          : User.fromJson(json['user'] as Map<String, dynamic>),
+      userBankInfo: json['user_bank_info'] as String?,
+      key: json['key'] as String?,
+      trash: json['trash'] as bool?,
+      name: json['name'] as String?,
+      city: json['city'] as String?,
+      province: json['province'] as String?,
+      postalCode: json['postal_code'] as String?,
+      address: json['address'] as String?,
+      wallet: (json['wallet'] as num?)?.toInt(),
+    );
+
+Map<String, dynamic> _$ChainCompanyToJson(_ChainCompany instance) =>
+    <String, dynamic>{
+      'user': instance.user,
+      'user_bank_info': instance.userBankInfo,
+      'key': instance.key,
+      'trash': instance.trash,
+      'name': instance.name,
+      'city': instance.city,
+      'province': instance.province,
+      'postal_code': instance.postalCode,
+      'address': instance.address,
+      'wallet': instance.wallet,
+    };
+
+_VetFarm _$VetFarmFromJson(Map<String, dynamic> json) => _VetFarm(
+  vetFarmFullName: json['vet_farm_full_name'] as String?,
+  vetFarmMobile: json['vet_farm_mobile'] as String?,
+);
+
+Map<String, dynamic> _$VetFarmToJson(_VetFarm instance) => <String, dynamic>{
+  'vet_farm_full_name': instance.vetFarmFullName,
+  'vet_farm_mobile': instance.vetFarmMobile,
+};
+
+_ActiveKill _$ActiveKillFromJson(Map<String, dynamic> json) => _ActiveKill(
+  activeKill: json['active_kill'] as bool?,
+  countOfRequest: (json['count_of_request'] as num?)?.toInt(),
+);
+
+Map<String, dynamic> _$ActiveKillToJson(_ActiveKill instance) =>
+    <String, dynamic>{
+      'active_kill': instance.activeKill,
+      'count_of_request': instance.countOfRequest,
+    };
+
+_KillingInfo _$KillingInfoFromJson(Map<String, dynamic> json) => _KillingInfo(
+  violationMessage: json['violation_message'] as String?,
   provinceKillRequests: (json['province_kill_requests'] as num?)?.toInt(),
   provinceKillRequestsQuantity:
       (json['province_kill_requests_quantity'] as num?)?.toInt(),
   provinceKillRequestsWeight: (json['province_kill_requests_weight'] as num?)
-      ?.toDouble(),
-  killHouseRequestsQuantity: (json['kill_house_requests_quantity'] as num?)
       ?.toInt(),
   killHouseRequests: (json['kill_house_requests'] as num?)?.toInt(),
-  killHouseRequestsWeight: (json['kill_house_requests_weight'] as num?)
-      ?.toDouble(),
-  totalQuantity: (json['total_quantity'] as num?)?.toInt(),
-  totalWeight: (json['total_weight'] as num?)?.toDouble(),
+  killHouseRequestsFirstQuantity:
+      (json['kill_house_requests_first_quantity'] as num?)?.toInt(),
+  killHouseRequestsFirstWeight:
+      (json['kill_house_requests_first_weight'] as num?)?.toInt(),
+  barCompleteWithKillHouse: (json['bar_complete_with_kill_house'] as num?)
+      ?.toInt(),
+  acceptedRealQuantityFinal: (json['accepted_real_quantity_final'] as num?)
+      ?.toInt(),
+  acceptedRealWightFinal: (json['accepted_real_wight_final'] as num?)?.toInt(),
 );
 
-Map<String, dynamic> _$GeneralInfoToJson(_GeneralInfo instance) =>
-    <String, dynamic>{
-      'ave_age': instance.aveAge,
-      'age': instance.age,
-      'ave_weight': instance.aveWeight,
+Map<String, dynamic> _$KillingInfoToJson(
+  _KillingInfo instance,
+) => <String, dynamic>{
+  'violation_message': instance.violationMessage,
   'province_kill_requests': instance.provinceKillRequests,
   'province_kill_requests_quantity': instance.provinceKillRequestsQuantity,
   'province_kill_requests_weight': instance.provinceKillRequestsWeight,
-      'kill_house_requests_quantity': instance.killHouseRequestsQuantity,
   'kill_house_requests': instance.killHouseRequests,
-      'kill_house_requests_weight': instance.killHouseRequestsWeight,
-      'total_quantity': instance.totalQuantity,
-      'total_weight': instance.totalWeight,
+  'kill_house_requests_first_quantity': instance.killHouseRequestsFirstQuantity,
+  'kill_house_requests_first_weight': instance.killHouseRequestsFirstWeight,
+  'bar_complete_with_kill_house': instance.barCompleteWithKillHouse,
+  'accepted_real_quantity_final': instance.acceptedRealQuantityFinal,
+  'accepted_real_wight_final': instance.acceptedRealWightFinal,
+};
+
+_FreeGovernmentalInfo _$FreeGovernmentalInfoFromJson(
+  Map<String, dynamic> json,
+) => _FreeGovernmentalInfo(
+  governmentalAllocatedQuantity:
+      (json['governmental_allocated_quantity'] as num?)?.toInt(),
+  totalCommitmentQuantity: (json['total_commitment_quantity'] as num?)
+      ?.toDouble(),
+  freeAllocatedQuantity: (json['free_allocated_quantity'] as num?)?.toInt(),
+  totalFreeCommitmentQuantity: (json['total_free_commitment_quantity'] as num?)
+      ?.toDouble(),
+  leftTotalFreeCommitmentQuantity:
+      (json['left_total_free_commitment_quantity'] as num?)?.toInt(),
+);
+
+Map<String, dynamic> _$FreeGovernmentalInfoToJson(
+  _FreeGovernmentalInfo instance,
+) => <String, dynamic>{
+  'governmental_allocated_quantity': instance.governmentalAllocatedQuantity,
+  'total_commitment_quantity': instance.totalCommitmentQuantity,
+  'free_allocated_quantity': instance.freeAllocatedQuantity,
+  'total_free_commitment_quantity': instance.totalFreeCommitmentQuantity,
+  'left_total_free_commitment_quantity':
+      instance.leftTotalFreeCommitmentQuantity,
+};
+
+_ReportInfo _$ReportInfoFromJson(Map<String, dynamic> json) => _ReportInfo(
+  poultryScience: json['poultry_science'] as bool?,
+  image: json['image'] as bool?,
+);
+
+Map<String, dynamic> _$ReportInfoToJson(_ReportInfo instance) =>
+    <String, dynamic>{
+      'poultry_science': instance.poultryScience,
+      'image': instance.image,
     };
+
+_LatestHatchingChange _$LatestHatchingChangeFromJson(
+  Map<String, dynamic> json,
+) => _LatestHatchingChange(
+  date: json['date'] == null ? null : DateTime.parse(json['date'] as String),
+  role: json['role'] as String?,
+  fullName: json['full_name'] as String?,
+);
+
+Map<String, dynamic> _$LatestHatchingChangeToJson(
+  _LatestHatchingChange instance,
+) => <String, dynamic>{
+  'date': instance.date?.toIso8601String(),
+  'role': instance.role,
+  'full_name': instance.fullName,
+};
+
+_Breed _$BreedFromJson(Map<String, dynamic> json) => _Breed(
+  breed: json['breed'] as String?,
+  mainQuantity: (json['main_quantity'] as num?)?.toInt(),
+  remainQuantity: (json['remain_quantity'] as num?)?.toInt(),
+);
+
+Map<String, dynamic> _$BreedToJson(_Breed instance) => <String, dynamic>{
+  'breed': instance.breed,
+  'main_quantity': instance.mainQuantity,
+  'remain_quantity': instance.remainQuantity,
+};
+
+_Address _$AddressFromJson(Map<String, dynamic> json) => _Address(
+  province: json['province'] == null
+      ? null
+      : Province.fromJson(json['province'] as Map<String, dynamic>),
+  city: json['city'] == null
+      ? null
+      : City.fromJson(json['city'] as Map<String, dynamic>),
+  address: json['address'] as String?,
+  postalCode: json['postal_code'] as String?,
+);
+
+Map<String, dynamic> _$AddressToJson(_Address instance) => <String, dynamic>{
+  'province': instance.province,
+  'city': instance.city,
+  'address': instance.address,
+  'postal_code': instance.postalCode,
+};
+
+_Province _$ProvinceFromJson(Map<String, dynamic> json) =>
+    _Province(key: json['key'] as String?, name: json['name'] as String?);
+
+Map<String, dynamic> _$ProvinceToJson(_Province instance) => <String, dynamic>{
+  'key': instance.key,
+  'name': instance.name,
+};
+
+_City _$CityFromJson(Map<String, dynamic> json) =>
+    _City(key: json['key'] as String?, name: json['name'] as String?);
+
+Map<String, dynamic> _$CityToJson(_City instance) => <String, dynamic>{
+  'key': instance.key,
+  'name': instance.name,
+};

packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart

@@ -376,7 +376,7 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
             mainAxisAlignment: MainAxisAlignment.start,
             children: [
               Text(
-                item.hatching?.poultry?.fullname ?? 'N/A',
+                item.hatching?.poultry?.user?.fullname ?? 'N/A',
                 textAlign: TextAlign.center,
                 style: AppFonts.yekan16.copyWith(color: AppColor.greenDark),
               ),
@@ -446,7 +446,7 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
           buildRow(
             title: 'دامپزشک فارم',
             value:
-                '${item.hatching?.vetFarm?.vetFarmFullname}(${item.hatching?.vetFarm?.vetFarmMobile})',
+                '${item.hatching?.vetFarm?.vetFarmFullName}(${item.hatching?.vetFarm?.vetFarmMobile})',
           ),
           buildRow(
             title: 'شرح بازرسی',
@@ -609,12 +609,12 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
             spacing: 5,
             children: [
               Text(
-                item.hatching?.poultry?.fullname ?? 'N/A',
+                item.hatching?.poultry?.user?.fullname ?? 'N/A',
                 textAlign: TextAlign.start,
                 style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
               ),
               Text(
-                item.hatching?.poultry?.mobile ?? 'N/A',
+                item.hatching?.poultry?.user?.mobile ?? 'N/A',
                 textAlign: TextAlign.center,
                 style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
               ),