Merge branch 'master' of http://110.40.230.242:3000/root/FMS

FMS/FMS.BLL/4.FMS.BLL.csproj

@@ -59,7 +59,7 @@
     <Compile Include="Common\ContextUserInfo.cs" />
     <Compile Include="Common\NoManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ServiceTypeBLL.cs" />
+    <Compile Include="Bd\ServiceTypeBLL.cs" />
     <Compile Include="Sys\Extend.cs" />
   </ItemGroup>
   <ItemGroup>

FMS/FMS.BLL/ServiceTypeBLL.cs → FMS/FMS.BLL/Bd/ServiceTypeBLL.cs

@@ -44,36 +44,39 @@ namespace FMS.BLL
                    foreach (string guid in listGuid)
                     {
 					    val.DeleteValidate(context,guid);
-                        SERVICE_TYPE.DAL.Delete().Where(a => a.GUID = guid).Execute(context.ts);
+                        BD_SERVICE_TYPE.DAL.Delete().Where(a => a.GUID = guid).Execute(context.ts);
                    }
          }
  
         public EntityBase Save(BLLContext context,EntityBase saveEntity,bool isAdd)
         {
-		       throw new NotImplementedException("代码未实现");
+		       //throw new NotImplementedException("代码未实现");
 
-                SERVICE_TYPE serviceType= new SERVICE_TYPE(SERVICE_TYPE.Fields.GUID);
+                BD_SERVICE_TYPE serviceType= new BD_SERVICE_TYPE(BD_SERVICE_TYPE.Fields.GUID);
                 serviceType.Data = saveEntity.Data;
                 serviceType.EffectDataFields();
 
 				val.SaveValidate(context,serviceType,isAdd);
 
-                 if (isAdd)
-                 {
-                      serviceType.GUID = Guid.NewGuid().ToString("N");
-                      serviceType.AddOperInfo(context, isAdd);
-					 
-					  serviceType.Validate();
-                      serviceType.Insert(context.Transaction);
-                 }
-                else
-                {
-                     serviceType.AddOperInfo(context, isAdd);
-					 serviceType.NotSave("CREATE_DATE,CREATE_USER");
+            if (isAdd)
+            {
+                serviceType.GUID = Guid.NewGuid().ToString("N");
+                //serviceType.AddOperInfo(context, isAdd);
+                serviceType.AddUserInfo(context, isAdd, true);
 
-					 serviceType.Validate();
-                     serviceType.Update(context.Transaction);
-                }
+                serviceType.Validate();
+                serviceType.Insert(context.Transaction);
+            }
+            else
+            {
+                //serviceType.AddOperInfo(context, isAdd);
+
+                serviceType.AddUserInfo(context, isAdd, false);
+                serviceType.NotSave("CREATE_DATE,CREATE_USER");
+
+                serviceType.Validate();
+                serviceType.Update(context.Transaction);
+            }
 
                return serviceType;
 

FMS/FMS.DAL/6.FMS.DAL.csproj

@@ -54,7 +54,7 @@
     <Compile Include="Bd\BdExtendDataDAL.cs" />
     <Compile Include="Bd\BdExtendTypeDAL.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ServiceTypeDAL.cs" />
+    <Compile Include="Bd\ServiceTypeDAL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FMS.Entity\7.FMS.Entity.csproj">

FMS/FMS.DAL/ServiceTypeDAL.cs → FMS/FMS.DAL/Bd/ServiceTypeDAL.cs

@@ -10,14 +10,14 @@ namespace FMS.DAL
 {
     public class ServiceTypeDAL : BaseDAL
     {
-      public SERVICE_TYPE Get(string guid)
+      public BD_SERVICE_TYPE Get(string guid)
         {
             return Get(guid, null);
         }
 
-        public SERVICE_TYPE Get(string guid, object ts)
+        public BD_SERVICE_TYPE Get(string guid, object ts)
         {
-            return SERVICE_TYPE.DAL.Select().Where(a => a.GUID = guid).SingleOrDefault(ts);
+            return BD_SERVICE_TYPE.DAL.Select().Where(a => a.GUID = guid).SingleOrDefault(ts);
         }
 
         public   DataTable Load(BLLContext context, string guid)

FMS/FMS.Entity/7.FMS.Entity.csproj

@@ -58,7 +58,7 @@
     <Compile Include="Param\WMSParam.cs" />
     <Compile Include="Param\WMSParamList.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Entity\SERVICE_TYPE.cs" />
+    <Compile Include="Entity\BD_SERVICE_TYPE.cs" />
     <Compile Include="State\DemoStatus.cs" />
     <Compile Include="State\States.cs" />
   </ItemGroup>

FMS/FMS.Entity/Entity/BD_SERVICE_TYPE.cs

@@ -0,0 +1,614 @@
+#pragma warning disable  1591
+using PL.Base;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using PL.Server.Entity;
+using PL.Server.Entity.Entity;
+
+namespace FMS.Entity
+{
+    public partial class BD_SERVICE_TYPE : EntityBase
+    {
+        public BD_SERVICE_TYPE()
+        {
+            base.Table = new TableInfo { Name = "FMS_SERVICE_TYPE" };
+            base.Columns = SERVICE_TYPE_COLUMN.Instance;
+            this.Init();
+        }
+
+        public BD_SERVICE_TYPE(string keyField) : this()
+        {
+            base.KeyField = keyField;
+        }
+
+        public BD_SERVICE_TYPE(string keyField, string keyValue) : this()
+        {
+            base.KeyField = keyField;
+            this[keyField] = keyValue;
+        }
+
+
+        public BD_SERVICE_TYPE(EntityBase entityBase)
+            : this()
+        {
+            this.Data = entityBase.Data;
+        }
+
+        #region DataMember
+
+        /// <summary>
+        ///  主键
+        /// </summary>
+        public string GUID
+        {
+            get
+            {
+                return this.TextAccess["GUID"];
+            }
+            set
+            {
+                this.TextAccess["GUID"] = value;
+            }
+        }
+        /// <summary>
+        ///  助记词
+        /// </summary>
+        public string MEMORY_WORD
+        {
+            get
+            {
+                return this.TextAccess["MEMORY_WORD"];
+            }
+            set
+            {
+                this.TextAccess["MEMORY_WORD"] = value;
+            }
+        }
+        /// <summary>
+        ///  中文名称
+        /// </summary>
+        public string TYPE_NAME_CN
+        {
+            get
+            {
+                return this.TextAccess["TYPE_NAME_CN"];
+            }
+            set
+            {
+                this.TextAccess["TYPE_NAME_CN"] = value;
+            }
+        }
+        /// <summary>
+        ///  英文名称
+        /// </summary>
+        public string TYPE_NAME_EN
+        {
+            get
+            {
+                return this.TextAccess["TYPE_NAME_EN"];
+            }
+            set
+            {
+                this.TextAccess["TYPE_NAME_EN"] = value;
+            }
+        }
+        /// <summary>
+        ///  默认应收
+        /// </summary>
+        public string DEFAULT_RECEIVE
+        {
+            get
+            {
+                return this.TextAccess["DEFAULT_RECEIVE"];
+            }
+            set
+            {
+                this.TextAccess["DEFAULT_RECEIVE"] = value;
+            }
+        }
+        /// <summary>
+        ///  收费标准
+        /// </summary>
+        public string RECEIVE_STANDARD_ID
+        {
+            get
+            {
+                return this.TextAccess["RECEIVE_STANDARD_ID"];
+            }
+            set
+            {
+                this.TextAccess["RECEIVE_STANDARD_ID"] = value;
+            }
+        }
+        /// <summary>
+        ///  收费单价
+        /// </summary>
+        public System.Nullable<double> RECEIVE_PRICE
+        {
+            get
+            {
+                return this.DoubleAccess["RECEIVE_PRICE"];
+            }
+            set
+            {
+                this.DoubleAccess["RECEIVE_PRICE"] = value;
+            }
+        }
+        /// <summary>
+        ///  收费单价币制
+        /// </summary>
+        public string RECEIVE_CURR_ID
+        {
+            get
+            {
+                return this.TextAccess["RECEIVE_CURR_ID"];
+            }
+            set
+            {
+                this.TextAccess["RECEIVE_CURR_ID"] = value;
+            }
+        }
+        /// <summary>
+        ///  应收最低收费
+        /// </summary>
+        public System.Nullable<double> RECEIVE_MIN
+        {
+            get
+            {
+                return this.DoubleAccess["RECEIVE_MIN"];
+            }
+            set
+            {
+                this.DoubleAccess["RECEIVE_MIN"] = value;
+            }
+        }
+        /// <summary>
+        ///  应收最高收费
+        /// </summary>
+        public System.Nullable<double> RECEIVE_MAX
+        {
+            get
+            {
+                return this.DoubleAccess["RECEIVE_MAX"];
+            }
+            set
+            {
+                this.DoubleAccess["RECEIVE_MAX"] = value;
+            }
+        }
+        /// <summary>
+        ///  应收小数长度
+        /// </summary>
+        public System.Nullable<double> DECIMAL_LENGTH
+        {
+            get
+            {
+                return this.DoubleAccess["DECIMAL_LENGTH"];
+            }
+            set
+            {
+                this.DoubleAccess["DECIMAL_LENGTH"] = value;
+            }
+        }
+        /// <summary>
+        ///  应收尾数处理方式
+        /// </summary>
+        public string RECEIVE_MANTISSA_TYPE_ID
+        {
+            get
+            {
+                return this.TextAccess["RECEIVE_MANTISSA_TYPE_ID"];
+            }
+            set
+            {
+                this.TextAccess["RECEIVE_MANTISSA_TYPE_ID"] = value;
+            }
+        }
+        /// <summary>
+        ///  默认应付
+        /// </summary>
+        public string DEFAULT_PAY
+        {
+            get
+            {
+                return this.TextAccess["DEFAULT_PAY"];
+            }
+            set
+            {
+                this.TextAccess["DEFAULT_PAY"] = value;
+            }
+        }
+        /// <summary>
+        ///  付费标准
+        /// </summary>
+        public string PAY_STANDARD_ID
+        {
+            get
+            {
+                return this.TextAccess["PAY_STANDARD_ID"];
+            }
+            set
+            {
+                this.TextAccess["PAY_STANDARD_ID"] = value;
+            }
+        }
+        /// <summary>
+        ///  付费单价
+        /// </summary>
+        public System.Nullable<double> PAY_PRICE
+        {
+            get
+            {
+                return this.DoubleAccess["PAY_PRICE"];
+            }
+            set
+            {
+                this.DoubleAccess["PAY_PRICE"] = value;
+            }
+        }
+        /// <summary>
+        ///  收费单价币制
+        /// </summary>
+        public string PAY_CURR_ID
+        {
+            get
+            {
+                return this.TextAccess["PAY_CURR_ID"];
+            }
+            set
+            {
+                this.TextAccess["PAY_CURR_ID"] = value;
+            }
+        }
+        /// <summary>
+        ///  应付最低收费
+        /// </summary>
+        public System.Nullable<double> PAY_MIN
+        {
+            get
+            {
+                return this.DoubleAccess["PAY_MIN"];
+            }
+            set
+            {
+                this.DoubleAccess["PAY_MIN"] = value;
+            }
+        }
+        /// <summary>
+        ///  应付最高收费
+        /// </summary>
+        public System.Nullable<double> PAY_MAX
+        {
+            get
+            {
+                return this.DoubleAccess["PAY_MAX"];
+            }
+            set
+            {
+                this.DoubleAccess["PAY_MAX"] = value;
+            }
+        }
+        /// <summary>
+        ///  应付小数长度
+        /// </summary>
+        public System.Nullable<double> PAY_DECIMAL_LENGTH
+        {
+            get
+            {
+                return this.DoubleAccess["PAY_DECIMAL_LENGTH"];
+            }
+            set
+            {
+                this.DoubleAccess["PAY_DECIMAL_LENGTH"] = value;
+            }
+        }
+        /// <summary>
+        ///  应付尾数处理方式
+        /// </summary>
+        public string PAY_MANTISSA_TYPE_ID
+        {
+            get
+            {
+                return this.TextAccess["PAY_MANTISSA_TYPE_ID"];
+            }
+            set
+            {
+                this.TextAccess["PAY_MANTISSA_TYPE_ID"] = value;
+            }
+        }
+        /// <summary>
+        ///  备注
+        /// </summary>
+        public string REAMRK
+        {
+            get
+            {
+                return this.TextAccess["REAMRK"];
+            }
+            set
+            {
+                this.TextAccess["REAMRK"] = value;
+            }
+        }
+        /// <summary>
+        ///  创建人
+        /// </summary>
+        public string CREATE_USER
+        {
+            get
+            {
+                return this.TextAccess["CREATE_USER"];
+            }
+            set
+            {
+                this.TextAccess["CREATE_USER"] = value;
+            }
+        }
+        /// <summary>
+        ///  创建日期
+        /// </summary>
+        public System.Nullable<DateTime> CREATE_DATE
+        {
+            get
+            {
+                return this.DateAccess["CREATE_DATE"];
+            }
+            set
+            {
+                this.DateAccess["CREATE_DATE"] = value;
+            }
+        }
+        /// <summary>
+        ///  修改人
+        /// </summary>
+        public string UPDATE_USER
+        {
+            get
+            {
+                return this.TextAccess["UPDATE_USER"];
+            }
+            set
+            {
+                this.TextAccess["UPDATE_USER"] = value;
+            }
+        }
+        /// <summary>
+        ///  修改日期
+        /// </summary>
+        public System.Nullable<DateTime> UPDATE_DATE
+        {
+            get
+            {
+                return this.DateAccess["UPDATE_DATE"];
+            }
+            set
+            {
+                this.DateAccess["UPDATE_DATE"] = value;
+            }
+        }
+        /// <summary>
+        ///  
+        /// </summary>
+        public string CREATE_USER_NAME
+        {
+            get
+            {
+                return this.TextAccess["CREATE_USER_NAME"];
+            }
+            set
+            {
+                this.TextAccess["CREATE_USER_NAME"] = value;
+            }
+        }
+        /// <summary>
+        ///  
+        /// </summary>
+        public string UPDATE_USER_NAME
+        {
+            get
+            {
+                return this.TextAccess["UPDATE_USER_NAME"];
+            }
+            set
+            {
+                this.TextAccess["UPDATE_USER_NAME"] = value;
+            }
+        }
+        /// <summary>
+        ///  服务类别
+        /// </summary>
+        public string SERVICE_TYPE_ID
+        {
+            get
+            {
+                return this.TextAccess["SERVICE_TYPE_ID"];
+            }
+            set
+            {
+                this.TextAccess["SERVICE_TYPE_ID"] = value;
+            }
+        }
+        /// <summary>
+        ///  业务范畴
+        /// </summary>
+        public string BIZ_FLAG
+        {
+            get
+            {
+                return this.TextAccess["BIZ_FLAG"];
+            }
+            set
+            {
+                this.TextAccess["BIZ_FLAG"] = value;
+            }
+        }
+
+
+        #endregion
+
+        #region Query Method
+        public BD_SERVICE_TYPE SingleOrDefault()
+        {
+            return new EntityBuilder<BD_SERVICE_TYPE>().ToEntityBySql(this.SQLSelect);
+        }
+
+        public BD_SERVICE_TYPE SingleOrDefault(object ts)
+        {
+            return new EntityBuilder<BD_SERVICE_TYPE>().ToEntityBySql(this.SQLSelect, ts);
+        }
+
+        public List<BD_SERVICE_TYPE> ToList()
+        {
+            return new EntityBuilder<BD_SERVICE_TYPE>().ToListBySql(this.SQLSelect);
+        }
+
+        public List<BD_SERVICE_TYPE> ToList(object ts)
+        {
+            return new EntityBuilder<BD_SERVICE_TYPE>().ToListBySql(this.SQLSelect, ts);
+        }
+
+        public static BD_SERVICE_TYPE SingleOrDefault(string sql)
+        {
+            return SingleOrDefault(sql, null);
+        }
+
+        public static BD_SERVICE_TYPE SingleOrDefault(string sql, object ts)
+        {
+            List<BD_SERVICE_TYPE> list = ToListBySql(sql, ts);
+
+            if (list.Count == 0) return null;
+            else
+            {
+                return list[0];
+            }
+        }
+
+        public static List<BD_SERVICE_TYPE> ToListBySql(string sql)
+        {
+            return ToListBySql(sql, null);
+        }
+
+        public static List<BD_SERVICE_TYPE> ToListBySql(string sql, object ts)
+        {
+            return new EntityBuilder<BD_SERVICE_TYPE>().ToListBySql(sql, ts);
+        }
+
+        public static List<BD_SERVICE_TYPE> ToList(DataTable data)
+        {
+            return new EntityBuilder<BD_SERVICE_TYPE>().ToList(data);
+        }
+
+
+        #endregion
+
+        public static TDAL<BD_SERVICE_TYPE, SERVICE_TYPE_FIELD> DAL
+        {
+            get
+            {
+                return new TDAL<BD_SERVICE_TYPE, SERVICE_TYPE_FIELD>();
+            }
+        }
+
+        public static SERVICE_TYPE_FIELD Fields
+        {
+            get { return SERVICE_TYPE_FIELD.Instance; }
+        }
+
+
+        public static EntityBuilder<BD_SERVICE_TYPE> EntityBuilder = new EntityBuilder<BD_SERVICE_TYPE>();
+    }
+
+    internal class SERVICE_TYPE_COLUMN : BaseColumn
+    {
+        public static SERVICE_TYPE_COLUMN Instance;
+
+        static SERVICE_TYPE_COLUMN()
+        {
+            Instance = new SERVICE_TYPE_COLUMN();
+        }
+
+        private SERVICE_TYPE_COLUMN()
+        {
+            base.ListColumn.Add(new ColumnInfo() { Name = "GUID", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "MEMORY_WORD", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "TYPE_NAME_CN", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "TYPE_NAME_EN", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "DEFAULT_RECEIVE", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_STANDARD_ID", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_PRICE", Type = "NUMBER" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_CURR_ID", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_MIN", Type = "NUMBER" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_MAX", Type = "NUMBER" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "DECIMAL_LENGTH", Type = "NUMBER" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_MANTISSA_TYPE_ID", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "DEFAULT_PAY", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "PAY_STANDARD_ID", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "PAY_PRICE", Type = "NUMBER" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "PAY_CURR_ID", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "PAY_MIN", Type = "NUMBER" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "PAY_MAX", Type = "NUMBER" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "PAY_DECIMAL_LENGTH", Type = "NUMBER" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "PAY_MANTISSA_TYPE_ID", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "REAMRK", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "CREATE_USER", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "CREATE_DATE", Type = "DATE" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "UPDATE_USER", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "UPDATE_DATE", Type = "DATE" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "CREATE_USER_NAME", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "UPDATE_USER_NAME", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "SERVICE_TYPE_ID", Type = "TEXT" });
+            base.ListColumn.Add(new ColumnInfo() { Name = "BIZ_FLAG", Type = "TEXT" });
+
+        }
+    }
+
+    public class SERVICE_TYPE_FIELD
+    {
+        private static SERVICE_TYPE_FIELD instance;
+
+        public static SERVICE_TYPE_FIELD Instance
+        {
+            get
+            {
+                if (instance == null)
+                {
+                    instance = new SERVICE_TYPE_FIELD();
+                }
+
+                return instance;
+            }
+        }
+
+        public readonly string GUID = "GUID";
+        public readonly string MEMORY_WORD = "MEMORY_WORD";
+        public readonly string TYPE_NAME_CN = "TYPE_NAME_CN";
+        public readonly string TYPE_NAME_EN = "TYPE_NAME_EN";
+        public readonly string DEFAULT_RECEIVE = "DEFAULT_RECEIVE";
+        public readonly string RECEIVE_STANDARD_ID = "RECEIVE_STANDARD_ID";
+        public readonly string RECEIVE_PRICE = "RECEIVE_PRICE";
+        public readonly string RECEIVE_CURR_ID = "RECEIVE_CURR_ID";
+        public readonly string RECEIVE_MIN = "RECEIVE_MIN";
+        public readonly string RECEIVE_MAX = "RECEIVE_MAX";
+        public readonly string DECIMAL_LENGTH = "DECIMAL_LENGTH";
+        public readonly string RECEIVE_MANTISSA_TYPE_ID = "RECEIVE_MANTISSA_TYPE_ID";
+        public readonly string DEFAULT_PAY = "DEFAULT_PAY";
+        public readonly string PAY_STANDARD_ID = "PAY_STANDARD_ID";
+        public readonly string PAY_PRICE = "PAY_PRICE";
+        public readonly string PAY_CURR_ID = "PAY_CURR_ID";
+        public readonly string PAY_MIN = "PAY_MIN";
+        public readonly string PAY_MAX = "PAY_MAX";
+        public readonly string PAY_DECIMAL_LENGTH = "PAY_DECIMAL_LENGTH";
+        public readonly string PAY_MANTISSA_TYPE_ID = "PAY_MANTISSA_TYPE_ID";
+        public readonly string REAMRK = "REAMRK";
+        public readonly string CREATE_USER = "CREATE_USER";
+        public readonly string CREATE_DATE = "CREATE_DATE";
+        public readonly string UPDATE_USER = "UPDATE_USER";
+        public readonly string UPDATE_DATE = "UPDATE_DATE";
+        public readonly string CREATE_USER_NAME = "CREATE_USER_NAME";
+        public readonly string UPDATE_USER_NAME = "UPDATE_USER_NAME";
+        public readonly string SERVICE_TYPE_ID = "SERVICE_TYPE_ID";
+        public readonly string BIZ_FLAG = "BIZ_FLAG";
+
+    }
+}

FMS/FMS.Entity/Entity/SERVICE_TYPE.cs

@@ -1,598 +0,0 @@
-#pragma warning disable  1591
-using PL.Base;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using PL.Server.Entity;
-using PL.Server.Entity.Entity;
- 
-namespace FMS.Entity
-{
-    public partial class SERVICE_TYPE : EntityBase
-	{
-	     public SERVICE_TYPE()
-		 {
-		    base.Table = new TableInfo { Name = "FMS_SERVICE_TYPE" };
-		    base.Columns = SERVICE_TYPE_COLUMN.Instance;
-			this.Init();
-		 }
-		
-		public SERVICE_TYPE(string keyField):this()
-        {
-            base.KeyField =  keyField;
-        }
-
-	public SERVICE_TYPE(string keyField,string keyValue):this()
-        {
-            base.KeyField =  keyField;
-            this[keyField]= keyValue;
-        }
-		
-		
-        public SERVICE_TYPE(EntityBase entityBase)
-            : this()
-        {
-            this.Data = entityBase.Data;
-        }
- 
-		#region DataMember
-		
-                                                     /// <summary>
-                    ///  主键
-                    /// </summary>
-                    public string GUID
-                    {
-                        get
-                        {
-                            return this.TextAccess["GUID"];
-                        }
-                        set
-                        {
-                            this.TextAccess["GUID"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  助记词
-                    /// </summary>
-                    public string MEMORY_WORD
-        {
-                        get
-                        {
-                            return this.TextAccess["MEMORY_WORD"];
-                        }
-                        set
-                        {
-                            this.TextAccess["MEMORY_WORD"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  中文名称
-                    /// </summary>
-                    public string TYPE_NAME_CN
-                    {
-                        get
-                        {
-                            return this.TextAccess["TYPE_NAME_CN"];
-                        }
-                        set
-                        {
-                            this.TextAccess["TYPE_NAME_CN"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  英文名称
-                    /// </summary>
-                    public string TYPE_NAME_EN
-                    {
-                        get
-                        {
-                            return this.TextAccess["TYPE_NAME_EN"];
-                        }
-                        set
-                        {
-                            this.TextAccess["TYPE_NAME_EN"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  默认应收
-                    /// </summary>
-                    public string DEFAULT_RECEIVE
-                    {
-                        get
-                        {
-                            return this.TextAccess["DEFAULT_RECEIVE"];
-                        }
-                        set
-                        {
-                            this.TextAccess["DEFAULT_RECEIVE"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  收费标准
-                    /// </summary>
-                    public string RECEIVE_STANDARD_ID
-                    {
-                        get
-                        {
-                            return this.TextAccess["RECEIVE_STANDARD_ID"];
-                        }
-                        set
-                        {
-                            this.TextAccess["RECEIVE_STANDARD_ID"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  收费单价
-                    /// </summary>
-                    public System.Nullable<double> RECEIVE_PRICE
-                    {
-                        get
-                        {
-                            return this.DoubleAccess["RECEIVE_PRICE"];
-                        }
-                        set
-                        {
-                            this.DoubleAccess["RECEIVE_PRICE"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  收费单价币制
-                    /// </summary>
-                    public string RECEIVE_CURR_ID
-                    {
-                        get
-                        {
-                            return this.TextAccess["RECEIVE_CURR_ID"];
-                        }
-                        set
-                        {
-                            this.TextAccess["RECEIVE_CURR_ID"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  应收最低收费
-                    /// </summary>
-                    public System.Nullable<double> RECEIVE_MIN
-                    {
-                        get
-                        {
-                            return this.DoubleAccess["RECEIVE_MIN"];
-                        }
-                        set
-                        {
-                            this.DoubleAccess["RECEIVE_MIN"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  应收最高收费
-                    /// </summary>
-                    public System.Nullable<double> RECEIVE_MAX
-                    {
-                        get
-                        {
-                            return this.DoubleAccess["RECEIVE_MAX"];
-                        }
-                        set
-                        {
-                            this.DoubleAccess["RECEIVE_MAX"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  应收小数长度
-                    /// </summary>
-                    public System.Nullable<double> DECIMAL_LENGTH
-                    {
-                        get
-                        {
-                            return this.DoubleAccess["DECIMAL_LENGTH"];
-                        }
-                        set
-                        {
-                            this.DoubleAccess["DECIMAL_LENGTH"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  应收尾数处理方式
-                    /// </summary>
-                    public string RECEIVE_MANTISSA_TYPE_ID
-                    {
-                        get
-                        {
-                            return this.TextAccess["RECEIVE_MANTISSA_TYPE_ID"];
-                        }
-                        set
-                        {
-                            this.TextAccess["RECEIVE_MANTISSA_TYPE_ID"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  默认应付
-                    /// </summary>
-                    public string DEFAULT_PAY
-                    {
-                        get
-                        {
-                            return this.TextAccess["DEFAULT_PAY"];
-                        }
-                        set
-                        {
-                            this.TextAccess["DEFAULT_PAY"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  付费标准
-                    /// </summary>
-                    public string PAY_STANDARD_ID
-                    {
-                        get
-                        {
-                            return this.TextAccess["PAY_STANDARD_ID"];
-                        }
-                        set
-                        {
-                            this.TextAccess["PAY_STANDARD_ID"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  付费单价
-                    /// </summary>
-                    public System.Nullable<double> PAY_PRICE
-                    {
-                        get
-                        {
-                            return this.DoubleAccess["PAY_PRICE"];
-                        }
-                        set
-                        {
-                            this.DoubleAccess["PAY_PRICE"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  收费单价币制
-                    /// </summary>
-                    public string PAY_CURR_ID
-                    {
-                        get
-                        {
-                            return this.TextAccess["PAY_CURR_ID"];
-                        }
-                        set
-                        {
-                            this.TextAccess["PAY_CURR_ID"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  应付最低收费
-                    /// </summary>
-                    public System.Nullable<double> PAY_MIN
-                    {
-                        get
-                        {
-                            return this.DoubleAccess["PAY_MIN"];
-                        }
-                        set
-                        {
-                            this.DoubleAccess["PAY_MIN"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  应付最高收费
-                    /// </summary>
-                    public System.Nullable<double> PAY_MAX
-                    {
-                        get
-                        {
-                            return this.DoubleAccess["PAY_MAX"];
-                        }
-                        set
-                        {
-                            this.DoubleAccess["PAY_MAX"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  应付小数长度
-                    /// </summary>
-                    public System.Nullable<double> PAY_DECIMAL_LENGTH
-                    {
-                        get
-                        {
-                            return this.DoubleAccess["PAY_DECIMAL_LENGTH"];
-                        }
-                        set
-                        {
-                            this.DoubleAccess["PAY_DECIMAL_LENGTH"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  应付尾数处理方式
-                    /// </summary>
-                    public string PAY_MANTISSA_TYPE_ID
-                    {
-                        get
-                        {
-                            return this.TextAccess["PAY_MANTISSA_TYPE_ID"];
-                        }
-                        set
-                        {
-                            this.TextAccess["PAY_MANTISSA_TYPE_ID"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  备注
-                    /// </summary>
-                    public string REAMRK
-                    {
-                        get
-                        {
-                            return this.TextAccess["REAMRK"];
-                        }
-                        set
-                        {
-                            this.TextAccess["REAMRK"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  创建人
-                    /// </summary>
-                    public string CREATE_USER
-                    {
-                        get
-                        {
-                            return this.TextAccess["CREATE_USER"];
-                        }
-                        set
-                        {
-                            this.TextAccess["CREATE_USER"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  创建日期
-                    /// </summary>
-                    public System.Nullable<DateTime> CREATE_DATE
-                    {
-                        get
-                        {
-                            return this.DateAccess["CREATE_DATE"];
-                        }
-                        set
-                        {
-                            this.DateAccess["CREATE_DATE"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  修改人
-                    /// </summary>
-                    public string UPDATE_USER
-                    {
-                        get
-                        {
-                            return this.TextAccess["UPDATE_USER"];
-                        }
-                        set
-                        {
-                            this.TextAccess["UPDATE_USER"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  修改日期
-                    /// </summary>
-                    public System.Nullable<DateTime> UPDATE_DATE
-                    {
-                        get
-                        {
-                            return this.DateAccess["UPDATE_DATE"];
-                        }
-                        set
-                        {
-                            this.DateAccess["UPDATE_DATE"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  
-                    /// </summary>
-                    public string CREATE_USER_NAME
-                    {
-                        get
-                        {
-                            return this.TextAccess["CREATE_USER_NAME"];
-                        }
-                        set
-                        {
-                            this.TextAccess["CREATE_USER_NAME"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  
-                    /// </summary>
-                    public string UPDATE_USER_NAME
-                    {
-                        get
-                        {
-                            return this.TextAccess["UPDATE_USER_NAME"];
-                        }
-                        set
-                        {
-                            this.TextAccess["UPDATE_USER_NAME"] = value;
-                        }
-                    }
-                    /// <summary>
-                    ///  服务类别
-                    /// </summary>
-                    public string SERVICE_TYPE_ID
-        {
-                        get
-                        {
-                            return this.TextAccess["SERVICE_TYPE_ID"];
-                        }
-                        set
-                        {
-                            this.TextAccess["SERVICE_TYPE_ID"] = value;
-                        }
-                    }
-
-
-		#endregion
-	 
-	    #region Query Method
-        public SERVICE_TYPE SingleOrDefault()
-        {
-           return new EntityBuilder<SERVICE_TYPE>().ToEntityBySql(this.SQLSelect);
-        }
-
-        public SERVICE_TYPE SingleOrDefault(object ts)
-        {
-            return new EntityBuilder<SERVICE_TYPE>().ToEntityBySql(this.SQLSelect, ts);
-        }
-
-        public List<SERVICE_TYPE> ToList()
-        {
-             return new EntityBuilder<SERVICE_TYPE>().ToListBySql(this.SQLSelect);
-        }
-		 
-        public List<SERVICE_TYPE> ToList(object ts)
-        {
-            return new EntityBuilder<SERVICE_TYPE>().ToListBySql(this.SQLSelect, ts);
-        }
-		
-		public static SERVICE_TYPE SingleOrDefault(string sql)
-        {
-            return SingleOrDefault(sql, null);
-        }
-
-        public static SERVICE_TYPE SingleOrDefault(string sql,object ts)
-        {
-            List<SERVICE_TYPE> list = ToListBySql(sql, ts);
-
-            if (list.Count == 0) return null;
-            else
-            {
-                return list[0];
-            }
-        }
-		
-		public static  List<SERVICE_TYPE> ToListBySql(string sql)
-        {
-            return ToListBySql(sql, null);
-        }
-
-        public static List<SERVICE_TYPE> ToListBySql(string sql, object ts)
-        {
-            return new EntityBuilder<SERVICE_TYPE>().ToListBySql(sql, ts);
-        }
-		
-		public static List<SERVICE_TYPE> ToList(DataTable data)
-        {
-            return new EntityBuilder<SERVICE_TYPE>().ToList(data);
-        }
-		
-		
-		#endregion
-		
-	    public static TDAL<SERVICE_TYPE, SERVICE_TYPE_FIELD> DAL
-        {
-            get
-            {
-                return new TDAL<SERVICE_TYPE, SERVICE_TYPE_FIELD>();
-            }
-        }
-		
-	    public static SERVICE_TYPE_FIELD Fields
-        {
-            get { return SERVICE_TYPE_FIELD.Instance; }
-        }
-		
-	
-		public static EntityBuilder<SERVICE_TYPE> EntityBuilder = new EntityBuilder<SERVICE_TYPE>();
-    }
-
-	internal class SERVICE_TYPE_COLUMN : BaseColumn
-    {
-        public static SERVICE_TYPE_COLUMN Instance;
-
-        static SERVICE_TYPE_COLUMN()
-        {
-            Instance = new SERVICE_TYPE_COLUMN();
-        }
-
-        private SERVICE_TYPE_COLUMN()
-        {
-               base.ListColumn.Add(new ColumnInfo() { Name = "GUID", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "MEMORY_WORD", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "TYPE_NAME_CN", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "TYPE_NAME_EN", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "DEFAULT_RECEIVE", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_STANDARD_ID", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_PRICE", Type = "NUMBER"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_CURR_ID", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_MIN", Type = "NUMBER"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_MAX", Type = "NUMBER"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "DECIMAL_LENGTH", Type = "NUMBER"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "RECEIVE_MANTISSA_TYPE_ID", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "DEFAULT_PAY", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "PAY_STANDARD_ID", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "PAY_PRICE", Type = "NUMBER"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "PAY_CURR_ID", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "PAY_MIN", Type = "NUMBER"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "PAY_MAX", Type = "NUMBER"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "PAY_DECIMAL_LENGTH", Type = "NUMBER"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "PAY_MANTISSA_TYPE_ID", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "REAMRK", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "CREATE_USER", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "CREATE_DATE", Type = "DATE"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "UPDATE_USER", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "UPDATE_DATE", Type = "DATE"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "CREATE_USER_NAME", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "UPDATE_USER_NAME", Type = "TEXT"});
-               base.ListColumn.Add(new ColumnInfo() { Name = "SERVICE_TYPE_ID", Type = "TEXT"});
-
-        }
-    }
-	
-  public class  SERVICE_TYPE_FIELD
-  {
-       private static SERVICE_TYPE_FIELD instance;
-
-        public static SERVICE_TYPE_FIELD Instance
-        {
-            get
-            {
-                if (instance == null)
-                {
-                    instance = new SERVICE_TYPE_FIELD();
-                }
-
-                return instance;
-            }
-        }
-		
-                    public readonly string GUID = "GUID";
-        public readonly string MEMORY_WORD = "MEMORY_WORD";
-        public readonly string TYPE_NAME_CN = "TYPE_NAME_CN";
-        public readonly string TYPE_NAME_EN = "TYPE_NAME_EN";
-        public readonly string DEFAULT_RECEIVE = "DEFAULT_RECEIVE";
-        public readonly string RECEIVE_STANDARD_ID = "RECEIVE_STANDARD_ID";
-        public readonly string RECEIVE_PRICE = "RECEIVE_PRICE";
-        public readonly string RECEIVE_CURR_ID = "RECEIVE_CURR_ID";
-        public readonly string RECEIVE_MIN = "RECEIVE_MIN";
-        public readonly string RECEIVE_MAX = "RECEIVE_MAX";
-        public readonly string DECIMAL_LENGTH = "DECIMAL_LENGTH";
-        public readonly string RECEIVE_MANTISSA_TYPE_ID = "RECEIVE_MANTISSA_TYPE_ID";
-        public readonly string DEFAULT_PAY = "DEFAULT_PAY";
-        public readonly string PAY_STANDARD_ID = "PAY_STANDARD_ID";
-        public readonly string PAY_PRICE = "PAY_PRICE";
-        public readonly string PAY_CURR_ID = "PAY_CURR_ID";
-        public readonly string PAY_MIN = "PAY_MIN";
-        public readonly string PAY_MAX = "PAY_MAX";
-        public readonly string PAY_DECIMAL_LENGTH = "PAY_DECIMAL_LENGTH";
-        public readonly string PAY_MANTISSA_TYPE_ID = "PAY_MANTISSA_TYPE_ID";
-        public readonly string REAMRK = "REAMRK";
-        public readonly string CREATE_USER = "CREATE_USER";
-        public readonly string CREATE_DATE = "CREATE_DATE";
-        public readonly string UPDATE_USER = "UPDATE_USER";
-        public readonly string UPDATE_DATE = "UPDATE_DATE";
-        public readonly string CREATE_USER_NAME = "CREATE_USER_NAME";
-        public readonly string UPDATE_USER_NAME = "UPDATE_USER_NAME";
-        public readonly string SERVICE_TYPE_ID = "SERVICE_TYPE_ID";
-
-   }
-}

FMS/FMS.SO/3.FMS.SO.csproj

@@ -72,10 +72,10 @@
     <Compile Include="BdExtendType\BdExtendTypeSave.cs" />
     <Compile Include="BdExtendType\BdExtendTypeSearch.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ServiceType\ServiceTypeDelete.cs" />
-    <Compile Include="ServiceType\ServiceTypeLoad.cs" />
-    <Compile Include="ServiceType\ServiceTypeSave.cs" />
-    <Compile Include="ServiceType\ServiceTypeSearch.cs" />
+    <Compile Include="BdExchange\ServiceTypeDelete.cs" />
+    <Compile Include="BdExchange\ServiceTypeLoad.cs" />
+    <Compile Include="BdExchange\ServiceTypeSave.cs" />
+    <Compile Include="BdExchange\ServiceTypeSearch.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FMS.BLL\4.FMS.BLL.csproj">

FMS/FMS.VAL/ServiceTypeVAL.cs

@@ -28,7 +28,7 @@ namespace FMS.VAL
         /// <param name="context"></param>
         /// <param name="eciDataGroup"></param>
         /// <param name="isAdd"></param>
-        public void SaveValidate(BLLContext context,SERVICE_TYPE serviceType, bool isAdd)
+        public void SaveValidate(BLLContext context,BD_SERVICE_TYPE serviceType, bool isAdd)
         {
              
         }

FMS/Web/AppFms/ServiceType/frmServiceTypeEdit.aspx.cs → FMS/Web/AppFms/Bd/frmServiceTypeEdit.aspx.cs

@@ -45,7 +45,7 @@ public partial class AppFms_ServiceType_frmServiceTypeEdit : BasePage
 
             EciResponse response = SOA.Execute(request);
 
-            SERVICE_TYPE data = response.DataTable.ToEntity<SERVICE_TYPE>();
+            BD_SERVICE_TYPE data = response.DataTable.ToEntity<BD_SERVICE_TYPE>();
 
             this.Bind(data);
     }
@@ -56,7 +56,7 @@ public partial class AppFms_ServiceType_frmServiceTypeEdit : BasePage
 
         request.IsAdd = this.key.NullOrEmpty();
 
-        SERVICE_TYPE saveEntity = new SERVICE_TYPE();
+        BD_SERVICE_TYPE saveEntity = new BD_SERVICE_TYPE();
 
         request.Entity = saveEntity;
 
@@ -66,7 +66,7 @@ public partial class AppFms_ServiceType_frmServiceTypeEdit : BasePage
 
         EciResponse response = SOA.Execute(request);
 
-        SERVICE_TYPE data = response.Entity.Upgrade<SERVICE_TYPE>();
+        BD_SERVICE_TYPE data = response.Entity.Upgrade<BD_SERVICE_TYPE>();
 
         if (request.IsAdd)
         {

FMS/Web/AppFms/ServiceType/frmServiceTypeList.aspx.cs → FMS/Web/AppFms/Bd/frmServiceTypeList.aspx.cs

@@ -31,12 +31,12 @@ public partial class AppFms_ServiceType_frmServiceTypeList : QueryPage
         request.Entity.GetBindingData();
     }
 
-    protected void btnDelete_Click(object sender, EventArgs e)
+    protected void btnAdd_Click(object sender, EventArgs e)
     {
            Button btn = sender as Button;
            string key = btn.CommandArgument;
 
-            EciRequest request = new EciRequest(FMSService.ServiceTypeDelete);
+            EciRequest request = new EciRequest(FMSService.ServiceTypeSave);
 
             request.ListKey = new List<string>() { key };
 
@@ -46,4 +46,19 @@ public partial class AppFms_ServiceType_frmServiceTypeList : QueryPage
 
             this.Search();
     }
+    protected void btnDelete_Click(object sender, EventArgs e)
+    {
+        Button btn = sender as Button;
+        string key = btn.CommandArgument;
+
+        EciRequest request = new EciRequest(FMSService.ServiceTypeDelete);
+
+        request.ListKey = new List<string>() { key };
+
+        SOA.Execute(request);
+
+        EAlert.Tip("删除执行成功");
+
+        this.Search();
+    }
 }