From 1321b305e5f1950d1928a2061a2358caff628873 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Wed, 30 Nov 2022 15:03:09 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=84=8A=E5=B7=A5?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/BLL.csproj                           |  6 ++++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       | 32 +++++++++++++++++--
 .../HJGL/PersonManage/WelderItemEdit.aspx     | 26 +++++++--------
 .../HJGL/PersonManage/WelderItemEdit.aspx.cs  | 17 ++++++++++
 4 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index ad2e916c..dd111259 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -153,7 +153,13 @@
     <Reference Include="ThoughtWorks.QRCode">
       <HintPath>..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll</HintPath>
     </Reference>
+    <Reference Include="ThoughtWorks.QRCode.Fakes">
+      <HintPath>..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.Fakes.dll</HintPath>
+    </Reference>
     <Reference Include="WindowsBase" />
+    <Reference Include="ZKWeb.System.Drawing, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ZKWeb.System.Drawing.4.0.0\lib\net45\ZKWeb.System.Drawing.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="API\APIBaseInfoService.cs" />
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index e9884f10..a03ae3e3 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -99,9 +99,6 @@
       <HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </Reference>
     <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -12219,6 +12216,35 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="Microsoft.Office.Core">
+      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>4</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="Microsoft.Office.Interop.Word">
+      <Guid>{00020905-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>8</VersionMajor>
+      <VersionMinor>4</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+    <COMReference Include="VBIDE">
+      <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>3</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx
index 2a453bc0..714b9e94 100644
--- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx
@@ -37,19 +37,19 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtWeldingMethod" runat="server" Label="焊接方法" LabelWidth="160px" Enabled="false"></f:TextBox>
-                        <f:TextBox ID="txtMaterialType" runat="server" Label="型号、牌号、级别" LabelWidth="160px" Enabled="false"></f:TextBox>
+                        <f:TextBox ID="txtWeldingMethod" runat="server" Label="焊接方法" LabelWidth="160px" ></f:TextBox>
+                        <f:TextBox ID="txtMaterialType" runat="server" Label="型号、牌号、级别" LabelWidth="160px" ></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtWeldingLocation" runat="server" Label="焊接位置" LabelWidth="160px" Enabled="false"></f:TextBox>
-                        <f:TextBox ID="txtWeldType" runat="server" Label="可焊焊缝类型" LabelWidth="160px" Enabled="false"></f:TextBox>
+                        <f:TextBox ID="txtWeldingLocation" runat="server" Label="焊接位置" LabelWidth="160px" ></f:TextBox>
+                        <f:TextBox ID="txtWeldType" runat="server" Label="可焊焊缝类型" LabelWidth="160px" ></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:CheckBox ID="ckbIsCanWeldG" runat="server" Label="是否可焊安装口" LabelWidth="160px" Enabled="false"></f:CheckBox>
+                        <f:CheckBox ID="ckbIsCanWeldG" runat="server" Label="是否可焊安装口" LabelWidth="160px" ></f:CheckBox>
                         <f:DropDownList ID="drpWeldingMode" runat="server" Label="机动化程度"
                             LabelAlign="Right">
                         </f:DropDownList>
@@ -64,14 +64,14 @@
                                     <Rows>
                                         <f:FormRow>
                                             <Items>
-                                                <f:TextBox ID="txtThicknessMin" runat="server" Label="壁厚覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
-                                                <f:TextBox ID="txtThicknessMax" runat="server" Label="壁厚覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
+                                                <f:TextBox ID="txtThicknessMin" runat="server" Label="壁厚覆盖范围（最小值）"  LabelWidth="200px" ></f:TextBox>
+                                                <f:TextBox ID="txtThicknessMax" runat="server" Label="壁厚覆盖范围（最大值）"  LabelWidth="200px" ></f:TextBox>
                                             </Items>
                                         </f:FormRow>
                                         <f:FormRow>
                                             <Items>
-                                                <f:TextBox ID="txtSizesMin" runat="server" Label="管径覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
-                                                <f:TextBox ID="txtSizesMax" runat="server" Label="管径覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
+                                                <f:TextBox ID="txtSizesMin" runat="server" Label="管径覆盖范围（最小值）"  LabelWidth="200px" ></f:TextBox>
+                                                <f:TextBox ID="txtSizesMax" runat="server" Label="管径覆盖范围（最大值）"  LabelWidth="200px" ></f:TextBox>
                                             </Items>
                                         </f:FormRow>
                                     </Rows>
@@ -89,14 +89,14 @@
                                     <Rows>
                                         <f:FormRow>
                                             <Items>
-                                                <f:TextBox ID="txtThicknessMin2" runat="server" Label="壁厚覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
-                                                <f:TextBox ID="txtThicknessMax2" runat="server" Label="壁厚覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
+                                                <f:TextBox ID="txtThicknessMin2" runat="server" Label="壁厚覆盖范围（最小值）"  LabelWidth="200px" ></f:TextBox>
+                                                <f:TextBox ID="txtThicknessMax2" runat="server" Label="壁厚覆盖范围（最大值）"  LabelWidth="200px" ></f:TextBox>
                                             </Items>
                                         </f:FormRow>
                                         <f:FormRow>
                                             <Items>
-                                                <f:TextBox ID="txtSizesMin2" runat="server" Label="管径覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
-                                                <f:TextBox ID="txtSizesMax2" runat="server" Label="管径覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
+                                                <f:TextBox ID="txtSizesMin2" runat="server" Label="管径覆盖范围（最小值）"  LabelWidth="200px" ></f:TextBox>
+                                                <f:TextBox ID="txtSizesMax2" runat="server" Label="管径覆盖范围（最大值）"  LabelWidth="200px" ></f:TextBox>
                                             </Items>
                                         </f:FormRow>
                                     </Rows>
diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs
index 1c089ee6..68f28bea 100644
--- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs
@@ -68,6 +68,23 @@ namespace FineUIPro.Web.HJGL.PersonManage
                             this.drpWeldingMode.SelectedValue = welderQualify.WelderMode;
                         }
                     }
+                    if (welderQualify.IsAudit == true)
+                    {
+                        this.txtQualificationItem.Enabled = false;
+                        this.txtWeldingMethod.Enabled = false;
+                        this.txtMaterialType.Enabled = false;
+                        this.txtWeldingLocation.Enabled = false;
+                        this.txtWeldType.Enabled = false;
+                        this.ckbIsCanWeldG.Enabled = false;
+                        this.txtThicknessMin.Enabled = false;
+                        this.txtThicknessMax.Enabled = false;
+                        this.txtSizesMin.Enabled = false;
+                        this.txtSizesMax.Enabled = false;
+                        this.txtThicknessMin2.Enabled = false;
+                        this.txtThicknessMax2.Enabled = false;
+                        this.txtSizesMin2.Enabled = false;
+                        this.txtSizesMax2.Enabled = false;
+                    }
                 }
                 var w = BLL.SitePerson_PersonService.GetSitePersonById(this.hdWelderId.Text);
                 if (w != null)

From 0eeb0126642eb748e61b10206443fc990531d5b3 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Wed, 30 Nov 2022 15:15:55 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=84=8A=E5=B7=A5?=
 =?UTF-8?q?=E5=90=88=E6=A0=BC=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx   | 3 ---
 .../FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs | 2 +-
 .../HJGL/PersonManage/WelderManage.aspx.designer.cs      | 9 ---------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx
index 7d2bf116..f0f806c3 100644
--- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx
@@ -216,9 +216,6 @@
                 Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Top"
                 runat="server" Text="删除">
             </f:MenuButton>
-            <f:MenuButton ID="btnView" OnClick="btnView_Click" Icon="Find" EnablePostBack="true"
-                runat="server" Text="查看">
-            </f:MenuButton>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs
index 1eeb80db..0dd7a032 100644
--- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
         {
             if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
             {
-                Model.SitePerson_Person welder = BLL.SitePerson_PersonService.GetSitePersonById(this.tvControlItem.SelectedNodeID);
+                Model.SitePerson_Person welder = BLL.SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, this.tvControlItem.SelectedNodeID);
                 if (welder != null)
                 {
                     this.btnEdit.Hidden = false;
diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.designer.cs
index b2512c53..61314c87 100644
--- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.designer.cs
@@ -308,14 +308,5 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuDelete;
-        
-        /// <summary>
-        /// btnView 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnView;
     }
 }

From 823cba39bb6a8790847fd1db61c7f2bb35f7586c Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Wed, 30 Nov 2022 15:51:42 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=84=8A=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CQMS/PersonManage/WelderItemEdit.aspx     | 26 +++++++-------
 .../CQMS/PersonManage/WelderItemEdit.aspx.cs  | 17 ++++++++++
 .../HJGL/PersonManage/WelderItemEdit.aspx.cs  | 34 +++++++++----------
 3 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderItemEdit.aspx b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderItemEdit.aspx
index 347d5650..773172d7 100644
--- a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderItemEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderItemEdit.aspx
@@ -37,19 +37,19 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtWeldingMethod" runat="server" Label="焊接方法" LabelWidth="160px" Enabled="false"></f:TextBox>
-                        <f:TextBox ID="txtMaterialType" runat="server" Label="型号、牌号、级别" LabelWidth="160px" Enabled="false"></f:TextBox>
+                        <f:TextBox ID="txtWeldingMethod" runat="server" Label="焊接方法" LabelWidth="160px" ></f:TextBox>
+                        <f:TextBox ID="txtMaterialType" runat="server" Label="型号、牌号、级别" LabelWidth="160px" ></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtWeldingLocation" runat="server" Label="焊接位置" LabelWidth="160px" Enabled="false"></f:TextBox>
-                        <f:TextBox ID="txtWeldType" runat="server" Label="可焊焊缝类型" LabelWidth="160px" Enabled="false"></f:TextBox>
+                        <f:TextBox ID="txtWeldingLocation" runat="server" Label="焊接位置" LabelWidth="160px" ></f:TextBox>
+                        <f:TextBox ID="txtWeldType" runat="server" Label="可焊焊缝类型" LabelWidth="160px" ></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:CheckBox ID="ckbIsCanWeldG" runat="server" Label="是否可焊安装口" LabelWidth="160px" Enabled="false"></f:CheckBox>
+                        <f:CheckBox ID="ckbIsCanWeldG" runat="server" Label="是否可焊安装口" LabelWidth="160px" ></f:CheckBox>
                         <f:DropDownList ID="drpWeldingMode" runat="server" Label="机动化程度"
                             LabelAlign="Right">
                         </f:DropDownList>
@@ -64,14 +64,14 @@
                                     <Rows>
                                         <f:FormRow>
                                             <Items>
-                                                <f:TextBox ID="txtThicknessMin" runat="server" Label="壁厚覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
-                                                <f:TextBox ID="txtThicknessMax" runat="server" Label="壁厚覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
+                                                <f:TextBox ID="txtThicknessMin" runat="server" Label="壁厚覆盖范围（最小值）"  LabelWidth="200px" ></f:TextBox>
+                                                <f:TextBox ID="txtThicknessMax" runat="server" Label="壁厚覆盖范围（最大值）"  LabelWidth="200px" ></f:TextBox>
                                             </Items>
                                         </f:FormRow>
                                         <f:FormRow>
                                             <Items>
-                                                <f:TextBox ID="txtSizesMin" runat="server" Label="管径覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
-                                                <f:TextBox ID="txtSizesMax" runat="server" Label="管径覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
+                                                <f:TextBox ID="txtSizesMin" runat="server" Label="管径覆盖范围（最小值）"  LabelWidth="200px" ></f:TextBox>
+                                                <f:TextBox ID="txtSizesMax" runat="server" Label="管径覆盖范围（最大值）"  LabelWidth="200px" ></f:TextBox>
                                             </Items>
                                         </f:FormRow>
                                     </Rows>
@@ -89,14 +89,14 @@
                                     <Rows>
                                         <f:FormRow>
                                             <Items>
-                                                <f:TextBox ID="txtThicknessMin2" runat="server" Label="壁厚覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
-                                                <f:TextBox ID="txtThicknessMax2" runat="server" Label="壁厚覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
+                                                <f:TextBox ID="txtThicknessMin2" runat="server" Label="壁厚覆盖范围（最小值）"  LabelWidth="200px" ></f:TextBox>
+                                                <f:TextBox ID="txtThicknessMax2" runat="server" Label="壁厚覆盖范围（最大值）"  LabelWidth="200px" ></f:TextBox>
                                             </Items>
                                         </f:FormRow>
                                         <f:FormRow>
                                             <Items>
-                                                <f:TextBox ID="txtSizesMin2" runat="server" Label="管径覆盖范围（最小值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
-                                                <f:TextBox ID="txtSizesMax2" runat="server" Label="管径覆盖范围（最大值）" Enabled="false" LabelWidth="200px" Readonly="true"></f:TextBox>
+                                                <f:TextBox ID="txtSizesMin2" runat="server" Label="管径覆盖范围（最小值）"  LabelWidth="200px" ></f:TextBox>
+                                                <f:TextBox ID="txtSizesMax2" runat="server" Label="管径覆盖范围（最大值）"  LabelWidth="200px" ></f:TextBox>
                                             </Items>
                                         </f:FormRow>
                                     </Rows>
diff --git a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderItemEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderItemEdit.aspx.cs
index 701a9f8a..37b3fecc 100644
--- a/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderItemEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/PersonManage/WelderItemEdit.aspx.cs
@@ -67,6 +67,23 @@ namespace FineUIPro.Web.CQMS.PersonManage
                         {
                             this.drpWeldingMode.SelectedValue = welderQualify.WelderMode;
                         }
+                        if (welderQualify.IsAudit == true)
+                        {
+                            this.txtQualificationItem.Enabled = false;
+                            this.txtWeldingMethod.Enabled = false;
+                            this.txtMaterialType.Enabled = false;
+                            this.txtWeldingLocation.Enabled = false;
+                            this.txtWeldType.Enabled = false;
+                            this.ckbIsCanWeldG.Enabled = false;
+                            this.txtThicknessMin.Enabled = false;
+                            this.txtThicknessMax.Enabled = false;
+                            this.txtSizesMin.Enabled = false;
+                            this.txtSizesMax.Enabled = false;
+                            this.txtThicknessMin2.Enabled = false;
+                            this.txtThicknessMax2.Enabled = false;
+                            this.txtSizesMin2.Enabled = false;
+                            this.txtSizesMax2.Enabled = false;
+                        }
                     }
                 }
                 var w = BLL.SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, this.hdWelderId.Text);
diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs
index 68f28bea..0a6b2451 100644
--- a/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/WelderItemEdit.aspx.cs
@@ -67,23 +67,23 @@ namespace FineUIPro.Web.HJGL.PersonManage
                         {
                             this.drpWeldingMode.SelectedValue = welderQualify.WelderMode;
                         }
-                    }
-                    if (welderQualify.IsAudit == true)
-                    {
-                        this.txtQualificationItem.Enabled = false;
-                        this.txtWeldingMethod.Enabled = false;
-                        this.txtMaterialType.Enabled = false;
-                        this.txtWeldingLocation.Enabled = false;
-                        this.txtWeldType.Enabled = false;
-                        this.ckbIsCanWeldG.Enabled = false;
-                        this.txtThicknessMin.Enabled = false;
-                        this.txtThicknessMax.Enabled = false;
-                        this.txtSizesMin.Enabled = false;
-                        this.txtSizesMax.Enabled = false;
-                        this.txtThicknessMin2.Enabled = false;
-                        this.txtThicknessMax2.Enabled = false;
-                        this.txtSizesMin2.Enabled = false;
-                        this.txtSizesMax2.Enabled = false;
+                        if (welderQualify.IsAudit == true)
+                        {
+                            this.txtQualificationItem.Enabled = false;
+                            this.txtWeldingMethod.Enabled = false;
+                            this.txtMaterialType.Enabled = false;
+                            this.txtWeldingLocation.Enabled = false;
+                            this.txtWeldType.Enabled = false;
+                            this.ckbIsCanWeldG.Enabled = false;
+                            this.txtThicknessMin.Enabled = false;
+                            this.txtThicknessMax.Enabled = false;
+                            this.txtSizesMin.Enabled = false;
+                            this.txtSizesMax.Enabled = false;
+                            this.txtThicknessMin2.Enabled = false;
+                            this.txtThicknessMax2.Enabled = false;
+                            this.txtSizesMin2.Enabled = false;
+                            this.txtSizesMax2.Enabled = false;
+                        }
                     }
                 }
                 var w = BLL.SitePerson_PersonService.GetSitePersonById(this.hdWelderId.Text);

From 50b22cc547275307e0c1525bea4144f8be2475aa Mon Sep 17 00:00:00 2001
From: yhw0507 <yhw0508@163.com>
Date: Wed, 30 Nov 2022 16:25:59 +0800
Subject: [PATCH 4/6] =?UTF-8?q?202211301=E3=80=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=BC=98=E5=8C=96=E3=80=822=E3=80=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=BA=E5=91=98=E6=98=AF=E5=90=A6=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E5=9C=A8=E5=A4=9A=E9=A1=B9=E7=9B=AE=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...-011-18-001.sql => SGGLDB_V2022-11-18-001.sql} |   0
 DataBase/版本日志/SGGLDB_V2022-11-30.sql      |   4 +
 .../版本日志/SGGLDB_V2022-11-30修改明细.txt   |   6 +
 .../SitePerson_PersonItemService.cs           | 167 +++++++++---------
 SGGL/BLL/Person/Person_PersonsService.cs      |   6 +-
 SGGL/FineUIPro.Web/Person/PersonEdit.aspx     |   4 +-
 SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs  |  15 ++
 .../Person/PersonEdit.aspx.designer.cs        |   9 +
 .../Person/ProjectPerson.aspx.cs              |   2 +
 .../Person/ProjectPersonEdit.aspx.cs          |   8 +-
 SGGL/Model/Model.cs                           |  38 +++-
 11 files changed, 167 insertions(+), 92 deletions(-)
 rename DataBase/版本日志/{SGGLDB_V2022-011-18-001.sql => SGGLDB_V2022-11-18-001.sql} (100%)
 create mode 100644 DataBase/版本日志/SGGLDB_V2022-11-30.sql
 create mode 100644 DataBase/版本日志/SGGLDB_V2022-11-30修改明细.txt

diff --git a/DataBase/版本日志/SGGLDB_V2022-011-18-001.sql b/DataBase/版本日志/SGGLDB_V2022-11-18-001.sql
similarity index 100%
rename from DataBase/版本日志/SGGLDB_V2022-011-18-001.sql
rename to DataBase/版本日志/SGGLDB_V2022-11-18-001.sql
diff --git a/DataBase/版本日志/SGGLDB_V2022-11-30.sql b/DataBase/版本日志/SGGLDB_V2022-11-30.sql
new file mode 100644
index 00000000..b7880e34
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2022-11-30.sql
@@ -0,0 +1,4 @@
+ALTER TABLE Person_Persons ADD MultiProject BIT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_Persons', @level2type=N'COLUMN',@level2name=N'MultiProject'
+GO
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_V2022-11-30修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-11-30修改明细.txt
new file mode 100644
index 00000000..a00d0918
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2022-11-30修改明细.txt
@@ -0,0 +1,6 @@
+--ADD BY YangHongwei 2022-11-30
+1、项目人员身份证变化事件优化。
+2、新增人员是否同时在多项目字段。
+--END
+
+ 
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
index 4ff56a60..69faccb3 100644
--- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
@@ -145,16 +145,19 @@ namespace BLL
                         };
 
                         AddPersonItem(newPersonItem);
-                        var getOtherPersons = db.SitePerson_Person.Where(x => x.IdentityCard == sitePerson.IdentityCard && x.ProjectId != sitePerson.ProjectId && x.States == Const.ProjectPersonStates_1);
-                        if (getOtherPersons.Count() > 0)
+                        if (!getPersons.MultiProject.HasValue || getPersons.MultiProject == false)
                         {
-                            foreach (var item in getOtherPersons)
-
+                            var getOtherPersons = db.SitePerson_Person.Where(x => x.IdentityCard == sitePerson.IdentityCard && x.ProjectId != sitePerson.ProjectId && x.States == Const.ProjectPersonStates_1);
+                            if (getOtherPersons.Count() > 0)
                             {
-                                item.OutTime = DateTime.Now;
-                                item.States = Const.ProjectPersonStates_2;
-                                item.OutResult = item.OutResult;
-                                db.SubmitChanges();
+                                foreach (var item in getOtherPersons)
+
+                                {
+                                    item.OutTime = DateTime.Now;
+                                    item.States = Const.ProjectPersonStates_2;
+                                    item.OutResult = item.OutResult;
+                                    db.SubmitChanges();
+                                }
                             }
                         }
 
@@ -184,86 +187,90 @@ namespace BLL
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                ///未离场项目 先离场
-                OutPersonItem(newitem.PersonId, null, DateTime.Now);
                 var getPerson = Person_PersonsService.GetPerson_PersonsById(newitem.PersonId);
                 if (getPerson != null)
                 {
                     newitem.PersonName = getPerson.PersonName;
                     newitem.IdentityCard = getPerson.IdentityCard;
-                }
-                var getPersonItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.PersonId == getPerson.PersonId 
-                    && x.InTime <= newitem.InTime && (x.OutTime > newitem.InTime || !x.OutTime.HasValue));
-                if (getPersonItem != null)
-                {
-                    getPersonItem.OutTime = null;
-                    db.SubmitChanges();             
-                }
-                else
-                {
-                    Model.SitePerson_PersonItem newPersonItem = new Model.SitePerson_PersonItem
+                    if (!getPerson.MultiProject.HasValue || getPerson.MultiProject == false)
                     {
-                        PersonItemId = newitem.PersonItemId,
-                        PersonId = newitem.PersonId,
-                        PersonName = newitem.PersonName,
-                        IdentityCard = newitem.IdentityCard,
-                        InTime = newitem.InTime,
-                       // OutTime = newitem.OutTime,
-                      //  OutResult = newitem.OutResult,
-                    };
-                    if (!string.IsNullOrEmpty(newitem.ProjectId))
-                    {
-                        newPersonItem.ProjectId = newitem.ProjectId;
-                        newPersonItem.ProjectName = ProjectService.GetProjectNameByProjectId(newitem.ProjectId);
-                    }
-                    else
-                    {
-                        newPersonItem.ProjectId = null;
-                        newPersonItem.ProjectName = newitem.ProjectName;
-                    }
-                    if (!string.IsNullOrEmpty(newitem.UnitId))
-                    {
-                        newPersonItem.UnitId = newitem.UnitId;
-                        newPersonItem.UnitName = UnitService.GetUnitNameByUnitId(newitem.UnitId);
-                    }
-                    else
-                    {
-                        newPersonItem.UnitId = null;
-                        newPersonItem.UnitName = newitem.UnitName;
-                    }
-                    if (!string.IsNullOrEmpty(newitem.WorkPostId))
-                    {
-                        newPersonItem.WorkPostId = newitem.WorkPostId;
-                        newPersonItem.WorkPostName = WorkPostService.getWorkPostNameById(newitem.WorkPostId);
-                    }
-                    else
-                    {
-                        newPersonItem.WorkPostId = null;
-                        newPersonItem.WorkPostName = newitem.WorkPostName;
-                    }
-                    if (!string.IsNullOrEmpty(newitem.TeamGroupId))
-                    {
-                        newPersonItem.TeamGroupId = newitem.TeamGroupId;
-                        newPersonItem.TeamGroupName = TeamGroupService.GetTeamGroupNameByTeamGroupId(newitem.TeamGroupId);
-                    }
-                    else
-                    {
-                        newPersonItem.TeamGroupId = null;
-                        newPersonItem.TeamGroupName = newitem.TeamGroupName;
-                    }
-                    if (!string.IsNullOrEmpty(newitem.RoleId))
-                    {
-                        newPersonItem.RoleId = newitem.RoleId;
-                        newPersonItem.RoleName = RoleService.getRoleNamesRoleIds(newitem.RoleId);
-                    }
-                    else
-                    {
-                        newPersonItem.RoleId = null;
-                        newPersonItem.RoleName = newitem.RoleName;
+                        ///未离场项目 先离场
+                        OutPersonItem(newitem.PersonId, null, DateTime.Now);
                     }
 
-                    db.SitePerson_PersonItem.InsertOnSubmit(newPersonItem);
-                    db.SubmitChanges();
+                    var getPersonItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.PersonId == getPerson.PersonId
+                        && x.InTime <= newitem.InTime && (x.OutTime > newitem.InTime || !x.OutTime.HasValue));
+                    if (getPersonItem != null)
+                    {
+                        getPersonItem.OutTime = null;
+                        db.SubmitChanges();
+                    }
+                    else
+                    {
+                        Model.SitePerson_PersonItem newPersonItem = new Model.SitePerson_PersonItem
+                        {
+                            PersonItemId = newitem.PersonItemId,
+                            PersonId = newitem.PersonId,
+                            PersonName = newitem.PersonName,
+                            IdentityCard = newitem.IdentityCard,
+                            InTime = newitem.InTime,
+                            // OutTime = newitem.OutTime,
+                            //  OutResult = newitem.OutResult,
+                        };
+                        if (!string.IsNullOrEmpty(newitem.ProjectId))
+                        {
+                            newPersonItem.ProjectId = newitem.ProjectId;
+                            newPersonItem.ProjectName = ProjectService.GetProjectNameByProjectId(newitem.ProjectId);
+                        }
+                        else
+                        {
+                            newPersonItem.ProjectId = null;
+                            newPersonItem.ProjectName = newitem.ProjectName;
+                        }
+                        if (!string.IsNullOrEmpty(newitem.UnitId))
+                        {
+                            newPersonItem.UnitId = newitem.UnitId;
+                            newPersonItem.UnitName = UnitService.GetUnitNameByUnitId(newitem.UnitId);
+                        }
+                        else
+                        {
+                            newPersonItem.UnitId = null;
+                            newPersonItem.UnitName = newitem.UnitName;
+                        }
+                        if (!string.IsNullOrEmpty(newitem.WorkPostId))
+                        {
+                            newPersonItem.WorkPostId = newitem.WorkPostId;
+                            newPersonItem.WorkPostName = WorkPostService.getWorkPostNameById(newitem.WorkPostId);
+                        }
+                        else
+                        {
+                            newPersonItem.WorkPostId = null;
+                            newPersonItem.WorkPostName = newitem.WorkPostName;
+                        }
+                        if (!string.IsNullOrEmpty(newitem.TeamGroupId))
+                        {
+                            newPersonItem.TeamGroupId = newitem.TeamGroupId;
+                            newPersonItem.TeamGroupName = TeamGroupService.GetTeamGroupNameByTeamGroupId(newitem.TeamGroupId);
+                        }
+                        else
+                        {
+                            newPersonItem.TeamGroupId = null;
+                            newPersonItem.TeamGroupName = newitem.TeamGroupName;
+                        }
+                        if (!string.IsNullOrEmpty(newitem.RoleId))
+                        {
+                            newPersonItem.RoleId = newitem.RoleId;
+                            newPersonItem.RoleName = RoleService.getRoleNamesRoleIds(newitem.RoleId);
+                        }
+                        else
+                        {
+                            newPersonItem.RoleId = null;
+                            newPersonItem.RoleName = newitem.RoleName;
+                        }
+
+                        db.SitePerson_PersonItem.InsertOnSubmit(newPersonItem);
+                        db.SubmitChanges();
+                    }
                 }
             }
         }
diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs
index 664737d2..6d97f8bd 100644
--- a/SGGL/BLL/Person/Person_PersonsService.cs
+++ b/SGGL/BLL/Person/Person_PersonsService.cs
@@ -686,8 +686,9 @@ namespace BLL
                     WorkDate = person.WorkDate,
                     RetirementDate = person.RetirementDate,
                     RelativeName = person.RelativeName,
-                    RelativeTel = person.RelativeTel,   
-                };
+                    RelativeTel = person.RelativeTel,
+                    MultiProject = person.MultiProject,
+            };
 
                 if (string.IsNullOrEmpty(person.QRCodeAttachUrl))
                 {
@@ -779,6 +780,7 @@ namespace BLL
                     newPerson.RetirementDate = person.RetirementDate;
                     newPerson.RelativeName = person.RelativeName;
                     newPerson.RelativeTel = person.RelativeTel;
+                    newPerson.MultiProject = person.MultiProject;
 
                     newPerson.IsCardNoOK = IDCardValid.CheckIDCard(person.IdentityCard);
                     if (string.IsNullOrEmpty(person.QRCodeAttachUrl))
diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx
index 73bde2c0..fa039240 100644
--- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx
+++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx
@@ -127,7 +127,7 @@
                                                 </f:DatePicker>
                                             </Items>
                                         </f:FormRow>
-                                        <f:FormRow ColumnWidths="25% 25% 50%">
+                                        <f:FormRow ColumnWidths="20% 15% 15% 50%">
                                             <Items>
                                                 <f:RadioButtonList ID="rblSex" runat="server" Label="性别">
                                                     <f:RadioItem Value="1" Text="男" Selected="true" />
@@ -135,6 +135,8 @@
                                                 </f:RadioButtonList>
                                                 <f:CheckBox runat="server" ID="ckIsPost" Label="在职" Checked="true" 
                                                     AutoPostBack="true" OnCheckedChanged="ckIsPost_CheckedChanged"></f:CheckBox>
+                                                    <f:CheckBox runat="server" ID="ckIsMultiProject" Label="多项目" 
+                                                    AutoPostBack="true" OnCheckedChanged="ckIsMultiProject_CheckedChanged"></f:CheckBox>
                                                 <f:DatePicker ID="txtBirthday" runat="server" Label="出生日期">
                                                 </f:DatePicker>
                                             </Items>
diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
index 3ab8f34f..9bdb4c2e 100644
--- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.Person
                         this.txtJobNum.Text = person.JobNum;
                         this.drpUnit.SelectedValue = person.UnitId;
                         this.ckIsPost.Checked = person.IsPost ?? true;
+                        this.ckIsMultiProject.Checked = person.MultiProject ?? false;
                         if (!string.IsNullOrEmpty(person.DepartId))
                         {
                             this.drpDepart.SelectedValue = person.DepartId;
@@ -528,6 +529,7 @@ namespace FineUIPro.Web.Person
                 Address = this.txtAddress.Text.Trim(),
                 SignatureUrl = this.SignatureUrl,
                 IsPost = this.ckIsPost.Checked,
+                MultiProject=this.ckIsMultiProject.Checked,
             };
 
             newPerson.RoleIds = Funs.GetStringByArray(this.drpRole.SelectedValueArray);
@@ -1087,5 +1089,18 @@ namespace FineUIPro.Web.Person
                 Alert.ShowInParent("人员不在职，则当前人所在的所有项目都将离场！", MessageBoxIcon.Warning);
             }
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ckIsMultiProject_CheckedChanged(object sender, CheckedEventArgs e)
+        {
+            if (this.ckIsMultiProject.Checked)
+            {
+                Alert.ShowInParent("人员可在多个项目上同时在岗！", MessageBoxIcon.Warning);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.designer.cs
index d9c97a55..ee95fa48 100644
--- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.designer.cs
@@ -248,6 +248,15 @@ namespace FineUIPro.Web.Person
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsPost;
 
+        /// <summary>
+        /// ckIsMultiProject 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckIsMultiProject;
+
         /// <summary>
         /// txtBirthday 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs
index ae5c07de..93deef23 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/ProjectPerson.aspx.cs
@@ -20,6 +20,8 @@ namespace FineUIPro.Web.Person
                 this.GetButtonPower();
                 this.btnNew.OnClientClick = Window1.GetShowReference("ProjectPersonEdit.aspx") + "return false;";
                 ProjectService.InitProjectShortNameDropDownList(this.drpProject, false);
+                this.drpProject.SelectedIndex= 0;
+
                 Funs.FineUIPleaseSelect(drpProject, "按项目查询");
                 Funs.FineUIPleaseSelect(drpUnit, "按单位查询");
                 WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, false);
diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
index aa273d0d..0b4279a9 100644
--- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs
@@ -281,7 +281,11 @@ namespace FineUIPro.Web.Person
             var getProjectPerson = SitePerson_PersonService.GetSitePersonById(this.SitePersonId);
             if (getProjectPerson != null)
             {
-                this.txtIdentityCard.Text = getProjectPerson.IdentityCard;
+                if (!string.IsNullOrEmpty(getProjectPerson.IdentityCard))
+                {
+                    this.txtIdentityCard.Text = getProjectPerson.IdentityCard;
+                }
+
                 if (!string.IsNullOrEmpty(getProjectPerson.PersonName))
                 {
                     this.txtPersonName.Text = getProjectPerson.PersonName;
@@ -302,7 +306,7 @@ namespace FineUIPro.Web.Person
                 {
                     this.btnOut.Hidden = false;
                 }
-             
+
                 this.drpProject.SelectedValue = getProjectPerson.ProjectId;
                 InitDropDownListProject();
                 this.drpUnit.SelectedValue = getProjectPerson.UnitId;
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index e20c2dae..6ff008a1 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -70769,7 +70769,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(30)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(300)")]
 		public string MaterialName
 		{
 			get
@@ -70789,7 +70789,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialSpec", DbType="NVarChar(20)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialSpec", DbType="NVarChar(300)")]
 		public string MaterialSpec
 		{
 			get
@@ -70809,7 +70809,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialMade", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialMade", DbType="NVarChar(300)")]
 		public string MaterialMade
 		{
 			get
@@ -70829,7 +70829,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(300)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(3000)")]
 		public string MaterialDef
 		{
 			get
@@ -70849,7 +70849,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeGrade", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeGrade", DbType="NVarChar(300)")]
 		public string PipeGrade
 		{
 			get
@@ -70869,7 +70869,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnit", DbType="NVarChar(10)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnit", DbType="NVarChar(300)")]
 		public string MaterialUnit
 		{
 			get
@@ -71191,7 +71191,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(1000)")]
 		public string SpecificationAndModel
 		{
 			get
@@ -116316,6 +116316,8 @@ namespace Model
 		
 		private string _PersonType;
 		
+		private System.Nullable<bool> _MultiProject;
+		
 		private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
 		
 		private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
@@ -116908,6 +116910,8 @@ namespace Model
     partial void OnCertificateIdChanged();
     partial void OnPersonTypeChanging(string value);
     partial void OnPersonTypeChanged();
+    partial void OnMultiProjectChanging(System.Nullable<bool> value);
+    partial void OnMultiProjectChanged();
     #endregion
 		
 		public Person_Persons()
@@ -118365,6 +118369,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MultiProject", DbType="Bit")]
+		public System.Nullable<bool> MultiProject
+		{
+			get
+			{
+				return this._MultiProject;
+			}
+			set
+			{
+				if ((this._MultiProject != value))
+				{
+					this.OnMultiProjectChanging(value);
+					this.SendPropertyChanging();
+					this._MultiProject = value;
+					this.SendPropertyChanged("MultiProject");
+					this.OnMultiProjectChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Person_Persons", Storage="_Accident_AccidentHandle", ThisKey="PersonId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
 		public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
 		{

From 0689eaa4e720126f3d684f2584f8b94ad23435f3 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Sat, 3 Dec 2022 09:55:11 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=84=8A=E6=8E=A5?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=AF=84=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_V2022-12-03.sql    |   2 +
 SGGL/BLL/HJGL/WPQ/WPQListService.cs         |   1 +
 SGGL/FineUIPro.Web/HJGL/WPQ/WPQEdit.aspx.cs |  25 +-
 SGGL/Model/Model.cs                         | 448 +++++++++++++++++++-
 4 files changed, 457 insertions(+), 19 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_V2022-12-03.sql

diff --git a/DataBase/版本日志/SGGLDB_V2022-12-03.sql b/DataBase/版本日志/SGGLDB_V2022-12-03.sql
new file mode 100644
index 00000000..bdbb789f
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2022-12-03.sql
@@ -0,0 +1,2 @@
+alter table WPQ_WPQList add CompileMan nvarchar(50) null
+GO
\ No newline at end of file
diff --git a/SGGL/BLL/HJGL/WPQ/WPQListService.cs b/SGGL/BLL/HJGL/WPQ/WPQListService.cs
index 19ea3f3d..1942fdda 100644
--- a/SGGL/BLL/HJGL/WPQ/WPQListService.cs
+++ b/SGGL/BLL/HJGL/WPQ/WPQListService.cs
@@ -31,6 +31,7 @@ namespace BLL
             newWPQ.WPQCode = WPQ.WPQCode;
             newWPQ.ProjectId = WPQ.ProjectId;
             newWPQ.UnitId = WPQ.UnitId;
+            newWPQ.CompileMan = WPQ.CompileMan;
             newWPQ.CompileDate = WPQ.CompileDate;
             newWPQ.MaterialId1 = WPQ.MaterialId1;
             newWPQ.MaterialId2 = WPQ.MaterialId2;
diff --git a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQEdit.aspx.cs
index ee97b46b..8145cb96 100644
--- a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQEdit.aspx.cs
@@ -225,6 +225,11 @@ namespace FineUIPro.Web.HJGL.WPQ
                 Alert.ShowInTop("焊丝、焊条不能同时为空！", MessageBoxIcon.Warning);
                 return;
             }
+            if (this.rblIsAgree.SelectedValue == "false" && (this.drpPerson.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpPerson.SelectedValue)))
+            {
+                Alert.ShowInTop("请选择办理人！", MessageBoxIcon.Warning);
+                return;
+            }
             string id = SaveData(BLL.Const.BtnSubmit);
             ShowNotify("提交成功！", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@@ -352,7 +357,7 @@ namespace FineUIPro.Web.HJGL.WPQ
             {
                 string newId = SQLHelper.GetNewID(typeof(Model.WPQ_WPQList));
                 wpq.WPQId = newId;
-
+                wpq.CompileMan = this.CurrUser.PersonId;
                 if (type == BLL.Const.BtnSubmit)
                 {
                     if (this.drpPerson.SelectedValue == BLL.Const._Null)
@@ -506,18 +511,14 @@ namespace FineUIPro.Web.HJGL.WPQ
                 Model.WPQ_WPQList wpq = BLL.WPQListServiceService.GetWPQById(WPQId);
                 if (wpq != null)
                 {
-                    Model.WPQ_WPQListFlowOperate flowOperate = Funs.DB.WPQ_WPQListFlowOperate.FirstOrDefault(x => x.WPQId == WPQId && x.OperateName == "施工单位编制");
-                    if (flowOperate != null)
+                    Model.Person_Persons user = BLL.Person_PersonsService.GetPerson_PersonsById(wpq.CompileMan);
+                    if (user != null)
                     {
-                        Model.Person_Persons user = BLL.Person_PersonsService.GetPerson_PersonsById(flowOperate.OperateManId);
-                        if (user != null)
-                        {
-                            ListItem[] list = new ListItem[1];
-                            list[0] = new ListItem(user.PersonName ?? "", user.PersonId.ToString());
-                            drpPerson.DataSource = list;
-                            drpPerson.DataBind();
-                            drpPerson.SelectedValue = user.PersonId;
-                        }
+                        ListItem[] list = new ListItem[1];
+                        list[0] = new ListItem(user.PersonName ?? "", user.PersonId.ToString());
+                        drpPerson.DataSource = list;
+                        drpPerson.DataBind();
+                        drpPerson.SelectedValue = user.PersonId;
                     }
                 }
             }
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index e20c2dae..c314cc7b 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -347,6 +347,12 @@ namespace Model
     partial void InsertCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance);
     partial void UpdateCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance);
     partial void DeleteCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance);
+    partial void InsertCommon_FileManage(Common_FileManage instance);
+    partial void UpdateCommon_FileManage(Common_FileManage instance);
+    partial void DeleteCommon_FileManage(Common_FileManage instance);
+    partial void InsertCommon_FileManageType(Common_FileManageType instance);
+    partial void UpdateCommon_FileManageType(Common_FileManageType instance);
+    partial void DeleteCommon_FileManageType(Common_FileManageType instance);
     partial void InsertCostGoods_CostManage(CostGoods_CostManage instance);
     partial void UpdateCostGoods_CostManage(CostGoods_CostManage instance);
     partial void DeleteCostGoods_CostManage(CostGoods_CostManage instance);
@@ -2286,6 +2292,22 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Common_FileManage> Common_FileManage
+		{
+			get
+			{
+				return this.GetTable<Common_FileManage>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Common_FileManageType> Common_FileManageType
+		{
+			get
+			{
+				return this.GetTable<Common_FileManageType>();
+			}
+		}
+		
 		public System.Data.Linq.Table<CostGoods_CostManage> CostGoods_CostManage
 		{
 			get
@@ -50000,6 +50022,394 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Common_FileManage")]
+	public partial class Common_FileManage : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private int _FileId;
+		
+		private string _FileCode;
+		
+		private string _FileName;
+		
+		private string _FileSize;
+		
+		private string _FileType;
+		
+		private System.Data.Linq.Binary _FileContent;
+		
+		private string _BigType;
+		
+		private string _SmallType;
+		
+		private string _FileCreate;
+		
+		private System.Nullable<System.DateTime> _FileDate;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnFileIdChanging(int value);
+    partial void OnFileIdChanged();
+    partial void OnFileCodeChanging(string value);
+    partial void OnFileCodeChanged();
+    partial void OnFileNameChanging(string value);
+    partial void OnFileNameChanged();
+    partial void OnFileSizeChanging(string value);
+    partial void OnFileSizeChanged();
+    partial void OnFileTypeChanging(string value);
+    partial void OnFileTypeChanged();
+    partial void OnFileContentChanging(System.Data.Linq.Binary value);
+    partial void OnFileContentChanged();
+    partial void OnBigTypeChanging(string value);
+    partial void OnBigTypeChanged();
+    partial void OnSmallTypeChanging(string value);
+    partial void OnSmallTypeChanged();
+    partial void OnFileCreateChanging(string value);
+    partial void OnFileCreateChanged();
+    partial void OnFileDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnFileDateChanged();
+    #endregion
+		
+		public Common_FileManage()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileId", AutoSync=AutoSync.OnInsert, DbType="Int NOT NULL IDENTITY", IsPrimaryKey=true, IsDbGenerated=true)]
+		public int FileId
+		{
+			get
+			{
+				return this._FileId;
+			}
+			set
+			{
+				if ((this._FileId != value))
+				{
+					this.OnFileIdChanging(value);
+					this.SendPropertyChanging();
+					this._FileId = value;
+					this.SendPropertyChanged("FileId");
+					this.OnFileIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileCode", DbType="NVarChar(50)")]
+		public string FileCode
+		{
+			get
+			{
+				return this._FileCode;
+			}
+			set
+			{
+				if ((this._FileCode != value))
+				{
+					this.OnFileCodeChanging(value);
+					this.SendPropertyChanging();
+					this._FileCode = value;
+					this.SendPropertyChanged("FileCode");
+					this.OnFileCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileName", DbType="NVarChar(100)")]
+		public string FileName
+		{
+			get
+			{
+				return this._FileName;
+			}
+			set
+			{
+				if ((this._FileName != value))
+				{
+					this.OnFileNameChanging(value);
+					this.SendPropertyChanging();
+					this._FileName = value;
+					this.SendPropertyChanged("FileName");
+					this.OnFileNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileSize", DbType="NVarChar(50)")]
+		public string FileSize
+		{
+			get
+			{
+				return this._FileSize;
+			}
+			set
+			{
+				if ((this._FileSize != value))
+				{
+					this.OnFileSizeChanging(value);
+					this.SendPropertyChanging();
+					this._FileSize = value;
+					this.SendPropertyChanged("FileSize");
+					this.OnFileSizeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileType", DbType="NVarChar(50)")]
+		public string FileType
+		{
+			get
+			{
+				return this._FileType;
+			}
+			set
+			{
+				if ((this._FileType != value))
+				{
+					this.OnFileTypeChanging(value);
+					this.SendPropertyChanging();
+					this._FileType = value;
+					this.SendPropertyChanged("FileType");
+					this.OnFileTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileContent", DbType="Image", CanBeNull=true, UpdateCheck=UpdateCheck.Never)]
+		public System.Data.Linq.Binary FileContent
+		{
+			get
+			{
+				return this._FileContent;
+			}
+			set
+			{
+				if ((this._FileContent != value))
+				{
+					this.OnFileContentChanging(value);
+					this.SendPropertyChanging();
+					this._FileContent = value;
+					this.SendPropertyChanged("FileContent");
+					this.OnFileContentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BigType", DbType="NVarChar(50)")]
+		public string BigType
+		{
+			get
+			{
+				return this._BigType;
+			}
+			set
+			{
+				if ((this._BigType != value))
+				{
+					this.OnBigTypeChanging(value);
+					this.SendPropertyChanging();
+					this._BigType = value;
+					this.SendPropertyChanged("BigType");
+					this.OnBigTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SmallType", DbType="NVarChar(50)")]
+		public string SmallType
+		{
+			get
+			{
+				return this._SmallType;
+			}
+			set
+			{
+				if ((this._SmallType != value))
+				{
+					this.OnSmallTypeChanging(value);
+					this.SendPropertyChanging();
+					this._SmallType = value;
+					this.SendPropertyChanged("SmallType");
+					this.OnSmallTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileCreate", DbType="NVarChar(50)")]
+		public string FileCreate
+		{
+			get
+			{
+				return this._FileCreate;
+			}
+			set
+			{
+				if ((this._FileCreate != value))
+				{
+					this.OnFileCreateChanging(value);
+					this.SendPropertyChanging();
+					this._FileCreate = value;
+					this.SendPropertyChanged("FileCreate");
+					this.OnFileCreateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> FileDate
+		{
+			get
+			{
+				return this._FileDate;
+			}
+			set
+			{
+				if ((this._FileDate != value))
+				{
+					this.OnFileDateChanging(value);
+					this.SendPropertyChanging();
+					this._FileDate = value;
+					this.SendPropertyChanged("FileDate");
+					this.OnFileDateChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Common_FileManageType")]
+	public partial class Common_FileManageType : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _FileCode;
+		
+		private string _FileType;
+		
+		private System.Nullable<int> _SortIndex;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnFileCodeChanging(string value);
+    partial void OnFileCodeChanged();
+    partial void OnFileTypeChanging(string value);
+    partial void OnFileTypeChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
+    #endregion
+		
+		public Common_FileManageType()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string FileCode
+		{
+			get
+			{
+				return this._FileCode;
+			}
+			set
+			{
+				if ((this._FileCode != value))
+				{
+					this.OnFileCodeChanging(value);
+					this.SendPropertyChanging();
+					this._FileCode = value;
+					this.SendPropertyChanged("FileCode");
+					this.OnFileCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileType", DbType="NVarChar(50)")]
+		public string FileType
+		{
+			get
+			{
+				return this._FileType;
+			}
+			set
+			{
+				if ((this._FileType != value))
+				{
+					this.OnFileTypeChanging(value);
+					this.SendPropertyChanging();
+					this._FileType = value;
+					this.SendPropertyChanged("FileType");
+					this.OnFileTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
+		public System.Nullable<int> SortIndex
+		{
+			get
+			{
+				return this._SortIndex;
+			}
+			set
+			{
+				if ((this._SortIndex != value))
+				{
+					this.OnSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SortIndex = value;
+					this.SendPropertyChanged("SortIndex");
+					this.OnSortIndexChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_CostManage")]
 	public partial class CostGoods_CostManage : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -70769,7 +71179,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(30)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(300)")]
 		public string MaterialName
 		{
 			get
@@ -70789,7 +71199,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialSpec", DbType="NVarChar(20)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialSpec", DbType="NVarChar(300)")]
 		public string MaterialSpec
 		{
 			get
@@ -70809,7 +71219,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialMade", DbType="NVarChar(200)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialMade", DbType="NVarChar(300)")]
 		public string MaterialMade
 		{
 			get
@@ -70829,7 +71239,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(300)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(3000)")]
 		public string MaterialDef
 		{
 			get
@@ -70849,7 +71259,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeGrade", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeGrade", DbType="NVarChar(300)")]
 		public string PipeGrade
 		{
 			get
@@ -70869,7 +71279,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnit", DbType="NVarChar(10)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnit", DbType="NVarChar(300)")]
 		public string MaterialUnit
 		{
 			get
@@ -71191,7 +71601,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(1000)")]
 		public string SpecificationAndModel
 		{
 			get
@@ -234458,6 +234868,8 @@ namespace Model
 		
 		private string _ProjectId;
 		
+		private string _CompileMan;
+		
 		private EntitySet<HJGL_WeldJoint> _HJGL_WeldJoint;
 		
 		private EntityRef<Base_Material> _Base_Material;
@@ -234566,6 +234978,8 @@ namespace Model
     partial void OnProtectionGasIdChanged();
     partial void OnProjectIdChanging(string value);
     partial void OnProjectIdChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
     #endregion
 		
 		public WPQ_WPQList()
@@ -235500,6 +235914,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_WeldJoint_WPQ_WPQList", Storage="_HJGL_WeldJoint", ThisKey="WPQId", OtherKey="WPQId", DeleteRule="NO ACTION")]
 		public EntitySet<HJGL_WeldJoint> HJGL_WeldJoint
 		{

From 09f094c34cd737049f8ecb66e94b1693863203e3 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Sat, 3 Dec 2022 10:07:39 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_V2022-12-03.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/DataBase/版本日志/SGGLDB_V2022-12-03.sql b/DataBase/版本日志/SGGLDB_V2022-12-03.sql
index bdbb789f..71e8d9af 100644
--- a/DataBase/版本日志/SGGLDB_V2022-12-03.sql
+++ b/DataBase/版本日志/SGGLDB_V2022-12-03.sql
@@ -1,2 +1,3 @@
 alter table WPQ_WPQList add CompileMan nvarchar(50) null
-GO
\ No newline at end of file
+GO
+