diff --git a/CreateModel.bat b/CreateModel.bat
deleted file mode 100644
index 2f27853..0000000
--- a/CreateModel.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-REM ---------------
-REM 发布包生成工具
-REM 执行此文件前请先用Release生成WebOA项目
-REM --------------
-
-
-
-REM --------------
-REM 环境变量设置 Project_Src为如WebOA这样的分支
-REM --------------
-set PROJECT_SRC=%CD%
-cd..
-
-REM 源代码Model项目文件夹
-set Model_ROOT=%PROJECT_SRC%\HJGL\Model
-
-
-REM --------------
-REM 发布程序包文件夹相关
-REM --------------
-
-
-
-
-@echo 设置.net控制台环境
-@echo.
-@call "%VS100COMNTOOLS%"vsvars32.bat
-
-SqlMetal /views  /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
-
-@ECHO 完成
-pause
diff --git a/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs b/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs
index 1ce0380..c0b41bd 100644
--- a/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs
+++ b/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs
@@ -36,7 +36,8 @@ namespace BLL
                     newItem.Status = 0;
                     newItem.PMIId = string.Empty;
                     newItem.WorkAreaId = jotInfo.WorkAreaId;
-                    newItem.CreatedTime = DateTime.Now;
+                    newItem.CheckTime = DateTime.Now;
+                    newItem.ReportTime= DateTime.Now;
                     newItem.DelegationDate= DateTime.Now;
                     newItem.DelegationNo = string.Empty;
                     returnViewMatch.Add(newItem);
diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs
index d59c98f..cd767c0 100644
--- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs
+++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs
@@ -1231,7 +1231,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   鏌ユ壘绫讳技 妫�娴嬫棩鏈� 鐨勬湰鍦板寲瀛楃涓层��
+        ///   鏌ユ壘绫讳技 濮旀墭鏃ユ湡 鐨勬湰鍦板寲瀛楃涓层��
         /// </summary>
         internal static string DelegationDate {
             get {
diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx
index a1589a9..3608b8d 100644
--- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx
+++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx
@@ -2107,7 +2107,7 @@
     <value>棣栭〉</value>
   </data>
   <data name="DelegationDate" xml:space="preserve">
-    <value>妫�娴嬫棩鏈�</value>
+    <value>濮旀墭鏃ユ湡</value>
   </data>
   <data name="DetectionMethod" xml:space="preserve">
     <value>妫�娴嬫柟娉�</value>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx
index 5e21a51..3b1f1cb 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx
@@ -139,8 +139,8 @@
                                 DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
                                 TextAlign="Center" Width="120px">
                             </f:RenderField>
-                            <f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="CreatedTime"
-                                DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
+                            <f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="DelegationDate"
+                                DataField="DelegationDate" SortField="DelegationDate" FieldType="Date" Renderer="Date"
                                 HeaderTextAlign="Center" TextAlign="Left" Width="120px">
                             </f:RenderField>
                               <f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo"
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
index 1a2744a..c614310 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
@@ -350,7 +350,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                 newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
                 newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
                 newTrustItem.Status = 0;
-                newTrustItem.CreatedTime = DateTime.Now;
+                newTrustItem.CheckTime = DateTime.Now;
+                newTrustItem.ReportTime = DateTime.Now;
                 newTrustItem.PMIId = this.PMIDelegationId;
                 listData.Add(newTrustItem);
             }
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
index f60120b..cc846cc 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
@@ -95,9 +95,9 @@
                                 </f:FormRow>
                                 <f:FormRow>
                                     <Items>
-                                        <f:Label ID="txtTabler" Label="<%$ Resources:Lan,Lister %>" runat="server" LabelAlign="Right"
-                                            LabelWidth="170px">
-                                        </f:Label>
+                                           <f:Label ID="txtTabler" Label="<%$ Resources:Lan,Lister %>" runat="server" LabelAlign="Right"
+                                               LabelWidth="170px">
+                                           </f:Label>
                                         <f:Label ID="txtRemark" Label="<%$ Resources:Lan,Remark %>" runat="server" LabelAlign="Right"
                                             LabelWidth="170px">
                                         </f:Label>
@@ -152,20 +152,20 @@
                                     DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px">
                                 </f:RenderField>
                                 <%-- 妫�娴嬫棩鏈� --%>
-                                <f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="DelegationDate"
-                                    DataField="DelegationDate" SortField="DelegationDate"  FieldType="Date" Renderer="Date"
+                                <f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="checkTime"
+                                    DataField="checkTime" RendererArgument="yyyy-MM-dd" SortField="checkTime" FieldType="Date" Renderer="Date"
                                     HeaderTextAlign="Center" TextAlign="Left" Width="120px">
                                     <Editor>
-                                        <f:DatePicker ID="tbxTrustDate" DateFormatString="yyyy-MM-dd" Required="true" runat="server">
+                                        <f:DatePicker ID="tbxTrustDate"  Required="true" runat="server">
                                         </f:DatePicker>
                                     </Editor>
                                 </f:RenderField>
                                 <%-- 鎶ュ憡鏃ユ湡 --%>
-                                <f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="CreatedTime"
-                                    DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
-                                    HeaderTextAlign="Center" TextAlign="Left"  Width="120px">
+                                <f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="reportTime"
+                                    DataField="reportTime" RendererArgument="yyyy-MM-dd" SortField="reportTime" FieldType="Date" Renderer="Date"
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="120px">
                                     <Editor>
-                                        <f:DatePicker ID="tbxCreatedTime" DateFormatString="yyyy-MM-dd" Required="true" runat="server">
+                                        <f:DatePicker ID="tbxreportTime"  Required="true" runat="server">
                                         </f:DatePicker>
                                     </Editor>
                                 </f:RenderField>
@@ -183,9 +183,9 @@
                                     DataField="StatusText" SortField="StatusText" FieldType="String" HeaderTextAlign="Center"
                                     TextAlign="Left" Width="100px">
                                     <Editor>
-                                        <f:DropDownList ID="drpstatus"   runat="server" ShowRedStar="true" Required="true" >
+                                        <f:DropDownList ID="drpstatus" runat="server" ShowRedStar="true" Required="true">
                                             <f:ListItem Value="鍚堟牸" Text="鍚堟牸" />
-                                             <f:ListItem Value="涓嶅悎鏍�" Text="涓嶅悎鏍�" />
+                                            <f:ListItem Value="涓嶅悎鏍�" Text="涓嶅悎鏍�" />
                                         </f:DropDownList>
                                     </Editor>
                                 </f:RenderField>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
index b073d35..025f486 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
@@ -197,12 +197,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         private void PageInfoLoad()
         {
             this.SimpleForm1.Reset(); ///閲嶇疆鎵�鏈夊瓧娈�
+           
             var pageInfo = (from x in Funs.DB.PMI_Delegation
                             join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
                             join n in Funs.DB.Project_Installation on x.InstallationId equals n.InstallationId
                             join u in Funs.DB.Sys_User on x.DetectionStandard equals u.UserId into u1 //宸﹁繛鎺ユ煡璇�
                             from u in u1.DefaultIfEmpty()
-                            where x.Id == hdPMIId.Text
+                            where x.Id == this.PMIID
                             select new
                             {
                                 DelegationNo = x.DelegationNo,
@@ -221,7 +222,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                 this.txtInstallationName.Text = pageInfo[0].InstallationName;
                 this.txtUnitName.Text = pageInfo[0].UnitName;
                 this.txtDetectionMethod.Text = pageInfo[0].DetectionMethod;
-                this.txtTabler.Text = pageInfo[0].Tabler;
+                this.txtTabler.Text = BLL.Sys_UserService.GetUserNameByUserId(pageInfo[0].Tabler);
                 this.txtRemark.Text = pageInfo[0].Remark;
                 this.txtDetectionStandard.Text = pageInfo[0].DetectionStandard;
             }
@@ -349,17 +350,17 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                         if (onePMIDelegationDetails == null)
                             continue;
                         //妫�娴嬫棩鏈�(缂哄け)
-                        string DelegationDate = values.Value<string>("DelegationDate");
-                        if (string.IsNullOrWhiteSpace(DelegationDate))
-                            ;
+                        string checkTime = values.Value<string>("checkTime");
+                        if (string.IsNullOrWhiteSpace(checkTime))
+                            onePMIDelegationDetails.CheckTime = null;
                         else
-                            ;
+                            onePMIDelegationDetails.CheckTime = Convert.ToDateTime(checkTime);
                         //鎶ュ憡鏃ユ湡
-                        string createdTime = values.Value<string>("CreatedTime");
-                        if (string.IsNullOrWhiteSpace(createdTime))
-                            onePMIDelegationDetails.CreatedTime=null;
+                        string reportTime = values.Value<string>("reportTime");
+                        if (string.IsNullOrWhiteSpace(reportTime))
+                            onePMIDelegationDetails.ReportTime = null;
                         else
-                            onePMIDelegationDetails.CreatedTime=Convert.ToDateTime(createdTime);
+                            onePMIDelegationDetails.ReportTime = Convert.ToDateTime(reportTime);
                         //鎶ュ憡缂栧彿                       
                         onePMIDelegationDetails.ReportNo = values.Value<string>("reportNo").ToString();
                         //鏄惁鍚堟牸 0鍚堟牸  1涓嶅悎鏍�
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs
index 285256e..b013712 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs
@@ -267,13 +267,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         protected global::FineUIPro.DatePicker tbxTrustDate;
 
         /// <summary>
-        /// tbxCreatedTime 鎺т欢銆�
+        /// tbxreportTime 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.DatePicker tbxCreatedTime;
+        protected global::FineUIPro.DatePicker tbxreportTime;
 
         /// <summary>
         /// tbxreportNo 鎺т欢銆�
diff --git a/HJGLPackFile/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql b/HJGLPackFile/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql
index f0570d5..983f586 100644
--- a/HJGLPackFile/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql
+++ b/HJGLPackFile/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql
@@ -255,13 +255,30 @@ GO
 
 /*******PMI委托明细视图***********/ 
 
+USE [HJGLDB_ZJBSF]
+GO
+
+/****** Object:  View [dbo].[View_PMI_DelegationDetails]    Script Date: 2024-5-13 9:06:44 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+
+
+alter table PMI_DelegationDetails add reportTime datetime
+
+
+
 ALTER VIEW [dbo].[View_PMI_DelegationDetails]
 AS
-/********热处理明细********/
+/********PMI处理明细********/
 SELECT 
 TrustItem.Id,
 TrustItem.Acceptance, 
-TrustItem.CreatedTime, 
+TrustItem.checkTime, 
+TrustItem.reportTime,
 TrustItem.JointId as WeldJointId, 
 TrustItem.status, 
 TrustItem.QualityNo,