diff --git a/CreateModel.bat b/CreateModel.bat
index 27ceb4a..2f27853 100644
--- a/CreateModel.bat
+++ b/CreateModel.bat
@@ -25,9 +25,9 @@ REM --------------
@echo 设置.net控制台环境
@echo.
-@call "%VS150%"
+@call "%VS100COMNTOOLS%"vsvars32.bat
-SqlMetal /views /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO 完成
pause
diff --git a/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql b/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql
index 8974a86..f0570d5 100644
--- a/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql
+++ b/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql
@@ -1,3 +1,8 @@
+-- 管线焊工 增加是否 PMI处理
+alter table Pipeline_WeldJoint add isPMI bit NULL
+GO
+update Pipeline_WeldJoint set isPMI=0
+GO
ALTER VIEW [dbo].[View_Pipeline_WeldJoint]
AS
@@ -202,7 +207,6 @@ FROM Pipeline_WeldJoint AS weldJoint
GO
-
UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','')
GO
@@ -223,6 +227,7 @@ create table PMI_Delegation
InstallationId nvarchar(50),
UnitId nvarchar(50),
DetectionStandard nvarchar(50),
+ Tabler nvarchar(50),
Remark nvarchar(255),
CreatedTime datetime default getdate()
)
@@ -240,43 +245,45 @@ create table PMI_DelegationDetails
)
go
--- 管线焊工 增加是否 PMI处理
-alter table Pipeline_WeldJoint add isPMI bit null
-update Pipeline_WeldJoint set isPMI=0
+
-- 插入PMI委托菜单
insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI检测管理','PMI detection management','',21,0,3,NUll,1)
-insert into Sys_Menu values(NEWID(),'PMI委托','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
-insert into Sys_Menu values(NEWID(),'PMI检测录入','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
+insert into Sys_Menu values(NEWID(),'PMI委托','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',1,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
+insert into Sys_Menu values(NEWID(),'PMI检测录入','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',2,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
+GO
/*******PMI委托明细视图***********/
-CREATE VIEW [dbo].[View_PMI_DelegationDetails]
+
+ALTER VIEW [dbo].[View_PMI_DelegationDetails]
AS
-
+/********热处理明细********/
SELECT
-B.PMIId,
-B.JointId,
-B.QualityNo,
-B.Acceptance,
-B.CreatedTime,
-B.status,
-Pipeline.PipelineCode,
+TrustItem.Id,
+TrustItem.Acceptance,
+TrustItem.CreatedTime,
+TrustItem.JointId as WeldJointId,
+TrustItem.status,
+TrustItem.QualityNo,
+TrustItem.PMIId,
+Trust.ProjectId,
+Trust.DelegationNo,
+Trust.DelegationDate,
WeldJoint.WeldJointCode,
+Pipeline.PipelineCode,
WeldJoint.Specification,
-WeldJoint.Remark,
-Pipeline.SingleNumber,
-(CASE WHEN WeldJoint.CoverWelderCode IS NOT NULL AND WeldJoint.BackingWelderCode IS NOT NULL
- THEN WeldJoint.CoverWelderCode + '/' + WeldJoint.BackingWelderCode
- ELSE (ISNULL(WeldJoint.CoverWelderCode,'') + ISNULL(WeldJoint.BackingWelderCode,'')) END) AS WelderCode, --焊工
- (CASE WHEN WeldJoint.Material1Code IS NOT NULL AND WeldJoint.Material2Code IS NOT NULL
- THEN WeldJoint.Material1Code + '/' + WeldJoint.Material2Code
- ELSE (ISNULL(WeldJoint.Material1Code,'') + ISNULL(WeldJoint.Material2Code,'')) END) AS MaterialCode --材质
-FROM PMI_Delegation AS A INNER JOIN
-PMI_DelegationDetails AS B ON A.Id=B.PMIId
-LEFT JOIN View_Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=B.JointId
+Material.MaterialCode,
+Pipeline.WorkAreaId
+FROM PMI_DelegationDetails AS TrustItem
+LEFT JOIN PMI_Delegation AS Trust ON Trust.Id=TrustItem.PMIId
+LEFT JOIN Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=TrustItem.JointId
LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId
-
+LEFT JOIN Base_Material AS Material ON Material.MaterialId=WeldJoint.Material1Id
GO
+
+
+
+
diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index bc38370..c6b5c5f 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/BLL/BLL.csproj.user b/HJGL/BLL/BLL.csproj.user
index 07dbd5b..55f44b9 100644
--- a/HJGL/BLL/BLL.csproj.user
+++ b/HJGL/BLL/BLL.csproj.user
@@ -1,6 +1,6 @@
锘
- ProjectFiles
+ ShowAllFiles
\ No newline at end of file
diff --git a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs
index 7dd4fd5..9c2ad63 100644
--- a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs
+++ b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs
@@ -252,6 +252,12 @@ namespace BLL
{
newWeldJoint.Electricity = weldJoint.Electricity;
}
+ if (weldJoint.IsPMI != null)
+ {
+ newWeldJoint.IsPMI = weldJoint.IsPMI;
+ }
+
+
if (!string.IsNullOrEmpty(weldJoint.Voltage))
{
newWeldJoint.Voltage = weldJoint.Voltage;
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
index 8bbf08f..89e031f 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -4473,6 +4473,7 @@
PMIDetectionEntry.aspx
+ ASPXCodeBehind
PMIDetectionEntry.aspx
@@ -4910,7 +4911,6 @@
GlobalResourceProxyGenerator
Lan.Designer.cs
- Designer
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index f9b03fb..8d0cdf2 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -35,7 +35,7 @@
True
0
/
- http://localhost:57613/
+ http://localhost:13960/
False
False
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
index f587eaf..74c1a36 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
@@ -197,7 +197,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
ShowNotify(Resources.Lan.SaveSuccessfully, MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PMIDelegationId)
- + ActiveWindow.GetHideReference());
+ + ActiveWindow.GetHidePostBackReference());
}
else
{
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
index 23776b0..de1f1f9 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
@@ -143,16 +143,25 @@
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="120px">
-
-
+
+
+
+
+
+
+
+
+
diff --git a/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs b/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs
index 9dcbb69..fba6709 100644
--- a/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs
+++ b/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs
@@ -85,12 +85,12 @@ namespace FineUIPro.Web.common
string strSql = @"SELECT (WelderName+'锛'+WelderCode+'锛 鐒婂伐璇佽繃鏈燂紝鏈夋晥鏈熶负锛'+CONVERT(VARCHAR(100),CertificateValidity,23))
AS QualificationLimit
FROM dbo.Welder_Welder
- WHERE CertificateValidity<=GETDATE()
+ WHERE CertificateValidity<=GETDATE() AND IsOnDuty=1
UNION
SELECT (WelderName+'锛'+WelderCode+'锛 鐒婂伐璇佽繕鏈夛細'+convert(nvarchar(6),DATEDIFF(day,getdate(),CertificateValidity))+ '澶╁埌鏈')
AS QualificationLimit
FROM dbo.Welder_Welder
- where DATEADD(m,-1,CertificateValidity)GETDATE()";
+ where DATEADD(m,-1,CertificateValidity)GETDATE() AND IsOnDuty=1";
DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
GridWelder.DataSource = dt;
GridWelder.DataBind();
diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs
index c89fb8c..d7b7bc6 100644
--- a/HJGL/Model/Model.cs
+++ b/HJGL/Model/Model.cs
@@ -21300,7 +21300,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string ProjectId
{
get
@@ -21477,10 +21477,10 @@ namespace Model
private string _Acceptance;
- private System.Nullable _CreatedTime;
-
private int _Status;
+ private System.Nullable _CreatedTime;
+
#region 鍙墿灞曟ф柟娉曞畾涔
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -21495,10 +21495,10 @@ namespace Model
partial void OnQualityNoChanged();
partial void OnAcceptanceChanging(string value);
partial void OnAcceptanceChanged();
- partial void OnCreatedTimeChanging(System.Nullable value);
- partial void OnCreatedTimeChanged();
partial void OnStatusChanging(int value);
partial void OnStatusChanged();
+ partial void OnCreatedTimeChanging(System.Nullable value);
+ partial void OnCreatedTimeChanged();
#endregion
public PMI_DelegationDetails()
@@ -21606,6 +21606,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")]
+ public int Status
+ {
+ get
+ {
+ return this._Status;
+ }
+ set
+ {
+ if ((this._Status != value))
+ {
+ this.OnStatusChanging(value);
+ this.SendPropertyChanging();
+ this._Status = value;
+ this.SendPropertyChanged("Status");
+ this.OnStatusChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
public System.Nullable CreatedTime
{
@@ -21626,26 +21646,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
- public int Status
- {
- get
- {
- return this._Status;
- }
- set
- {
- if ((this._Status != value))
- {
- this.OnStatusChanging(value);
- this.SendPropertyChanging();
- this._Status = value;
- this.SendPropertyChanged("Status");
- this.OnStatusChanged();
- }
- }
- }
-
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -37266,8 +37266,6 @@ namespace Model
private string _ProjectId;
- private System.Nullable _IsPMI;
-
private string _PipelineCode;
private string _PipelineId;
@@ -37398,22 +37396,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")]
- public System.Nullable IsPMI
- {
- get
- {
- return this._IsPMI;
- }
- set
- {
- if ((this._IsPMI != value))
- {
- this._IsPMI = value;
- }
- }
- }
-
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")]
public string PipelineCode
{
@@ -39422,6 +39404,8 @@ namespace Model
private string _PipingClassCode;
+ private string _PIPClassCode;
+
private string _WeldingDate;
private System.Nullable _IsCancel;
@@ -40530,6 +40514,22 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")]
+ public string PIPClassCode
+ {
+ get
+ {
+ return this._PIPClassCode;
+ }
+ set
+ {
+ if ((this._PIPClassCode != value))
+ {
+ this._PIPClassCode = value;
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")]
public string WeldingDate
{
diff --git a/HJGL/Model/Model.csproj.user b/HJGL/Model/Model.csproj.user
index 07dbd5b..55f44b9 100644
--- a/HJGL/Model/Model.csproj.user
+++ b/HJGL/Model/Model.csproj.user
@@ -1,6 +1,6 @@
锘
- ProjectFiles
+ ShowAllFiles
\ No newline at end of file