diff --git a/.gitignore b/.gitignore index 761ecab..9046ab9 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ bin-release/ /HJGL_DS/FineUIPro.Web/FileUploadHJGLHotProessManage /HJGL_DS/FineUIPro.Web/File/Excel /HJGL_DS/.vs/ -/HJGL_DS/.vs/config/applicationhost.config \ No newline at end of file +/HJGL_DS/.vs/config/applicationhost.config +/HJGL_DS/FineUIPro.Web/FileUpload/Sign diff --git a/DataBase/版本日志/HJGLDB_DS_2025-05-20_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-05-20_gf.sql new file mode 100644 index 0000000..e8d94f5 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-05-20_gf.sql @@ -0,0 +1,12 @@ +update Sys_Menu set SortIndex=10,MenuName='ҵ(RT)' where MenuId='41C22E63-36B7-4C44-6666-F765BFBB7C55' +GO + +INSERT INTO dbo.Sys_Menu(MenuId, MenuName, Url, SortIndex, SuperMenu,MenuModule) +VALUES('9C7129AB-4557-4D03-BE7E-9A3311F02990','ҵ(PAUT)','HJGL/WeldingReport/WelderPerformancePAUT.aspx',20,'F3B157B7-9BEE-4150-6666-087828F1C51D','3') +GO +INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('70929397-A461-45F2-81EA-D40D20D3C232','9C7129AB-4557-4D03-BE7E-9A3311F02990','ͳ',1) +INSERT INTO dbo.ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('87309E05-7C92-4439-A8E4-537833BC90A0','9C7129AB-4557-4D03-BE7E-9A3311F02990','',2) +go + +alter table Weld_Storeman add UnitStoreId nvarchar(50) null +GO \ No newline at end of file diff --git a/HJGL_DS/BLL/WeldMat/BaseInfo/StoremanInfoService.cs b/HJGL_DS/BLL/WeldMat/BaseInfo/StoremanInfoService.cs index 0609d1e..b2fe9b2 100644 --- a/HJGL_DS/BLL/WeldMat/BaseInfo/StoremanInfoService.cs +++ b/HJGL_DS/BLL/WeldMat/BaseInfo/StoremanInfoService.cs @@ -43,6 +43,7 @@ newStoreman.StoreCode = storeMan.StoreCode; newStoreman.StoreName = storeMan.StoreName; newStoreman.UserId = storeMan.UserId; + newStoreman.UnitStoreId = storeMan.UnitStoreId; db.Weld_Storeman.InsertOnSubmit(newStoreman); db.SubmitChanges(); } @@ -62,6 +63,7 @@ // newStoreman.UserId = storeMan.UserId; newStoreman.IdentityCard = storeMan.IdentityCard; newStoreman.SignatureUrl = storeMan.SignatureUrl; + newStoreman.UnitStoreId = storeMan.UnitStoreId; //newStoreman.MyFinger = storeMan.MyFinger; db.SubmitChanges(); } diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 45cdc54..2c5bd8d 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1221,6 +1221,7 @@ + @@ -6477,6 +6478,13 @@ WelderPerformance.aspx + + WelderPerformancePAUT.aspx + ASPXCodeBehind + + + WelderPerformancePAUT.aspx + WeldInspectionCheckRecord.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/Global.asax.cs b/HJGL_DS/FineUIPro.Web/Global.asax.cs index da3d6f2..aca0746 100644 --- a/HJGL_DS/FineUIPro.Web/Global.asax.cs +++ b/HJGL_DS/FineUIPro.Web/Global.asax.cs @@ -11,6 +11,9 @@ using System.Threading; using System.Web; using BLL; + using System.Data; + using System.Data.SqlClient; + using System.Collections.Generic; public class Global : System.Web.HttpApplication { @@ -464,6 +467,88 @@ BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedProject(updateQue); } } + + bool b = false; + string orderTime = string.Empty; + if (intHour == 8) + { + orderTime = "7:00 - 8:00"; + } + else if (intHour == 9) + { + orderTime = "8:00 - 9:00"; + } + else if (intHour == 10) + { + orderTime = "9:00 - 10:00"; + } + else if (intHour == 11) + { + orderTime = "10:00 - 11:00"; + } + else if (intHour == 12) + { + orderTime = "11:00 - 12:00"; + } + else if (intHour == 13) + { + orderTime = "12:00 - 13:00"; + } + else if (intHour == 14) + { + orderTime = "13:00 - 14:00"; + } + else if (intHour == 15) + { + orderTime = "14:00 - 15:00"; + } + else if (intHour == 16) + { + orderTime = "15:00 - 16:00"; + } + else if (intHour == 17) + { + orderTime = "16:00 - 17:00"; + } + else if (intHour == 18) + { + orderTime = "17:00 - 18:00"; + } + else if (intHour == 19) + { + orderTime = "18:00 - 19:00"; + } + else if (intHour == 20) + { + orderTime = "19:00 - 20:00"; + } + else if (intHour == 21) + { + orderTime = "20:00 - 21:00"; + } + if (!string.IsNullOrEmpty(orderTime)) + { + b = true; + } + if (b) + { + string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p + WHERE p.OrderDate listStr = new List(); + listStr.Add(new SqlParameter("@OrderTime", orderTime)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable dt = SQLHelper.GetDataTableRunText(lastPlan, parameter); + if (dt.Rows.Count > 0) + { + for (int i = 0; i < dt.Rows.Count; i++) + { + string usingPlanId = dt.Rows[i]["UsingPlanId"].ToString(); + BLL.UsingPlanService.UpdateIsCancel(usingPlanId, "超时未领用"); + } + } + } } protected void Session_Start(object sender, EventArgs e) diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx new file mode 100644 index 0000000..1892e98 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx @@ -0,0 +1,163 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WelderPerformancePAUT.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingReport.WelderPerformancePAUT" %> + + + + + + 焊工业绩分析 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx.cs new file mode 100644 index 0000000..58d2017 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx.cs @@ -0,0 +1,548 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Text; +using BLL; +using Newtonsoft.Json.Linq; +using System.Linq; +using AspNet = System.Web.UI.WebControls; + +namespace FineUIPro.Web.HJGL.WeldingReport +{ + public partial class WelderPerformancePAUT : PageBase + { + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + var pUnit = BLL.Base_UnitService.GetUnitsByProjectUnitType(this.drpProject.SelectedValue, BLL.Const.UnitType_4); + ///单位 + this.drpUnit.DataTextField = "UnitName"; + this.drpUnit.DataValueField = "UnitId"; + this.drpUnit.DataSource = pUnit; + this.drpUnit.DataBind(); + Funs.FineUIPleaseSelect(this.drpUnit); + + ///项目 + this.drpProject.DataTextField = "ProjectCode"; + this.drpProject.DataValueField = "ProjectId"; + this.drpProject.DataSource = BLL.Base_ProjectService.GetProjectListByUserId(this.CurrUser.UserId, "1"); + this.drpProject.DataBind(); + Funs.FineUIPleaseSelect(this.drpProject); + ///焊工 + this.drpWloName.DataTextField = "Text"; + this.drpWloName.DataValueField = "Value"; + this.drpWloName.DataSource = BLL.HJGL_PersonManageService.GetWelderCodeList(); + this.drpWloName.DataBind(); + Funs.FineUIPleaseSelect(this.drpWloName); + ////材质 + this.drpSteel.DataTextField = "STE_Code"; + this.drpSteel.DataValueField = "STE_ID"; + this.drpSteel.DataSource = BLL.HJGL_MaterialService.GetSteelList(); + this.drpSteel.DataBind(); + Funs.FineUIPleaseSelect(this.drpSteel); + } + } + #endregion + + /// + /// 全部行合计 + /// + private void OutputSummaryData() + { + if (tb != null) + { + double totalSize = 0.0f; + int totalJoint = 0; + int JointNum1 = 0; + int totalfilm = 0; + int JointPassNum1 = 0; + int totalPassfilm = 0; + int RepairJoint1 = 0; + int repairFilm1 = 0; + int RepairJoint2 = 0; + int repairFilm2 = 0; + int RepairJoint3 = 0; + int repairFilm3 = 0; + string filmPassRate = ""; + string jointPassRate = ""; + + //foreach (DataRow row in tb.Rows) + //{ + // totalSize += Convert.ToDouble(row["totalSize"]); + // totalJoint += Convert.ToInt32(row["totalJoint"]); + // JointNum1 += Convert.ToInt32(row["JointNum1"]); + // totalfilm += Convert.ToInt32(row["totalfilm"]); + // JointPassNum1 += Convert.ToInt32(row["JointPassNum1"]); + // totalPassfilm += Convert.ToInt32(row["totalPassfilm"]); + + // RepairJoint1 += Convert.ToInt32(row["RepairJoint1"]); + // repairFilm1 += Convert.ToInt32(row["repairFilm1"]); + // RepairJoint2 += Convert.ToInt32(row["RepairJoint2"]); + // repairFilm2 += Convert.ToInt32(row["repairFilm2"]); + // RepairJoint3 += Convert.ToInt32(row["RepairJoint3"]); + // repairFilm3 += Convert.ToInt32(row["repairFilm3"]); + //} + //if (totalfilm != 0) + //{ + // filmPassRate = (totalPassfilm * 100.0 / totalfilm * 1.0).ToString("0.00") + "%"; + //} + //if (JointNum1 != 0) + //{ + // jointPassRate = (JointPassNum1 * 100.0 / JointNum1 * 1.0).ToString("0.00") + "%"; + //} + string projectIds = String.Join(",", drpProject.SelectedValueArray); + List listStr = new List(); + + if (this.drpIns.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@installationId", null)); + } + + if (this.drpUnit.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@unitcode", this.drpUnit.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@unitcode", null)); + } + + if (this.drpSteel.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@steel", this.drpSteel.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@steel", null)); + } + if (this.drpWloName.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@WED_ID", this.drpWloName.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@WED_ID", null)); + } + + if (!string.IsNullOrEmpty(this.txtStarTime.Text)) + { + listStr.Add(new SqlParameter("@date1", Convert.ToDateTime(this.txtStarTime.Text))); + } + else + { + listStr.Add(new SqlParameter("@date1", null)); + } + + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + listStr.Add(new SqlParameter("@date2", Convert.ToDateTime(this.txtEndTime.Text).AddDays(1))); + } + else + { + listStr.Add(new SqlParameter("@date2", null)); + } + + if (this.drpProject.SelectedValueArray.Length > 0 && this.drpProject.SelectedValueArray[0] != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@projectId", projectIds)); + } + else + { + listStr.Add(new SqlParameter("@projectId", null)); + } + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tbSum = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderPerformanceSum", parameter); + if (tbSum.Rows.Count > 0) + { + JObject summary = new JObject(); + summary.Add("tfNumber", "合计"); + summary.Add("totalJoint", tbSum.Rows[0]["totalJoint"].ToString()); + summary.Add("totalSize", tbSum.Rows[0]["totalSize"].ToString()); + summary.Add("JointNum1", tbSum.Rows[0]["JointNum1"].ToString()); + summary.Add("totalfilm", tbSum.Rows[0]["totalfilm"].ToString()); + summary.Add("JointPassNum1", tbSum.Rows[0]["JointPassNum1"].ToString()); + summary.Add("totalPassfilm", tbSum.Rows[0]["totalPassfilm"].ToString()); + + summary.Add("RepairJoint1", tbSum.Rows[0]["RepairJoint1"].ToString()); + summary.Add("repairFilm1", tbSum.Rows[0]["repairFilm1"].ToString()); + summary.Add("RepairJoint2", tbSum.Rows[0]["RepairJoint2"].ToString()); + summary.Add("repairFilm2", tbSum.Rows[0]["repairFilm2"].ToString()); + summary.Add("RepairJoint3", tbSum.Rows[0]["RepairJoint3"].ToString()); + summary.Add("repairFilm3", tbSum.Rows[0]["repairFilm3"].ToString()); + summary.Add("JointPassRate", (Funs.GetNewDecimalOrZero(tbSum.Rows[0]["JointPassRate"].ToString()) * 100).ToString("0.00") + "%"); + summary.Add("JointFilmPassRate", (Funs.GetNewDecimalOrZero(tbSum.Rows[0]["JointFilmPassRate"].ToString()) * 100).ToString("0.00") + "%"); + + Grid1.SummaryData = summary; + } + } + + } + + /// + /// 数据表 + /// + private DataTable tb = null; + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + string projectIds = String.Join(",", drpProject.SelectedValueArray); + List listStr = new List(); + + if (this.drpIns.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@installationId", null)); + } + + if (this.drpUnit.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@unitcode", this.drpUnit.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@unitcode", null)); + } + + if (this.drpSteel.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@steel", this.drpSteel.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@steel", null)); + } + if (this.drpWloName.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@WED_ID", this.drpWloName.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@WED_ID", null)); + } + + if (!string.IsNullOrEmpty(this.txtStarTime.Text)) + { + listStr.Add(new SqlParameter("@date1", Convert.ToDateTime(this.txtStarTime.Text))); + } + else + { + listStr.Add(new SqlParameter("@date1", null)); + } + + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + listStr.Add(new SqlParameter("@date2", Convert.ToDateTime(this.txtEndTime.Text).AddDays(1))); + } + else + { + listStr.Add(new SqlParameter("@date2", null)); + } + + if (this.drpProject.SelectedValueArray.Length > 0 && this.drpProject.SelectedValueArray[0] != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@projectId", projectIds)); + } + else + { + listStr.Add(new SqlParameter("@projectId", null)); + } + + SqlParameter[] parameter = listStr.ToArray(); + tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderPerformancePAUT", parameter); + this.Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 绑定数据 + /// + private void BindGrid2() + { + string projectIds = String.Join(",", drpProject.SelectedValueArray); + List listStr = new List(); + + if (this.drpIns.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@installationId", this.drpIns.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@installationId", null)); + } + + if (this.drpUnit.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@unitcode", this.drpUnit.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@unitcode", null)); + } + + if (this.drpSteel.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@steel", this.drpSteel.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@steel", null)); + } + if (this.drpWloName.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@WED_ID", this.drpWloName.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@WED_ID", null)); + } + + if (!string.IsNullOrEmpty(this.txtStarTime.Text)) + { + listStr.Add(new SqlParameter("@date1", Convert.ToDateTime(this.txtStarTime.Text))); + } + else + { + listStr.Add(new SqlParameter("@date1", null)); + } + + if (!string.IsNullOrEmpty(this.txtEndTime.Text)) + { + listStr.Add(new SqlParameter("@date2", Convert.ToDateTime(this.txtEndTime.Text).AddDays(1))); + } + else + { + listStr.Add(new SqlParameter("@date2", null)); + } + + if (this.drpProject.SelectedValueArray.Length > 0 && this.drpProject.SelectedValueArray[0] != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@projectId", projectIds)); + } + else + { + listStr.Add(new SqlParameter("@projectId", null)); + } + + SqlParameter[] parameter = listStr.ToArray(); + tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_welderPerformancePAUT2", parameter); + this.Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 分页 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + this.BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue); + this.BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 统计按钮事件 + /// + /// 统计 + /// + /// + /// + protected void BtnAnalyse_Click(object sender, EventArgs e) + { + this.Grid1.Columns[1].Hidden = false; + BindGrid(); + OutputSummaryData(); + } + + /// + /// 统计 + /// + /// + /// + protected void BtnAnalyse2_Click(object sender, EventArgs e) + { + this.Grid1.Columns[1].Hidden = true; + BindGrid2(); + this.Grid1.SummaryData = null; + //OutputSummaryData(); + } + #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("焊工业绩分析" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Grid1.PageSize = 100000; + BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + + /// + /// 导出方法 + /// + /// + /// + private string GetGridTableHtml(Grid grid) + { + StringBuilder sb = new StringBuilder(); + sb.Append(""); + sb.Append(""); + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + sb.AppendFormat("", column.HeaderText); + } + sb.Append(""); + foreach (GridRow row in grid.Rows) + { + sb.Append(""); + foreach (GridColumn column in grid.Columns) + { + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber") + { + html = (row.FindControl("labNumber") as AspNet.Label).Text; + } + sb.AppendFormat("", html); + } + + sb.Append(""); + } + + sb.Append("
{0}
{0}
"); + + return sb.ToString(); + } + #endregion + + #region 下拉框联动事件 + /// + /// 项目下拉框变化事件 + /// + /// + /// + protected void drpProject_OnSelectedIndexChanged(object sender, EventArgs e) + { + drpIns.Items.Clear(); + this.drpUnit.Items.Clear(); ///单位 + this.drpWloName.Items.Clear(); ///焊工 + if (drpProject.SelectedValueArray.Length > 1) + { + drpProject.Items[0].Selected = false; + } + if (drpProject.SelectedValueArray.Length == 0) + { + drpProject.Items[0].Selected = true; + } + if (drpProject.SelectedValueArray.Length == 1 && this.drpProject.SelectedValueArray[0] != BLL.Const._Null) + { + var pUnit = BLL.Base_UnitService.GetUnitsByProjectUnitType(drpProject.SelectedValueArray[0], BLL.Const.UnitType_4); + this.drpUnit.DataSource = pUnit; + this.drpUnit.DataBind(); + + this.drpIns.Items.Clear(); + this.drpIns.DataTextField = "Text"; + this.drpIns.DataValueField = "Value"; + this.drpIns.DataSource = BLL.Project_InstallationService.GetInstallationList(drpProject.SelectedValueArray[0]); + this.drpIns.DataBind(); + + } + Funs.FineUIPleaseSelect(this.drpIns); + this.drpIns.SelectedValue = BLL.Const._Null; + Funs.FineUIPleaseSelect(this.drpUnit); + this.drpUnit.SelectedValue = BLL.Const._Null; + this.drpWloName.DataTextField = "Text"; + this.drpWloName.DataValueField = "Value"; + if (drpProject.SelectedValueArray.Length == 1 && this.drpProject.SelectedValueArray[0] == BLL.Const._Null) + { + this.drpWloName.DataSource = BLL.HJGL_PersonManageService.GetWelderCodeList(); + } + else + { + this.drpWloName.DataSource = BLL.HJGL_PersonManageService.GetProjectWelderCodeList2(drpProject.SelectedValueArray[0]); + } + this.drpWloName.DataBind(); + Funs.FineUIPleaseSelect(this.drpWloName); + this.drpWloName.SelectedValue = BLL.Const._Null; + + } + + /// + /// 单位下拉框变化事件 + /// + /// + /// + protected void drpUnit_OnSelectedIndexChanged(object sender, EventArgs e) + { + this.drpWloName.Items.Clear(); ///焊工 + if (this.drpUnit.SelectedValue != BLL.Const._Null) + { + this.drpWloName.DataTextField = "Text"; + this.drpWloName.DataValueField = "Value"; + this.drpWloName.DataSource = BLL.HJGL_PersonManageService.GetProjectWelderCodeListByUnitId(this.drpProject.SelectedValue, this.drpUnit.SelectedValue); + this.drpWloName.DataBind(); + } + Funs.FineUIPleaseSelect(this.drpWloName); + this.drpWloName.SelectedValue = BLL.Const._Null; + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx.designer.cs new file mode 100644 index 0000000..db592bd --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WelderPerformancePAUT.aspx.designer.cs @@ -0,0 +1,231 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.WeldingReport { + + + public partial class WelderPerformancePAUT { + + /// + /// Head1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlHead Head1; + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// RegionPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RegionPanel RegionPanel1; + + /// + /// Region1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Region Region1; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// drpProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProject; + + /// + /// drpIns 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpIns; + + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + + /// + /// drpWloName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpWloName; + + /// + /// txtStarTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStarTime; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// drpSteel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpSteel; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// BtnAnalyse2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button BtnAnalyse2; + + /// + /// BtnAnalyse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button BtnAnalyse; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// Region2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Region Region2; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 97d6b43..bf404b8 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx index 4c20c35..5a18bd9 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx @@ -44,7 +44,7 @@ <%-- --%> - + + <%----%> @@ -84,11 +87,14 @@ + + + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx.cs index b554d29..15b92e2 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx.cs @@ -19,7 +19,15 @@ namespace FineUIPro.Web.WeldMat.BaseInfo if (!IsPostBack) { ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - + BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStore, string.Empty, true); + if (this.CurrUser.UserId == BLL.Const.GlyId || this.CurrUser.UserId == "32da7c11-0869-4b9a-8db4-4e51a4a91f31") + { + this.drpUnitStore.Enabled = true; + } + else + { + this.drpUnitStore.Enabled = false; + } // 绑定表格 BindGrid(); } @@ -32,10 +40,12 @@ namespace FineUIPro.Web.WeldMat.BaseInfo /// private void BindGrid() { - string strSql = @"SELECT StoremanId, StoreCode, StoreName, IdentityCard,SignatureUrl" - + @" FROM Weld_Storeman WHERE 1=1 "; + string strSql = @"SELECT StoremanId, StoreCode, StoreName, IdentityCard,SignatureUrl,us.UnitStoreName" + + @" FROM Weld_Storeman a + left join Weld_UnitStore us on a.UnitStoreId=us.UnitStoreId + WHERE 1=1 "; List listStr = new List(); - + if (!string.IsNullOrEmpty(this.txtName.Text.Trim())) { strSql += " AND StoreName LIKE @StoreName"; @@ -204,12 +214,17 @@ namespace FineUIPro.Web.WeldMat.BaseInfo } string Id = Grid1.SelectedRowID; var storemanInfo = BLL.StoremanInfoService.GetStoremanById(Id); + this.drpUnitStore.SelectedValue = BLL.Const._Null; if (storemanInfo != null) { //this.txtStoreCode.Text = storemanInfo.StoreCode; this.txtStoreName.Text = storemanInfo.StoreName; this.txtIdentityCard.Text = storemanInfo.IdentityCard; imgPhoto.ImageUrl = storemanInfo.SignatureUrl; + if (!string.IsNullOrEmpty(storemanInfo.UnitStoreId)) + { + this.drpUnitStore.SelectedValue = storemanInfo.UnitStoreId; + } hfFormID.Text = Id; this.btnDelete.Enabled = true; } @@ -242,6 +257,10 @@ namespace FineUIPro.Web.WeldMat.BaseInfo storeman.StoreName = this.txtStoreName.Text.Trim(); storeman.IdentityCard = this.txtIdentityCard.Text.Trim(); storeman.SignatureUrl = imgPhoto.ImageUrl; + if (this.drpUnitStore.SelectedValue != BLL.Const._Null) + { + storeman.UnitStoreId = this.drpUnitStore.SelectedValue; + } if (!string.IsNullOrEmpty(strRowID)) { storeman.StoremanId = strRowID; diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx.designer.cs index 22cd603..e9e23e0 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/StoremanInfo.aspx.designer.cs @@ -2,8 +2,8 @@ // <自动生成> // 此代码由工具生成。 // -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 // //------------------------------------------------------------------------------ @@ -165,6 +165,15 @@ namespace FineUIPro.Web.WeldMat.BaseInfo { /// protected global::FineUIPro.TextBox txtIdentityCard; + /// + /// drpUnitStore 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitStore; + /// /// filePhoto 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelect.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelect.aspx.cs index c52e969..1c85caa 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelect.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelect.aspx.cs @@ -57,7 +57,7 @@ namespace FineUIPro.Web.WeldMat.Stock LEFT JOIN dbo.Weld_WeldType AS wType ON wType.WeldTypeId = weld.WeldTypeId WHERE 1=1"; List listStr = new List(); - + if (!string.IsNullOrEmpty(this.txtWeldName.Text.Trim())) { strSql += " AND weld.WeldName LIKE @WeldName"; @@ -175,7 +175,12 @@ namespace FineUIPro.Web.WeldMat.Stock string id = Grid1.SelectedRowID.Split(',')[0]; if (!string.IsNullOrEmpty(id)) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockSelectDetail.aspx?WeldId={0}", id, "编辑 - "))); + string unitStoreId = string.Empty; + if (this.drpUnitStore.SelectedValue != BLL.Const._Null) + { + unitStoreId = this.drpUnitStore.SelectedValue; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockSelectDetail.aspx?WeldId={0}&UnitStoreId={1}", id, unitStoreId, "编辑 - "))); } } #endregion diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelectDetail.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelectDetail.aspx.cs index 7605262..9975b77 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelectDetail.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockSelectDetail.aspx.cs @@ -80,7 +80,12 @@ namespace FineUIPro.Web.WeldMat.Stock strSql += " AND StockIn.WeldId=@WeldId"; listStr.Add(new SqlParameter("@WeldId", this.WeldId)); } - + string unitStoreId= Request.Params["UnitStoreId"]; + if (!string.IsNullOrEmpty(unitStoreId)) + { + strSql += " AND StockIn.UnitStoreId=@UnitStoreId"; + listStr.Add(new SqlParameter("@UnitStoreId", unitStoreId)); + } if (drpUnit.SelectedValue != Const._Null && drpUnit.SelectedValue != null) { strSql += " AND unit.UnitId = @UnitId"; diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx index 75afd5b..966bfce 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx @@ -129,10 +129,13 @@ - - + + 0) - { - for (int i = 0; i < dt.Rows.Count; i++) - { - string usingPlanId = dt.Rows[i]["UsingPlanId"].ToString(); - BLL.UsingPlanService.UpdateIsCancel(usingPlanId, "超时未领用"); - } - } + //string lastPlan = @"SELECT p.UsingPlanId FROM dbo.Weld_UsingPlan p + // WHERE p.OrderDate 0) + //{ + // for (int i = 0; i < dt.Rows.Count; i++) + // { + // string usingPlanId = dt.Rows[i]["UsingPlanId"].ToString(); + // BLL.UsingPlanService.UpdateIsCancel(usingPlanId, "超时未领用"); + // } + //} // 绑定表格 BindGrid(); @@ -56,7 +56,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan string projectIds = BLL.Project_UserService.GetStrProjectIds(this.CurrUser.UserId); string strSql = @"SELECT UsingPlan.UsingPlanId, UsingPlan.WeldId, UsingPlan.ProjectId, UsingPlan.UsePosition,TeamGroupId,UsingPlan.STE_Name, unit.UnitName AS UsingUnit,UsingPlan.Amount, UsingPlan.UsingManOne, UsingPlan.InPutDate, - UsingPlan.OrderDate,UsingPlan.OrderTime, UsingPlan.CancelDate,UsingPlan.IsNeedConfirm, + CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime, UsingPlan.CancelDate,UsingPlan.IsNeedConfirm, (CASE UsingPlan.IsSteelStru WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsSteelStru, (CASE UsingPlan.IsSubmit WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsSubmit, (CASE UsingPlan.IsCancel WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsCancel, @@ -335,6 +335,12 @@ namespace FineUIPro.Web.WeldMat.UsingPlan var usedMat = BLL.UsingMatService.GetUsingMatByPlanId(id); if (usedMat == null) { + Model.Weld_UsingPlan usingPlan = BLL.UsingPlanService.GetUsingPlanById(id); + if (usingPlan != null && usingPlan.IsCancel == true) + { + Alert.ShowInTop("记录已作废，不能修改！", MessageBoxIcon.Warning); + return; + } PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("UsingPlanEdit.aspx?UsingPlanId={0}", id, "编辑 - "))); } else diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx.cs index b39bd8e..910000d 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx.cs @@ -69,16 +69,25 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat LEFT JOIN dbo.Weld_Supplier supplier ON supplier.SupplierId=StockIn.SupplierId LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId = StockIn.UnitStoreId WHERE (StockIn.Amount-ISNULL(StockIn.UsingAmount,0)+ISNULL(StockIn.RecycleAmount,0))>0 - AND StockIn.WeldId=@WeldId AND (StockIn.Amount-ISNULL(StockIn.UsingAmount,0))>=0 "; + AND StockIn.WeldId=@WeldId AND (StockIn.Amount-ISNULL(StockIn.UsingAmount,0))>=0 + and StockIn.UnitStoreId=@UnitStoreId "; + Model.Weld_Storeman storeMan = BLL.StoremanInfoService.GetStoremanByUserId(this.CurrUser.UserId); + string unitStoreId = string.Empty; + if (storeMan != null) + { + unitStoreId = storeMan.UnitStoreId; + } List listStr = new List(); if (plan != null) { listStr.Add(new SqlParameter("@OneAmount", plan.Amount)); listStr.Add(new SqlParameter("@WeldId", plan.WeldId)); + listStr.Add(new SqlParameter("@UnitStoreId", unitStoreId)); } else { listStr.Add(new SqlParameter("@WeldId", null)); + listStr.Add(new SqlParameter("@UnitStoreId", unitStoreId)); } //if (CurrUser.UnitId != null) //{ diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx index bb0ec87..a56700c 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx @@ -61,6 +61,12 @@ + + + + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs index 73c5d13..64deb1b 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs @@ -37,6 +37,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat string strSql = @"SELECT UsingMat.UsingMatId, UsingMat.ProjectId, UsingMat.UsePosition, UsingMat.WeldId,UsingMat.UsingPlanId,ISNULL(UsingMat.Amount,0) AS Amount, ISNULL(UsingMat.TwoAmount,0) AS TwoAmount,UsingMat.UsingMan, UsingMat.UsingDate, + CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime, (CASE WHEN stockIn.Warrantybook IS NOT NULL THEN stockIn.Warrantybook ELSE UsingMat.Warrantybook END) AS Warrantybook,UsingPlan.STE_Name, UsingMat.Number,Project.ProjectCode,Project.ProjectName,WeldInfo.WeldCode, @@ -340,7 +341,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat BindGrid(); foreach (GridColumn column in grid.Columns) { - if (column.ColumnIndex < 18) + if (column.ColumnIndex < 20) { sb.AppendFormat("{0}", column.HeaderText); } @@ -352,7 +353,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat sb.Append(""); foreach (GridColumn column in grid.Columns) { - if (column.ColumnIndex < 18) + if (column.ColumnIndex < 20) { string html = row.Values[column.ColumnIndex].ToString(); if (column.ColumnID == "tfNumber") diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 30d6ad1..9cc0689 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -35195,7 +35195,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CH_TrustCode", DbType="VarChar(30)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CH_TrustCode", DbType="NVarChar(100)")] public string CH_TrustCode { get @@ -56497,7 +56497,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CH_TRUSTCODE1", DbType="VarChar(30)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CH_TRUSTCODE1", DbType="NVarChar(100)")] public string CH_TRUSTCODE1 { get @@ -63690,6 +63690,16 @@ namespace Model private string _ProjectId; + private string _PointType; + + private string _RT1_RepairFilm; + + private string _Dreportid; + + private string _BSU_ID; + + private string _STE_ID; + private string _JOT_JointNo; private string _JOT_DailyReportNo; @@ -63880,6 +63890,86 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PointType", DbType="NVarChar(10)")] + public string PointType + { + get + { + return this._PointType; + } + set + { + if ((this._PointType != value)) + { + this._PointType = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RT1_RepairFilm", DbType="NVarChar(20)")] + public string RT1_RepairFilm + { + get + { + return this._RT1_RepairFilm; + } + set + { + if ((this._RT1_RepairFilm != value)) + { + this._RT1_RepairFilm = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="dreportid", Storage="_Dreportid", DbType="VarChar(50)")] + public string Dreportid + { + get + { + return this._Dreportid; + } + set + { + if ((this._Dreportid != value)) + { + this._Dreportid = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BSU_ID", DbType="NVarChar(50)")] + public string BSU_ID + { + get + { + return this._BSU_ID; + } + set + { + if ((this._BSU_ID != value)) + { + this._BSU_ID = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_STE_ID", DbType="VarChar(50)")] + public string STE_ID + { + get + { + return this._STE_ID; + } + set + { + if ((this._STE_ID != value)) + { + this._STE_ID = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JOT_JointNo", DbType="VarChar(50) NOT NULL", CanBeNull=false)] public string JOT_JointNo { @@ -78734,7 +78824,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MIDWelder_QualifiedProjectCode", DbType="NVarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MIDWelder_QualifiedProjectCode", DbType="VarChar(255)")] public string MIDWelder_QualifiedProjectCode { get @@ -110622,6 +110712,8 @@ namespace Model private System.Nullable _IsFaceTrain; + private string _UnitStoreId; + private EntitySet _Weld_RecycleMat; private EntitySet _Weld_RecycleMatTop; @@ -110648,6 +110740,8 @@ namespace Model partial void OnSignatureUrlChanged(); partial void OnIsFaceTrainChanging(System.Nullable value); partial void OnIsFaceTrainChanged(); + partial void OnUnitStoreIdChanging(string value); + partial void OnUnitStoreIdChanged(); #endregion public Weld_Storeman() @@ -110818,6 +110912,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitStoreId", DbType="NVarChar(50)")] + public string UnitStoreId + { + get + { + return this._UnitStoreId; + } + set + { + if ((this._UnitStoreId != value)) + { + this.OnUnitStoreIdChanging(value); + this.SendPropertyChanging(); + this._UnitStoreId = value; + this.SendPropertyChanged("UnitStoreId"); + this.OnUnitStoreIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMat_Weld_Storeman", Storage="_Weld_RecycleMat", ThisKey="StoremanId", OtherKey="StockMan", DeleteRule="NO ACTION")] public EntitySet Weld_RecycleMat { @@ -113428,7 +113542,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TeamGroupName", DbType="NVarChar(20)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TeamGroupName", DbType="NVarChar(50)")] public string TeamGroupName { get