From 97248f361abf1b69ad9cd70fb56a6ad0d0ab59a4 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Mon, 21 Jul 2025 11:33:39 +0800
Subject: [PATCH] 111

---
 .../Model/YTKJTShopParameter.cs               | 46 +++++++++++++------
 .../MyCode.Project.GenerateCode/App.config    |  4 +-
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
index 8345633..8e5de07 100644
--- a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
+++ b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs
@@ -56,7 +56,7 @@ namespace MyCode.Project.Domain.Model
            /// <summary>
            /// Desc:
            /// Default:
-           /// Nullable:True
+           /// Nullable:False
            /// </summary>           
            [SugarColumn(ColumnName="F_YTKJ_TEXT2")]
            public string FYTKJTEXT2 {get;set;}
@@ -64,15 +64,15 @@ namespace MyCode.Project.Domain.Model
            /// <summary>
            /// Desc:是否同步金蝶
            /// Default:1
-           /// Nullable:True
+           /// Nullable:False
            /// </summary>           
            [SugarColumn(ColumnName="F_SYNCHRONIZEKINGDEE")]
            public string FSYNCHRONIZEKINGDEE {get;set;}
 
            /// <summary>
-           /// Desc:是否同步WM
+           /// Desc:是否同步WMS
            /// Default:1
-           /// Nullable:True
+           /// Nullable:False
            /// </summary>           
            [SugarColumn(ColumnName="F_SYNCHRONIZEWMS")]
            public string FSYNCHRONIZEWMS {get;set;}
@@ -80,23 +80,23 @@ namespace MyCode.Project.Domain.Model
            /// <summary>
            /// Desc:销售客户
            /// Default:0
-           /// Nullable:True
+           /// Nullable:False
            /// </summary>           
            [SugarColumn(ColumnName="F_SALESCUSTOMERS")]
-           public int? FSALESCUSTOMERS {get;set;}
+           public int FSALESCUSTOMERS {get;set;}
 
            /// <summary>
-           /// Desc:发货仓库
+           /// Desc:发货仓库ID
            /// Default:0
-           /// Nullable:True
+           /// Nullable:False
            /// </summary>           
            [SugarColumn(ColumnName="F_WAREHOUSE")]
-           public int? FWAREHOUSE {get;set;}
+           public int FWAREHOUSE {get;set;}
 
            /// <summary>
            /// Desc:仓库货主
            /// Default:
-           /// Nullable:True
+           /// Nullable:False
            /// </summary>           
            [SugarColumn(ColumnName="F_CANGKUHUOZHU")]
            public string FCANGKUHUOZHU {get;set;}
@@ -104,15 +104,15 @@ namespace MyCode.Project.Domain.Model
            /// <summary>
            /// Desc:公司ID
            /// Default:
-           /// Nullable:True
+           /// Nullable:False
            /// </summary>           
            [SugarColumn(ColumnName="F_COMPANYID")]
            public string FCOMPANYID {get;set;}
 
            /// <summary>
-           /// Desc:
+           /// Desc:发货大仓
            /// Default:
-           /// Nullable:True
+           /// Nullable:False
            /// </summary>           
            [SugarColumn(ColumnName="F_DACANG")]
            public string FDACANG {get;set;}
@@ -120,10 +120,10 @@ namespace MyCode.Project.Domain.Model
            /// <summary>
            /// Desc:税率
            /// Default:0
-           /// Nullable:True
+           /// Nullable:False
            /// </summary>           
            [SugarColumn(ColumnName="F_TAXRATE")]
-           public decimal? FTAXRATE {get;set;}
+           public decimal FTAXRATE {get;set;}
 
            /// <summary>
            /// Desc:创建日期
@@ -173,5 +173,21 @@ namespace MyCode.Project.Domain.Model
            [SugarColumn(ColumnName="F_AUDITOR")]
            public int FAUDITOR {get;set;}
 
+           /// <summary>
+           /// Desc:仓库编码
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_WAREHOUSE_CODE")]
+           public string FWAREHOUSECODE {get;set;}
+
+           /// <summary>
+           /// Desc:仓库名称
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(ColumnName="F_WAREHOUSE_NAME")]
+           public string FWAREHOUSENAME {get;set;}
+
     }
 }
diff --git a/Reportapi/MyCode.Project.GenerateCode/App.config b/Reportapi/MyCode.Project.GenerateCode/App.config
index 5a956c8..b30d0c2 100644
--- a/Reportapi/MyCode.Project.GenerateCode/App.config
+++ b/Reportapi/MyCode.Project.GenerateCode/App.config
@@ -10,8 +10,8 @@
 
   <connectionStrings>
 
-	  <add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
-	  <add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
+	  <add name="WMSConn" connectionString="Data Source=127.0.0.1; Initial Catalog=yuntong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
+	  <add name="YunTongConn" connectionString="Data Source=127.0.0.1; Initial Catalog=yuntong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
 
 
   </connectionStrings>