.gitignore

@@ -5732,4 +5732,3 @@ HJGLPackFile/版本日志/HJGLDB_2024.05.02.sql
 /HJGLPackFile/PackFile
 /HJGL/.vs/HJGL/v17/.suo
 /CreateModel2017.bat
-/CreateModel.bat

CreateModel.bat

@@ -0,0 +1,33 @@
+@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

DataBase/版本日志/HJGLDB_2024.05.12.sql

@@ -255,24 +255,6 @@ 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 VIEW [dbo].[View_PMI_DelegationDetails]
 AS
 /********热处理明细********/
@@ -287,7 +269,6 @@ TrustItem.PMIId,
 Trust.ProjectId,
 Trust.DelegationNo,
 Trust.DelegationDate,
-ISNULL(TrustItem.reportNo,Trust.DelegationNo) as reportNo,
 WeldJoint.WeldJointCode,
 Pipeline.PipelineCode,
 WeldJoint.Specification,
@@ -306,4 +287,3 @@ GO
 
 
 
-

HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs

@@ -36,8 +36,7 @@ namespace BLL
                     newItem.Status = 0;
                     newItem.PMIId = string.Empty;
                     newItem.WorkAreaId = jotInfo.WorkAreaId;
-                    newItem.CheckTime = DateTime.Now;
+                    newItem.CreatedTime = DateTime.Now;
-                    newItem.ReportTime= DateTime.Now;
                     newItem.DelegationDate= DateTime.Now;
                     newItem.DelegationNo = string.Empty;
                     returnViewMatch.Add(newItem);

HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs

@@ -1231,7 +1231,7 @@ namespace Resources {
         }
         
         /// <summary>
-        ///   查找类似 委托日期 的本地化字符串。
+        ///   查找类似 检测日期 的本地化字符串。
         /// </summary>
         internal static string DelegationDate {
             get {

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>

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="DelegationDate"
+                            <f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="CreatedTime"
-                                DataField="DelegationDate" SortField="DelegationDate" FieldType="Date" Renderer="Date"
+                                DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
                                 HeaderTextAlign="Center" TextAlign="Left" Width="120px">
                             </f:RenderField>
                               <f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo"

HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs

@@ -350,8 +350,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                 newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
                 newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
                 newTrustItem.Status = 0;
-                newTrustItem.CheckTime = DateTime.Now;
+                newTrustItem.CreatedTime = DateTime.Now;
-                newTrustItem.ReportTime = DateTime.Now;
                 newTrustItem.PMIId = this.PMIDelegationId;
                 listData.Add(newTrustItem);
             }

HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx

@@ -152,20 +152,20 @@
                                     DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px">
                                 </f:RenderField>
                                 <%-- 检测日期 --%>
-                                <f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="checkTime"
+                                <f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="DelegationDate"
-                                    DataField="checkTime" RendererArgument="yyyy-MM-dd" SortField="checkTime" FieldType="Date" Renderer="Date"
+                                    DataField="DelegationDate" SortField="DelegationDate"  FieldType="Date" Renderer="Date"
                                     HeaderTextAlign="Center" TextAlign="Left" Width="120px">
                                     <Editor>
-                                        <f:DatePicker ID="tbxTrustDate"  Required="true" runat="server">
+                                        <f:DatePicker ID="tbxTrustDate" DateFormatString="yyyy-MM-dd" Required="true" runat="server">
                                         </f:DatePicker>
                                     </Editor>
                                 </f:RenderField>
                                 <%-- 报告日期 --%>
-                                <f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="reportTime"
+                                <f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="CreatedTime"
-                                    DataField="reportTime" RendererArgument="yyyy-MM-dd" SortField="reportTime" FieldType="Date" Renderer="Date"
+                                    DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
                                     HeaderTextAlign="Center" TextAlign="Left"  Width="120px">
                                     <Editor>
-                                        <f:DatePicker ID="tbxreportTime"  Required="true" runat="server">
+                                        <f:DatePicker ID="tbxCreatedTime" DateFormatString="yyyy-MM-dd" Required="true" runat="server">
                                         </f:DatePicker>
                                     </Editor>
                                 </f:RenderField>

HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs

@@ -197,13 +197,12 @@ 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 == this.PMIID
+                            where x.Id == hdPMIId.Text
                             select new
                             {
                                 DelegationNo = x.DelegationNo,
@@ -222,7 +221,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 = BLL.Sys_UserService.GetUserNameByUserId(pageInfo[0].Tabler);
+                this.txtTabler.Text = pageInfo[0].Tabler;
                 this.txtRemark.Text = pageInfo[0].Remark;
                 this.txtDetectionStandard.Text = pageInfo[0].DetectionStandard;
             }
@@ -350,17 +349,17 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                         if (onePMIDelegationDetails == null)
                             continue;
                         //检测日期(缺失)
-                        string checkTime = values.Value<string>("checkTime");
+                        string DelegationDate = values.Value<string>("DelegationDate");
-                        if (string.IsNullOrWhiteSpace(checkTime))
+                        if (string.IsNullOrWhiteSpace(DelegationDate))
-                            onePMIDelegationDetails.CheckTime = null;
+                            ;
                         else
-                            onePMIDelegationDetails.CheckTime = Convert.ToDateTime(checkTime);
+                            ;
                         //报告日期
-                        string reportTime = values.Value<string>("reportTime");
+                        string createdTime = values.Value<string>("CreatedTime");
-                        if (string.IsNullOrWhiteSpace(reportTime))
+                        if (string.IsNullOrWhiteSpace(createdTime))
-                            onePMIDelegationDetails.ReportTime = null;
+                            onePMIDelegationDetails.CreatedTime=null;
                         else
-                            onePMIDelegationDetails.ReportTime = Convert.ToDateTime(reportTime);
+                            onePMIDelegationDetails.CreatedTime=Convert.ToDateTime(createdTime);
                         //报告编号                       
                         onePMIDelegationDetails.ReportNo = values.Value<string>("reportNo").ToString();
                         //是否合格 0合格  1不合格

HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs

@@ -267,13 +267,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         protected global::FineUIPro.DatePicker tbxTrustDate;
 
         /// <summary>
-        /// tbxreportTime 控件。
+        /// tbxCreatedTime 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker tbxreportTime;
+        protected global::FineUIPro.DatePicker tbxCreatedTime;
 
         /// <summary>
         /// tbxreportNo 控件。

HJGL/Model/Model.cs

@@ -21477,14 +21477,12 @@ namespace Model
 		
 		private string _Acceptance;
 		
+		private System.Nullable<System.DateTime> _CreatedTime;
+		
 		private int _Status;
 		
 		private string _ReportNo;
 		
-		private System.Nullable<System.DateTime> _CheckTime;
-		
-		private System.Nullable<System.DateTime> _ReportTime;
-		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -21499,14 +21497,12 @@ namespace Model
     partial void OnQualityNoChanged();
     partial void OnAcceptanceChanging(string value);
     partial void OnAcceptanceChanged();
+    partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreatedTimeChanged();
     partial void OnStatusChanging(int value);
     partial void OnStatusChanged();
     partial void OnReportNoChanging(string value);
     partial void OnReportNoChanged();
-    partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnCheckTimeChanged();
-    partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnReportTimeChanged();
     #endregion
 		
 		public PMI_DelegationDetails()
@@ -21614,6 +21610,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CreatedTime
+		{
+			get
+			{
+				return this._CreatedTime;
+			}
+			set
+			{
+				if ((this._CreatedTime != value))
+				{
+					this.OnCreatedTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CreatedTime = value;
+					this.SendPropertyChanged("CreatedTime");
+					this.OnCreatedTimeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
 		public int Status
 		{
@@ -21654,46 +21670,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> CheckTime
-		{
-			get
-			{
-				return this._CheckTime;
-			}
-			set
-			{
-				if ((this._CheckTime != value))
-				{
-					this.OnCheckTimeChanging(value);
-					this.SendPropertyChanging();
-					this._CheckTime = value;
-					this.SendPropertyChanged("CheckTime");
-					this.OnCheckTimeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ReportTime
-		{
-			get
-			{
-				return this._ReportTime;
-			}
-			set
-			{
-				if ((this._ReportTime != value))
-				{
-					this.OnReportTimeChanging(value);
-					this.SendPropertyChanging();
-					this._ReportTime = value;
-					this.SendPropertyChanged("ReportTime");
-					this.OnReportTimeChanged();
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -40715,9 +40691,7 @@ namespace Model
 		
 		private string _Acceptance;
 		
-		private System.Nullable<System.DateTime> _CheckTime;
+		private System.Nullable<System.DateTime> _CreatedTime;
-		
-		private System.Nullable<System.DateTime> _ReportTime;
 		
 		private string _WeldJointId;
 		
@@ -40733,8 +40707,6 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _DelegationDate;
 		
-		private string _ReportNo;
-		
 		private string _WeldJointCode;
 		
 		private string _PipelineCode;
@@ -40781,34 +40753,18 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> CheckTime
+		public System.Nullable<System.DateTime> CreatedTime
 		{
 			get
 			{
-				return this._CheckTime;
+				return this._CreatedTime;
 			}
 			set
 			{
-				if ((this._CheckTime != value))
+				if ((this._CreatedTime != value))
 				{
-					this._CheckTime = value;
+					this._CreatedTime = value;
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ReportTime
-		{
-			get
-			{
-				return this._ReportTime;
-			}
-			set
-			{
-				if ((this._ReportTime != value))
-				{
-					this._ReportTime = value;
 				}
 			}
 		}
@@ -40925,22 +40881,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
-		public string ReportNo
-		{
-			get
-			{
-				return this._ReportNo;
-			}
-			set
-			{
-				if ((this._ReportNo != value))
-				{
-					this._ReportNo = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(50)")]
 		public string WeldJointCode
 		{