From 717afffeb50a846525629dda880a29fd2b158bfe Mon Sep 17 00:00:00 2001
From: "yidi.wu" <yidi.wu@ccwin-in.com>
Date: Mon, 23 Oct 2023 13:09:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B4=A6=E5=8F=B7=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E9=A6=96=E9=A1=B5=C2=A0=E6=AC=A2=E8=BF=8E=E6=82=A8?=
 =?UTF-8?q?=EF=BC=9AXXX=E5=90=8E=E5=A2=9E=E5=8A=A0=E2=80=9C=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95XX=E5=8E=82=E2=80=9C=EF=BC=8C=E9=9B=B6=E4=BB=B6?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=C2=A0=E5=9C=B0=E7=82=B9=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 北京北汽/SCP/Properties/AssemblyInfo.cs | 4 ++--
 北京北汽/SCP/Views/BasicData/Part.aspx  | 2 +-
 北京北汽/SCP/main.aspx.cs               | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/北京北汽/SCP/Properties/AssemblyInfo.cs b/北京北汽/SCP/Properties/AssemblyInfo.cs
index 1d95458..4b6f073 100644
--- a/北京北汽/SCP/Properties/AssemblyInfo.cs
+++ b/北京北汽/SCP/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // 可以指定所有值，也可以使用“修订号”和“内部版本号”的默认值，
 // 方法是按如下所示使用 "*":
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.23.1023.1")]
+[assembly: AssemblyFileVersion("1.23.1023.1")]
diff --git a/北京北汽/SCP/Views/BasicData/Part.aspx b/北京北汽/SCP/Views/BasicData/Part.aspx
index 94ae338..1007fdb 100644
--- a/北京北汽/SCP/Views/BasicData/Part.aspx
+++ b/北京北汽/SCP/Views/BasicData/Part.aspx
@@ -41,7 +41,7 @@
                                     <Items>
                                         <f:TextBox ID="txtPartCode" runat="server" Label="零件号" />
                                         <f:TextBox ID="txtPartName" runat="server" Label="零件名称" />
-                                        <f:DropDownList  DataTextField="FactoryName" DataValueField="FactoryId" runat="server" ID="DPL_Factory" Label="地点"></f:DropDownList>
+                                        <f:DropDownList  DataTextField="FactoryName" DataValueField="FactoryId" runat="server" ID="DPL_Factory" Label="地点"  Hidden="true"></f:DropDownList>
                                     </Items>
                                 </f:FormRow>
 
diff --git a/北京北汽/SCP/main.aspx.cs b/北京北汽/SCP/main.aspx.cs
index f4885a3..3f6c917 100644
--- a/北京北汽/SCP/main.aspx.cs
+++ b/北京北汽/SCP/main.aspx.cs
@@ -63,7 +63,8 @@ namespace SCP
             JObject ids = GetClientIDS(regionPanel, regionTop, mainTabStrip, txtUser,
                 txtOnlineUserCount, txtCurrentTime, btnRefresh);
             ids.Add("userName", GetIdentityName());
-            ids.Add("userIP", Request.UserHostAddress);
+            var factoryModel =  DB.TA_FACTORY.FirstOrDefault(p => p.FactoryId == CurrentUser.UsedDomain);
+            ids.Add("userIP", factoryModel != null ? factoryModel.FactoryName : Request.UserHostAddress); //
             ids.Add("onlineUserCount", GetOnlineCount());
 
             if (ConfigHelper.MenuType == "accordion")