gaofei/SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

焊工 入场 离场 日报导入 装置排序

Browse Source
This commit is contained in:
李超
2025-08-14 17:26:23 +08:00
parent 2e0c97e981
commit bead4c1d76
18 changed files with 597 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportDataIn.aspx.cs
+31 -1
View File
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
#endregion
#region 加载
#region 加载
/// <summary>
/// 加载页面
/// </summary>
@@ -429,6 +429,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var welder = welders.Where(x => x.WED_Unit == unit.UnitId && x.TeamGroupId == teamGroup.TeamGroupId && x.WED_Code == row15.Trim()).FirstOrDefault();
if (welder != null)
{
if(welder.OutTime.HasValue && welder.OutTime.Value < DateTime.Now)
{
result += (i + 2).ToString() + "," + "盖面焊工" + "," + "已经出场！" + "|";
}
if (!welder.WED_IfOnGuard.HasValue || welder.WED_IfOnGuard.HasValue && !welder.WED_IfOnGuard.Value)
{
result += (i + 2).ToString() + "," + "盖面焊工" + "," + "不在岗！" + "|";
}
var steel = steels.Where(x => x.MaterialCode == row4.Trim()).FirstOrDefault();
if (steel != null && !string.IsNullOrEmpty(steel.SteelType) && !string.IsNullOrEmpty(welder.Steels) && !welder.Steels.Contains(steel.SteelType))
{
@@ -484,6 +492,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
result += (i + 2).ToString() + "," + "打底焊工代号" + "," + "该单位没有此焊工代号！" + "|";
}
else
{
if (welder.OutTime.HasValue && welder.OutTime.Value < DateTime.Now)
{
result += (i + 2).ToString() + "," + "打底焊工" + "," + "已经出场！" + "|";
}
if (!welder.WED_IfOnGuard.HasValue || (welder.WED_IfOnGuard.HasValue && !welder.WED_IfOnGuard.Value))
{
result += (i + 2).ToString() + "," + "打底焊工" + "," + "不在岗！" + "|";
}
}
}
}
else
@@ -493,6 +512,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
result += (i + 2).ToString() + "," + "打底焊工代号" + "," + "该单位没有此焊工代号！" + "|";
}
else
{
if (welder.OutTime.HasValue && welder.OutTime.Value < DateTime.Now)
{
result += (i + 2).ToString() + "," + "打底焊工" + "," + "已经出场！" + "|";
}
if (!welder.WED_IfOnGuard.HasValue || (welder.WED_IfOnGuard.HasValue && !welder.WED_IfOnGuard.Value))
{
result += (i + 2).ToString() + "," + "打底焊工" + "," + "不在岗！" + "|";
}
}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+4 -3
View File
@@ -534,9 +534,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
//if (!string.IsNullOrEmpty(this.drpUnit.SelectedValue) && this.drpUnit.SelectedValue != BLL.Const._Null)
if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && this.drpInstallation.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpInstallation.SelectedValue))
{
string strList = this.CurrUser.LoginProjectId + "|" + this.drpUnit.SelectedValue + "|" + this.DReportID + "|" + this.drpInstallation.SelectedValue;
// if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && this.drpInstallation.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpInstallation.SelectedValue))
if ( this.drpInstallation.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpInstallation.SelectedValue))
{
string strList = this.CurrUser.LoginProjectId + "|" + this.drpUnit.SelectedValue + "|" + this.DReportID + "|" + this.drpInstallation.SelectedValue;
string window = String.Format("WeldReportItemEdit.aspx?strList={0}&jotIds={1}", strList, jotIds, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID) + Window1.GetShowReference(window));
}