EF framework更新实体

travelExport/DB.Context.cs

@@ -49,7 +49,6 @@ namespace travelExport
         public virtual DbSet<Fin_DailyFeePaymentContent> Fin_DailyFeePaymentContent { get; set; }
         public virtual DbSet<Fin_ForeignReceivables> Fin_ForeignReceivables { get; set; }
         public virtual DbSet<Fin_GroupExtraCost> Fin_GroupExtraCost { get; set; }
-        public virtual DbSet<Fin_GroupExtraCost1> Fin_GroupExtraCost1 { get; set; }
         public virtual DbSet<Fin_OtherPrice> Fin_OtherPrice { get; set; }
         public virtual DbSet<Fin_PaymentRefundAndOtherMoney> Fin_PaymentRefundAndOtherMoney { get; set; }
         public virtual DbSet<Fin_ProceedsReceived> Fin_ProceedsReceived { get; set; }
@@ -65,7 +64,6 @@ namespace travelExport
         public virtual DbSet<Grp_CheckBoxs> Grp_CheckBoxs { get; set; }
         public virtual DbSet<Grp_CostTypeHotelNumber> Grp_CostTypeHotelNumber { get; set; }
         public virtual DbSet<Grp_CreditCardPayment> Grp_CreditCardPayment { get; set; }
-        public virtual DbSet<Grp_CreditCardPayment1> Grp_CreditCardPayment1 { get; set; }
         public virtual DbSet<Grp_Customers> Grp_Customers { get; set; }
         public virtual DbSet<Grp_DayAndCost> Grp_DayAndCost { get; set; }
         public virtual DbSet<Grp_DecreasePayments> Grp_DecreasePayments { get; set; }
@@ -85,18 +83,15 @@ namespace travelExport
         public virtual DbSet<Grp_InvertedList> Grp_InvertedList { get; set; }
         public virtual DbSet<Grp_InvertedListVisaCountry> Grp_InvertedListVisaCountry { get; set; }
         public virtual DbSet<Grp_InvitationOfficialActivities> Grp_InvitationOfficialActivities { get; set; }
-        public virtual DbSet<Grp_InvitationOfficialActivities1> Grp_InvitationOfficialActivities1 { get; set; }
         public virtual DbSet<Grp_NationalTravelFee> Grp_NationalTravelFee { get; set; }
         public virtual DbSet<Grp_ScenicSpotInfo> Grp_ScenicSpotInfo { get; set; }
         public virtual DbSet<Grp_Schedule> Grp_Schedule { get; set; }
         public virtual DbSet<Grp_ScheduleDetail> Grp_ScheduleDetail { get; set; }
         public virtual DbSet<Grp_SchedulePerson> Grp_SchedulePerson { get; set; }
         public virtual DbSet<Grp_TeamRate> Grp_TeamRate { get; set; }
-        public virtual DbSet<Grp_TeamRate1> Grp_TeamRate1 { get; set; }
         public virtual DbSet<Grp_TourClientList> Grp_TourClientList { get; set; }
         public virtual DbSet<Grp_TravelList> Grp_TravelList { get; set; }
         public virtual DbSet<Grp_VisaFeeInfo> Grp_VisaFeeInfo { get; set; }
-        public virtual DbSet<Grp_VisaInfo0430171300> Grp_VisaInfo0430171300 { get; set; }
         public virtual DbSet<Grp_VisaProgress> Grp_VisaProgress { get; set; }
         public virtual DbSet<Grp_VisaProgressCustomer> Grp_VisaProgressCustomer { get; set; }
         public virtual DbSet<Grp_VisaProgressCustomerPicture> Grp_VisaProgressCustomerPicture { get; set; }
@@ -140,8 +135,6 @@ namespace travelExport
         public virtual DbSet<Sys_UserAuthority> Sys_UserAuthority { get; set; }
         public virtual DbSet<Sys_Users> Sys_Users { get; set; }
         public virtual DbSet<sysdiagrams> sysdiagrams { get; set; }
-        public virtual DbSet<Grp_CreditCardPayment2> Grp_CreditCardPayment2 { get; set; }
-        public virtual DbSet<Grp_InvertedListVisaCountry20240430114047> Grp_InvertedListVisaCountry20240430114047 { get; set; }
         public virtual DbSet<Res_OfficialActivities0426> Res_OfficialActivities0426 { get; set; }
         public virtual DbSet<Grp_HotelInquiry> Grp_HotelInquiry { get; set; }
         public virtual DbSet<Grp_VisaInfo> Grp_VisaInfo { get; set; }

travelExport/DB.Designer.cs

@@ -1,4 +1,4 @@
-// 为模型“E:\新建1\project\travelExport\travelExport\DB.edmx”启用了 T4 代码生成。
+// 为模型“E:\project\project\travelExport\travelExport\DB.edmx”启用了 T4 代码生成。
 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值
 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在
 // “属性”窗口中。

travelExport/DB.edmx.diagram

@@ -4,7 +4,7 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="91f6a5e0dba8427eaab843fafdcdde0b" Name="Diagram1">
+      <Diagram DiagramId="91f6a5e0dba8427eaab843fafdcdde0b" Name="Diagram1" ZoomLevel="54">
         <EntityTypeShape EntityType="oa2023DBModel.Air_TicketBlackCode" Width="1.5" PointX="0.75" PointY="0.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Bus_ConfItem" Width="1.5" PointX="2.75" PointY="0.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Bus_ConfItemList" Width="1.5" PointX="4.75" PointY="0.75" IsExpanded="true" />
@@ -29,7 +29,6 @@
         <EntityTypeShape EntityType="oa2023DBModel.Fin_DailyFeePaymentContent" Width="1.5" PointX="14.75" PointY="14.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Fin_ForeignReceivables" Width="1.5" PointX="16.75" PointY="0.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Fin_GroupExtraCost" Width="1.5" PointX="2.75" PointY="16.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="oa2023DBModel.Fin_GroupExtraCost1" Width="1.5" PointX="4.75" PointY="16.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Fin_OtherPrice" Width="1.5" PointX="16.75" PointY="6.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Fin_PaymentRefundAndOtherMoney" Width="1.5" PointX="10.75" PointY="16.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Fin_ProceedsReceived" Width="1.5" PointX="16.75" PointY="11.75" IsExpanded="true" />
@@ -45,7 +44,6 @@
         <EntityTypeShape EntityType="oa2023DBModel.Grp_CheckBoxs" Width="1.5" PointX="20.75" PointY="16.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_CostTypeHotelNumber" Width="1.5" PointX="20.75" PointY="20.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_CreditCardPayment" Width="1.5" PointX="22.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="oa2023DBModel.Grp_CreditCardPayment1" Width="1.5" PointX="0.75" PointY="22.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_Customers" Width="1.5" PointX="2.75" PointY="22.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_DayAndCost" Width="1.5" PointX="4.75" PointY="22.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_DecreasePayments" Width="1.5" PointX="22.75" PointY="11.75" IsExpanded="true" />
@@ -65,18 +63,15 @@
         <EntityTypeShape EntityType="oa2023DBModel.Grp_InvertedList" Width="1.5" PointX="26.75" PointY="17.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_InvertedListVisaCountry" Width="1.5" PointX="18.75" PointY="26.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_InvitationOfficialActivities" Width="1.5" PointX="26.75" PointY="26.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="oa2023DBModel.Grp_InvitationOfficialActivities1" Width="1.5" PointX="2.75" PointY="27.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_NationalTravelFee" Width="1.5" PointX="12.75" PointY="27.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_ScenicSpotInfo" Width="1.5" PointX="20.75" PointY="27.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_Schedule" Width="1.5" PointX="28.75" PointY="0.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_ScheduleDetail" Width="1.5" PointX="28.75" PointY="5.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_SchedulePerson" Width="1.5" PointX="28.75" PointY="11.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_TeamRate" Width="1.5" PointX="28.75" PointY="15.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="oa2023DBModel.Grp_TeamRate1" Width="1.5" PointX="28.75" PointY="23.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_TourClientList" Width="1.5" PointX="22.75" PointY="29.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_TravelList" Width="1.5" PointX="30.75" PointY="0.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaFeeInfo" Width="1.5" PointX="30.75" PointY="5.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaInfo0430171300" Width="1.5" PointX="30.75" PointY="14.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaProgress" Width="1.5" PointX="14.75" PointY="30.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaProgressCustomer" Width="1.5" PointX="16.75" PointY="30.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaProgressCustomerPicture" Width="1.5" PointX="30.75" PointY="19.75" IsExpanded="true" />
@@ -120,8 +115,6 @@
         <EntityTypeShape EntityType="oa2023DBModel.Sys_UserAuthority" Width="1.5" PointX="36.75" PointY="35.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Sys_Users" Width="1.5" PointX="26.75" PointY="37.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.sysdiagrams" Width="1.5" PointX="38.75" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="oa2023DBModel.Grp_CreditCardPayment2" Width="1.5" PointX="2.75" PointY="38.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="oa2023DBModel.Grp_InvertedListVisaCountry20240430114047" Width="1.5" PointX="38.75" PointY="3.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Res_OfficialActivities0426" Width="1.5" PointX="4.75" PointY="38.75" IsExpanded="true" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_HotelInquiry" Width="1.5" PointX="29.375" PointY="38.75" />
         <EntityTypeShape EntityType="oa2023DBModel.Grp_VisaInfo" Width="1.5" PointX="39.375" PointY="7.75" />

travelExport/Fin_ForeignReceivables.cs

@@ -34,5 +34,8 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> Status { get; set; }
+        public Nullable<int> Auditor { get; set; }
+        public string AuditTime { get; set; }
     }
 }

travelExport/Fin_GroupExtraCost.cs

@@ -32,5 +32,9 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> Area { get; set; }
+        public Nullable<int> ManagerConfirm { get; set; }
+        public Nullable<int> SupervisorConfirm { get; set; }
+        public Nullable<int> SYsupervisorConfirm { get; set; }
     }
 }

travelExport/Fin_GroupExtraCost1.cs

@@ -1,36 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace travelExport
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Fin_GroupExtraCost1
-    {
-        public int Id { get; set; }
-        public Nullable<int> DiId { get; set; }
-        public string PriceName { get; set; }
-        public Nullable<decimal> Price { get; set; }
-        public Nullable<int> PriceCount { get; set; }
-        public Nullable<decimal> PriceSum { get; set; }
-        public Nullable<System.DateTime> PriceDt { get; set; }
-        public Nullable<int> PriceCurrency { get; set; }
-        public Nullable<int> PriceType { get; set; }
-        public Nullable<decimal> Coefficient { get; set; }
-        public Nullable<int> PriceDetailType { get; set; }
-        public string FilePath { get; set; }
-        public Nullable<int> CreateUserId { get; set; }
-        public Nullable<System.DateTime> CreateTime { get; set; }
-        public Nullable<int> DeleteUserId { get; set; }
-        public string DeleteTime { get; set; }
-        public string Remark { get; set; }
-        public Nullable<int> IsDel { get; set; }
-    }
-}

travelExport/Grp_CarTouristGuideGroundReservations.cs

@@ -39,5 +39,7 @@ namespace travelExport
         public string SelectCheck { get; set; }
         public Nullable<int> PriceType { get; set; }
         public string PriceName { get; set; }
+        public Nullable<int> toCurr { get; set; }
+        public Nullable<decimal> Rate { get; set; }
     }
 }

travelExport/Grp_CreditCardPayment1.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace travelExport
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Grp_CreditCardPayment1
-    {
-        public int Id { get; set; }
-        public Nullable<int> DIId { get; set; }
-        public Nullable<int> CId { get; set; }
-        public Nullable<int> CTable { get; set; }
-        public Nullable<int> PayDId { get; set; }
-        public string ConsumptionPatterns { get; set; }
-        public string ConsumptionDate { get; set; }
-        public Nullable<int> CTDId { get; set; }
-        public string BankNo { get; set; }
-        public string CardholderName { get; set; }
-        public Nullable<decimal> PayMoney { get; set; }
-        public Nullable<int> PaymentCurrency { get; set; }
-        public Nullable<decimal> DayRate { get; set; }
-        public string CompanyBankNo { get; set; }
-        public string OtherBankName { get; set; }
-        public string OtherSideNo { get; set; }
-        public string OtherSideName { get; set; }
-        public Nullable<int> MFOperator { get; set; }
-        public string MFOperatorDate { get; set; }
-        public Nullable<int> IsAuditDM { get; set; }
-        public Nullable<int> AuditDMOperate { get; set; }
-        public string AuditDMDate { get; set; }
-        public Nullable<int> IsAuditMF { get; set; }
-        public Nullable<int> AuditMFOperate { get; set; }
-        public string AuditMFDate { get; set; }
-        public Nullable<int> IsAuditGM { get; set; }
-        public Nullable<int> AuditGMOperate { get; set; }
-        public string AuditGMDate { get; set; }
-        public Nullable<int> IsPay { get; set; }
-        public Nullable<decimal> PayPercentage { get; set; }
-        public Nullable<decimal> PayPercentageOld { get; set; }
-        public Nullable<decimal> PayThenMoney { get; set; }
-        public Nullable<decimal> PayThenMoneyOld { get; set; }
-        public string UpdateDate { get; set; }
-        public string Payee { get; set; }
-        public Nullable<decimal> RMBPrice { get; set; }
-        public Nullable<int> OrbitalPrivateTransfer { get; set; }
-        public Nullable<decimal> ExceedBudget { get; set; }
-        public Nullable<int> IsMatchCreditCard { get; set; }
-        public Nullable<int> CreateUserId { get; set; }
-        public Nullable<System.DateTime> CreateTime { get; set; }
-        public Nullable<int> DeleteUserId { get; set; }
-        public Nullable<System.DateTime> DeleteTime { get; set; }
-        public string Remark { get; set; }
-        public Nullable<int> IsDel { get; set; }
-    }
-}

travelExport/Grp_CreditCardPayment2.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace travelExport
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Grp_CreditCardPayment2
-    {
-        public int Id { get; set; }
-        public Nullable<int> DIId { get; set; }
-        public Nullable<int> CId { get; set; }
-        public Nullable<int> CTable { get; set; }
-        public Nullable<int> PayDId { get; set; }
-        public string ConsumptionPatterns { get; set; }
-        public string ConsumptionDate { get; set; }
-        public Nullable<int> CTDId { get; set; }
-        public string BankNo { get; set; }
-        public string CardholderName { get; set; }
-        public Nullable<decimal> PayMoney { get; set; }
-        public Nullable<int> PaymentCurrency { get; set; }
-        public Nullable<decimal> DayRate { get; set; }
-        public string CompanyBankNo { get; set; }
-        public string OtherBankName { get; set; }
-        public string OtherSideNo { get; set; }
-        public string OtherSideName { get; set; }
-        public Nullable<int> MFOperator { get; set; }
-        public string MFOperatorDate { get; set; }
-        public Nullable<int> IsAuditDM { get; set; }
-        public Nullable<int> AuditDMOperate { get; set; }
-        public string AuditDMDate { get; set; }
-        public Nullable<int> IsAuditMF { get; set; }
-        public Nullable<int> AuditMFOperate { get; set; }
-        public string AuditMFDate { get; set; }
-        public Nullable<int> IsAuditGM { get; set; }
-        public Nullable<int> AuditGMOperate { get; set; }
-        public string AuditGMDate { get; set; }
-        public Nullable<int> IsPay { get; set; }
-        public Nullable<decimal> PayPercentage { get; set; }
-        public Nullable<decimal> PayThenMoney { get; set; }
-        public Nullable<decimal> PayPercentageOld { get; set; }
-        public Nullable<decimal> PayThenMoneyOld { get; set; }
-        public string UpdateDate { get; set; }
-        public string Payee { get; set; }
-        public Nullable<decimal> RMBPrice { get; set; }
-        public string OrbitalPrivateTransfer { get; set; }
-        public Nullable<decimal> ExceedBudget { get; set; }
-        public Nullable<int> IsMatchCreditCard { get; set; }
-        public Nullable<int> CreateUserId { get; set; }
-        public Nullable<System.DateTime> CreateTime { get; set; }
-        public Nullable<int> DeleteUserId { get; set; }
-        public string DeleteTime { get; set; }
-        public string Remark { get; set; }
-        public Nullable<int> IsDel { get; set; }
-    }
-}

travelExport/Grp_DecreasePayments.cs

@@ -26,5 +26,17 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> SupplierArea { get; set; }
+        public Nullable<int> SupplierTypeId { get; set; }
+        public string SupplierName { get; set; }
+        public string SupplierContact { get; set; }
+        public string SupplierContactNumber { get; set; }
+        public string SupplierSocialAccount { get; set; }
+        public string SupplierEmail { get; set; }
+        public string SupplierAddress { get; set; }
+        public Nullable<decimal> Quantity { get; set; }
+        public Nullable<decimal> FeeTotal { get; set; }
+        public string OTAOrderNo { get; set; }
+        public Nullable<int> IsSelect { get; set; }
     }
 }

travelExport/Grp_DelegationInfo.cs

@@ -65,5 +65,6 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> IsBid { get; set; }
     }
 }

travelExport/Grp_EnterExitCost.cs

@@ -25,7 +25,6 @@ namespace travelExport
         public Nullable<decimal> Ticket { get; set; }
         public Nullable<decimal> Safe { get; set; }
         public Nullable<decimal> OutsideJJPay { get; set; }
-        public Nullable<decimal> OutsaideGWPay { get; set; }
         public Nullable<decimal> AirJJ { get; set; }
         public Nullable<decimal> AirGW { get; set; }
         public Nullable<decimal> CityTranffic { get; set; }
@@ -51,5 +50,14 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public string FirstItemRemark { get; set; }
+        public Nullable<decimal> OutsideGWPay { get; set; }
+        public Nullable<decimal> OutsideTDPay { get; set; }
+        public Nullable<decimal> AirTD { get; set; }
+        public Nullable<int> SumTDC { get; set; }
+        public Nullable<int> AirTDC_Checked { get; set; }
+        public Nullable<int> OtherExpenses_Checked { get; set; }
+        public Nullable<int> IsConfirm { get; set; }
+        public string TwoItemRemark { get; set; }
     }
 }

travelExport/Grp_GroupCost.cs

@@ -61,5 +61,6 @@ namespace travelExport
         public Nullable<int> IsDel { get; set; }
         public string gwCount { get; set; }
         public string fyCount { get; set; }
+        public string EFR { get; set; }
     }
 }

travelExport/Grp_GroupCostParameter.cs

@@ -74,5 +74,8 @@ namespace travelExport
         public Nullable<System.DateTime> CostTypeendTime { get; set; }
         public Nullable<int> CostTypenumber { get; set; }
         public Nullable<int> DJRS { get; set; }
+        public Nullable<decimal> TDCCB { get; set; }
+        public Nullable<decimal> TDCXS { get; set; }
+        public Nullable<int> TDCRS { get; set; }
     }
 }

travelExport/Grp_HotelReservations.cs

@@ -69,5 +69,6 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> AreaId { get; set; }
     }
 }

travelExport/Grp_InvertedListVisaCountry20240430114047.cs

@@ -1,30 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace travelExport
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Grp_InvertedListVisaCountry20240430114047
-    {
-        public int Id { get; set; }
-        public Nullable<int> ILId { get; set; }
-        public string Country { get; set; }
-        public Nullable<int> OfficialTypeId { get; set; }
-        public Nullable<int> VisaTypeId { get; set; }
-        public Nullable<int> VisaDay { get; set; }
-        public Nullable<int> CreateUserId { get; set; }
-        public Nullable<System.DateTime> CreateTime { get; set; }
-        public Nullable<int> DeleteUserId { get; set; }
-        public string DeleteTime { get; set; }
-        public string Remark { get; set; }
-        public Nullable<int> IsDel { get; set; }
-    }
-}

travelExport/Grp_InvitationOfficialActivities.cs

@@ -35,5 +35,6 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> DataId { get; set; }
     }
 }

travelExport/Grp_InvitationOfficialActivities1.cs

@@ -1,39 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace travelExport
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Grp_InvitationOfficialActivities1
-    {
-        public int Id { get; set; }
-        public Nullable<int> DiId { get; set; }
-        public string InviterArea { get; set; }
-        public string Inviter { get; set; }
-        public Nullable<System.DateTime> InviteTime { get; set; }
-        public string Attachment { get; set; }
-        public Nullable<decimal> InviteCost { get; set; }
-        public Nullable<int> InviteCurrency { get; set; }
-        public Nullable<decimal> SendCost { get; set; }
-        public Nullable<int> SendCurrency { get; set; }
-        public Nullable<decimal> EventsCost { get; set; }
-        public Nullable<int> EventsCurrency { get; set; }
-        public Nullable<decimal> TranslateCost { get; set; }
-        public Nullable<int> TranslateCurrency { get; set; }
-        public Nullable<int> IsGoOfficaiaBussiness { get; set; }
-        public Nullable<int> CreateUserId { get; set; }
-        public Nullable<System.DateTime> CreateTime { get; set; }
-        public Nullable<int> DeleteUserId { get; set; }
-        public string DeleteTime { get; set; }
-        public string Remark { get; set; }
-        public Nullable<int> IsDel { get; set; }
-    }
-}

travelExport/Grp_TeamRate1.cs

@@ -1,51 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace travelExport
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Grp_TeamRate1
-    {
-        public int Id { get; set; }
-        public Nullable<int> DiId { get; set; }
-        public Nullable<int> CTable { get; set; }
-        public string OtherRateCode { get; set; }
-        public Nullable<decimal> OtherPrice { get; set; }
-        public Nullable<decimal> RateU { get; set; }
-        public Nullable<decimal> RateE { get; set; }
-        public Nullable<decimal> RateJ { get; set; }
-        public Nullable<decimal> RateH { get; set; }
-        public Nullable<decimal> RateN { get; set; }
-        public Nullable<decimal> RateS { get; set; }
-        public Nullable<decimal> RateA { get; set; }
-        public Nullable<decimal> RateC { get; set; }
-        public Nullable<decimal> RateT { get; set; }
-        public Nullable<decimal> RateBL { get; set; }
-        public Nullable<decimal> RateHB { get; set; }
-        public Nullable<decimal> RateFJD { get; set; }
-        public Nullable<decimal> RateTL { get; set; }
-        public Nullable<decimal> RateRP { get; set; }
-        public Nullable<decimal> RatePeso { get; set; }
-        public Nullable<decimal> RateMYR { get; set; }
-        public Nullable<decimal> RateCZK { get; set; }
-        public Nullable<decimal> RateMXN { get; set; }
-        public Nullable<decimal> RateMOP { get; set; }
-        public Nullable<decimal> RateARS { get; set; }
-        public Nullable<decimal> RateHUF { get; set; }
-        public Nullable<decimal> RateRUB { get; set; }
-        public Nullable<int> CreateUserId { get; set; }
-        public Nullable<System.DateTime> CreateTime { get; set; }
-        public Nullable<int> DeleteUserId { get; set; }
-        public string DeleteTime { get; set; }
-        public string Remark { get; set; }
-        public Nullable<int> IsDel { get; set; }
-    }
-}

travelExport/Grp_TourClientList.cs

@@ -27,5 +27,6 @@ namespace travelExport
         public string DeleteTime { get; set; }
         public string Remark { get; set; }
         public Nullable<int> IsDel { get; set; }
+        public Nullable<int> IsAccompany { get; set; }
     }
 }

travelExport/Grp_VisaInfo.cs

@@ -30,5 +30,7 @@ namespace travelExport
         public string Remark { get; set; }
         public int IsDel { get; set; }
         public string visaDescription { get; set; }
+        public string Area { get; set; }
+        public Nullable<int> AgencyFeeType { get; set; }
     }
 }

travelExport/Grp_VisaInfo0430171300.cs

@@ -1,34 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码已从模板生成。
-//
-//     手动更改此文件可能导致应用程序出现意外的行为。
-//     如果重新生成代码，将覆盖对此文件的手动更改。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace travelExport
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class Grp_VisaInfo0430171300
-    {
-        public int Id { get; set; }
-        public Nullable<int> DIId { get; set; }
-        public string VisaClient { get; set; }
-        public Nullable<decimal> VisaPrice { get; set; }
-        public Nullable<int> VisaCurrency { get; set; }
-        public Nullable<int> IsThird { get; set; }
-        public Nullable<int> PassengerType { get; set; }
-        public Nullable<int> VisaNumber { get; set; }
-        public Nullable<int> VisaFreeNumber { get; set; }
-        public Nullable<int> CreateUserId { get; set; }
-        public Nullable<System.DateTime> CreateTime { get; set; }
-        public Nullable<int> DeleteTime { get; set; }
-        public Nullable<int> DeleteUserId { get; set; }
-        public string Remark { get; set; }
-        public int IsDel { get; set; }
-        public string visaDescription { get; set; }
-    }
-}

travelExport/Home.cs

@@ -2553,7 +2553,7 @@ namespace travelExport
                 IsPay = x.IsPay,
                 IsSubmitApproval = x.IsSubmitApproval,
                 Job = x.Job,
-                language = x.language,
+                Language = x.Language,
                 OfficialForm = x.OfficialForm,
                 Remark = x.Remark,
                 Setting = x.Setting,
@@ -2594,7 +2594,7 @@ namespace travelExport
                     isFindTimeGw = true;
                     newGwTime = thisData;
                     info += $"{thisData.ToString("HH:mm")} 拜访{g.Client},联系人{g.Contact},电话{g.Tel}, 地址{g.Address}" +
-                   $"着装要求{g.Dresscode},是否需要翻译{(g.IsNeedTrans == null || g.IsNeedTrans == 0 ? "不需要翻译人员" : "需要翻译人员翻译语种为" + g.language)},议题：- ";
+                   $"着装要求{g.Dresscode},是否需要翻译{(g.IsNeedTrans == null || g.IsNeedTrans == 0 ? "不需要翻译人员" : "需要翻译人员翻译语种为" + g.Language)},议题：- ";
                     listgw.Remove(listgw.Find(x => x.Id == g.Id));
                     gl = g;
                     break;
@@ -2617,7 +2617,7 @@ namespace travelExport
                         isFindTimeGw = true;
                         newGwTime = thisData;
                         info += $"{thisData.ToString("HH:mm")} 拜访{g.Client},联系人{g.Contact},电话{g.Tel}, 地址{g.Address}" +
-                    $"着装要求{g.Dresscode},是否需要翻译{(g.IsNeedTrans == null || g.IsNeedTrans == 0 ? "不需要翻译人员" : "需要翻译人员翻译语种为" + g.language)},议题：- ";
+                    $"着装要求{g.Dresscode},是否需要翻译{(g.IsNeedTrans == null || g.IsNeedTrans == 0 ? "不需要翻译人员" : "需要翻译人员翻译语种为" + g.Language)},议题：- ";
                         listgw.Remove(listgw.Find(x => x.Id == g.Id));
                         gl = g;
                     }

travelExport/Res_OfficialActivities.cs

@@ -30,7 +30,6 @@ namespace travelExport
         public string Attendees { get; set; }
         public Nullable<int> IsNeedTrans { get; set; }
         public string Translators { get; set; }
-        public string language { get; set; }
         public string Trip { get; set; }
         public Nullable<int> CreateUserId { get; set; }
         public Nullable<System.DateTime> CreateTime { get; set; }
@@ -44,5 +43,13 @@ namespace travelExport
         public string Area { get; set; }
         public string Field { get; set; }
         public string ReqSample { get; set; }
+        public Nullable<int> DataSource { get; set; }
+        public string Language { get; set; }
+        public Nullable<int> ConfirmTheInvitation { get; set; }
+        public string ScreenshotOfMailUrl { get; set; }
+        public string EmailOrWeChat { get; set; }
+        public string Website { get; set; }
+        public string Nature { get; set; }
+        public Nullable<int> DataId { get; set; }
     }
 }

travelExport/travelExport.csproj

@@ -151,9 +151,6 @@
     <Compile Include="Fin_GroupExtraCost.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
-    <Compile Include="Fin_GroupExtraCost1.cs">
-      <DependentUpon>DB.tt</DependentUpon>
-    </Compile>
     <Compile Include="Fin_OtherPrice.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
@@ -211,12 +208,6 @@
     <Compile Include="Grp_CreditCardPayment.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
-    <Compile Include="Grp_CreditCardPayment1.cs">
-      <DependentUpon>DB.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Grp_CreditCardPayment2.cs">
-      <DependentUpon>DB.tt</DependentUpon>
-    </Compile>
     <Compile Include="Grp_Customers.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
@@ -271,15 +262,9 @@
     <Compile Include="Grp_InvertedListVisaCountry.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
-    <Compile Include="Grp_InvertedListVisaCountry20240430114047.cs">
-      <DependentUpon>DB.tt</DependentUpon>
-    </Compile>
     <Compile Include="Grp_InvitationOfficialActivities.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
-    <Compile Include="Grp_InvitationOfficialActivities1.cs">
-      <DependentUpon>DB.tt</DependentUpon>
-    </Compile>
     <Compile Include="Grp_NationalTravelFee.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
@@ -298,9 +283,6 @@
     <Compile Include="Grp_TeamRate.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
-    <Compile Include="Grp_TeamRate1.cs">
-      <DependentUpon>DB.tt</DependentUpon>
-    </Compile>
     <Compile Include="Grp_TourClientList.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
@@ -310,9 +292,6 @@
     <Compile Include="Grp_VisaFeeInfo.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>
-    <Compile Include="Grp_VisaInfo0430171300.cs">
-      <DependentUpon>DB.tt</DependentUpon>
-    </Compile>
     <Compile Include="Grp_VisaProgress.cs">
       <DependentUpon>DB.tt</DependentUpon>
     </Compile>