From 434cf0b09212f6bd7346018f6a681c2981252ed7 Mon Sep 17 00:00:00 2001
From: TML <1448969505@qq.com>
Date: Thu, 28 Jan 2021 08:53:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SCP/Views/BasicData/SCP_LANGUAGE_1.aspx       |  48 ++++-----
 SCP/Views/BasicData/SCP_LANGUAGE_1.aspx.cs    |   5 +-
 SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx  |  39 ++-----
 .../BasicData/SCP_LANGUAGE_DETAIL.aspx.cs     | 101 +++++++++++++-----
 .../SCP_LANGUAGE_DETAIL.aspx.designer.cs      |   4 +-
 5 files changed, 103 insertions(+), 94 deletions(-)

diff --git a/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx b/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx
index bd6b1c2..facf185 100644
--- a/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx
+++ b/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx
@@ -26,30 +26,21 @@
                                </f:Button>
                                  <f:Button ID="Update" runat="server" Text="修改" Icon="BasketEdit" OnClick="Button4_Click"  >
                                </f:Button>                            
-                                     <f:TextBox runat = "server" Label = "" EmptyText = "请输入中文" ID = "TextCH"  LabelWidth="50px" />
+                                     <f:TextBox runat = "server" Label = "中文" EmptyText = "请输入中文" ID = "TextCH"  LabelWidth="50px" />
                                     <f:Button ID="btnSearch" runat="server" OnClick="btnSearch_Click" Text="快速查找" Icon="Find">
                                 </f:Button>
-                                <f:ToolbarSeparator runat="server" />
-                           
+                                <f:ToolbarSeparator runat="server" />                          
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
                 </f:Form>
-                
-                    <f:Grid ID = "Grid_TA_LANGUAGE" 
-                 EnableCollapse = "true" 
-                 ShowBorder = "true" 
-                 ShowHeader = "true"                         
-                 runat ="server" 
-                  BoxFlex="1"  
-                  EnableTextSelection="true"
-                 DataKeyNames = "UID,GUID,CH,EN,RU,DE,FR,EL,AR,JP,IsDeleted" 
-                 PageSize="100"
-                 IsDatabasePaging="true" AllowPaging="true"
-                 AutoScroll="True"  SortDirection="ASC"
-                SortField="UID"
-                 OnPageIndexChange="Grid_TA_LANGUAGE_PageIndexChange"  
-                 >
+                      <f:Grid ID = "Grid_TA_LANGUAGE"  ShowBorder = "true" ShowHeader = "true"  runat ="server"   EnableTextSelection="true"
+               DataKeyNames = "UID,GUID,CH,EN,RU,DE,FR,EL,AR,JP,IsDeleted" 
+                    AllowSorting="true"  BoxFlex="1"
+                    PageSize="100"          
+                     EnableRowDoubleClickEvent="True"  SortField="UID"
+                     IsDatabasePaging="True" AllowPaging="True" 
+                    AutoScroll="True"   SortDirection="ASC" OnPageIndexChange="Grid_TA_LANGUAGE_PageIndexChange"   >                  
                  <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator3" runat="server">
                         </f:ToolbarSeparator>
@@ -62,14 +53,15 @@
                         </f:DropDownList>
                 </PageItems>          
              <Columns >
-                    <f:BoundField Width = "100px" DataField = "UID" DataFormatString = "{0}" HeaderText = ""  Hidden="true"/> 
-                    <f:BoundField Width = "80px" DataField = "CH" DataFormatString = "{0}" HeaderText = "中文"/>  
-                    <f:BoundField Width = "80px" DataField = "EN" DataFormatString = "{0}" HeaderText = "英文"/>    
-                      <f:BoundField Width = "100px" DataField = "RU" DataFormatString = "{0}" HeaderText ="俄文" /> 
-                    <f:BoundField Width = "100px" DataField = "DE" DataFormatString = "{0}" HeaderText = "德文" />
-                     <f:BoundField Width = "100px" DataField = "FP" DataFormatString = "{0}" HeaderText ="法文" /> 
-                    <f:BoundField Width = "100px" DataField = "AR" DataFormatString = "{0}" HeaderText ="阿拉伯" /> 
-                    <f:BoundField Width = "100px" DataField = "JP" DataFormatString = "{0}" HeaderText ="日文" />    
+                    <f:BoundField runat="server" Width = "250px" DataField = "UID" DataFormatString = "{0}" HeaderText = ""  Hidden="true"/> 
+                   <f:BoundField runat="server" Width = "250px" DataField = "GUID" DataFormatString = "{0}" HeaderText = ""  Hidden="true"/> 
+                    <f:BoundField  runat="server" Width = "250px" DataField = "CH" DataFormatString = "{0}" HeaderText = "中文" />  
+                    <f:BoundField  runat="server" Width = "350px" DataField = "EN" DataFormatString = "{0}" HeaderText = "英文"/>    
+                      <f:BoundField  runat="server" Width = "80px" DataField = "RU" DataFormatString = "{0}" HeaderText ="俄文" /> 
+                    <f:BoundField  runat="server" Width = "80px" DataField = "DE" DataFormatString = "{0}" HeaderText = "德文" />
+                     <f:BoundField  runat="server" Width = "80px" DataField = "FP" DataFormatString = "{0}" HeaderText ="法文" /> 
+                    <f:BoundField  runat="server" Width = "80px" DataField = "AR" DataFormatString = "{0}" HeaderText ="阿拉伯" /> 
+                    <f:BoundField  runat="server" Width = "80px" DataField = "JP" DataFormatString = "{0}" HeaderText ="日文" />    
               
                  
                     </Columns>
@@ -78,8 +70,8 @@
         </f:Panel>
            <f:HiddenField ID="highlightRows" runat="server">
         </f:HiddenField>
-        <f:Window runat="server" ID="Window1" Hidden="True"  AutoScroll="True" Width="1024px" Height="600px"  CloseAction="HidePostBack"
-            WindowPosition="Center" IsModal="true" Title="" Target="Parent" EnableIFrame="true" 
+        <f:Window runat="server" ID="Window1"  Hidden="True"   AutoScroll="false" Width="800px" Height="350px"  CloseAction="HidePostBack"
+            WindowPosition="Center" IsModal="true" Title="多语言明细" Target="Parent" EnableIFrame="true" 
             IFrameUrl="about:blank" />
     </form>    
 </body>
diff --git a/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx.cs b/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx.cs
index 9cf25b5..a58aa7a 100644
--- a/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx.cs
+++ b/SCP/Views/BasicData/SCP_LANGUAGE_1.aspx.cs
@@ -87,9 +87,10 @@ namespace SCP.Views.BasicData
         }
         protected void Button4_Click(object sender, EventArgs e)
         {
+            string GUID = GetSelectedDataKey(Grid_TA_LANGUAGE, 1);
             string CH = GetSelectedDataKey(Grid_TA_LANGUAGE, 2);
-            string EN = GetSelectedDataKey(Grid_TA_LANGUAGE, 3);
-            string url = String.Format("../BasicData/SCP_LANGUAGE_DETAIL.aspx?CH={0}&&EN={1}", CH, EN);
+            string EN = GetSelectedDataKey(Grid_TA_LANGUAGE, 3);        
+            string url = String.Format("../BasicData/SCP_LANGUAGE_DETAIL.aspx?CH={0}&&EN={1}&&GUID={2}", CH, EN,GUID);
             PageContext.RegisterStartupScript(Window1.GetShowReference(url));
         }
         protected void btnShow_Click1(object sender, EventArgs e)
diff --git a/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx b/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx
index 623ad1a..96d0335 100644
--- a/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx
+++ b/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx
@@ -8,9 +8,9 @@
     <title></title>
 </head>
 <body>
-      <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" CssClass="blockpanel" Margin="0px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+      <form id="form1" runat="server" >
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server"/>
+        <f:Panel ID="Panel1" CssClass="blockpanel"  runat="server" ShowBorder="true" ShowHeader="true" Layout="Region">
            
             <Toolbars>
                 <f:Toolbar ID="Toolbar2" runat="server">
@@ -22,9 +22,10 @@
                 </f:Toolbar>
             </Toolbars>
             <Items>
-                  <f:Form runat="server" Title="" ID="F_PO_DETAIL" >
+                  <f:Form runat="server" Width="550px" BodyPadding="25 25 30 25">
                       <Items>
-                    <f:TextBox runat = "server" Label = "中文" EmptyText = "" ID = "TXT_CH"     />
+                     <f:TextBox runat = "server" Label = "编码" EmptyText = "" ID = "TXT_GUID"  Hidden="true"/>
+                    <f:TextBox runat = "server" Label = "中文" EmptyText = "" ID = "TXT_CH"  />
                     <f:TextBox runat = "server" Label = "英文" EmptyText = "" ID = "TXT_EN"   />
                     <f:TextBox runat = "server" Label = "俄文" EmptyText = "" ID = "TXT_RU"   />
                     <f:TextBox runat = "server" Label = "德文" EmptyText = "" ID = "TXT_DE"   />
@@ -40,31 +41,3 @@
 </body>
 </html>
 
- <%--  <form id="form1" runat="server">
-     <f:PageManager runat="server" AutoSizePanelID="Panel1" />
-       <f:Form ID="Panel1" Title="" runat="server" Width="600px" Height="400px"
-            LabelAlign="Right" LabelWidth="80px"
-            BodyPadding="5" ShowBorder="true" ShowHeader="true" Layout="VBox">
-                    <Items>
-                   
-                    <f:TextBox runat = "server" Label = "键值" EmptyText = "" ID = "TXT_GUID"   />
-                    <f:TextBox runat = "server" Label = "中文" EmptyText = "" ID = "TXT_CH"     />
-                    <f:TextBox runat = "server" Label = "英文" EmptyText = "" ID = "TXT_EN"   />
-                    <f:TextBox runat = "server" Label = "俄文" EmptyText = "" ID = "TXT_RU"   />
-                    <f:TextBox runat = "server" Label = "德文" EmptyText = "" ID = "TXT_DE"   />
-                    <f:TextBox runat = "server" Label = "法文" EmptyText = "" ID = "TXT_FR"   />
-                    <f:TextBox runat = "server" Label = "阿拉伯" EmptyText = "" ID = "TXT_AR"   />
-                    <f:TextBox runat = "server" Label = "日文" EmptyText = "" ID = "TXT_JP"   />   
-                       <f:Button ID="Btn_Save" runat="server" EnablePostBack="True" Text="保存" Icon="SystemSave" OnClick="Btn_Save_Click"  Width="200px">
-                        </f:Button>     
-</Items>
-               </f:Form>
-    </form>
-</body>
-</html>
-     
-    </form>
-</body>
-</html>--%>
-
-    
\ No newline at end of file
diff --git a/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx.cs b/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx.cs
index 3be7eda..4e51e60 100644
--- a/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx.cs
+++ b/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx.cs
@@ -42,46 +42,89 @@ namespace SCP.Views.BasicData
                 TA_LANGUAGE _entity = new TA_LANGUAGE();
                 _entity.CH = Request["CH"];
                 _entity.EN = Request["EN"];
-                
+                _entity.GUID = Request["GUID"];
                 TXT_CH.Text = _entity.CH;
                 TXT_EN.Text = _entity.EN;
-                var ret = SCP_TA_LANGUAGE_CONTROLLER.Get_TA_LANGUAGE_List(_entity);
+                TXT_GUID.Text = _entity.GUID;
+            }
             }
-        }
-          
-            protected void Btn_Save_Click(object sender, EventArgs e)
-        {
-            TA_LANGUAGE _entity = new TA_LANGUAGE();
-             _entity.GUID = Guid.NewGuid().ToString("N").ToUpper();
-            _entity.CH = TXT_CH.Text;
-            _entity.EN = TXT_EN.Text;
-            _entity.RU = TXT_RU.Text;
-            _entity.DE = TXT_DE.Text;
-            _entity.FR = TXT_FR.Text;
-            _entity.AR = TXT_AR.Text;
-            _entity.JP = TXT_JP.Text;           
-            var ret = SCP_TA_LANGUAGE_CONTROLLER.Get_TA_LANGUAGE_List(new TA_LANGUAGE { CH = TXT_CH.Text, EN = TXT_EN.Text });
-            if (ret.State == ReturnStatus.Succeed)
-            {
 
-                if (ret.Result.Count > 0)
-                {
-                    Alert.ShowInTop("中文名称重复！");
-                    return;
-                }
-                else
+        protected void Btn_Save_Click(object sender, EventArgs e)
+        {
+       
+                if (!string.IsNullOrEmpty(Request["CH"]))
                 {
-                    var ret1 = SCP_TA_LANGUAGE_CONTROLLER.Save_TA_LANGUAGE(new List<TA_LANGUAGE>() { _entity });
-                    if (ret1.State == ReturnStatus.Succeed)
+                    TA_LANGUAGE _entity = new TA_LANGUAGE();                 
+                    _entity.GUID = Request["GUID"];
+                    _entity.CH = TXT_CH.Text;
+                    _entity.EN = TXT_EN.Text;
+                    _entity.RU = TXT_RU.Text;
+                    _entity.DE = TXT_DE.Text;
+                    _entity.FR = TXT_FR.Text;
+                    _entity.AR = TXT_AR.Text;
+                    _entity.JP = TXT_JP.Text;
+                    TXT_GUID.Text = _entity.GUID;
+                    var ret = SCP_TA_LANGUAGE_CONTROLLER.Get_TA_LANGUAGE_List(new TA_LANGUAGE {  CH = TXT_CH.Text  });
+                    if (ret.State == ReturnStatus.Succeed)
                     {
-                        Alert.Show("保存成功");
+                        if (String.IsNullOrEmpty(TXT_CH.Text))
+                        {
+                            Alert.ShowInTop("中文名不能为空！");
+                            return;
                         }
+                    if (ret.Result.Count > 0)
+                    {
+                        Alert.ShowInTop("中文名称重复！");
+                        return;
                     }
+                    else
+                        {
+                            var ret1 = SCP_TA_LANGUAGE_CONTROLLER.Save_TA_LANGUAGE(new List<TA_LANGUAGE>() { _entity });
+                            if (ret1.State == ReturnStatus.Succeed)
+                            {
+                                Alert.Show("保存成功");
+                            }
+                        }
 
+                    }
                 }
+                else
+                {
+                    TA_LANGUAGE _entity = new TA_LANGUAGE();
+                    _entity.GUID = Guid.NewGuid().ToString("N").ToUpper();
+                    _entity.CH = TXT_CH.Text;
+                    _entity.EN = TXT_EN.Text;
+                    _entity.RU = TXT_RU.Text;
+                    _entity.DE = TXT_DE.Text;
+                    _entity.FR = TXT_FR.Text;
+                    _entity.AR = TXT_AR.Text;
+                    _entity.JP = TXT_JP.Text;
 
-            }
+                    var ret = SCP_TA_LANGUAGE_CONTROLLER.Get_TA_LANGUAGE_List(new TA_LANGUAGE { CH = TXT_CH.Text });
+                    if (ret.State == ReturnStatus.Succeed)
+                    {
+                        if (String.IsNullOrEmpty(_entity.CH))
+                        {
+                            Alert.ShowInTop("中文名不能为空！");
+                            return;
+                        }
+                        if (ret.Result.Count > 0)
+                        {
+                            Alert.ShowInTop("中文名称重复！");
+                            return;
+                        }
+                        else
+                        {
+                            var ret1 = SCP_TA_LANGUAGE_CONTROLLER.Save_TA_LANGUAGE(new List<TA_LANGUAGE>() { _entity });
+                            if (ret1.State == ReturnStatus.Succeed)
+                            {
+                                Alert.Show("保存成功");
+                            }
+                        }
 
+                    }
 
-        }
+                }             
+    }
     }
+}
diff --git a/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx.designer.cs b/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx.designer.cs
index 3fd3276..2e90367 100644
--- a/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx.designer.cs
+++ b/SCP/Views/BasicData/SCP_LANGUAGE_DETAIL.aspx.designer.cs
@@ -60,13 +60,13 @@ namespace SCP.Views.BasicData
         protected global::FineUI.Button Btn_Save;
 
         /// <summary>
-        /// F_PO_DETAIL 控件。
+        /// TXT_GUID 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.Form F_PO_DETAIL;
+        protected global::FineUI.TextBox TXT_GUID;
 
         /// <summary>
         /// TXT_CH 控件。

From 1c438ad1ec745aff51daab6c0bd92c010b804e5e Mon Sep 17 00:00:00 2001
From: TML <1448969505@qq.com>
Date: Thu, 28 Jan 2021 14:57:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=EF=BC=88?=
 =?UTF-8?q?=E8=80=81=E7=89=88=E6=9C=AC=EF=BC=89=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SCP/SCP.csproj                                |   8 -
 SCP/Views/BasicData/SCP_LANGUAGE.aspx         | 112 ---------
 SCP/Views/BasicData/SCP_LANGUAGE.aspx.cs      | 210 -----------------
 .../BasicData/SCP_LANGUAGE.aspx.designer.cs   | 222 ------------------
 4 files changed, 552 deletions(-)
 delete mode 100644 SCP/Views/BasicData/SCP_LANGUAGE.aspx
 delete mode 100644 SCP/Views/BasicData/SCP_LANGUAGE.aspx.cs
 delete mode 100644 SCP/Views/BasicData/SCP_LANGUAGE.aspx.designer.cs

diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj
index a07d889..cc3b35c 100644
--- a/SCP/SCP.csproj
+++ b/SCP/SCP.csproj
@@ -254,7 +254,6 @@
     <Content Include="Views\BasicData\PublicDataEdit.aspx" />
     <Content Include="Views\BasicData\SCP_FACTORY.aspx" />
     <Content Include="Views\BasicData\SCP_FACTORY_EDIT.aspx" />
-    <Content Include="Views\BasicData\SCP_LANGUAGE.aspx" />
     <Content Include="Views\BasicData\SCP_LANGUAGE_1.aspx" />
     <Content Include="Views\BasicData\SCP_LANGUAGE_DETAIL.aspx" />
     <Content Include="Views\BasicData\SCP_MoldSharing.aspx" />
@@ -5003,13 +5002,6 @@
     <Compile Include="Views\BasicData\SCP_FACTORY_EDIT.aspx.designer.cs">
       <DependentUpon>SCP_FACTORY_EDIT.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Views\BasicData\SCP_LANGUAGE.aspx.cs">
-      <DependentUpon>SCP_LANGUAGE.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Views\BasicData\SCP_LANGUAGE.aspx.designer.cs">
-      <DependentUpon>SCP_LANGUAGE.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Views\BasicData\SCP_LANGUAGE_1.aspx.cs">
       <DependentUpon>SCP_LANGUAGE_1.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SCP/Views/BasicData/SCP_LANGUAGE.aspx b/SCP/Views/BasicData/SCP_LANGUAGE.aspx
deleted file mode 100644
index 141f7dd..0000000
--- a/SCP/Views/BasicData/SCP_LANGUAGE.aspx
+++ /dev/null
@@ -1,112 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_LANGUAGE.aspx.cs" Inherits="SCP.BasicData.SCP_LANGUAGE" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        <f:Panel ID="Panel1" CssClass="blockpanel" Margin="0px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
-            <Items>
-                <f:Panel runat="server" ID="panelTopRegion" RegionPosition="Top" RegionSplit="true" EnableCollapse="true" 
-                    Title="顶部面板" ShowBorder="true" ShowHeader="false" BodyPadding="0"  >
-                    <Items>    
-                     <f:Form runat="server">
-                       <Toolbars>
-                        <f:Toolbar ID="Toolbar2" runat="server">
-                            <Items>
-                                <f:Button ID="Btn_Add" runat="server" EnablePostBack="True" Text="新建" Icon="Add" OnClick="Btn_Add_Click">
-                                </f:Button>
-                                <f:Button ID="Btn_Save" runat="server" EnablePostBack="True" Text="保存" Icon="SystemSave" OnClick="Btn_Save_Click">
-                                </f:Button>
-                                <f:Button ID="Btn_Delete" runat="server" Text="删除" Icon="Delete" OnClick="Btn_Delete_Click">
-                                </f:Button>       
-                            </Items>
-                        </f:Toolbar>
-                    </Toolbars>
-
-                    </f:Form>
-                                
-                    </Items> 
-                </f:Panel>
-                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true"
-                        Title="左侧面板（有提示信息）"  ShowBorder="true" ShowHeader="false" Width="300px"
-                    BodyPadding="10px" >
-                    <Items>
-                   
-                    <f:TextBox runat = "server" Label = "键值" EmptyText = "" ID = "TXT_GUID"   />
-                    <f:TextBox runat = "server" Label = "中文" EmptyText = "" ID = "TXT_CH"     />
-                    <f:TextBox runat = "server" Label = "英文" EmptyText = "" ID = "TXT_EN"   />
-                    <f:TextBox runat = "server" Label = "俄文" EmptyText = "" ID = "TXT_RU"   />
-                    <f:TextBox runat = "server" Label = "德文" EmptyText = "" ID = "TXT_DE"   />
-                    <f:TextBox runat = "server" Label = "法文" EmptyText = "" ID = "TXT_FR"   />
-                  
-                    <f:TextBox runat = "server" Label = "阿拉伯" EmptyText = "" ID = "TXT_AR"   />
-                    <f:TextBox runat = "server" Label = "日文" EmptyText = "" ID = "TXT_JP"   />
-                     <f:CheckBox Hidden="true" ID = "CB_IsDeleted" ShowLabel = "false" runat = "server" Text ="" Checked = "FALSE"  />
-                     <f:Button Text="查找名称" runat="server" id="BtnSearch" OnClick="BtnSearch_Click"></f:Button>
-
-                     <%--<f:NumberBox  Hidden="true" Label="" ID="NB_State" runat="server"  NoDecimal="true" NoNegative="True" Required="True" EmptyText="" ShowRedStar="True" />
-                  
-                     <f:DatePicker Hidden="true" runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="" EmptyText="请选择日期" ID="DP_CreateTime" />
-                     <f:TextBox Hidden="true" runat = "server" Label = "" EmptyText = "" ID = "TXT_CreateUser"   />
-                     <f:DatePicker Hidden="true" runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="" EmptyText="请选择日期" ID="DP_UpdateTime" />
-                     <f:TextBox Hidden="true" runat = "server" Label = "" EmptyText = "" ID = "TXT_UpdateUser"   />
-                     <f:TextBox Hidden="true" runat = "server" Label = "" EmptyText = "" ID = "TXT_UpdateInfo"   />
-                     <f:CheckBox Hidden="true" ID = "CB_IsDeleted" ShowLabel = "false" runat = "server" Text ="" Checked = "FALSE" />
-                     <f:TextBox runat = "server" Label = "工厂编号" EmptyText = "" ID = "TXT_FactoryId"   />
-                     <f:TextBox runat = "server" Label = "工厂名称" EmptyText = "" ID = "TXT_FactoryName"   />  
-                     <f:TextBox Hidden="true" runat = "server" Label = "ERP地点" EmptyText = "" ID = "TXT_ErpSite"   />
-                     <f:TextBox  Hidden="true" runat = "server" Label = "ERP区域" EmptyText = "" ID = "TXT_ErpDomain"   />
-                     <f:TextBox runat = "server" Label = "工厂地址" EmptyText = "" ID = "TXT_Address"   />
-                     <f:TextBox runat = "server" Label = "邮编号码" EmptyText = "" ID = "TXT_ZipCode"   />
-                     <f:TextBox runat = "server" Label = "备注" EmptyText = "" ID = "TXT_Remark"    />--%>
-                       
-                    </Items>
-                </f:Panel>
-                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" AutoScroll="true"
-                    Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px" >
-                    <Items>
-                      <f:Grid  SortField="UID" 
-                      ID = "Grid_TA_LANGUAGE"   
-                      ShowBorder = "true" 
-                      ShowHeader = "false" Width = "800px"  AutoScroll="true"
-                   
-
-                      runat ="server"  EnableRowSelectEvent="true"
-                      OnRowSelect="Grid_TA_LANGUAGE_RowSelect"   
-                      DataKeyNames = "UID,GUID,CH,EN,RU,DE,FR,EL,AR,JP,IsDeleted" >
-                         <Columns>                       
-                         <f:BoundField Width = "200px" DataField = "UID" DataFormatString = "{0}" HeaderText = ""  Hidden="true"/>                   
-                         <f:BoundField Width = "200px" DataField = "CH" DataFormatString = "{0}" HeaderText = "中文" />
-                        <f:RenderField Width="100px" ColumnID="EN" DataField="EN" FieldType="String" HeaderText="英文">
-                           <Editor> 
-                               <f:TextBox ID="txtBatch1" Text=""  runat="server"  ></f:TextBox> 
-                           </Editor>     
-                        </f:RenderField>
-                         <f:BoundField Width = "200px" DataField = "EN" DataFormatString = "{0}" HeaderText = "英文" />
-                         <f:BoundField Width = "200px" DataField = "DE" DataFormatString = "{0}" HeaderText = "德文" />
-                         <f:BoundField Width = "200px" DataField = "JP" DataFormatString = "{0}" HeaderText = "日文" />
-                         <f:BoundField Width = "200px" DataField = "FR" DataFormatString = "{0}" HeaderText = "法文" /> 
-                         <f:BoundField Width = "200px" DataField = "RU" DataFormatString = "{0}" HeaderText = "俄文" />                    
-                         <f:BoundField Width = "200px" DataField = "AR" DataFormatString = "{0}" HeaderText = "阿拉伯文" />
-                         <f:TemplateField HeaderText="GUID" Width="350px">
-                            <ItemTemplate>
-                                <asp:TextBox ID="GURID" runat="server" Width="300px"
-                                    Text='<%# Eval("GUID") %>' ></asp:TextBox>
-                            </ItemTemplate>
-                        </f:TemplateField>    
-                         
-                         </Columns>
-                        </f:Grid>
-                    </Items>
-                </f:Panel>    
-            </Items>
-        </f:Panel>
-    </form>
-</body>
-</html>
diff --git a/SCP/Views/BasicData/SCP_LANGUAGE.aspx.cs b/SCP/Views/BasicData/SCP_LANGUAGE.aspx.cs
deleted file mode 100644
index e292e71..0000000
--- a/SCP/Views/BasicData/SCP_LANGUAGE.aspx.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using CK.SCP.Models.ScpEntity;
-using CK.SCP.Utils;
-using CK.SCP.Controller;
-using FineUI;
-
-namespace SCP.BasicData
-{
-    public partial class SCP_LANGUAGE : PageBase
-    {
-        //    private List<TA_LANGUAGE> _list=new List<TA_LANGUAGE>();
-        //    public int num;
-        //    protected void Page_Load(object sender, EventArgs e)
-        //    {
-        //        if (!IsPostBack)
-        //        {
-        //            BindData();             
-        //        }
-        //    }
-
-        //    public void BindData()
-        //    {              
-        //            _list = SearchData();
-        //            var list = Sort<TA_LANGUAGE>(_list.AsQueryable(), Grid_TA_LANGUAGE);
-        //            Grid_TA_LANGUAGE.DataSource = list;
-        //            Grid_TA_LANGUAGE.RecordCount = list.Count();
-        //            Grid_TA_LANGUAGE.DataBind();
-        //    }
-
-        //    //导出
-        //    public void BtnOutPut_OnClick(object sender, EventArgs e)
-        //    {
-        //        //var _ret = Controller.SCP_TA_LANGUAGE_CONTROLLER.Get_TA_LANGUAGE_List(new TA_LANGUAGE());
-        //        //if (_ret.State == ReturnStatus.Succeed)
-        //        //{
-        //        //    _list = _ret.Result;
-        //        //    var list = Sort<TA_LANGUAGE>(_list.AsQueryable(), Grid_TA_LANGUAGE).ToList();
-
-        //        //    Dictionary<string, string> cellheader = new Dictionary<string, string>(){
-        //        //    { "AddressNo", "地点编号" },
-        //        //    { "Region", "所属区域" },
-        //        //    { "AccountingUnit", "会计单位" },
-        //        //    { "AddressDescription", "地点描述" }
-        //        //};
-        //        //    string url = EntityListToExcel2003(cellheader, list, "地址");
-        //        //}
-        //    }
-
-        //    //查询
-        //    protected void btnSearch_OnClick(object sender, EventArgs e)
-        //    {
-        //        BindData();
-        //    }  
-        //    //public List<TA_LANGUAGE> SearchData()
-        //    //{
-        //    //    TA_LANGUAGE _entity = new TA_LANGUAGE(); 
-        //    //    _entity.GUID = TXT_GUID.Text;
-        //    //    _entity.CH = TXT_CH.Text;
-
-        //    //    var _ret =SCP_TA_LANGUAGE_CONTROLLER.Get_TA_LANGUAGE_List(_entity);
-        //    //    if (_ret.State == ReturnStatus.Succeed)
-        //    //    {
-        //    //        _list = _ret.Result;
-
-        //    //    }
-        //    //    else
-        //    //    {
-        //    //        _list = new List<TA_LANGUAGE>(); 
-        //    //    }
-
-        //    //    return _list;
-
-        //    //}
-        //    //显示
-        //    protected void btnShow_OnClick(object sender, EventArgs e)
-        //    {
-        //        //gp1.Hidden = false;
-        //    }
-        //    //关闭
-        //    protected void btnClose_OnClick(object sender, EventArgs e)
-        //    {
-        //        //gp1.Hidden = true;
-        //    }
-
-        //    protected void Grid1_OnPageIndexChange(object sender, GridPageEventArgs e)
-        //    {
-        //        Grid_TA_LANGUAGE.PageIndex = e.NewPageIndex;
-        //    }
-
-        //    protected void Grid1_OnSort(object sender, GridSortEventArgs e)
-        //    {
-
-        //        _list = SearchData();
-        //        var list = Sort<TA_LANGUAGE>(_list.AsQueryable(), Grid_TA_LANGUAGE);
-        //        Grid_TA_LANGUAGE.DataSource = list;
-        //        Grid_TA_LANGUAGE.RecordCount = list.Count();
-        //        Grid_TA_LANGUAGE.DataBind();
-        //    }
-
-        //    protected void Btn_Add_Click(object sender, EventArgs e)
-        //    {
-
-        //      TXT_GUID.Text=Guid.NewGuid().ToString("N").ToUpper();
-        //      TXT_CH.Text=string.Empty;
-        //      TXT_EN.Text=string.Empty;
-        //      TXT_RU.Text=string.Empty;
-        //      TXT_DE.Text=string.Empty;
-        //      TXT_FR.Text=string.Empty;
-        //      TXT_AR.Text=string.Empty;
-        //      TXT_JP.Text = string.Empty;
-        //      CB_IsDeleted.Checked = false;
-
-        //    }
-
-        //    protected void Grid_TA_LANGUAGE_RowSelect(object sender, GridRowSelectEventArgs e)
-        //    {
-        //        object[] rowDataKeys = Grid_TA_LANGUAGE.DataKeys[e.RowIndex];
-        //        TA_LANGUAGE _entity = new TA_LANGUAGE();
-        //        _entity.UID = ConvertHelper.To<Int32>(rowDataKeys[0]);
-        //        _entity.GUID = rowDataKeys[1] as string;
-        //        _entity.CH = rowDataKeys[2] as string;
-        //        _entity.EN = rowDataKeys[3] as string;
-        //        _entity.RU = rowDataKeys[4] as string;
-        //        _entity.DE = rowDataKeys[5] as string;
-        //        _entity.FR = rowDataKeys[6] as string;
-        //        _entity.EL = rowDataKeys[7] as string;
-        //        _entity.AR = rowDataKeys[8] as string;
-        //        _entity.JP = rowDataKeys[9] as string;
-        //        _entity.IsDeleted = ConvertHelper.To<Boolean>(rowDataKeys[10]);
-        //        TXT_GUID.Text = _entity.GUID;
-        //        TXT_CH.Text = _entity.CH;
-        //        TXT_EN.Text = _entity.EN;
-        //        TXT_RU.Text = _entity.RU;
-        //        TXT_DE.Text = _entity.DE;
-        //        TXT_FR.Text = _entity.FR;
-        //        TXT_AR.Text = _entity.AR;
-        //        TXT_JP.Text = _entity.JP;
-        //        CB_IsDeleted.Checked = _entity.IsDeleted;
-        //    }
-
-
-
-        //    protected void Btn_Save_Click(object sender, EventArgs e)
-        //    {
-        //        TA_LANGUAGE _entity = new TA_LANGUAGE();          
-        //        _entity.GUID = TXT_GUID.Text;
-        //        _entity.CH = TXT_CH.Text;
-        //        _entity.EN = TXT_EN.Text;
-        //        _entity.RU = TXT_RU.Text;
-        //        _entity.DE = TXT_DE.Text;
-        //        _entity.FR = TXT_FR.Text;         
-        //        _entity.AR = TXT_AR.Text;
-        //        _entity.JP = TXT_JP.Text;
-        //        _entity.IsDeleted = CB_IsDeleted.Checked;
-        //        var ret=SCP_TA_LANGUAGE_CONTROLLER.Get_TA_LANGUAGE_List(new TA_LANGUAGE { CH = TXT_CH.Text });
-        //        if (ret.State == ReturnStatus.Succeed)
-        //        {
-
-        //            if (ret.Result.Count > 0)
-        //            {
-        //                Alert.ShowInTop("中文名称重复！");
-        //                return;
-        //            }
-        //            else
-        //            {
-        //                var ret1 = SCP_TA_LANGUAGE_CONTROLLER.Save_TA_LANGUAGE(new List<TA_LANGUAGE>() { _entity });
-        //                if (ret1.State == ReturnStatus.Succeed)
-        //                {
-        //                    var _ret = SCP_TA_LANGUAGE_CONTROLLER.Get_TA_LANGUAGE_List(new TA_LANGUAGE());
-        //                    if (_ret.State == ReturnStatus.Succeed)
-        //                    {
-        //                        _list = _ret.Result;
-        //                        var list = Sort<TA_LANGUAGE>(_list.AsQueryable(), Grid_TA_LANGUAGE);
-        //                        Grid_TA_LANGUAGE.DataSource = list;
-        //                        Grid_TA_LANGUAGE.RecordCount = list.Count();
-        //                        Grid_TA_LANGUAGE.DataBind();
-
-        //                    }
-        //                }
-
-        //            }
-
-        //        }
-
-
-        //    }
-
-        //    protected void Btn_Delete_Click(object sender, EventArgs e)
-        //    {
-        //        //var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_LANGUAGE(new TA_LANGUAGE { GUID = TXT_GUID.Text });
-        //        //if (ret.State == ReturnStatus.Succeed)
-        //        //{
-        //        //    BindData();
-        //        //}
-
-
-        //    }
-
-        //    protected void BtnSearch_Click(object sender, EventArgs e)
-        //    {
-        //        BindData();
-        //    }
-        //}
-    }
-}
\ No newline at end of file
diff --git a/SCP/Views/BasicData/SCP_LANGUAGE.aspx.designer.cs b/SCP/Views/BasicData/SCP_LANGUAGE.aspx.designer.cs
deleted file mode 100644
index 34ef865..0000000
--- a/SCP/Views/BasicData/SCP_LANGUAGE.aspx.designer.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-//------------------------------------------------------------------------------
-// <自动生成>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，则所做更改将丢失。
-// </自动生成>
-//------------------------------------------------------------------------------
-
-namespace SCP.BasicData {
-    
-    
-    public partial class SCP_LANGUAGE {
-        
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
-        /// <summary>
-        /// PageManager1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.PageManager PageManager1;
-        
-        /// <summary>
-        /// Panel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Panel Panel1;
-        
-        /// <summary>
-        /// panelTopRegion 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Panel panelTopRegion;
-        
-        /// <summary>
-        /// Toolbar2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Toolbar Toolbar2;
-        
-        /// <summary>
-        /// Btn_Add 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Button Btn_Add;
-        
-        /// <summary>
-        /// Btn_Save 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Button Btn_Save;
-        
-        /// <summary>
-        /// Btn_Delete 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Button Btn_Delete;
-        
-        /// <summary>
-        /// panelLeftRegion 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Panel panelLeftRegion;
-        
-        /// <summary>
-        /// TXT_GUID 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.TextBox TXT_GUID;
-        
-        /// <summary>
-        /// TXT_CH 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.TextBox TXT_CH;
-        
-        /// <summary>
-        /// TXT_EN 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.TextBox TXT_EN;
-        
-        /// <summary>
-        /// TXT_RU 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.TextBox TXT_RU;
-        
-        /// <summary>
-        /// TXT_DE 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.TextBox TXT_DE;
-        
-        /// <summary>
-        /// TXT_FR 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.TextBox TXT_FR;
-        
-        /// <summary>
-        /// TXT_AR 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.TextBox TXT_AR;
-        
-        /// <summary>
-        /// TXT_JP 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.TextBox TXT_JP;
-        
-        /// <summary>
-        /// CB_IsDeleted 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.CheckBox CB_IsDeleted;
-        
-        /// <summary>
-        /// BtnSearch 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Button BtnSearch;
-        
-        /// <summary>
-        /// panelCenterRegion 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Panel panelCenterRegion;
-        
-        /// <summary>
-        /// Grid_TA_LANGUAGE 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.Grid Grid_TA_LANGUAGE;
-        
-        /// <summary>
-        /// txtBatch1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUI.TextBox txtBatch1;
-        
-        /// <summary>
-        /// GURID 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox GURID;
-    }
-}