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/PersonManage/PersonManage.aspx
+7 -10
View File
@@ -81,16 +81,13 @@
<f:RenderField Width="100px" ColumnID="WED_Birthday" DataField="WED_Birthday" FieldType="Date"
HeaderText="出生日期" HeaderTextAlign="Center" TextAlign="Left" Renderer="Date">
</f:RenderField>
<f:TemplateField ColumnID="InTime" Width="100px" HeaderText="入场时间" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbInTime" runat="server" Text='<%# ConvertInTime(Eval("IdentityCard")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="OutTime" Width="100px" HeaderText="出场时间" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbOutTime" runat="server" Text='<%# ConvertOutTime(Eval("IdentityCard")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="InTime" DataField="InTime" FieldType="Date"
HeaderText="入场时间" HeaderTextAlign="Center" TextAlign="Left" Renderer="Date">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="OutTime" DataField="OutTime" FieldType="Date"
HeaderText="出场时间" HeaderTextAlign="Center" TextAlign="Left" Renderer="Date">
</f:RenderField>
<f:TemplateField ColumnID="Qualification" Width="100px" HeaderText="资质" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbQualification" runat="server" Text='<%# ConvertQualification(Eval("WED_ID")) %>'></asp:Label>
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs
+1 -1
View File
@@ -56,7 +56,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
Welder.IdentityCard,
Welder.TeamGroupId,
Welder.WED_Code,
Welder.WED_Name,
Welder.WED_Name, Welder.InTime, Welder.OutTime,
(CASE WHEN Welder.WED_Sex='2' THEN '女' ELSE '男' END ) AS WED_Sex,
Welder.WED_Birthday,
Welder.WED_WorkCode,
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.designer.cs
Generated
-18
View File
@@ -185,24 +185,6 @@ namespace FineUIPro.Web.HJGL.PersonManage
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// lbInTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbInTime;
/// <summary>
/// lbOutTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbOutTime;
/// <summary>
/// lbQualification 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageEdit.aspx
+7
View File
@@ -52,6 +52,13 @@
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtTimeIn" runat="server" Label="入场时间" LabelAlign="Right" LabelWidth="120px"></f:DatePicker>
<f:DatePicker ID="txtTimeOut" runat="server" Label="出场时间" LabelAlign="Right" LabelWidth="120px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtWorkCode" runat="server" Label="上岗证号"
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageEdit.aspx.cs
+22 -1
View File
@@ -77,6 +77,8 @@ namespace FineUIPro.Web.HJGL.PersonManage
this.txtWED_Name.Text = welder.WED_Name;
this.txtWED_Code.Text = welder.WED_Code;
this.txtBirthday.Text = welder.WED_Birthday.HasValue ? string.Format("{0:yyyy-MM-dd}", welder.WED_Birthday) : "";
this.txtTimeIn.Text = welder.InTime.HasValue ? string.Format("{0:yyyy-MM-dd}", welder.InTime) : "";
this.txtTimeOut.Text = welder.OutTime.HasValue ? string.Format("{0:yyyy-MM-dd}", welder.OutTime) : "";
if (!string.IsNullOrEmpty(welder.WED_TYPE))
{
this.rbtype.SelectedValue = welder.WED_TYPE;
@@ -116,6 +118,10 @@ namespace FineUIPro.Web.HJGL.PersonManage
this.drpSteType.Values = welder.Steels.Split(',');
}
}
}
}
@@ -184,6 +190,14 @@ namespace FineUIPro.Web.HJGL.PersonManage
welder.WED_TYPE = this.rbtype.SelectedValue;
welder.WED_Birthday = Funs.GetNewDateTime(this.txtBirthday.Text.Trim());
welder.LimitDate = Funs.GetNewDateTime(this.txtLimitDate.Text.Trim());
if (!string.IsNullOrEmpty(txtTimeIn.Text))
{
welder.InTime = Funs.GetNewDateTime(this.txtTimeIn.Text.Trim());
}
if (!string.IsNullOrEmpty(txtTimeOut.Text))
{
welder.OutTime = Funs.GetNewDateTime(this.txtTimeOut.Text.Trim());
}
welder.WED_WorkCode = this.txtWorkCode.Text.Trim();
welder.WED_Class = this.txtClass.Text.Trim();
if (this.cbIfOnGuard.Checked)
@@ -232,6 +246,8 @@ namespace FineUIPro.Web.HJGL.PersonManage
}
}
BLL.WelderService.UpdateBSWelder(welder);
}
else
{
@@ -260,6 +276,8 @@ namespace FineUIPro.Web.HJGL.PersonManage
person.PersonId = welder.WED_ID;
person.IdentityCard = welder.IdentityCard;
person.PhotoUrl = welder.AttachUrl;
///上传人脸库
if (!string.IsNullOrEmpty(person.PhotoUrl))
{
@@ -295,7 +313,10 @@ namespace FineUIPro.Web.HJGL.PersonManage
}
}
}
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageEdit.aspx.designer.cs
Generated
+18
View File
@@ -95,6 +95,24 @@ namespace FineUIPro.Web.HJGL.PersonManage
/// </remarks>
protected global::FineUIPro.RadioButtonList rblSex;
/// <summary>
/// txtTimeIn 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtTimeIn;
/// <summary>
/// txtTimeOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtTimeOut;
/// <summary>
/// txtWorkCode 控件。
/// </summary>
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));
}