diff --git a/CreateModel.bat b/CreateModel.bat index 2f27853..27ceb4a 100644 --- a/CreateModel.bat +++ b/CreateModel.bat @@ -25,9 +25,9 @@ REM -------------- @echo 设置.net控制台环境 @echo. -@call "%VS100COMNTOOLS%"vsvars32.bat +@call "%VS150%" -SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO 完成 pause diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 119d724..a87ca48 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/BLL/BLL.csproj b/HJGL/BLL/BLL.csproj index b94c0d4..5b80311 100644 --- a/HJGL/BLL/BLL.csproj +++ b/HJGL/BLL/BLL.csproj @@ -178,6 +178,7 @@ + diff --git a/HJGL/BLL/Common/Const.cs b/HJGL/BLL/Common/Const.cs index 53fe3ce..37f33fd 100644 --- a/HJGL/BLL/Common/Const.cs +++ b/HJGL/BLL/Common/Const.cs @@ -243,6 +243,10 @@ namespace BLL /// public const string WelderQueTemplateUrl = "File\\Excel\\WelderQue.xlsx"; + /// + /// 鐒婂伐鑰冭瘯鎯呭喌 + /// + public const string WelderTestInfoTemplateUrl = "File\\Excel\\鐒婂伐鑰冭瘯鎯呭喌.xlsx"; /// /// 濮旀墭鍗曞鍏ユā鏉 /// diff --git a/HJGL/BLL/WeldingProcess/WelderTest/WelderTestService.cs b/HJGL/BLL/WeldingProcess/WelderTest/WelderTestService.cs new file mode 100644 index 0000000..19084de --- /dev/null +++ b/HJGL/BLL/WeldingProcess/WelderTest/WelderTestService.cs @@ -0,0 +1,61 @@ +锘縰sing Model; +using NPOI.HSSF.EventUserModel; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + public class WelderTestService + { + public static void Add(Model.Welder_TestInfo input) + { + var model = new Model.Welder_TestInfo(); + model.Id = SQLHelper.GetNewID(typeof(Welder_TestInfo)); + model.WeldMethodId = input.WeldMethodId; + model.MaterialId = input.MaterialId; + model.Remark = input.Remark; + model.ProjectId = input.ProjectId; + model.CreatedDate = input.CreatedDate; + model.ProjectId = input.ProjectId; + model.WelderId = input.WelderId; + model.IsPass = input.IsPass; + Funs.DB.Welder_TestInfo.InsertOnSubmit(model); + Funs.DB.SubmitChanges(); + } + public static void Edit(Model.Welder_TestInfo input) + { + var result=Funs.DB.Welder_TestInfo.FirstOrDefault(t=>t.Id== input.Id); + if (result == null) + { + return ; + } + result.WelderId = input.WelderId; + result.WeldMethodId = input.WeldMethodId; + result.MaterialId = input.MaterialId; + result.Remark = input.Remark; + result.CreatedDate = input.CreatedDate; + result.IsPass = input.IsPass; + Funs.DB.SubmitChanges(); + + } + public static Model.Welder_TestInfo Get(string Id) + { + var result = Funs.DB.Welder_TestInfo.FirstOrDefault(t => t.Id == Id); + return result; + } + public static bool Delete(string Id) + { + var result = Funs.DB.Welder_TestInfo.FirstOrDefault(t => t.Id == Id); + if (result == null) + return false; + + Funs.DB.Welder_TestInfo.DeleteOnSubmit(result); + Funs.DB.SubmitChanges(); + return true; + } + + } +} diff --git a/HJGL/FineUIPro.Web/File/Excel/鐩綍妯＄増.xlsx b/HJGL/FineUIPro.Web/File/Excel/鐩綍妯＄増.xlsx index b4bb7bb..82d936b 100644 Binary files a/HJGL/FineUIPro.Web/File/Excel/鐩綍妯＄増.xlsx and b/HJGL/FineUIPro.Web/File/Excel/鐩綍妯＄増.xlsx differ diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index f843a5d..7c53860 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1081,6 +1081,7 @@ + @@ -1225,6 +1226,8 @@ + + @@ -4410,6 +4413,13 @@ QualifiedProjectEdit.aspx + + WelderTestInfoImportError.aspx + ASPXCodeBehind + + + WelderTestInfoImportError.aspx + WelderManage.aspx ASPXCodeBehind @@ -5353,6 +5363,20 @@ imageUp.ashx + + WelderTestInfo.aspx + ASPXCodeBehind + + + WelderTestInfo.aspx + + + WelderTestInfoEdit.aspx + ASPXCodeBehind + + + WelderTestInfoEdit.aspx + CheckManage.aspx ASPXCodeBehind diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index baa8804..9ecdad1 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx new file mode 100644 index 0000000..72b23e5 --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx @@ -0,0 +1,144 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WelderTestInfo.aspx.cs" Inherits="FineUIPro.Web.WelderManage.WelderTestInfo" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.cs new file mode 100644 index 0000000..834e21b --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.cs @@ -0,0 +1,650 @@ +锘縰sing BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; +using System.Web.Configuration; +using System.Security.Principal; + +namespace FineUIPro.Web.WelderManage +{ + public partial class WelderTestInfo : PageBase + { + //瀹氫箟鍙橀噺 + /// + /// 涓婁紶棰勮鐨勮櫄鎷熻矾寰 + /// + private string initPath = Const.ExcelUrl; + /// + /// 閿欒闆嗗悎 + /// + public static string errorInfos = string.Empty; + + #region 鍔犺浇 + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + + this.drpUnitId.DataTextField = "UnitName"; + this.drpUnitId.DataValueField = "UnitId"; + this.drpUnitId.DataSource = (from x in Funs.DB.Base_Unit select x).ToList(); + this.drpUnitId.DataBind(); + Funs.FineUIPleaseSelect(this.drpUnitId); + + this.InitTreeMenu();//鍔犺浇鏍 + } + } + + /// + /// 鍔犺浇鏍 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "鍗曚綅-鐒婂伐"; + rootNode.ToolTip = "鍗曚綅"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode); + + List welders = new List(); + List units = (from x in Funs.DB.Base_Unit select x).ToList(); + if (this.drpUnitId.SelectedValue != BLL.Const._Null) + { + units = units.Where(e => e.UnitId == this.drpUnitId.SelectedValue).ToList(); + } + foreach (var item in units) + { + TreeNode rootProjectNode = new TreeNode();//瀹氫箟鏍硅妭鐐 + rootProjectNode.Text = item.UnitName; + rootProjectNode.NodeID = item.UnitId; + //rootProjectNode.Expanded = true; + rootProjectNode.ToolTip = "鍗曚綅"; + rootNode.Nodes.Add(rootProjectNode); + + welders = (from x in Funs.DB.Welder_Welder + where x.UnitId == item.UnitId + select x).ToList(); + + + this.BindNodes(rootProjectNode, welders); + } + } + #endregion + + #region 缁戝畾鏍戣妭鐐 + /// + /// 缁戝畾鏍戣妭鐐 + /// + /// + private void BindNodes(TreeNode node, List welders) + { + if (node.ToolTip == "鍗曚綅") + { + if (!string.IsNullOrEmpty(this.txtWelderCodeS.Text.Trim())) + { + welders = welders.Where(e => e.WelderCode.Contains(this.txtWelderCodeS.Text.Trim())).ToList(); + } + if (!string.IsNullOrEmpty(txtWelderNameS.Text.Trim())) + { + welders = welders.Where(e => e.WelderName.Contains(this.txtWelderNameS.Text.Trim())).ToList(); + } + + welders = welders.OrderBy(x => x.WelderCode).ToList(); + foreach (var item in welders) + { + TreeNode newNode = new TreeNode(); + newNode.Text = item.WelderName + "(" + item.WelderCode + ")"; + newNode.NodeID = item.WelderId; + newNode.ToolTip = item.WelderCode; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); + } + } + } + #endregion + + #region 鐐瑰嚮TreeView + /// + /// 鐐瑰嚮TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + this.BindGrid(); + } + #endregion + + #region Grid 缁戝畾 + private void BindGrid() + { + var welder = BLL.WelderService.GetWelderById(this.tvControlItem.SelectedNodeID); + if (welder != null) + { + this.lblCode.Text = welder.WelderCode; + this.lblName.Text = welder.WelderName; + } + string strSql = @"SELECT A.*,b.WeldingMethodCode,C.MaterialCode, + (case when A.IsPass=1 then '鏄' else '鍚' end ) As PassName , + convert(varchar,A.CreatedDate,23) as TestDate + FROM Welder_TestInfo AS A + inner join Base_WeldingMethod as B + on A.WeldMethodId=B.WeldingMethodId + inner join Base_Material as C on + A.MaterialId=C.MaterialId + WHERE A.WelderId=@WelderId"; + List listStr = new List(); + listStr.Add(new SqlParameter("@WelderId", this.tvControlItem.SelectedNodeID)); + + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + // 2.鑾峰彇褰撳墠鍒嗛〉鏁版嵁 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 鍙屽嚮浜嬩欢 + /// + /// Grid琛屽弻鍑讳簨浠 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇烽夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnAdd)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WelderTestInfoEdit.aspx?Id={0}", Grid1.SelectedRowID, "缁存姢 - "))); + } + else + { + ShowNotify("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning); + } + } + #endregion + + #region 鍙抽敭缂栬緫 + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.Welder_QualifiedProjectMenuId, BLL.Const.BtnModify)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇烽夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WelderTestInfoEdit.aspx?Id={0}", Grid1.SelectedRowID, "缁存姢 - "))); + } + else + { + ShowNotify("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning); + } + } + + + /// + /// 鍒犻櫎 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnDelete)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("璇烽夋嫨涓鏉¤褰曪紒", MessageBoxIcon.Warning); + return; + } + + bool isShow = true; + if (Grid1.SelectedRowIndexArray.Length > 1) + { + isShow = false; + } + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + if (judgementDelete(rowID, isShow)) + { + BLL.WelderTestService.Delete(rowID); + //BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "鍒犻櫎鍚堟牸椤圭洰鐒婂伐"); + } + } + + ShowNotify("鍒犻櫎鎴愬姛锛", MessageBoxIcon.Success); + this.BindGrid(); + } + else + { + ShowNotify("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning); + } + } + #endregion + + #region 鍒ゆ柇鏄惁鍙垹闄 + /// + /// 鍒ゆ柇鏄惁鍙互鍒犻櫎 + /// + /// + private bool judgementDelete(string id, bool isShow) + { + string content = string.Empty; + + if (string.IsNullOrEmpty(content)) + { + return true; + } + else + { + if (isShow) + { + Alert.ShowInTop(content, MessageBoxIcon.Error); + } + return false; + } + } + #endregion + + #region 妯℃澘涓嬭浇 + /// + /// 妯℃澘涓嬭浇 + /// + /// + /// + protected void btnDownLoad_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string uploadfilepath = rootPath + Const.WelderTestInfoTemplateUrl; + string filePath = Const.WelderTestInfoTemplateUrl; + string fileName = Path.GetFileName(filePath); + FileInfo info = new FileInfo(uploadfilepath); + long fileSize = info.Length; + Response.ClearContent(); + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.ContentType = "excel/plain"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Response.AddHeader("Content-Length", fileSize.ToString().Trim()); + Response.TransmitFile(uploadfilepath, 0, fileSize); + Response.End(); + //PageContext.RegisterStartupScript(Confirm.GetShowReference("纭畾瑕佷笅杞界剨宸ヨ祫璐ㄥ鍏ユā鏉?", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel"))); + } + + /// + /// 涓嬭浇瀵煎叆妯℃澘 + /// + /// + /// + protected void PageManager1_CustomEvent(object sender, CustomEventArgs e) + { + if (e.EventArgument == "Confirm_OK") + { + string rootPath = Server.MapPath("~/"); + string uploadfilepath = rootPath + Const.WelderQueTemplateUrl; + string filePath = Const.WelderQueTemplateUrl; + string fileName = Path.GetFileName(filePath); + FileInfo info = new FileInfo(uploadfilepath); + long fileSize = info.Length; + Response.ClearContent(); + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.ContentType = "excel/plain"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + Response.AddHeader("Content-Length", fileSize.ToString().Trim()); + Response.TransmitFile(uploadfilepath, 0, fileSize); + Response.End(); + } + } + #endregion + + protected void btnImport_Click(object sender, EventArgs e) + { + string message = string.Empty; + errorInfos = string.Empty; + try + { + if (this.fileUpload.HasFile == false) + { + ShowNotify("璇烽夋嫨Excel鏂囦欢!", MessageBoxIcon.Warning); + return; + } + string IsXls = Path.GetExtension(this.fileUpload.FileName).ToString().Trim().ToLower(); + if (IsXls != ".xls" && IsXls != ".xlsx") + { + ShowNotify("鍙兘閫夋嫨Excel鏂囦欢!", MessageBoxIcon.Warning); + return; + } + + string rootPath = Server.MapPath("~/"); + string initFullPath = rootPath + initPath; + if (!Directory.Exists(initFullPath)) + { + Directory.CreateDirectory(initFullPath); + } + //鎸囧畾涓婁紶鏂囦欢鍚嶇О + this.hidFileName.Text = BLL.Funs.GetNewFileName() + IsXls; + //涓婁紶鏂囦欢璺緞 + string filePath = initFullPath + this.hidFileName.Text; + //鏂囦欢涓婁紶鏈嶅姟鍣 + this.fileUpload.PostedFile.SaveAs(filePath); + //鏂囦欢涓婁紶鏈嶅姟鍣ㄥ悗鐨勫悕绉 + string fileName = rootPath + initPath + this.hidFileName.Text; + //璇诲彇Excel + DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true); + //楠岃瘉Excel璇诲彇鏄惁鏈夎 + if (!string.IsNullOrEmpty(errorInfos)) + { + ShowNotify(errorInfos, MessageBoxIcon.Warning); + return; + } + DataTable dt = ds.Tables[0]; + if (dt.Rows.Count > 0) + { + List listData = new List(); + var validate = ValidateImportFileds(dt); + if(validate!=null && validate.Count > 0) + { + Cache["errLog"] = validate; + //鎻愮ず閿欒淇℃伅 + PageContext.RegisterStartupScript(Window2.GetShowReference("WelderTestInfoImportError.aspx")); + } + else + { + foreach (DataRow dr in dt.Rows) + { + Model.Welder_TestInfo model = new Model.Welder_TestInfo(); + string welderCode = dr[0].ToString(); + string weldMethod = dr[1].ToString(); + string weldMeatrail = dr[2].ToString(); + string isPass = dr[3].ToString(); + string testDate = dr[4].ToString(); + string remark = dr[5].ToString(); + + var welderId = Funs.DB.Welder_Welder.FirstOrDefault(t => t.WelderCode == welderCode)?.WelderId; + var methodId = Funs.DB.Base_WeldingMethod.FirstOrDefault(t => t.WeldingMethodCode == weldMethod)?.WeldingMethodId; + var materId = Funs.DB.Base_Material.FirstOrDefault(t => t.MaterialCode == weldMeatrail)?.MaterialId; + model.Id = SQLHelper.GetNewID(typeof(Model.Welder_TestInfo)); + model.WeldMethodId= methodId; + model.MaterialId= materId; + model.IsPass = isPass == "鏄" ? true : false; + model.ProjectId = this.CurrUser.LoginProjectId; + model.WelderId= welderId; + model.CreatedDate = DateTime.Parse(testDate); + model.Remark = remark; + listData.Add(model); + } + } + + if(listData.Count > 0) + { + Funs.DB.Welder_TestInfo.InsertAllOnSubmit(listData); + Funs.DB.SubmitChanges(); + ShowNotify("瀵煎叆鎴愬姛", MessageBoxIcon.Success); + this.BindGrid(); + } + } + else + { + ShowAlert("娌℃湁鏁版嵁!", MessageBoxIcon.Warning); + return; + } + + } + catch (Exception ex) + { + ShowAlert("'" + ex.Message + "'", MessageBoxIcon.Warning); + } + } + + #region 寮瑰嚭缂栬緫绐楀彛鍏抽棴浜嬩欢 + /// + /// 寮瑰嚭缂栬緫绐椾綋鍏抽棴浜嬩欢 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + #endregion + + #region 鍒嗛〉 鎺掑簭 + /// + /// 鍒嗛〉 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 鍒嗛〉鏄剧ず鏉℃暟涓嬫媺妗 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 鎺掑簭 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + Grid1.SortDirection = e.SortDirection; + Grid1.SortField = e.SortField; + BindGrid(); + } + #endregion + + #region 鏌ヨ + /// + /// 鏌ヨ + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + this.BindGrid(); + } + #endregion + + #region 澧炲姞 + /// + /// 澧炲姞 + /// + /// + /// + protected void btnAdd_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnAdd)) + { + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WelderTestInfoEdit.aspx?WelderId={0}", this.tvControlItem.SelectedNodeID, "鏂板 - "))); + } + else + { + Alert.ShowInTop("璇烽夋嫨涓鍚嶇剨宸!", MessageBoxIcon.Warning); + return; + } + } + else + { + ShowNotify("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning); + } + } + #endregion + + protected void Window2_Close(object sender, EventArgs e) + { + Cache["errLog"] = null; + } + + private List ValidateImportFileds(DataTable dt) + { + var listData = new List(); + int i = 0; + foreach (DataRow dr in dt.Rows) + { + i++; + + string welderCode = dr[0].ToString(); + string weldMethod = dr[1].ToString(); + string weldMeatrail = dr[2].ToString(); + string isPass = dr[3].ToString(); + string testDate = dr[4].ToString(); + string remark = dr[5].ToString(); + + //楠岃瘉鐒婂伐鍙 + if (string.IsNullOrEmpty(welderCode)) + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鐒婂伐鍙"; + model.errMsg = "鐒婂伐鍙蜂笉鑳戒负绌"; + model.isSuccess = false; + listData.Add(model); + } + + if (string.IsNullOrEmpty(weldMethod)) + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鐒婃帴鏂规硶"; + model.errMsg = "鐒婃帴鏂规硶涓嶈兘涓虹┖"; + model.isSuccess = false; + listData.Add(model); + } + if (string.IsNullOrEmpty(weldMeatrail)) + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鐒婃帴鏉愯川"; + model.errMsg = "鐒婃帴鏉愯川涓嶈兘涓虹┖"; + model.isSuccess = false; + listData.Add(model); + } + if (string.IsNullOrEmpty(weldMeatrail)) + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鐒婃帴鏉愯川"; + model.errMsg = "鐒婃帴鏉愯川涓嶈兘涓虹┖"; + model.isSuccess = false; + listData.Add(model); + } + if (string.IsNullOrEmpty(isPass)) + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鏄惁鍚堟牸"; + model.errMsg = "鏄惁鍚堟牸涓嶈兘涓虹┖"; + model.isSuccess = false; + listData.Add(model); + } + if(isPass!="鏄" && isPass != "鍚") + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鏄惁鍚堟牸"; + model.errMsg = "鍚堟牸瀛楁鍙兘鏄垨鑰呭惁"; + model.isSuccess = false; + listData.Add(model); + } + if (string.IsNullOrEmpty(testDate)) + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鑰冭瘯鏃ユ湡"; + model.errMsg = "鑰冭瘯鏃ユ湡涓嶈兘涓虹┖"; + model.isSuccess = false; + listData.Add(model); + } + DateTime t1 = new DateTime(); + if(!DateTime.TryParse(testDate,out t1)) + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鑰冭瘯鏃ユ湡"; + model.errMsg = "璇疯緭鍏ユ纭殑鑰冭瘯鏃ユ湡(yyyy-MM-dd)"; + model.isSuccess = false; + listData.Add(model); + } + //楠岃瘉鏄惁瀛樺湪 + var isAnyWelderCode = Funs.DB.Welder_Welder.Any(t => t.WelderCode == welderCode); + if (!isAnyWelderCode) + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鐒婂伐鍙"; + model.errMsg = "鐒婂伐鍙蜂笉瀛樺湪"; + model.isSuccess = false; + listData.Add(model); + } + var isAnyWeldMethod = Funs.DB.Base_WeldingMethod.Any(t => t.WeldingMethodCode == weldMethod); + if (!isAnyWeldMethod) + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鐒婃帴鏂规硶"; + model.errMsg = "鐒婃帴鏂规硶涓嶅瓨鍦"; + model.isSuccess = false; + listData.Add(model); + } + var isAnyMeaterail = Funs.DB.Base_Material.Any(t => t.MaterialCode == weldMeatrail); + if (!isAnyMeaterail) + { + var model = new Model.ViewModels.ImportErrorViewModel(); + model.rowId = i; + model.createdTime = DateTime.Now; + model.columnName = "鐒婃帴鏉愯川"; + model.errMsg = "鐒婃帴鏉愯川涓嶅瓨鍦"; + model.isSuccess = false; + listData.Add(model); + } + } + return listData; + } + + } + +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.designer.cs new file mode 100644 index 0000000..4c29c43 --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfo.aspx.designer.cs @@ -0,0 +1,287 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WelderManage +{ + + + public partial class WelderTestInfo + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// Toolbar4 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar4; + + /// + /// drpUnitId 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpUnitId; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtWelderCodeS 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtWelderCodeS; + + /// + /// Toolbar3 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// txtWelderNameS 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextBox txtWelderNameS; + + /// + /// tvControlItem 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// lblCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblCode; + + /// + /// lblName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lblName; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// fileUpload 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.FileUpload fileUpload; + + /// + /// btnImport 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnImport; + + /// + /// btnDownLoad 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnDownLoad; + + /// + /// btnAdd 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnAdd; + + /// + /// hidFileName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.HiddenField hidFileName; + + /// + /// ToolbarSeparator1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Window Window2; + + /// + /// Menu1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoEdit.aspx b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoEdit.aspx new file mode 100644 index 0000000..24b49b9 --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoEdit.aspx @@ -0,0 +1,75 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WelderTestInfoEdit.aspx.cs" Inherits="FineUIPro.Web.WelderManage.WelderTestInfoEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoEdit.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoEdit.aspx.cs new file mode 100644 index 0000000..e673e0f --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoEdit.aspx.cs @@ -0,0 +1,118 @@ +锘縰sing BLL; +using Microsoft.JScript; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.WelderManage +{ + public partial class WelderTestInfoEdit : PageBase + { + private string Id = string.Empty; + private string welderId=string.Empty; + protected void Page_Load(object sender, EventArgs e) + { + this.welderId = Request.Params["WelderId"]; + this.Id= Request.Params["id"]; + if (!IsPostBack) + { + this.BindDrpInit(); + this.GetWelderInfo(); + if(!string.IsNullOrEmpty(this.Id)) + this.GetTestInfo(); + } + } + public void GetTestInfo() { + var result=Funs.DB.Welder_TestInfo.FirstOrDefault(t=>t.Id==this.Id); + if (result == null) + { + ShowNotify("璇蜂笉瑕侀潪娉曟搷浣",MessageBoxIcon.Error); + return; + } + drpIsPass.SelectedValue = result.IsPass.ToString(); + drpMaterial.SelectedValue=result.MaterialId.ToString(); + drpWeldMethod.SelectedValue = result.WeldMethodId.ToString(); + txtCheckDate.Text = result.CreatedDate.Value.ToString("yyyy-MM-dd"); + txtRemark.Text = result.Remark.ToString(); + } + private void GetWelderInfo() + { + var result = Funs.DB.Welder_Welder.FirstOrDefault(t => t.WelderId == this.welderId); + if(result == null) + { + return; + } + lbWedlerName.Text= result.WelderName; + lbWedlerCode.Text= result.WelderCode; + } + private void BindDrpInit() + { + var methodList = Funs.DB.Base_WeldingMethod.OrderBy(t=>t.WeldingMethodCode).ToList(); + drpWeldMethod.DataSource= methodList; + drpWeldMethod.DataTextField = "WeldingMethodCode"; + drpWeldMethod.DataValueField = "WeldingMethodId"; + drpWeldMethod.DataBind(); + drpWeldMethod.Items.Insert(0, new ListItem("璇烽夋嫨", "")); + + var materList = Funs.DB.Base_Material.OrderBy(t=>t.MaterialCode).ToList(); + drpMaterial.DataSource= materList; + drpMaterial.DataTextField = "MaterialCode"; + drpMaterial.DataValueField = "MaterialId"; + drpMaterial.DataBind(); + drpMaterial.Items.Insert(0, new ListItem("璇烽夋嫨", "")); + } + protected void btnSave_Click(object sender, EventArgs e) + { + var result = SaveData(); + if (result.Item1) + { + ShowNotify("淇濆瓨鎴愬姛", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + ShowNotify(result.Item2, MessageBoxIcon.Error); + } + + + + } + + (bool,string) SaveData() + { + try + { + + var input = new Model.Welder_TestInfo(); + input.CreatedDate = System.Convert.ToDateTime(txtCheckDate.Text); + input.ProjectId = this.CurrUser.LoginProjectId; + input.WeldMethodId = drpWeldMethod.SelectedValue; + input.WelderId = this.welderId; + input.MaterialId = drpMaterial.SelectedValue; + input.Remark = txtRemark.Text.Trim(); + input.IsPass = drpIsPass.SelectedValue == "鏄" ? true : false; + + if (string.IsNullOrEmpty(this.Id)) + { + BLL.WelderTestService.Add(input); + } + else + { + input.Id = this.Id; + BLL.WelderTestService.Edit(input); + } + return (true, "淇濆瓨鎴愬姛"); + + } + catch (Exception ex) + { + BLL.ErrLogInfo.WriteLog(ex, "淇濆瓨鐒婂伐鑰冭瘯缁撴灉澶辫触"); + return (false, ex.Message); + } + } + + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoEdit.aspx.designer.cs new file mode 100644 index 0000000..f1a0743 --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoEdit.aspx.designer.cs @@ -0,0 +1,152 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WelderManage +{ + + + public partial class WelderTestInfoEdit + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// lbWedlerName 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lbWedlerName; + + /// + /// lbWedlerCode 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lbWedlerCode; + + /// + /// drpWeldMethod 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpWeldMethod; + + /// + /// drpMaterial 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpMaterial; + + /// + /// txtCheckDate 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DatePicker txtCheckDate; + + /// + /// drpIsPass 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownList drpIsPass; + + /// + /// txtRemark 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// Toolbar1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// lbTemp 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Label lbTemp; + + /// + /// ToolbarFill1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoImportError.aspx b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoImportError.aspx new file mode 100644 index 0000000..01d02d5 --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoImportError.aspx @@ -0,0 +1,30 @@ +锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WelderTestInfoImportError.aspx.cs" Inherits="FineUIPro.Web.WelderManage.WelderImportError" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoImportError.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoImportError.aspx.cs new file mode 100644 index 0000000..64e3176 --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoImportError.aspx.cs @@ -0,0 +1,30 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.WelderManage +{ + public partial class WelderImportError : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.BindGrid(); + } + } + void BindGrid() + { + var cacheData = Cache["errLog"]; + if(cacheData != null) + { + var listData = Cache["errLog"] as List; + Grid1.DataSource= listData; + Grid1.DataBind(); + } + } + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoImportError.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoImportError.aspx.designer.cs new file mode 100644 index 0000000..1291252 --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/WelderTestInfoImportError.aspx.designer.cs @@ -0,0 +1,53 @@ +锘//------------------------------------------------------------------------------ +// <鑷姩鐢熸垚> +// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆 +// +// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉 +// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵鍋氭洿鏀瑰皢涓㈠け銆 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WelderManage +{ + + + public partial class WelderImportError + { + + /// + /// form1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Grid1 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// lablRemark 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::System.Web.UI.WebControls.Label lablRemark; + } +} diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx index 82ab602..2c37247 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/ImportError.aspx @@ -4,34 +4,34 @@ - + 璇曞帇鍖呭鍏ラ敊璇棩蹇
- - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs index 96f325d..502cdd0 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs @@ -745,7 +745,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.GetRow(rowIndex + 11).Height = 11 * 20; ws.GetRow(rowIndex + 10).GetCell(1).SetCellValue("璇曞帇鍖呭彿\r\nTest Package No."); - ws.GetRow(rowIndex + 10).GetCell(4).SetCellValue("UG-130-FW-HT-0001"); + ws.GetRow(rowIndex + 10).GetCell(4).SetCellValue(info?.testpackageNo); ws.AddMergedRegion(new CellRangeAddress(rowIndex + 12, rowIndex + 13, 2, 4)); ws.AddMergedRegion(new CellRangeAddress(rowIndex + 12, rowIndex + 13, 6, 7)); @@ -756,7 +756,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.GetRow(rowIndex + 12).GetCell(2).SetCellValue("ACTIVITY"); ws.GetRow(rowIndex + 12).GetCell(2).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 14, true, true, "Arial"); - ws.GetRow(rowIndex + 12).GetCell(6).SetCellValue("CC7"); + ws.GetRow(rowIndex + 12).GetCell(6).SetCellValue(info?.workAreaCode); ws.GetRow(rowIndex + 12).GetCell(6).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 14, true, true, "Arial"); ws.GetRow(rowIndex + 12).GetCell(9).SetCellValue("JIANLI"); @@ -1138,12 +1138,6 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage //鍨傜洿姘村钩灞呬腑 ws.VerticallyCenter = true; ws.HorizontallyCenter = true; - //鎵撳嵃杈硅窛璁剧疆 鍘樼背/3 - ws.SetMargin(MarginType.RightMargin, (double)2.4 / 3); - ws.SetMargin(MarginType.LeftMargin, (double)2.9 / 3); - ws.SetMargin(MarginType.TopMargin, (double)2.4 / 3); - ws.SetMargin(MarginType.BottomMargin, (double)2.4 / 3); - //椤电湁椤佃剼闂磋窛 ws.SetMargin(MarginType.HeaderMargin, 0); ws.SetMargin(MarginType.FooterMargin, 0); @@ -6980,25 +6974,30 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { hssfworkbook = (XSSFWorkbook)WorkbookFactory.Create(file); } - + //鎿嶄綔鐩綍妯＄増sheet鏄惁瀛樺湪,涓嶅瓨鍦ㄥ氨鎶婂搴旂殑sheet鍒犻櫎鎺夛紙鐗规畩澶勭悊锛 int index = 0; + if (!templateFileIds.Contains("2BEFB0F4-A466-4C59-963F-9092BACF2E52")) + { + hssfworkbook.RemoveAt(0); + index++; + } //'2-TP-02-璇曞帇鍖呭皝闈G-FW-001 if (!templateFileIds.Contains("D4B4DD64-8361-4A75-AA3E-E484934B9B06")) { - hssfworkbook.RemoveAt(0); + hssfworkbook.RemoveAt(1); index++; } //3-TP-03-璇曞帇鍖呯洰褰昒G-FW-001 if (!templateFileIds.Contains("6CD2710C-2AD6-4E7D-BED7-C8BEDAD300DE")) { - hssfworkbook.RemoveAt(1 - index); + hssfworkbook.RemoveAt(2 - index); index++; } //4-TP-04-璇曞帇鏍囪瘑 if (!templateFileIds.Contains("87A66CAA-CA30-4A1E-8382-E8503059A0D0")) { - hssfworkbook.RemoveAt(2 - index); + hssfworkbook.RemoveAt(3 - index); index++; } @@ -7010,11 +7009,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage continue; switch (templateFileId) { - //1-TP-01-璇曞帇鍖呰矾寰勮〃UG-FW-001 - case "2BEFB0F4-A466-4C59-963F-9092BACF2E52": - XSSFSheet sheet1 = (XSSFSheet)hssfworkbook.CreateSheet(oneTemp.Title); - template1(hssfworkbook, sheet1); - break; + //6-TP-05-P&ID娓呭崟UG-FW-001 妯＄増 case "811EF650-7686-447F-BEE8-776D50041CD0": XSSFSheet sheet6 = (XSSFSheet)hssfworkbook.CreateSheet(oneTemp.Title); diff --git a/HJGL/HJGL.sln b/HJGL/HJGL.sln index fbcd85a..9d00fd0 100644 --- a/HJGL/HJGL.sln +++ b/HJGL/HJGL.sln @@ -1,7 +1,7 @@ 锘 Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.1231 +# Visual Studio Version 17 +VisualStudioVersion = 17.7.34221.43 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}" EndProject diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index 32e181d..bd39254 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -272,6 +272,9 @@ namespace Model partial void InsertWelder_TeamGroup(Welder_TeamGroup instance); partial void UpdateWelder_TeamGroup(Welder_TeamGroup instance); partial void DeleteWelder_TeamGroup(Welder_TeamGroup instance); + partial void InsertWelder_TestInfo(Welder_TestInfo instance); + partial void UpdateWelder_TestInfo(Welder_TestInfo instance); + partial void DeleteWelder_TestInfo(Welder_TestInfo instance); partial void InsertWelder_Welder(Welder_Welder instance); partial void UpdateWelder_Welder(Welder_Welder instance); partial void DeleteWelder_Welder(Welder_Welder instance); @@ -1235,6 +1238,14 @@ namespace Model } } + public System.Data.Linq.Table Welder_TestInfo + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Welder_Welder { get @@ -20700,6 +20711,8 @@ namespace Model private System.Nullable _IsPMI; + private System.Nullable _AuditStatus; + private EntitySet _Batch_BatchTrustItem; private EntitySet _Batch_PointBatchItem; @@ -20840,6 +20853,8 @@ namespace Model partial void OnANSISCHChanged(); partial void OnIsPMIChanging(System.Nullable value); partial void OnIsPMIChanged(); + partial void OnAuditStatusChanging(System.Nullable value); + partial void OnAuditStatusChanged(); #endregion public Pipeline_WeldJoint() @@ -21894,6 +21909,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditStatus", DbType="Int")] + public System.Nullable AuditStatus + { + get + { + return this._AuditStatus; + } + set + { + if ((this._AuditStatus != value)) + { + this.OnAuditStatusChanging(value); + this.SendPropertyChanging(); + this._AuditStatus = value; + this.SendPropertyChanged("AuditStatus"); + this.OnAuditStatusChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Batch_BatchTrustItem_Pipeline_WeldJoint", Storage="_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")] public EntitySet Batch_BatchTrustItem { @@ -22518,12 +22553,12 @@ namespace Model private string _DetectionStandard; + private string _Tabler; + private string _Remark; private System.Nullable _CreatedTime; - private string _Tabler; - #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -22542,12 +22577,12 @@ namespace Model partial void OnUnitIdChanged(); partial void OnDetectionStandardChanging(string value); partial void OnDetectionStandardChanged(); + partial void OnTablerChanging(string value); + partial void OnTablerChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); partial void OnCreatedTimeChanging(System.Nullable value); partial void OnCreatedTimeChanged(); - partial void OnTablerChanging(string value); - partial void OnTablerChanged(); #endregion public PMI_Delegation() @@ -22615,7 +22650,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 @@ -22695,6 +22730,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")] + public string Tabler + { + get + { + return this._Tabler; + } + set + { + if ((this._Tabler != value)) + { + this.OnTablerChanging(value); + this.SendPropertyChanging(); + this._Tabler = value; + this.SendPropertyChanged("Tabler"); + this.OnTablerChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")] public string Remark { @@ -22735,26 +22790,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")] - public string Tabler - { - get - { - return this._Tabler; - } - set - { - if ((this._Tabler != value)) - { - this.OnTablerChanging(value); - this.SendPropertyChanging(); - this._Tabler = value; - this.SendPropertyChanged("Tabler"); - this.OnTablerChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -22794,10 +22829,10 @@ namespace Model private int _Status; - private string _ReportNo; - private System.Nullable _CheckTime; + private string _ReportNo; + private System.Nullable _ReportTime; private string _WorkAreaId; @@ -22818,10 +22853,10 @@ namespace Model partial void OnAcceptanceChanged(); partial void OnStatusChanging(int value); partial void OnStatusChanged(); - partial void OnReportNoChanging(string value); - partial void OnReportNoChanged(); partial void OnCheckTimeChanging(System.Nullable value); partial void OnCheckTimeChanged(); + partial void OnReportNoChanging(string value); + partial void OnReportNoChanged(); partial void OnReportTimeChanging(System.Nullable value); partial void OnReportTimeChanged(); partial void OnWorkAreaIdChanging(string value); @@ -22933,7 +22968,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")] public int Status { get @@ -22953,26 +22988,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.OnReportNoChanging(value); - this.SendPropertyChanging(); - this._ReportNo = value; - this.SendPropertyChanged("ReportNo"); - this.OnReportNoChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")] public System.Nullable CheckTime { @@ -22993,6 +23008,26 @@ 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.OnReportNoChanging(value); + this.SendPropertyChanging(); + this._ReportNo = value; + this.SendPropertyChanged("ReportNo"); + this.OnReportNoChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")] public System.Nullable ReportTime { @@ -37307,6 +37342,8 @@ namespace Model private string _PipelineId; + private string _WeldJointId; + private string _PipelineCode; private string _WeldJointCode; @@ -37345,6 +37382,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointId", DbType="NVarChar(50)")] + public string WeldJointId + { + get + { + return this._WeldJointId; + } + set + { + if ((this._WeldJointId != value)) + { + this._WeldJointId = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")] public string PipelineCode { @@ -39587,8 +39640,6 @@ namespace Model private string _ProjectId; - private System.Nullable _IsPMI; - private string _PipelineCode; private string _PipelineId; @@ -39719,22 +39770,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 { @@ -41743,6 +41778,8 @@ namespace Model private string _PipingClassCode; + private string _PIPClassCode; + private string _WeldingDate; private System.Nullable _IsCancel; @@ -41757,8 +41794,6 @@ namespace Model private string _DetectionType; - private string _PIPClassCode; - private string _PageNum; public View_Pipeline_WeldJoint() @@ -42853,6 +42888,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 { @@ -42965,22 +43016,6 @@ 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="_PageNum", DbType="NVarChar(10)")] public string PageNum { @@ -43560,10 +43595,6 @@ namespace Model public partial class View_PTP_TestPackageAudit { - private string _PipelineId; - - private string _PT_PipeId; - private string _PTP_ID; private string _ProjectId; @@ -43572,59 +43603,29 @@ namespace Model private string _PipelineCode; - private int _WeldJointCount; + private string _PipelineId; - private int _WeldJointCountT; + private System.Nullable _IsAll; - private int _CountS; + private System.Nullable _WeldJointCount; + + private System.Nullable _WeldJointCountT; + + private System.Nullable _CountS; private System.Nullable _CountU; - private string _NDTR_Name; + private int _NDTR_Rate; private string _Ratio; - private int _NDTR_Rate; - private System.Nullable _RatioC; public View_PTP_TestPackageAudit() { } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50)")] - public string PipelineId - { - get - { - return this._PipelineId; - } - set - { - if ((this._PipelineId != value)) - { - this._PipelineId = value; - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PT_PipeId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] - public string PT_PipeId - { - get - { - return this._PT_PipeId; - } - set - { - if ((this._PT_PipeId != value)) - { - this._PT_PipeId = value; - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PTP_ID", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PTP_ID", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] public string PTP_ID { get @@ -43688,8 +43689,40 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCount", DbType="Int NOT NULL")] - public int WeldJointCount + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50)")] + public string PipelineId + { + get + { + return this._PipelineId; + } + set + { + if ((this._PipelineId != value)) + { + this._PipelineId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isAll", Storage="_IsAll", DbType="Bit")] + public System.Nullable IsAll + { + get + { + return this._IsAll; + } + set + { + if ((this._IsAll != value)) + { + this._IsAll = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCount", DbType="BigInt")] + public System.Nullable WeldJointCount { get { @@ -43704,8 +43737,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCountT", DbType="Int NOT NULL")] - public int WeldJointCountT + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCountT", DbType="Int")] + public System.Nullable WeldJointCountT { get { @@ -43720,8 +43753,8 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CountS", DbType="Int NOT NULL")] - public int CountS + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="countS", Storage="_CountS", DbType="Int")] + public System.Nullable CountS { get { @@ -43752,18 +43785,18 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NDTR_Name", DbType="VarChar(30)")] - public string NDTR_Name + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NDTR_Rate", DbType="Int NOT NULL")] + public int NDTR_Rate { get { - return this._NDTR_Name; + return this._NDTR_Rate; } set { - if ((this._NDTR_Name != value)) + if ((this._NDTR_Rate != value)) { - this._NDTR_Name = value; + this._NDTR_Rate = value; } } } @@ -43784,22 +43817,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NDTR_Rate", DbType="Int NOT NULL")] - public int NDTR_Rate - { - get - { - return this._NDTR_Rate; - } - set - { - if ((this._NDTR_Rate != value)) - { - this._NDTR_Rate = value; - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RatioC", DbType="Decimal(19,2)")] public System.Nullable RatioC { @@ -45895,6 +45912,236 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Welder_TestInfo")] + public partial class Welder_TestInfo : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ProjectId; + + private bool _IsPass; + + private string _WeldMethodId; + + private string _MaterialId; + + private System.Nullable _CreatedDate; + + private string _Remark; + + private string _WelderId; + + #region 鍙墿灞曟ф柟娉曞畾涔 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnIsPassChanging(bool value); + partial void OnIsPassChanged(); + partial void OnWeldMethodIdChanging(string value); + partial void OnWeldMethodIdChanged(); + partial void OnMaterialIdChanging(string value); + partial void OnMaterialIdChanged(); + partial void OnCreatedDateChanging(System.Nullable value); + partial void OnCreatedDateChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnWelderIdChanging(string value); + partial void OnWelderIdChanged(); + #endregion + + public Welder_TestInfo() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsPass", DbType="Bit NOT NULL")] + public bool IsPass + { + get + { + return this._IsPass; + } + set + { + if ((this._IsPass != value)) + { + this.OnIsPassChanging(value); + this.SendPropertyChanging(); + this._IsPass = value; + this.SendPropertyChanged("IsPass"); + this.OnIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldMethodId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string WeldMethodId + { + get + { + return this._WeldMethodId; + } + set + { + if ((this._WeldMethodId != value)) + { + this.OnWeldMethodIdChanging(value); + this.SendPropertyChanging(); + this._WeldMethodId = value; + this.SendPropertyChanged("WeldMethodId"); + this.OnWeldMethodIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string MaterialId + { + get + { + return this._MaterialId; + } + set + { + if ((this._MaterialId != value)) + { + this.OnMaterialIdChanging(value); + this.SendPropertyChanging(); + this._MaterialId = value; + this.SendPropertyChanged("MaterialId"); + this.OnMaterialIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedDate", DbType="DateTime")] + public System.Nullable CreatedDate + { + get + { + return this._CreatedDate; + } + set + { + if ((this._CreatedDate != value)) + { + this.OnCreatedDateChanging(value); + this.SendPropertyChanging(); + this._CreatedDate = value; + this.SendPropertyChanged("CreatedDate"); + this.OnCreatedDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderId", DbType="NVarChar(50)")] + public string WelderId + { + get + { + return this._WelderId; + } + set + { + if ((this._WelderId != value)) + { + this.OnWelderIdChanging(value); + this.SendPropertyChanging(); + this._WelderId = value; + this.SendPropertyChanged("WelderId"); + this.OnWelderIdChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Welder_Welder")] public partial class Welder_Welder : INotifyPropertyChanging, INotifyPropertyChanged { @@ -47811,7 +48058,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="VarChar(1000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string WelderIds { get diff --git a/HJGL/Model/Model.csproj b/HJGL/Model/Model.csproj index 390d058..8deb4ce 100644 --- a/HJGL/Model/Model.csproj +++ b/HJGL/Model/Model.csproj @@ -75,6 +75,7 @@ + diff --git a/HJGL/Model/ViewModels/ImportErrorViewModel.cs b/HJGL/Model/ViewModels/ImportErrorViewModel.cs new file mode 100644 index 0000000..3bce362 --- /dev/null +++ b/HJGL/Model/ViewModels/ImportErrorViewModel.cs @@ -0,0 +1,23 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model.ViewModels +{ + public class ImportErrorViewModel + { + public int rowId { get; set; } + + public string columnName { get; set; } + + public string errMsg { get; set; } + + public bool isSuccess { get; set; } = true; + + public DateTime createdTime { get; set; } + + + } +}