Browse Source

搜索排除特殊字符和%

陈龙 1 year ago
parent
commit
76c2e5d3be
26 changed files with 347 additions and 450 deletions
  1. 28 28
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/CartItem.Designer.cs
  2. 15 15
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/CartItem.cs
  3. 38 38
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrder.Designer.cs
  4. 30 30
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrder.cs
  5. 35 35
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrderLine.Designer.cs
  6. 15 15
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrderLine.cs
  7. 10 10
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrderPromoSkus.Designer.cs
  8. 3 3
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrderPromoSkus.cs
  9. 38 38
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/SalesItem.cs
  10. 14 14
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/ShopFavorites.Designer.cs
  11. 3 3
      src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/ShopFavorites.cs
  12. 16 2
      src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Content/themes/Client/version1/src/search.js
  13. 1 1
      src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Controllers/ProductController.cs
  14. 1 1
      src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Views/Shared/_Layout.cshtml
  15. 1 1
      tools/代码生成器(Goldhoo)/Arista.WinUI.exe.config
  16. 1 1
      tools/代码生成器(Goldhoo)/Arista.WinUI.vshost.exe.config
  17. BIN
      tools/代码生成器(Goldhoo)/DockPanel.config
  18. 11 11
      tools/代码生成器(Goldhoo)/Template/Controller.cst
  19. 20 20
      tools/代码生成器(Goldhoo)/Template/DataAccess.Designer.cst
  20. 3 3
      tools/代码生成器(Goldhoo)/Template/DataAccess.cst
  21. 1 1
      tools/代码生成器(Goldhoo)/Template/Empty.cst
  22. 13 13
      tools/代码生成器(Goldhoo)/Template/IService.cst
  23. 5 5
      tools/代码生成器(Goldhoo)/Template/Model.Designer.cst
  24. 3 3
      tools/代码生成器(Goldhoo)/Template/Model.cst
  25. 13 13
      tools/代码生成器(Goldhoo)/Template/Service.cst
  26. 29 146
      tools/代码生成器(Goldhoo)/_sourlet.cs

+ 28 - 28
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/CartItem.Designer.cs

@@ -7,132 +7,132 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {    
     /// <summary>
-    /// 购物车商品数据实体类   
-    /// 生成日期: 2016年5月12日 11:14
+    /// 璐�墿杞﹀晢鍝佹暟鎹�疄浣撶被   
+    /// 鐢熸垚鏃ユ湡: 2016骞�5鏈�12鏃� 11:14
     ///</summary>
     /// <remarks>
-    /// 该文件是由代码生成器自动生成的, 请不要随意修改, 你的修改将在代码重新生成时会被覆盖,
-    /// 如果要对该类进行修改, 请直接修改该分部类的CartItem文件(文件名不含.designer)
+    /// 璇ユ枃浠舵槸鐢变唬鐮佺敓鎴愬櫒鑷�姩鐢熸垚鐨�, 璇蜂笉瑕侀殢鎰忎慨鏀�, 浣犵殑淇�敼灏嗗湪浠g爜閲嶆柊鐢熸垚鏃朵細琚��鐩栵紝
+    /// 濡傛灉瑕佸�璇ョ被杩涜�淇�敼, 璇风洿鎺ヤ慨鏀硅�鍒嗛儴绫荤殑CartItem鏂囦欢(鏂囦欢鍚嶄笉鍚�.designer)
     /// </remarks>
     public partial class CartItem
     { 
       /// <summary>
-      ///  获取或设置CartItemId
+      ///  鑾峰彇鎴栬�缃瓹artItemId
       /// </summary>
       public int CartItemId { get; set; }  
       
         /// <summary>
-      ///  获取或设置销售类型
+      ///  鑾峰彇鎴栬�缃�攢鍞�被鍨�
       /// </summary>
       public byte SalesType { get; set; }  
       
       /// <summary>
-      ///  获取或设置订单类型
+      ///  鑾峰彇鎴栬�缃��鍗曠被鍨�
       /// </summary>
       public byte OrderType { get; set; }  
       
       /// <summary>
-      ///  获取或设置购物车内码
+      ///  鑾峰彇鎴栬�缃�喘鐗╄溅鍐呯爜
       /// </summary>
       public string ShoppingCartId { get; set; }  
       
       /// <summary>
-      ///  获取或设置显示图片的商品内码
+      ///  鑾峰彇鎴栬�缃�樉绀哄浘鐗囩殑鍟嗗搧鍐呯爜
       /// </summary>
       public int ImageItemId { get; set; }  
       
       /// <summary>
-      ///  获取或设置组合商品内码
+      ///  鑾峰彇鎴栬�缃�粍鍚堝晢鍝佸唴鐮�
       /// </summary>
       public int CombtItemId { get; set; }  
       
       /// <summary>
-      ///  获取或设置组合商品编码
+      ///  鑾峰彇鎴栬�缃�粍鍚堝晢鍝佺紪鐮�
       /// </summary>
       public string CombtItemNumber { get; set; }  
       
       /// <summary>
-      ///  获取或设置组合商品名称
+      ///  鑾峰彇鎴栬�缃�粍鍚堝晢鍝佸悕绉�
       /// </summary>
       public string CombtItemName { get; set; }  
       
       /// <summary>
-      ///  获取或设置商品内码
+      ///  鑾峰彇鎴栬�缃�晢鍝佸唴鐮�
       /// </summary>
       public int ItemId { get; set; }  
       
       /// <summary>
-      ///  获取或设置数量
+      ///  鑾峰彇鎴栬�缃�暟閲�
       /// </summary>
       public decimal Quantity { get; set; }  
       
       /// <summary>
-      ///  获取或设置单价
+      ///  鑾峰彇鎴栬�缃�崟浠�
       /// </summary>
       public decimal Price { get; set; }  
       
       /// <summary>
-      ///  获取或设置定金
+      ///  鑾峰彇鎴栬�缃�畾閲�
       /// </summary>
       public decimal? PredAmt { get; set; }  
       
       /// <summary>
-      ///  获取或设置尾款金额
+      ///  鑾峰彇鎴栬�缃�熬娆鹃噾棰�
       /// </summary>
       public decimal? BalanceAmt { get; set; }  
       
       /// <summary>
-      ///  获取或设置特殊规格标记
+      ///  鑾峰彇鎴栬�缃�壒娈婅�鏍兼爣璁�
       /// </summary>
       public bool IsSpecial { get; set; }  
       
       /// <summary>
-      ///  获取或设置特殊规格说明
+      ///  鑾峰彇鎴栬�缃�壒娈婅�鏍艰�鏄�
       /// </summary>
       public string SpecialSpec { get; set; }  
       
       /// <summary>
-      ///  获取或设置特殊加价
+      ///  鑾峰彇鎴栬�缃�壒娈婂姞浠�
       /// </summary>
       public decimal? SpecialFare { get; set; }  
       
       /// <summary>
-      ///  获取或设置异型标记
+      ///  鑾峰彇鎴栬�缃�紓鍨嬫爣璁�
       /// </summary>
       public bool IsAllotype { get; set; }  
       
       /// <summary>
-      ///  获取或设置加急标记
+      ///  鑾峰彇鎴栬�缃�姞鎬ユ爣璁�
       /// </summary>
       public bool IsUrgent { get; set; }  
       
       /// <summary>
-      ///  获取或设置交货期
+      ///  鑾峰彇鎴栬�缃�氦璐ф湡
       /// </summary>
       public int? DeliveryPeriod { get; set; }  
       
       /// <summary>
-      ///  获取或设置整体加长
+      ///  鑾峰彇鎴栬�缃�暣浣撳姞闀�
       /// </summary>
       public decimal? Lengthen { get; set; }  
       
       /// <summary>
-      ///  获取或设置整体加宽
+      ///  鑾峰彇鎴栬�缃�暣浣撳姞瀹�
       /// </summary>
       public decimal? Widen { get; set; }  
       
       /// <summary>
-      ///  获取或设置整体加高
+      ///  鑾峰彇鎴栬�缃�暣浣撳姞楂�
       /// </summary>
       public decimal? Heighten { get; set; }  
       
       /// <summary>
-      ///  获取或设置加入购物车时间
+      ///  鑾峰彇鎴栬�缃�姞鍏ヨ喘鐗╄溅鏃堕棿
       /// </summary>
       public DateTime AddedOn { get; set; }  
       
       /// <summary>
-      ///  获取或设置备注
+      ///  鑾峰彇鎴栬�缃��娉�
       /// </summary>
       public string Description { get; set; }  
       

+ 15 - 15
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/CartItem.cs

@@ -7,69 +7,69 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {    
     /// <summary>
-    /// 购物车商品数据实体类
-    /// 开发人员:
-    /// 开发日期: 2016-05
+    /// 璐�墿杞﹀晢鍝佹暟鎹�疄浣撶被
+    /// 寮€鍙戜汉鍛橈細
+    /// 寮€鍙戞棩鏈�: 2016-05
     ///</summary>
     public partial class CartItem
     {
         /// <summary>
-        /// 获取或设置商品编码(料号)
+        /// 鑾峰彇鎴栬�缃�晢鍝佺紪鐮�(鏂欏彿)
         /// </summary>
         public string ItemNumber { get; set; }
 
         /// <summary>
-        /// 获取或设置商品名称
+        /// 鑾峰彇鎴栬�缃�晢鍝佸悕绉�
         /// </summary>
         public string ItemName { get; set; }
 
         /// <summary>
-        /// 获取或设置规格型号
+        /// 鑾峰彇鎴栬�缃��鏍煎瀷鍙�
         /// </summary>
         public string Spec { get; set; }
 
         /// <summary>
-        /// 获取或设置商品缩略图路径
+        /// 鑾峰彇鎴栬�缃�晢鍝佺缉鐣ュ浘璺�緞
         /// </summary>
         public string MasterImageUrl { get; set; }
 
         /// <summary>
-        /// 获取或设置商品主图路径
+        /// 鑾峰彇鎴栬�缃�晢鍝佷富鍥捐矾寰�
         /// </summary>
         public string HandledUrl { get; set; }
 
         /// <summary>
-        /// 产品类型
+        /// 浜у搧绫诲瀷
         /// </summary>
         public byte ItemType { get; set; }
 
         /// <summary>
-        /// 运费
+        /// 杩愯垂
         /// </summary>
         public decimal? Freight { get; set; }
 
         /// <summary>
-        /// 折扣
+        /// 鎶樻墸
         /// </summary>
         public decimal? DiscountCoef { get; set; }
 
         /// <summary>
-        /// 库存
+        /// 搴撳瓨
         /// </summary>
         public decimal? WhQty { get; set; }
 
         /// <summary>
-        /// 正特价
+        /// 姝g壒浠�
         /// </summary>
         public byte PriceType { get; set; }
 
         /// <summary>
-        /// 交付周期
+        /// 浜や粯鍛ㄦ湡
         /// </summary>
         public int? DeliveryCycle { get; set; }
 
         /// <summary>
-        /// 交付周期-字符
+        /// 浜や粯鍛ㄦ湡-瀛楃�
         /// </summary>
         public string DeliveryCycleStr { get; set; }
     }

+ 38 - 38
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrder.Designer.cs

@@ -7,182 +7,182 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {
     /// <summary>
-    /// 【采购订单】数据实体类   
-    /// 生成日期: 2016年6月2日 10:37
+    /// 銆愰噰璐��鍗曘€戞暟鎹�疄浣撶被   
+    /// 鐢熸垚鏃ユ湡: 2016骞�6鏈�2鏃� 10:37
     ///</summary>
     /// <remarks>
-    /// 该文件是由代码生成器自动生成的, 请不要随意修改, 你的修改将在代码重新生成时会被覆盖,
-    /// 如果要对该类进行修改, 请直接修改该分部类的PurchaseOrder文件(文件名不含.designer)
+    /// 璇ユ枃浠舵槸鐢变唬鐮佺敓鎴愬櫒鑷�姩鐢熸垚鐨�, 璇蜂笉瑕侀殢鎰忎慨鏀�, 浣犵殑淇�敼灏嗗湪浠g爜閲嶆柊鐢熸垚鏃朵細琚��鐩栵紝
+    /// 濡傛灉瑕佸�璇ョ被杩涜�淇�敼, 璇风洿鎺ヤ慨鏀硅�鍒嗛儴绫荤殑PurchaseOrder鏂囦欢(鏂囦欢鍚嶄笉鍚�.designer)
     /// </remarks>
     public partial class PurchaseOrder
     {
         /// <summary>
-        ///  获取或设置采购订单内码
+        ///  鑾峰彇鎴栬�缃�噰璐��鍗曞唴鐮�
         /// </summary>
         public int PurchaseOrderId { get; set; }
 
         /// <summary>
-        ///  获取或设置专卖店内码
+        ///  鑾峰彇鎴栬�缃�笓鍗栧簵鍐呯爜
         /// </summary>
         public int ShopId { get; set; }
 
         /// <summary>
-        ///  获取或设置订单编号
+        ///  鑾峰彇鎴栬�缃��鍗曠紪鍙�
         /// </summary>
         public string OrderNumber { get; set; }
 
         /// <summary>
-        ///  获取或设置订单类型
+        ///  鑾峰彇鎴栬�缃��鍗曠被鍨�
         /// </summary>
         public byte OrderType { get; set; }
 
         /// <summary>
-        ///  获取或设置销售类型
+        ///  鑾峰彇鎴栬�缃�攢鍞�被鍨�
         /// </summary>
         public byte SalesType { get; set; }
 
         /// <summary>
-        /// 扣款类型
+        /// 鎵f�绫诲瀷
         /// </summary>
         public int CreditType { get; set; }
 
         /// <summary>
-        ///  获取或设置促销活动内码
+        ///  鑾峰彇鎴栬�缃�績閿€娲诲姩鍐呯爜
         /// </summary>
         public int? SalesActivityId { get; set; }
 
         /// <summary>
-        ///  获取或设置订货日期
+        ///  鑾峰彇鎴栬�缃��璐ф棩鏈�
         /// </summary>
         public DateTime? OrderedOn { get; set; }
 
         /// <summary>
-        ///  获取或设置需求日期
+        ///  鑾峰彇鎴栬�缃�渶姹傛棩鏈�
         /// </summary>
         public DateTime? RequiredOn { get; set; }
 
         /// <summary>
-        ///  获取或设置前置单据内码
+        ///  鑾峰彇鎴栬�缃�墠缃�崟鎹�唴鐮�
         /// </summary>
         public int? PreviousVoucherId { get; set; }
 
         /// <summary>
-        /// 获取或设置促销活动内码
+        /// 鑾峰彇鎴栬�缃�績閿€娲诲姩鍐呯爜
         /// </summary>
         public int? PromoActivityId { get; set; }
 
         /// <summary>
-        ///  获取或设置总金额
+        ///  鑾峰彇鎴栬�缃�€婚噾棰�
         /// </summary>
         public decimal? Amount { get; set; }
 
         /// <summary>
-        ///  获取或设置发运方式
+        ///  鑾峰彇鎴栬�缃�彂杩愭柟寮�
         /// </summary>
         public byte ShippingMode { get; set; }
 
         /// <summary>
-        ///  获取或设置发货日期
+        ///  鑾峰彇鎴栬�缃�彂璐ф棩鏈�
         /// </summary>
         public DateTime? ShipedOn { get; set; }
 
         /// <summary>
-        ///  获取或设置收货地址
+        ///  鑾峰彇鎴栬�缃�敹璐у湴鍧€
         /// </summary>
         public string ReceiptedAt { get; set; }
 
         /// <summary>
-        ///  获取或设置制单人
+        ///  鑾峰彇鎴栬�缃�埗鍗曚汉
         /// </summary>
         public string PreparedBy { get; set; }
 
         /// <summary>
-        ///  获取或设置制单日期
+        ///  鑾峰彇鎴栬�缃�埗鍗曟棩鏈�
         /// </summary>
         public DateTime PreparedOn { get; set; }
 
         /// <summary>
-        ///  获取或设置审核标记
+        ///  鑾峰彇鎴栬�缃��鏍告爣璁�
         /// </summary>
         public bool Approved { get; set; }
 
         /// <summary>
-        ///  获取或设置审核人内码
+        ///  鑾峰彇鎴栬�缃��鏍镐汉鍐呯爜
         /// </summary>
         public string ApprovedBy { get; set; }
 
         /// <summary>
-        ///  获取或设置审核日期
+        ///  鑾峰彇鎴栬�缃��鏍告棩鏈�
         /// </summary>
         public DateTime? ApprovedOn { get; set; }
 
         /// <summary>
-        ///  获取或设置审核结果
+        ///  鑾峰彇鎴栬�缃��鏍哥粨鏋�
         /// </summary>
         public byte? ApprovedResult { get; set; }
 
         /// <summary>
-        ///  获取或设置审核意见
+        ///  鑾峰彇鎴栬�缃��鏍告剰瑙�
         /// </summary>
         public string ApprovedIdea { get; set; }
 
         /// <summary>
-        ///  获取或设置是否关闭
+        ///  鑾峰彇鎴栬�缃�槸鍚﹀叧闂�
         /// </summary>
         public bool Closed { get; set; }
 
         /// <summary>
-        ///  获取或设置关闭人内码
+        ///  鑾峰彇鎴栬�缃�叧闂�汉鍐呯爜
         /// </summary>
         public string ClosedBy { get; set; }
 
         /// <summary>
-        ///  获取或设置关闭日期
+        ///  鑾峰彇鎴栬�缃�叧闂�棩鏈�
         /// </summary>
         public DateTime? ClosedOn { get; set; }
 
         /// <summary>
-        ///  获取或设置关闭原因
+        ///  鑾峰彇鎴栬�缃�叧闂�師鍥�
         /// </summary>
         public string ClosedReason { get; set; }
 
         /// <summary>
-        ///  获取或设置订单状态
+        ///  鑾峰彇鎴栬�缃��鍗曠姸鎬�
         /// </summary>
         public byte OrderStatus { get; set; }
 
         /// <summary>
-        ///  获取或设置记录版本
+        ///  鑾峰彇鎴栬�缃��褰曠増鏈�
         /// </summary>
         public Int16 VersionNumber { get; set; }
 
         /// <summary>
-        ///  获取或设置记录创建人
+        ///  鑾峰彇鎴栬�缃��褰曞垱寤轰汉
         /// </summary>
         public string CreatedBy { get; set; }
 
         /// <summary>
-        ///  获取或设置记录创建时间
+        ///  鑾峰彇鎴栬�缃��褰曞垱寤烘椂闂�
         /// </summary>
         public DateTime CreatedOn { get; set; }
 
         /// <summary>
-        ///  获取或设置记录修改人
+        ///  鑾峰彇鎴栬�缃��褰曚慨鏀逛汉
         /// </summary>
         public string ModifiedBy { get; set; }
 
         /// <summary>
-        ///  获取或设置记录修改时间
+        ///  鑾峰彇鎴栬�缃��褰曚慨鏀规椂闂�
         /// </summary>
         public DateTime ModifiedOn { get; set; }
 
         /// <summary>
-        ///  获取或设置备注
+        ///  鑾峰彇鎴栬�缃��娉�
         /// </summary>
         public string Description { get; set; }
 
         /// <summary>
-        /// 发货单位
+        /// 鍙戣揣鍗曚綅
         /// </summary>
         public string BusinessUnitCode { get; set; }
 

+ 30 - 30
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrder.cs

@@ -7,9 +7,9 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {
     /// <summary>
-    /// 采购订单数据实体类
-    /// 开发人员:
-    /// 开发日期: 2016-05
+    /// 閲囪喘璁㈠崟鏁版嵁瀹炰綋绫�
+    /// 寮€鍙戜汉鍛橈細
+    /// 寮€鍙戞棩鏈�: 2016-05
     ///</summary>
     public partial class PurchaseOrder
     {
@@ -21,7 +21,7 @@ namespace Befri.Goldhoo.Models
         public string Telephone { get; set; }
 
         /// <summary>
-        /// 订购日期文本
+        /// 璁㈣喘鏃ユ湡鏂囨湰
         /// </summary>
         public string OrderedOnText
         {
@@ -32,7 +32,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 需求日期文本
+        /// 闇€姹傛棩鏈熸枃鏈�
         /// </summary>
         public string RequiredOnText
         {
@@ -43,7 +43,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 制单日期文本
+        /// 鍒跺崟鏃ユ湡鏂囨湰
         /// </summary>
         public string PreparedOnText
         {
@@ -54,7 +54,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 审核日期文本
+        /// 瀹℃牳鏃ユ湡鏂囨湰
         /// </summary>
         public string ApprovedOnText
         {
@@ -65,7 +65,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 关闭日期文本
+        /// 鍏抽棴鏃ユ湡鏂囨湰
         /// </summary>
         public string ClosedOnText
         {
@@ -76,7 +76,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 关闭日期文本
+        /// 鍏抽棴鏃ユ湡鏂囨湰
         /// </summary>
         public string CreatedOnText
         {
@@ -87,7 +87,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 修改日期文本
+        /// 淇�敼鏃ユ湡鏂囨湰
         /// </summary>
         public string ModifiedOnText
         {
@@ -98,7 +98,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 订单提交日期文本
+        /// 璁㈠崟鎻愪氦鏃ユ湡鏂囨湰
         /// </summary>
         public string SubmitOnText
         {
@@ -109,7 +109,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 获取或设置订销售型文本
+        /// 鑾峰彇鎴栬�缃��閿€鍞�瀷鏂囨湰
         /// </summary>
         public string SalesTypeText
         {
@@ -119,16 +119,16 @@ namespace Befri.Goldhoo.Models
                 switch (this.SalesType)
                 {
                     case (byte)Goldhoo.SalesType.Common:
-                        _text = "普通销售";
+                        _text = "鏅�€氶攢鍞�";
                         break;
                     case (byte)Goldhoo.SalesType.Promo:
-                        _text = "促销";
+                        _text = "淇冮攢";
                         break;
                     case (byte)Goldhoo.SalesType.Clearance:
-                        _text = "清仓销售";
+                        _text = "娓呬粨閿€鍞�";
                         break;
                     case (byte)Goldhoo.SalesType.Customizable:
-                        _text = "定做";
+                        _text = "瀹氬仛";
                         break;
                 }
                 return _text;
@@ -136,38 +136,38 @@ namespace Befri.Goldhoo.Models
         }
         
         /// <summary>
-        /// 获取或设置订单类型文本
+        /// 鑾峰彇鎴栬�缃��鍗曠被鍨嬫枃鏈�
         /// </summary>
         public string OrderTypeText { get; set; }
 
         /// <summary>
-        /// 获取或设置订单状态文本
+        /// 鑾峰彇鎴栬�缃��鍗曠姸鎬佹枃鏈�
         /// </summary>
         public string OrderStatusText { get; set; }
 
         /// <summary>
-        /// 提交日期
+        /// 鎻愪氦鏃ユ湡
         /// </summary>
         public DateTime? SubmitOn { get; set; }
 
 
         /// <summary>
-        /// 提交人
+        /// 鎻愪氦浜�
         /// </summary>
         public string SubmitBy { get; set; }
 
         /// <summary>
-        /// 发运方式文本
+        /// 鍙戣繍鏂瑰紡鏂囨湰
         /// </summary>
         public string ShippingModeText { get; set; }
 
         /// <summary>
-        /// 扣款方式文本
+        /// 鎵f�鏂瑰紡鏂囨湰
         /// </summary>
         public string CreditTypeText { get; set; }
          
         /// <summary>
-        /// 获取总价
+        /// 鑾峰彇鎬讳环
         /// </summary>
         public decimal Total
         {
@@ -186,7 +186,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 采购订单行列表
+        /// 閲囪喘璁㈠崟琛屽垪琛�
         /// </summary>
         public IList<PurchaseOrderLine> Lines
         {
@@ -204,17 +204,17 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 采购订单ERP状态
+        /// 閲囪喘璁㈠崟ERP鐘舵€�
         /// </summary>
         public byte? ErpStatus { get; set; }
 
         /// <summary>
-        /// 采购订单ERP状态文本
+        /// 閲囪喘璁㈠崟ERP鐘舵€佹枃鏈�
         /// </summary>
         public string ErpStatusText { get; set; }
 
         /// <summary>
-        /// 信用类型列表
+        /// 淇$敤绫诲瀷鍒楄〃
         /// </summary>
         public IList<ValueText> CreditTypeList
         {
@@ -231,7 +231,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 是否是定制订单
+        /// 鏄�惁鏄�畾鍒惰�鍗�
         /// </summary>
         public bool IsCustom
         {
@@ -249,12 +249,12 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 销售单号
+        /// 閿€鍞�崟鍙�
         /// </summary>
         public string SalesOrderNumber { get; set; }
 
         /// <summary>
-        /// U8单号
+        /// U8鍗曞彿
         /// </summary>
         public string OtVoucherNumber { get; set; }
     }

+ 35 - 35
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrderLine.Designer.cs

@@ -7,167 +7,167 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {
     /// <summary>
-    /// 【采购订单行】数据实体类   
-    /// 生成日期: 2016年6月2日 10:39
+    /// 銆愰噰璐��鍗曡�銆戞暟鎹�疄浣撶被   
+    /// 鐢熸垚鏃ユ湡: 2016骞�6鏈�2鏃� 10:39
     ///</summary>
     /// <remarks>
-    /// 该文件是由代码生成器自动生成的, 请不要随意修改, 你的修改将在代码重新生成时会被覆盖,
-    /// 如果要对该类进行修改, 请直接修改该分部类的PurchaseOrderLine文件(文件名不含.designer)
+    /// 璇ユ枃浠舵槸鐢变唬鐮佺敓鎴愬櫒鑷�姩鐢熸垚鐨�, 璇蜂笉瑕侀殢鎰忎慨鏀�, 浣犵殑淇�敼灏嗗湪浠g爜閲嶆柊鐢熸垚鏃朵細琚��鐩栵紝
+    /// 濡傛灉瑕佸�璇ョ被杩涜�淇�敼, 璇风洿鎺ヤ慨鏀硅�鍒嗛儴绫荤殑PurchaseOrderLine鏂囦欢(鏂囦欢鍚嶄笉鍚�.designer)
     /// </remarks>
     public partial class PurchaseOrderLine
     {
         /// <summary>
-        ///  获取或设置采购订单行内码
+        ///  鑾峰彇鎴栬�缃�噰璐��鍗曡�鍐呯爜
         /// </summary>
         public int PurchaseOrderLineId { get; set; }
 
         /// <summary>
-        ///  获取或设置采购订单内码
+        ///  鑾峰彇鎴栬�缃�噰璐��鍗曞唴鐮�
         /// </summary>
         public int PurchaseOrderId { get; set; }
 
         /// <summary>
-        ///  获取或设置存货大类
+        ///  鑾峰彇鎴栬�缃�瓨璐уぇ绫�
         /// </summary>
         public byte InventoryType { get; set; }
 
         /// <summary>
-        ///  获取或设置显示图片的商品内码
+        ///  鑾峰彇鎴栬�缃�樉绀哄浘鐗囩殑鍟嗗搧鍐呯爜
         /// </summary>
         public int? ImageItemId { get; set; }
 
         /// <summary>
-        ///  获取或设置组合商品内码
+        ///  鑾峰彇鎴栬�缃�粍鍚堝晢鍝佸唴鐮�
         /// </summary>
         public int CombtItemId { get; set; }
 
         /// <summary>
-        ///  获取或设置组合商品编码
+        ///  鑾峰彇鎴栬�缃�粍鍚堝晢鍝佺紪鐮�
         /// </summary>
         public string CombtItemNumber { get; set; }
 
         /// <summary>
-        ///  获取或设置组合商品名称
+        ///  鑾峰彇鎴栬�缃�粍鍚堝晢鍝佸悕绉�
         /// </summary>
         public string CombtItemName { get; set; }
 
         /// <summary>
-        ///  获取或设置存货内码
+        ///  鑾峰彇鎴栬�缃�瓨璐у唴鐮�
         /// </summary>
         public int InventoryId { get; set; }
 
         /// <summary>
-        ///  获取或设置存货编码
+        ///  鑾峰彇鎴栬�缃�瓨璐х紪鐮�
         /// </summary>
         public string InventoryNumber { get; set; }
 
         /// <summary>
-        ///  获取或设置存货名称
+        ///  鑾峰彇鎴栬�缃�瓨璐у悕绉�
         /// </summary>
         public string InventoryName { get; set; }
 
         /// <summary>
-        ///  获取或设置规格型号
+        ///  鑾峰彇鎴栬�缃��鏍煎瀷鍙�
         /// </summary>
         public string Spec { get; set; }
 
         /// <summary>
-        ///  获取或设置长度
+        ///  鑾峰彇鎴栬�缃�暱搴�
         /// </summary>
         public decimal? Length { get; set; }
 
         /// <summary>
-        ///  获取或设置宽度
+        ///  鑾峰彇鎴栬�缃��搴�
         /// </summary>
         public decimal? Width { get; set; }
 
         /// <summary>
-        ///  获取或设置高度
+        ///  鑾峰彇鎴栬�缃�珮搴�
         /// </summary>
         public decimal? Height { get; set; }
 
         /// <summary>
-        ///  获取或设置计量单位
+        ///  鑾峰彇鎴栬�缃��閲忓崟浣�
         /// </summary>
         public string Uom { get; set; }
 
         /// <summary>
-        ///  获取或设置订购数量
+        ///  鑾峰彇鎴栬�缃��璐�暟閲�
         /// </summary>
         public decimal Quantity { get; set; }
 
         /// <summary>
-        ///  获取或设置剩余发货数量
+        ///  鑾峰彇鎴栬�缃�墿浣欏彂璐ф暟閲�
         /// </summary>
         public decimal RemainQty { get; set; }
 
         /// <summary>
-        ///  获取或设置单价
+        ///  鑾峰彇鎴栬�缃�崟浠�
         /// </summary>
         public decimal Price { get; set; }
 
         /// <summary>
-        ///  获取或设置加急标记
+        ///  鑾峰彇鎴栬�缃�姞鎬ユ爣璁�
         /// </summary>
         public bool IsUrgent { get; set; }
 
         /// <summary>
-        ///  获取或设置异形标记
+        ///  鑾峰彇鎴栬�缃�紓褰㈡爣璁�
         /// </summary>
         public bool IsAllotype { get; set; }
 
         /// <summary>
-        ///  获取或设置特殊规格标记
+        ///  鑾峰彇鎴栬�缃�壒娈婅�鏍兼爣璁�
         /// </summary>
         public bool IsSpecial { get; set; }
 
         /// <summary>
-        ///  获取或设置特殊规格说明
+        ///  鑾峰彇鎴栬�缃�壒娈婅�鏍艰�鏄�
         /// </summary>
         public string SpecialSpec { get; set; }
 
         /// <summary>
-        ///  获取或设置特殊加价
+        ///  鑾峰彇鎴栬�缃�壒娈婂姞浠�
         /// </summary>
         public decimal? SpecialFare { get; set; }
 
         /// <summary>
-        ///  获取或设置审核意见
+        ///  鑾峰彇鎴栬�缃��鏍告剰瑙�
         /// </summary>
         public string ApprovedIdea { get; set; }
 
         /// <summary>
-        ///  获取或设置关闭标记
+        ///  鑾峰彇鎴栬�缃�叧闂�爣璁�
         /// </summary>
         public bool Closed { get; set; }
 
         /// <summary>
-        ///  获取或设置关闭人内码
+        ///  鑾峰彇鎴栬�缃�叧闂�汉鍐呯爜
         /// </summary>
         public string ClosedBy { get; set; }
 
         /// <summary>
-        ///  获取或设置关闭日期
+        ///  鑾峰彇鎴栬�缃�叧闂�棩鏈�
         /// </summary>
         public DateTime? ClosedOn { get; set; }
 
         /// <summary>
-        ///  获取或设置关闭原因
+        ///  鑾峰彇鎴栬�缃�叧闂�師鍥�
         /// </summary>
         public string ClosedReason { get; set; }
 
         /// <summary>
-        ///  获取或设置行状态
+        ///  鑾峰彇鎴栬�缃��鐘舵€�
         /// </summary>
         public byte LineStatus { get; set; }
 
         /// <summary>
-        ///  获取或设置记录版本
+        ///  鑾峰彇鎴栬�缃��褰曠増鏈�
         /// </summary>
         public Int16 VersionNumber { get; set; }
 
         /// <summary>
-        ///  获取或设置备注
+        ///  鑾峰彇鎴栬�缃��娉�
         /// </summary>
         public string Description { get; set; }
 

+ 15 - 15
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrderLine.cs

@@ -7,23 +7,23 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {    
     /// <summary>
-    /// 采购订单行数据实体类
-    /// 开发人员:
-    /// 开发日期: 2016-05
+    /// 閲囪喘璁㈠崟琛屾暟鎹�疄浣撶被
+    /// 寮€鍙戜汉鍛橈細
+    /// 寮€鍙戞棩鏈�: 2016-05
     ///</summary>
     public partial class PurchaseOrderLine
     {
         /// <summary>
-        /// 获取或设置商品缩略图路径
+        /// 鑾峰彇鎴栬�缃�晢鍝佺缉鐣ュ浘璺�緞
         /// </summary>
         public string MasterImageUrl { get; set; }
         /// <summary>
-        /// 获取或设置商品主图路径
+        /// 鑾峰彇鎴栬�缃�晢鍝佷富鍥捐矾寰�
         /// </summary>
         public string HandledUrl { get; set; }
 
         /// <summary>
-        /// 特殊加价后的价格
+        /// 鐗规畩鍔犱环鍚庣殑浠锋牸
         /// </summary>
         public decimal SpecialFareAdded
         { 
@@ -39,7 +39,7 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 行状态文本
+        /// 琛岀姸鎬佹枃鏈�
         /// </summary>
         public string LineStatusText { get; set; }
 
@@ -47,42 +47,42 @@ namespace Befri.Goldhoo.Models
         public int ClosedTime { get; set; }
 
         /// <summary>
-        /// 运费
+        /// 杩愯垂
         /// </summary>
         public decimal? Freight { get; set; }
 
         /// <summary>
-        /// 折扣系数
+        /// 鎶樻墸绯绘暟
         /// </summary>
         public decimal? DiscountCoef { get; set; }
 
         /// <summary>
-        /// 库存
+        /// 搴撳瓨
         /// </summary>
         public decimal? WhQty { get; set; }
 
         /// <summary>
-        /// 清仓区折扣系数
+        /// 娓呬粨鍖烘姌鎵g郴鏁�
         /// </summary>
         public decimal? ClearanceDiscountCoef { get; set; }
 
         /// <summary>
-        /// 清仓区库存
+        /// 娓呬粨鍖哄簱瀛�
         /// </summary>
         public decimal? ClearanceWhQty { get; set; }
 
         /// <summary>
-        /// 折扣区折扣系数
+        /// 鎶樻墸鍖烘姌鎵g郴鏁�
         /// </summary>
         public decimal? DiscountDiscountCoef { get; set; }
 
         /// <summary>
-        /// 折扣区库存
+        /// 鎶樻墸鍖哄簱瀛�
         /// </summary>
         public decimal? DiscountWhQty { get; set; }
 
         /// <summary>
-        /// 价格类型
+        /// 浠锋牸绫诲瀷
         /// </summary>
         public byte PriceType { get; set; }
     }

+ 10 - 10
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrderPromoSkus.Designer.cs

@@ -7,42 +7,42 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {    
     /// <summary>
-    /// 专卖店订货.采购促销包数据实体类   
-    /// 生成日期: 2018年12月3日 12:18
+    /// 涓撳崠搴楄�璐�.閲囪喘淇冮攢鍖呮暟鎹�疄浣撶被   
+    /// 鐢熸垚鏃ユ湡: 2018骞�12鏈�3鏃� 12:18
     ///</summary>
     /// <remarks>
-    /// 该文件是由代码生成器自动生成的, 请不要随意修改, 你的修改将在代码重新生成时会被覆盖,
-    /// 如果要对该类进行修改, 请直接修改该分部类的PurchaseOrderPromoSkus文件(文件名不含.designer)
+    /// 璇ユ枃浠舵槸鐢变唬鐮佺敓鎴愬櫒鑷�姩鐢熸垚鐨�, 璇蜂笉瑕侀殢鎰忎慨鏀�, 浣犵殑淇�敼灏嗗湪浠g爜閲嶆柊鐢熸垚鏃朵細琚��鐩栵紝
+    /// 濡傛灉瑕佸�璇ョ被杩涜�淇�敼, 璇风洿鎺ヤ慨鏀硅�鍒嗛儴绫荤殑PurchaseOrderPromoSkus鏂囦欢(鏂囦欢鍚嶄笉鍚�.designer)
     /// </remarks>
     public partial class PurchaseOrderPromoSkus
     { 
       /// <summary>
-      ///  获取或设置采购促销包内码
+      ///  鑾峰彇鎴栬�缃�噰璐�績閿€鍖呭唴鐮�
       /// </summary>
       public int PurchaseOrderPromoSkusId { get; set; }  
       
       /// <summary>
-      ///  获取或设置采购订单内码
+      ///  鑾峰彇鎴栬�缃�噰璐��鍗曞唴鐮�
       /// </summary>
       public int PurchaseOrderId { get; set; }  
       
       /// <summary>
-      ///  获取或设置专卖店内码
+      ///  鑾峰彇鎴栬�缃�笓鍗栧簵鍐呯爜
       /// </summary>
       public int ShopId { get; set; }  
       
       /// <summary>
-      ///  获取或设置促销活动内码
+      ///  鑾峰彇鎴栬�缃�績閿€娲诲姩鍐呯爜
       /// </summary>
       public int PromoActivityId { get; set; }  
       
       /// <summary>
-      ///  获取或设置促销包内码
+      ///  鑾峰彇鎴栬�缃�績閿€鍖呭唴鐮�
       /// </summary>
       public int PromoSkuId { get; set; }  
       
       /// <summary>
-      ///  获取或设置购买数量
+      ///  鑾峰彇鎴栬�缃�喘涔版暟閲�
       /// </summary>
       public decimal Quantity { get; set; }  
       

+ 3 - 3
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/PurchaseOrderPromoSkus.cs

@@ -7,9 +7,9 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {    
 	/// <summary>
-	/// 专卖店订货.采购促销包数据实体类
-	/// 开发人员:
-	/// 开发日期: 2018-12
+	/// 涓撳崠搴楄�璐�.閲囪喘淇冮攢鍖呮暟鎹�疄浣撶被
+	/// 寮€鍙戜汉鍛橈細
+	/// 寮€鍙戞棩鏈�: 2018-12
 	///</summary>
 	public partial class PurchaseOrderPromoSkus
 	{

+ 38 - 38
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/SalesItem.cs

@@ -7,9 +7,9 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {
     /// <summary>
-    /// 可销售商品数据实体类
-    /// 开发人员:
-    /// 开发日期: 2016-05
+    /// 鍙�攢鍞�晢鍝佹暟鎹�疄浣撶被
+    /// 寮€鍙戜汉鍛橈細
+    /// 寮€鍙戞棩鏈�: 2016-05
     ///</summary>
     public partial class SalesItem
     {
@@ -18,37 +18,37 @@ namespace Befri.Goldhoo.Models
         private IList<SalesItem> _members;
 
         /// <summary>
-        /// 获取或设置商品大类
+        /// 鑾峰彇鎴栬�缃�晢鍝佸ぇ绫�
         /// </summary>
         public byte ItemType { get; set; }
 
         /// <summary>
-        /// 获取或设置组合产品内码
+        /// 鑾峰彇鎴栬�缃�粍鍚堜骇鍝佸唴鐮�
         /// </summary>
         public int CombtItemId { get; set; }
 
         /// <summary>
-        ///  获取或设置商品内码
+        ///  鑾峰彇鎴栬�缃�晢鍝佸唴鐮�
         /// </summary>
         public int ItemId { get; set; }
 
         /// <summary>
-        ///  获取或设置商品编码(料号)
+        ///  鑾峰彇鎴栬�缃�晢鍝佺紪鐮�(鏂欏彿)
         /// </summary>
         public string ItemNumber { get; set; }
 
         /// <summary>
-        ///  获取或设置商品名称
+        ///  鑾峰彇鎴栬�缃�晢鍝佸悕绉�
         /// </summary>
         public string ItemName { get; set; }
 
         /// <summary>
-        ///  获取或设置商品名称
+        ///  鑾峰彇鎴栬�缃�晢鍝佸悕绉�
         /// </summary>
         public string InventoryName { get; set; }
 
         /// <summary>
-        /// 获取或设置商品别名
+        /// 鑾峰彇鎴栬�缃�晢鍝佸埆鍚�
         /// </summary>
         public string AliasName
         {
@@ -63,37 +63,37 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 获取或设置规格型号
+        /// 鑾峰彇鎴栬�缃��鏍煎瀷鍙�
         /// </summary>
         public string Spec { get; set; }
 
         /// <summary>
-        /// 获取或设置商品缩略图路径
+        /// 鑾峰彇鎴栬�缃�晢鍝佺缉鐣ュ浘璺�緞
         /// </summary>
         public string MasterImageUrl { get; set; }
 
         /// <summary>
-        /// 获取或设置商品主图路径
+        /// 鑾峰彇鎴栬�缃�晢鍝佷富鍥捐矾寰�
         /// </summary>
         public string HandledUrl { get; set; }
 
         /// <summary>
-        /// 图片路径
+        /// 鍥剧墖璺�緞
         /// </summary>
         public string ImageUrl { get; set; }
 
         /// <summary>
-        /// 获取或设置参考零售价
+        /// 鑾峰彇鎴栬�缃�弬鑰冮浂鍞�环
         /// </summary>
         public decimal SalesPrice { get; set; }
 
         /// <summary>
-        /// 获取或设置组合产品默认成员数量
+        /// 鑾峰彇鎴栬�缃�粍鍚堜骇鍝侀粯璁ゆ垚鍛樻暟閲�
         /// </summary>
         public decimal Quantity { get; set; }
 
         /// <summary>
-        /// 是否允许定制标记
+        /// 鏄�惁鍏佽�瀹氬埗鏍囪�
         /// </summary>
         public bool IsCustomizable { get; set; }
 
@@ -113,60 +113,60 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 是否清仓产品
+        /// 鏄�惁娓呬粨浜у搧
         /// </summary>
         public bool IsClearance { get; set; }
 
         /// <summary>
-        /// 是否折扣产品
+        /// 鏄�惁鎶樻墸浜у搧
         /// </summary>
         public bool IsDiscount { get; set; }
 
         /// <summary>
-        /// 产品现有库存
+        /// 浜у搧鐜版湁搴撳瓨
         /// </summary>
         public decimal? InventoryAcc { get; set; }
 
         /// <summary>
-        /// 产品折扣系数
+        /// 浜у搧鎶樻墸绯绘暟
         /// </summary>
         public decimal? DiscountCoef { get; set; }
 
         /// <summary>
-        /// 运费
+        /// 杩愯垂
         /// </summary>
         public decimal? Freight { get; set; }
 
         /// <summary>
-        /// 正特价
+        /// 姝g壒浠�
         /// </summary>
         public byte PriceType { get; set; }
 
 //        /// <summary>
-//        /// 店铺折扣
+//        /// 搴楅摵鎶樻墸
 //        /// </summary>
 //        public decimal? ShopPriceRatio { get; set; }
 
 //        /// <summary>
-//        /// 显示价格
+//        /// 鏄剧ず浠锋牸
 //        /// </summary>
 //        public decimal DisplayPrice => this.SalesPrice * this.ShopPriceRatio.GetValueOrDefault(1);
 
         /// <summary>
-        /// 热销
+        /// 鐑�攢
         /// </summary>
         public bool IsHot { get; set; }
         /// <summary>
-        /// 新品
+        /// 鏂板搧
         /// </summary>
         public bool IsNew{ get; set; }
         /// <summary>
-        /// 备注
+        /// 澶囨敞
         /// </summary>
         public string Description{ get; set; }
 
         /// <summary>
-        /// 是否是组合产品
+        /// 鏄�惁鏄�粍鍚堜骇鍝�
         /// </summary>
         public bool IsCombt
         {
@@ -181,47 +181,47 @@ namespace Befri.Goldhoo.Models
         }
 
         /// <summary>
-        /// 链接地址
+        /// 閾炬帴鍦板潃
         /// </summary>
         public string Href { get; set; }
 
         /// <summary>
-        /// 产品介绍
+        /// 浜у搧浠嬬粛
         /// </summary>
         public string Introduction { get; set; }
 
         /// <summary>
-        /// 交付周期
+        /// 浜や粯鍛ㄦ湡
         /// </summary>
         public int? DeliveryCycle { get; set; }
 
         /// <summary>
-        /// 交付周期-字符
+        /// 浜や粯鍛ㄦ湡-瀛楃�
         /// </summary>
         public string DeliveryCycleStr { get; set; }
 
         /// <summary>
-        /// 生产属性
+        /// 鐢熶骇灞炴€�
         /// </summary>
         public int? ProductionProperty { get; set; }
 
         /// <summary>
-        /// 生产属性文本
+        /// 鐢熶骇灞炴€ф枃鏈�
         /// </summary>
         public string ProductionPropertyText { get; set; }
 
         /// <summary>
-        /// 修改时间
+        /// 淇�敼鏃堕棿
         /// </summary>
         public DateTime ModifiedOn { get; set; }
 
         /// <summary>
-        /// 原价
+        /// 鍘熶环
         /// </summary>
         public decimal? Price { get; set; }
 
         /// <summary>
-        /// 存货内码
+        /// 瀛樿揣鍐呯爜
         /// </summary>
         public int InventoryId { get; set; }
     }

+ 14 - 14
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/ShopFavorites.Designer.cs

@@ -7,62 +7,62 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {    
     /// <summary>
-    /// 专卖店收藏数据实体类   
-    /// 生成日期: 2016年5月16日 10:16
+    /// 涓撳崠搴楁敹钘忔暟鎹�疄浣撶被   
+    /// 鐢熸垚鏃ユ湡: 2016骞�5鏈�16鏃� 10:16
     ///</summary>
     /// <remarks>
-    /// 该文件是由代码生成器自动生成的, 请不要随意修改, 你的修改将在代码重新生成时会被覆盖,
-    /// 如果要对该类进行修改, 请直接修改该分部类的ShopFavorites文件(文件名不含.designer)
+    /// 璇ユ枃浠舵槸鐢变唬鐮佺敓鎴愬櫒鑷�姩鐢熸垚鐨�, 璇蜂笉瑕侀殢鎰忎慨鏀�, 浣犵殑淇�敼灏嗗湪浠g爜閲嶆柊鐢熸垚鏃朵細琚��鐩栵紝
+    /// 濡傛灉瑕佸�璇ョ被杩涜�淇�敼, 璇风洿鎺ヤ慨鏀硅�鍒嗛儴绫荤殑ShopFavorites鏂囦欢(鏂囦欢鍚嶄笉鍚�.designer)
     /// </remarks>
     public partial class ShopFavorites
     { 
       /// <summary>
-      ///  获取或设置专卖店内码
+      ///  鑾峰彇鎴栬�缃�笓鍗栧簵鍐呯爜
       /// </summary>
       public int ShopId { get; set; }  
       
       /// <summary>
-      ///  获取或设置存货内码
+      ///  鑾峰彇鎴栬�缃�瓨璐у唴鐮�
       /// </summary>
       public int InventoryId { get; set; }  
       
       /// <summary>
-      ///  获取或设置收藏人
+      ///  鑾峰彇鎴栬�缃�敹钘忎汉
       /// </summary>
       public string CollectedBy { get; set; }  
       
       /// <summary>
-      ///  获取或设置收藏日期
+      ///  鑾峰彇鎴栬�缃�敹钘忔棩鏈�
       /// </summary>
       public DateTime CollectedOn { get; set; }  
       
       /// <summary>
-      ///  获取或设置记录版本
+      ///  鑾峰彇鎴栬�缃��褰曠増鏈�
       /// </summary>
       public Int16 VersionNumber { get; set; }  
       
       /// <summary>
-      ///  获取或设置记录创建人
+      ///  鑾峰彇鎴栬�缃��褰曞垱寤轰汉
       /// </summary>
       public string CreatedBy { get; set; }  
       
       /// <summary>
-      ///  获取或设置记录创建时间
+      ///  鑾峰彇鎴栬�缃��褰曞垱寤烘椂闂�
       /// </summary>
       public DateTime CreatedOn { get; set; }  
       
       /// <summary>
-      ///  获取或设置记录修改人
+      ///  鑾峰彇鎴栬�缃��褰曚慨鏀逛汉
       /// </summary>
       public string ModifiedBy { get; set; }  
       
       /// <summary>
-      ///  获取或设置记录修改时间
+      ///  鑾峰彇鎴栬�缃��褰曚慨鏀规椂闂�
       /// </summary>
       public DateTime ModifiedOn { get; set; }  
       
       /// <summary>
-      ///  获取或设置备注
+      ///  鑾峰彇鎴栬�缃��娉�
       /// </summary>
       public string Description { get; set; }  
       

+ 3 - 3
src/Befri.Goldhoo/Befri.Goldhoo.Common/Models/shop_order/ShopFavorites.cs

@@ -7,9 +7,9 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {    
     /// <summary>
-    /// 专卖店收藏数据实体类
-    /// 开发人员:
-    /// 开发日期: 2016-05
+    /// 涓撳崠搴楁敹钘忔暟鎹�疄浣撶被
+    /// 寮€鍙戜汉鍛橈細
+    /// 寮€鍙戞棩鏈�: 2016-05
     ///</summary>
     public partial class ShopFavorites
     {

+ 16 - 2
src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Content/themes/Client/version1/src/search.js

@@ -1,6 +1,7 @@
 /**
  * 查询
- * 2024/5/21
+ * 2024/8/1
+ * version: 1.0.2
  */
 !(() => {
     /**
@@ -176,7 +177,20 @@
             /**
              * 查询字符串
              */
-            let searchText = $('.topbar-searchInput').val();
+            let searchText = $('.topbar-searchInput').val().trim();
+
+            // 搜索字符串不能为空
+            if (String.IsNullOrWhiteSpace(searchText)) {
+                Sys.Show('请输入搜索内容');
+                return;
+            }
+
+            // 判断特殊字符
+            spStr = String.IsSpecialCharacters(searchText, '%');
+            if (spStr) {
+                Sys.Show(`含有特殊字符:${spStr}`);
+                return;
+            }
 
             if (Object.IsNullOrEmpty(paramenter)) {
                 let data = {};

+ 1 - 1
src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Controllers/ProductController.cs

@@ -96,7 +96,7 @@ namespace Befri.Goldhoo.Mobile.MvcUI.Controllers
             try
             {
                 ProductParameter productParam = new ProductParameter();
-                productParam.SearchText = searchText;
+                productParam.SearchText = searchText.Trim();
                 productParam.pageIndex = PageIndex;
                 productParam.pageSize = PageSize;
                 productParam.Categories = categories;

+ 1 - 1
src/Befri.Goldhoo/Befri.Goldhoo.Mobile.MvcUI/Views/Shared/_Layout.cshtml

@@ -34,7 +34,7 @@
     <script src="@Url.Content("~/Content/themes/Client/version1/src/system.js")?v=1.1.0"></script>
     <script src="@Url.Content("~/Content/themes/Client/version1/src/base.js")?v=1.3.6"></script>
     <script src="@Url.Content("~/Content/themes/Client/version1/src/fixed.js")?v=2"></script>
-    <script src="@Url.Content("~/Content/themes/Client/version1/src/search.js")?v=1"></script>
+    <script src="@Url.Content("~/Content/themes/Client/version1/src/search.js")?v=1.0.2"></script>
     <script>
         // 必读列表获取地址
         Sys.Config.Add('GetMustReadListUrl', '@Url.Content("~/Activity/ListRequiredReadActivities")');

+ 1 - 1
tools/代码生成器(Goldhoo)/Arista.WinUI.exe.config

@@ -13,7 +13,7 @@
   <appSettings>
     <add key="corporation" value="nengyou"/>
     <add key="project" value=""/>
-    <add key="author" value="chunjianjun"/>
+    <add key="author" value="chenlong"/>
     <add key="generatedcomment" value="true"/>
     <add key="daoClassName" value="Arista.DataAccess.SqlSchemaDAO2012"/>
   </appSettings>

+ 1 - 1
tools/代码生成器(Goldhoo)/Arista.WinUI.vshost.exe.config

@@ -13,7 +13,7 @@
   <appSettings>
     <add key="corporation" value="nengyou"/>
     <add key="project" value=""/>
-    <add key="author" value="chunjianjun"/>
+    <add key="author" value="chenlong"/>
     <add key="generatedcomment" value="true"/>
     <add key="daoClassName" value="Arista.DataAccess.SqlSchemaDAO2012"/>
   </appSettings>

BIN
tools/代码生成器(Goldhoo)/DockPanel.config


+ 11 - 11
tools/代码生成器(Goldhoo)/Template/Controller.cst

@@ -18,10 +18,10 @@ using Befri.Goldhoo.MvcUI.Controllers;
 namespace Befri.Goldhoo.MvcUI.Areas.Basedata.Controllers
 { 
     /// <summary>
-    /// Ãû    ³Æ:¡¾<%= Request.Table.Text %>¡¿¹ÜÀí¿ØÖÆÆ÷Àà
-    /// Ö÷Òª¹¦ÄÜ:
-    /// ¿ª·¢ÈËÔ±: 
-    /// ¿ª·¢ÈÕÆÚ: <%= DateTime.Today.ToString("yyyy-MM") %>
+    /// �    称:�<%= Request.Table.Text %>】管�控制器类
+    /// 主�功能:
+    /// 开�人员: 
+    /// 开�日期: <%= DateTime.Today.ToString("yyyy-MM") %>
     /// </summary>
     [HandleException("defaultPolicy")]
     public class <%= Table.AliasName %>Controller : BaseController
@@ -35,7 +35,7 @@ namespace Befri.Goldhoo.MvcUI.Areas.Basedata.Controllers
         }
  
         /// <summary>
-        /// ´ò¿ª¡¾<%= Table.Text %>¡¿Áбí¼ÇÂ¼Ò³Ãæ
+        /// 打开�<%= Table.Text %>】列表记录页�
         /// </summary>
         /// <returns></returns>
         public ActionResult Index()
@@ -44,7 +44,7 @@ namespace Befri.Goldhoo.MvcUI.Areas.Basedata.Controllers
         }
         
         /// <summary>
-        /// ´ò¿ª¡¾<%= Table.Text %>¡¿ÐÂÔö¡¢ÐÞ¸ÄÒ³Ãæ
+        /// 打开�<%= Table.Text %>】新增�修改页�
         /// </summary>
         /// <returns></returns>
         public ActionResult Edit<%= Table.AliasName %>()
@@ -53,7 +53,7 @@ namespace Befri.Goldhoo.MvcUI.Areas.Basedata.Controllers
         }
         
         /// <summary>
-        /// »ñÈ¡¡¾<%= Table.Text %>¡¿Áбí¼Ç¼
+        /// 获��<%= Table.Text %>】列表记录
         /// </summary>
         /// <returns></returns>
         public ActionResult List<%= Table.AliasName %>(string searchText, int page, int rows)
@@ -84,7 +84,7 @@ namespace Befri.Goldhoo.MvcUI.Areas.Basedata.Controllers
         }
         
         /// <summary>
-        /// »ñÈ¡¡¾<%= Table.Text %>¡¿¼Ç¼
+        /// 获��<%= Table.Text %>】记录
         /// </summary>
         /// <returns></returns>
         public ActionResult Load<%= Table.AliasName %>(<%= KeyParamsText %>)
@@ -103,7 +103,7 @@ namespace Befri.Goldhoo.MvcUI.Areas.Basedata.Controllers
         }
         
 		/// <summary>
-        /// ´´½¨¡¾<%= Table.Text %>¡¿¼Ç¼
+        /// 创建�<%= Table.Text %>】记录
         /// </summary>
         /// <returns></returns>
         public ActionResult Create<%= Table.AliasName %>(<%= Table.AliasName %> <%= Table.aliasName %>)
@@ -125,7 +125,7 @@ namespace Befri.Goldhoo.MvcUI.Areas.Basedata.Controllers
         }
 
 		/// <summary>
-        /// ¸üС¾<%= Table.Text %>¡¿¼Ç¼
+        /// 更新�<%= Table.Text %>】记录
         /// </summary>
         /// <returns></returns>
         public ActionResult Update<%= Table.AliasName %>(<%= Table.AliasName %> <%= Table.aliasName %>)
@@ -146,7 +146,7 @@ namespace Befri.Goldhoo.MvcUI.Areas.Basedata.Controllers
         }
 
 		/// <summary>
-        /// ɾ³ý¡¾<%= Table.Text %>¡¿¼Ç¼
+        /// 删除�<%= Table.Text %>】记录
         /// </summary>
         /// <returns></returns>
         public ActionResult Delete<%= Table.AliasName %>(<%= KeyParamsText %>)

+ 20 - 20
tools/代码生成器(Goldhoo)/Template/DataAccess.Designer.cst

@@ -13,20 +13,20 @@ using Befri.Goldhoo.Models;
 namespace Befri.Goldhoo.DataAccess
 {
 	/// <summary>
-	/// <%= Table.Text %>数据存取类
-	/// 生成日期: <%= DateTime.Today.ToLongDateString() %> <%= DateTime.Now.ToShortTimeString() %>
+	/// <%= Table.Text %>鏁版嵁瀛樺彇绫�
+	/// 鐢熸垚鏃ユ湡: <%= DateTime.Today.ToLongDateString() %> <%= DateTime.Now.ToShortTimeString() %>
 	///</summary>
 	/// <remarks>
-	/// 该文件是由代码生成器自动生成的, 请不要随意修改, 你的修改将在代码重新生成时会被覆盖,
-	/// 如果要对该类进行修改, 请直接修改该分部类的<%= Table.AliasName %>DAO文件(文件名不含.designer)
+	/// 璇ユ枃浠舵槸鐢变唬鐮佺敓鎴愬櫒鑷�姩鐢熸垚鐨�, 璇蜂笉瑕侀殢鎰忎慨鏀�, 浣犵殑淇�敼灏嗗湪浠g爜閲嶆柊鐢熸垚鏃朵細琚��鐩栵紝
+	/// 濡傛灉瑕佸�璇ョ被杩涜�淇�敼, 璇风洿鎺ヤ慨鏀硅�鍒嗛儴绫荤殑<%= Table.AliasName %>DAO鏂囦欢(鏂囦欢鍚嶄笉鍚�.designer)
 	/// </remarks>
 	public partial class <%= Table.AliasName %>DAO : BaseDAO
 	{
 		/// <summary>
-		/// 返回满足查询条件的<%= Table.Text %>实体
+		/// 杩斿洖婊¤冻鏌ヨ�鏉′欢鐨�<%= Table.Text %>瀹炰綋
 		/// </summary>
-		/// <param name="param">查询条件</param>
-		/// <returns><%= Table.Text %>实体</returns>
+		/// <param name="param">鏌ヨ�鏉′欢</param>
+		/// <returns><%= Table.Text %>瀹炰綋</returns>
 		public <%= Table.AliasName %> Find<%= Table.AliasName%>(QueryParameter param)
 		{
 			string sql = @"<%= Request.Table.SqlBuilder.GetSelectCommandText() %>";
@@ -42,7 +42,7 @@ namespace Befri.Goldhoo.DataAccess
 
 			if (param != null)
 			{
-				//设置参数
+				//璁剧疆鍙傛暟
 				foreach (IExpression exp in param.WhereExpressions)
 				{
 					if (exp is SimpleExpression)
@@ -69,10 +69,10 @@ namespace Befri.Goldhoo.DataAccess
 		}
 		
 		/// <summary>
-		/// 返回满足查询条件的<%= Table.Text %>实体列表
+		/// 杩斿洖婊¤冻鏌ヨ�鏉′欢鐨�<%= Table.Text %>瀹炰綋鍒楄〃
 		/// </summary>
-		/// <param name="param">查询条件</param>
-		/// <returns><%= Table.Text %>实体列表</returns>
+		/// <param name="param">鏌ヨ�鏉′欢</param>
+		/// <returns><%= Table.Text %>瀹炰綋鍒楄〃</returns>
 		public IList<<%= Table.AliasName %>> Get<%= Table.AliasName %>s(QueryParameter param)
 		{
 			string sql = @"<%= Request.Table.SqlBuilder.GetSelectCommandText() %>";
@@ -88,7 +88,7 @@ namespace Befri.Goldhoo.DataAccess
 
 			if (param != null)
 			{
-				//设置参数
+				//璁剧疆鍙傛暟
 				foreach (IExpression exp in param.WhereExpressions)
 				{
 					if (exp is SimpleExpression)
@@ -120,9 +120,9 @@ namespace Befri.Goldhoo.DataAccess
 		partial void OnInserted(<%= Table.AliasName %> <%= Table.aliasName %>, int affectedRecords);  
         
 		/// <summary>
-		/// 插入<%= Table.Text %>记录
+		/// 鎻掑叆<%= Table.Text %>璁板綍
 		/// </summary>
-		/// <param name="<%= Table.aliasName %>"><%= Table.Text %>对象</param>
+		/// <param name="<%= Table.aliasName %>"><%= Table.Text %>瀵硅薄</param>
 		/// <returns></returns>
 		public int Insert(<%= Table.AliasName %> <%= Table.aliasName %>)
 		{
@@ -151,7 +151,7 @@ namespace Befri.Goldhoo.DataAccess
 			
 			if (affectedRecords < 1)
 			{
-				throw new ApplicationException("插入数据失败, 没有记录被插入");
+				throw new ApplicationException("鎻掑叆鏁版嵁澶辫触, 娌℃湁璁板綍琚�彃鍏�");
 			}
 			<% if (Table.IdentityColumn != null)
 				{  %>
@@ -165,10 +165,10 @@ namespace Befri.Goldhoo.DataAccess
 		partial void OnUpdated(<%= Table.AliasName %> <%= Table.aliasName %>, int affectedRecords);
        
 		/// <summary>
-		/// 更新<%= Table.Text %>记录
+		/// 鏇存柊<%= Table.Text %>璁板綍
 		/// </summary>
-		/// <param name="<%= Table.aliasName %>"><%= Table.Text %>对象</param>
-		/// <returns>受影响的记录数</returns>
+		/// <param name="<%= Table.aliasName %>"><%= Table.Text %>瀵硅薄</param>
+		/// <returns>鍙楀奖鍝嶇殑璁板綍鏁�</returns>
 		public int Update(<%= Table.AliasName %> <%= Table.aliasName %>)
 		{
 			OnUpdating(<%= Table.aliasName %>);
@@ -193,10 +193,10 @@ namespace Befri.Goldhoo.DataAccess
 		}
         
 		/// <summary>
-		/// 删除<%= Table.Text %>记录
+		/// 鍒犻櫎<%= Table.Text %>璁板綍
 		/// </summary>
 		<% foreach(Arista.Data.ColumnSchema column in Table.Keys){%>/// <param name="<%= column.aliasName %>"><%= column.Text %></param><% } %>
-		/// <returns>受影响的记录数</returns>
+		/// <returns>鍙楀奖鍝嶇殑璁板綍鏁�</returns>
 		public int Delete(<%= KeyParamsText %>)
 		{
 			string sql = @"<%= Request.Table.SqlBuilder.GetDeleteCommandText() %>";

+ 3 - 3
tools/代码生成器(Goldhoo)/Template/DataAccess.cst

@@ -13,9 +13,9 @@ using Befri.Goldhoo.Models;
 namespace Befri.Goldhoo.DataAccess
 {
 	/// <summary>
-	/// Ãû    ³Æ: <%= Request.Table.Text %>Êý¾Ý´æÈ¡Àà
-	/// ¿ª·¢ÈËÔ±:
-	/// ¿ª·¢ÈÕÆÚ: <%= DateTime.Today.ToString("yyyy-MM") %>
+	/// �    称: <%= Request.Table.Text %>数�存�类
+	/// 开�人员:
+	/// 开�日期: <%= DateTime.Today.ToString("yyyy-MM") %>
 	/// </summary>
 	public partial class <%= Table.AliasName %>DAO
 	{

+ 1 - 1
tools/代码生成器(Goldhoo)/Template/Empty.cst

@@ -72,7 +72,7 @@
 --------------------------------------------------------------------------------
    <% foreach (ColumnSchema column in Table.SelectedColumns) { %>
    <td width="10%" class="td_item" align="right">
-      <%= column.Text %>£º
+      <%= column.Text %>:
    </td>
    <td width="23%" class="td_item_text">
       <input name="<%= column.AliasName %>" class="easyui-textbox" />

+ 13 - 13
tools/代码生成器(Goldhoo)/Template/IService.cst

@@ -12,38 +12,38 @@ using Befri.Goldhoo.Models;
 namespace Befri.Goldhoo.Services
 {
     /// <summary>
-    /// 名    称: <%= Table.Text %>管理接口
-    /// 开发人员: 
-    /// 开发日期: <%= DateTime.Today.ToLongDateString() %>
+    /// 鍚�    绉�: <%= Table.Text %>绠$悊鎺ュ彛
+    /// 寮€鍙戜汉鍛�: 
+    /// 寮€鍙戞棩鏈�: <%= DateTime.Today.ToLongDateString() %>
     /// </summary>
     public interface I<%= Table.AliasName %>Service : IDataService
     {
         /// <summary>
-        /// 返回满足查询条件的<%= Table.Text %>实体列表
+        /// 杩斿洖婊¤冻鏌ヨ�鏉′欢鐨�<%= Table.Text %>瀹炰綋鍒楄〃
         /// </summary>
-        /// <param name="param">查询条件</param>
-        /// <returns><%= Table.Text %>实体列表</returns>
+        /// <param name="param">鏌ヨ�鏉′欢</param>
+        /// <returns><%= Table.Text %>瀹炰綋鍒楄〃</returns>
         IList<<%= Table.AliasName %>> Get<%= Table.AliasName %>s(QueryParameter param);
        
         /// <summary>
-        /// 创建<%= Table.Text %>记录
+        /// 鍒涘缓<%= Table.Text %>璁板綍
         /// </summary>
-        /// <param name="<%= Table.aliasName %>"><%= Table.Text %>对象</param>
+        /// <param name="<%= Table.aliasName %>"><%= Table.Text %>瀵硅薄</param>
         /// <returns></returns>
         int Create<%= Table.AliasName %>(<%= Table.AliasName %> <%= Table.aliasName %>);
                   
         /// <summary>
-        /// 更新<%= Table.Text %>记录
+        /// 鏇存柊<%= Table.Text %>璁板綍
         /// </summary>
-        /// <param name="<%= Table.aliasName %>"><%= Table.Text %>对象</param>
-        /// <returns>受影响的记录数</returns>
+        /// <param name="<%= Table.aliasName %>"><%= Table.Text %>瀵硅薄</param>
+        /// <returns>鍙楀奖鍝嶇殑璁板綍鏁�</returns>
         int Update<%= Table.AliasName %>(<%= Table.AliasName %> <%= Table.aliasName %>);
         
         /// <summary>
-        /// 删除<%= Table.Text %>记录
+        /// 鍒犻櫎<%= Table.Text %>璁板綍
         /// </summary>
         <% foreach(Arista.Data.ColumnSchema column in Table.Keys){%>/// <param name="<%= column.aliasName %>"><%= column.Text %></param> <% } %>
-        /// <returns>受影响的记录数</returns>
+        /// <returns>鍙楀奖鍝嶇殑璁板綍鏁�</returns>
         int Delete<%= Table.AliasName %>(<%= KeyParamsText %>);
           
     }

+ 5 - 5
tools/代码生成器(Goldhoo)/Template/Model.Designer.cst

@@ -7,17 +7,17 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {
     /// <summary>
-    /// <%= Table.Text %>数据实体类
-    /// 生成日期: <%= DateTime.Today.ToLongDateString() %> <%= DateTime.Now.ToShortTimeString() %>
+    /// <%= Table.Text %>鏁版嵁瀹炰綋绫�
+    /// 鐢熸垚鏃ユ湡: <%= DateTime.Today.ToLongDateString() %> <%= DateTime.Now.ToShortTimeString() %>
     ///</summary>
     /// <remarks>
-    /// 该文件是由代码生成器自动生成的, 请不要随意修改, 你的修改将在代码重新生成时会被覆盖,
-    /// 如果要对该类进行修改, 请直接修改该分部类的<%= Table.AliasName %>文件(文件名不含.designer)
+    /// 璇ユ枃浠舵槸鐢变唬鐮佺敓鎴愬櫒鑷�姩鐢熸垚鐨�, 璇蜂笉瑕侀殢鎰忎慨鏀�, 浣犵殑淇�敼灏嗗湪浠g爜閲嶆柊鐢熸垚鏃朵細琚��鐩栵紝
+    /// 濡傛灉瑕佸�璇ョ被杩涜�淇�敼, 璇风洿鎺ヤ慨鏀硅�鍒嗛儴绫荤殑<%= Table.AliasName %>鏂囦欢(鏂囦欢鍚嶄笉鍚�.designer)
 	/// </remarks>
     public partial class <%= Table.AliasName %>
     { <% foreach (ColumnSchema column in Table.Columns) { %>
 		/// <summary>
-		///  获取或设置<%= column.Text %>
+		///  鑾峰彇鎴栬�缃�<%= column.Text %>
 		/// </summary>
 		public <%= column.CSDataType %> <%= column.AliasName %> { get; set; }
 		<% } %>

+ 3 - 3
tools/代码生成器(Goldhoo)/Template/Model.cst

@@ -7,9 +7,9 @@ using System.ComponentModel;
 namespace Befri.Goldhoo.Models
 {
 	/// <summary>
-	/// <%= Table.Text %>Êý¾ÝʵÌåÀà
-	/// ¿ª·¢ÈËÔ±£º
-	/// ¿ª·¢ÈÕÆÚ: <%= DateTime.Today.ToString("yyyy-MM") %>
+	/// <%= Table.Text %>数�实体类
+	/// 开�人员:
+	/// 开�日期: <%= DateTime.Today.ToString("yyyy-MM") %>
 	///</summary>
 	public partial class <%= Table.AliasName %>
 	{

+ 13 - 13
tools/代码生成器(Goldhoo)/Template/Service.cst

@@ -14,28 +14,28 @@ using Befri.Goldhoo.DataAccess;
 namespace Befri.Goldhoo.Services
 {
     /// <summary>
-    /// 名    称: <%= Table.Text %>管理服务类
-    /// 开发人员: 
-    /// 开发日期: <%= DateTime.Today.ToLongDateString() %>
+    /// 鍚�    绉�: <%= Table.Text %>绠$悊鏈嶅姟绫�
+    /// 寮€鍙戜汉鍛�: 
+    /// 寮€鍙戞棩鏈�: <%= DateTime.Today.ToLongDateString() %>
     /// </summary>
     public class <%= Table.AliasName %>Service : DataService, I<%= Table.AliasName %>Service
     {
         private <%= Table.AliasName %>DAO _<%= Table.aliasName %>DAO = new <%= Table.AliasName %>DAO();
         
         /// <summary>
-        /// 返回满足查询条件的<%= Table.Text %>实体列表
+        /// 杩斿洖婊¤冻鏌ヨ�鏉′欢鐨�<%= Table.Text %>瀹炰綋鍒楄〃
         /// </summary>
-        /// <param name="param">查询条件</param>
-        /// <returns><%= Table.Text %>实体列表</returns>
+        /// <param name="param">鏌ヨ�鏉′欢</param>
+        /// <returns><%= Table.Text %>瀹炰綋鍒楄〃</returns>
         public IList<<%= Table.AliasName %>> Get<%= Table.AliasName %>s(QueryParameter param)
         {
             return _<%= Table.aliasName %>DAO.Get<%= Table.AliasName %>s(param);
         }
        
         /// <summary>
-        /// 创建<%= Table.Text %>记录
+        /// 鍒涘缓<%= Table.Text %>璁板綍
         /// </summary>
-        /// <param name="<%= Table.aliasName %>"><%= Table.Text %>对象</param>
+        /// <param name="<%= Table.aliasName %>"><%= Table.Text %>瀵硅薄</param>
         /// <returns></returns>
         public int Create<%= Table.AliasName %>(<%= Table.AliasName %> <%= Table.aliasName %>)
         {
@@ -43,20 +43,20 @@ namespace Befri.Goldhoo.Services
         }
                   
         /// <summary>
-        /// 更新<%= Table.Text %>记录
+        /// 鏇存柊<%= Table.Text %>璁板綍
         /// </summary>
-        /// <param name="<%= Table.aliasName %>"><%= Table.Text %>对象</param>
-        /// <returns>受影响的记录数</returns>
+        /// <param name="<%= Table.aliasName %>"><%= Table.Text %>瀵硅薄</param>
+        /// <returns>鍙楀奖鍝嶇殑璁板綍鏁�</returns>
         public int Update<%= Table.AliasName %>(<%= Table.AliasName %> <%= Table.aliasName %>)
         {
         	return _<%= Table.aliasName %>DAO.Update(<%= Table.aliasName %>);
         }
         
         /// <summary>
-        /// 删除<%= Table.Text %>记录
+        /// 鍒犻櫎<%= Table.Text %>璁板綍
         /// </summary>
         <% foreach(Arista.Data.ColumnSchema column in Table.Keys){%>/// <param name="<%= column.aliasName %>"><%= column.Text %></param> <% } %>
-        /// <returns>受影响的记录数</returns>
+        /// <returns>鍙楀奖鍝嶇殑璁板綍鏁�</returns>
         public int Delete<%= Table.AliasName %>(<%= KeyParamsText %>)
         {
         	return _<%= Table.aliasName %>DAO.Delete(<%= KeyParamsValueText %>);

+ 29 - 146
tools/代码生成器(Goldhoo)/_sourlet.cs

@@ -28,167 +28,50 @@ namespace Arista.CodeGenerate
         Response.Output.WriteLine("using System.Collections.Generic;");
         Response.Output.WriteLine("using System.Text;");
         Response.Output.WriteLine("using System.Data;");
-        Response.Output.WriteLine("using System.Data.Common;");
         Response.Output.WriteLine("using System.ComponentModel;");
-        Response.Output.WriteLine("using System.Transactions;");
         Response.Output.WriteLine("");
-        Response.Output.WriteLine("using Befri.Query;");
-        Response.Output.WriteLine("using Befri.Data.SqlClient;");
-        Response.Output.WriteLine("using Befri.Goldhoo.Models;");
-        Response.Output.WriteLine("using Befri.Goldhoo.DataAccess;");
-        Response.Output.WriteLine("");
-        Response.Output.WriteLine("namespace Befri.Goldhoo.Services");
+        Response.Output.WriteLine("namespace Befri.Goldhoo.Models");
         Response.Output.WriteLine("{");
         Response.Output.Write("    /// ");
         Response.Output.WriteLine("<summary>");
-        Response.Output.Write("    /// 名    称: ");
+        Response.Output.Write("    /// ");
         Response.Output.Write( Table.Text );
-        Response.Output.WriteLine("管理服务类");
-        Response.Output.WriteLine("    /// 开发人员: ");
-        Response.Output.Write("    /// 开发日期: ");
+        Response.Output.WriteLine("数据实体类");
+        Response.Output.Write("    /// 生成日期: ");
         Response.Output.Write( DateTime.Today.ToLongDateString() );
+        Response.Output.Write(" ");
+        Response.Output.Write( DateTime.Now.ToShortTimeString() );
         Response.Output.WriteLine("");
-        Response.Output.Write("    /// ");
+        Response.Output.Write("    ///");
         Response.Output.WriteLine("</summary>");
-        Response.Output.Write("    public class ");
-        Response.Output.Write( Table.AliasName );
-        Response.Output.Write("Service : DataService, I");
-        Response.Output.Write( Table.AliasName );
-        Response.Output.WriteLine("Service");
-        Response.Output.WriteLine("    {");
-        Response.Output.Write("        private ");
-        Response.Output.Write( Table.AliasName );
-        Response.Output.Write("DAO _");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.Write("DAO = new ");
-        Response.Output.Write( Table.AliasName );
-        Response.Output.WriteLine("DAO();");
-        Response.Output.WriteLine("        ");
-        Response.Output.Write("        /// ");
-        Response.Output.WriteLine("<summary>");
-        Response.Output.Write("        /// 返回满足查询条件的");
-        Response.Output.Write( Table.Text );
-        Response.Output.WriteLine("实体列表");
-        Response.Output.Write("        /// ");
-        Response.Output.WriteLine("</summary>");
-        Response.Output.Write("        /// ");
-        Response.Output.Write("<param name=\"param\">查询条件");
-        Response.Output.WriteLine("</param>");
-        Response.Output.Write("        /// ");
-        Response.Output.Write("<returns>");
-        Response.Output.Write( Table.Text );
-        Response.Output.Write("实体列表");
-        Response.Output.WriteLine("</returns>");
-        Response.Output.Write("        public IList");
-        Response.Output.Write("<");
-        Response.Output.Write( Table.AliasName );
-        Response.Output.Write("> Get");
-        Response.Output.Write( Table.AliasName );
-        Response.Output.WriteLine("s(QueryParameter param)");
-        Response.Output.WriteLine("        {");
-        Response.Output.Write("            return _");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.Write("DAO.Get");
-        Response.Output.Write( Table.AliasName );
-        Response.Output.WriteLine("s(param);");
-        Response.Output.WriteLine("        }");
-        Response.Output.WriteLine("       ");
-        Response.Output.Write("        /// ");
-        Response.Output.WriteLine("<summary>");
-        Response.Output.Write("        /// 创建");
-        Response.Output.Write( Table.Text );
-        Response.Output.WriteLine("记录");
-        Response.Output.Write("        /// ");
-        Response.Output.WriteLine("</summary>");
-        Response.Output.Write("        /// ");
-        Response.Output.Write("<param name=\"");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.Write("\">");
-        Response.Output.Write( Table.Text );
-        Response.Output.Write("对象");
-        Response.Output.WriteLine("</param>");
-        Response.Output.Write("        /// ");
-        Response.Output.Write("<returns>");
-        Response.Output.WriteLine("</returns>");
-        Response.Output.Write("        public int Create");
+        Response.Output.Write("    /// ");
+        Response.Output.WriteLine("<remarks>");
+        Response.Output.WriteLine("    /// 该文件是由代码生成器自动生成的, 请不要随意修改, 你的修改将在代码重新生成时会被覆盖,");
+        Response.Output.Write("    /// 如果要对该类进行修改, 请直接修改该分部类的");
         Response.Output.Write( Table.AliasName );
-        Response.Output.Write("(");
+        Response.Output.WriteLine("文件(文件名不含.designer)");
+        Response.Output.Write("	/// ");
+        Response.Output.WriteLine("</remarks>");
+        Response.Output.Write("    public partial class ");
         Response.Output.Write( Table.AliasName );
-        Response.Output.Write(" ");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.WriteLine(")");
-        Response.Output.WriteLine("        {");
-        Response.Output.Write("        	return _");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.Write("DAO.Insert(");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.WriteLine(");");
-        Response.Output.WriteLine("        }");
-        Response.Output.WriteLine("                  ");
-        Response.Output.Write("        /// ");
+        Response.Output.WriteLine("");
+        Response.Output.Write("    { ");
+ foreach (ColumnSchema column in Table.Columns) {         Response.Output.WriteLine("");
+        Response.Output.Write("		/// ");
         Response.Output.WriteLine("<summary>");
-        Response.Output.Write("        /// 更新");
-        Response.Output.Write( Table.Text );
-        Response.Output.WriteLine("记录");
-        Response.Output.Write("        /// ");
+        Response.Output.Write("		///  获取或设置");
+        Response.Output.Write( column.Text );
+        Response.Output.WriteLine("");
+        Response.Output.Write("		/// ");
         Response.Output.WriteLine("</summary>");
-        Response.Output.Write("        /// ");
-        Response.Output.Write("<param name=\"");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.Write("\">");
-        Response.Output.Write( Table.Text );
-        Response.Output.Write("对象");
-        Response.Output.WriteLine("</param>");
-        Response.Output.Write("        /// ");
-        Response.Output.Write("<returns>受影响的记录数");
-        Response.Output.WriteLine("</returns>");
-        Response.Output.Write("        public int Update");
-        Response.Output.Write( Table.AliasName );
-        Response.Output.Write("(");
-        Response.Output.Write( Table.AliasName );
+        Response.Output.Write("		public ");
+        Response.Output.Write( column.CSDataType );
         Response.Output.Write(" ");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.WriteLine(")");
-        Response.Output.WriteLine("        {");
-        Response.Output.Write("        	return _");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.Write("DAO.Update(");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.WriteLine(");");
-        Response.Output.WriteLine("        }");
-        Response.Output.WriteLine("        ");
-        Response.Output.Write("        /// ");
-        Response.Output.WriteLine("<summary>");
-        Response.Output.Write("        /// 删除");
-        Response.Output.Write( Table.Text );
-        Response.Output.WriteLine("记录");
-        Response.Output.Write("        /// ");
-        Response.Output.WriteLine("</summary>");
-        Response.Output.Write("        ");
- foreach(Arista.Data.ColumnSchema column in Table.Keys){        Response.Output.Write("/// ");
-        Response.Output.Write("<param name=\"");
-        Response.Output.Write( column.aliasName );
-        Response.Output.Write("\">");
-        Response.Output.Write( column.Text );
-        Response.Output.Write("</param> ");
+        Response.Output.Write( column.AliasName );
+        Response.Output.WriteLine(" { get; set; }");
+        Response.Output.Write("		");
  }         Response.Output.WriteLine("");
-        Response.Output.Write("        /// ");
-        Response.Output.Write("<returns>受影响的记录数");
-        Response.Output.WriteLine("</returns>");
-        Response.Output.Write("        public int Delete");
-        Response.Output.Write( Table.AliasName );
-        Response.Output.Write("(");
-        Response.Output.Write( KeyParamsText );
-        Response.Output.WriteLine(")");
-        Response.Output.WriteLine("        {");
-        Response.Output.Write("        	return _");
-        Response.Output.Write( Table.aliasName );
-        Response.Output.Write("DAO.Delete(");
-        Response.Output.Write( KeyParamsValueText );
-        Response.Output.WriteLine(");");
-        Response.Output.WriteLine("        }");
-        Response.Output.WriteLine("          ");
-        Response.Output.WriteLine("    }");
+        Response.Output.WriteLine("	}");
         Response.Output.Write("}");
         this.EndGenerate();