From 85324e8ffa94a393bb39528290c8d6c12133b91a Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 20 Feb 2025 17:22:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SGGL/FineUIPro.Web/common/mainProject2.aspx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx
index 7587e2f2..db2d21a1 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx
@@ -534,7 +534,7 @@
- --%>
+ --%>
From f9d3a2a8cc303480881c8fc4cf8b748e7c702e7a Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Fri, 21 Feb 2025 17:01:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?20250221=20NCR=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Comprehensive/InspectionEquipment.aspx | 4 +-
.../CQMS/Comprehensive/NCRManagement.aspx | 6 +-
.../CQMS/Comprehensive/NCRManagement.aspx.cs | 2 +-
.../Comprehensive/NCRManagementDataInNew.aspx | 190 ++++++
.../NCRManagementDataInNew.aspx.cs | 624 ++++++++++++++++++
.../NCRManagementDataInNew.aspx.designer.cs | 249 +++++++
.../NCRManagementDataInNewEdit.aspx | 83 +++
.../NCRManagementDataInNewEdit.aspx.cs | 291 ++++++++
...CRManagementDataInNewEdit.aspx.designer.cs | 222 +++++++
.../ThoughtWorks.QRCode.Fakes.dll | Bin 150528 -> 150528 bytes
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 16 +
11 files changed, 1681 insertions(+), 6 deletions(-)
create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx
create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx
create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
index 8301b5ec..9b9cadc1 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx
@@ -15,8 +15,8 @@
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
index 65d9065b..f66409a9 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx
@@ -15,8 +15,8 @@
@@ -130,7 +130,7 @@
+ Width="1200px" Height="600px">
protected void btnImport_Click(object sender, EventArgs e)
{
- PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("NCRManagementDataIn.aspx", "导入 - ")));
+ PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("NCRManagementDataInNew.aspx", "导入 - ")));
}
#endregion
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx
new file mode 100644
index 00000000..b900485a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx
@@ -0,0 +1,190 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NCRManagementDataInNew.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.NCRManagementDataInNew" %>
+
+
+
+
+
+
+ NCR导入
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs
new file mode 100644
index 00000000..ea7b9fe6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.cs
@@ -0,0 +1,624 @@
+using BLL;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using FineUIPro.Web.DataShow;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+ public partial class NCRManagementDataInNew : PageBase
+ {
+ ///
+ /// 错误集合
+ ///
+ public static string errorInfos = string.Empty;
+
+ #region 加载页面
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ if (percent == null)
+ {
+ percent = new Dictionary();
+ }
+ this.id.Text = this.CurrUser.UserId;
+ this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+ // 绑定表格
+ this.BindGrid();
+ }
+ else if (GetRequestEventArgument() == "reloadGrid")
+ {
+ BindGrid();
+ }
+ }
+ #endregion
+
+ #region 绑定数据
+ ///
+ /// 绑定数据
+ ///
+ private void BindGrid()
+ {
+ string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7,Value8,Value9,Value10"
+ + @" ,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19,Value20"
+ + @",ToopValue,Type"
+ + @" FROM Sys_CQMS_DataInTemp "
+ + @" WHERE ProjectId=@ProjectId AND UserId=@UserId AND Type=@Type";
+ List listStr = new List();
+ listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+ listStr.Add(new SqlParameter("@UserId", this.CurrUser.UserId));
+ listStr.Add(new SqlParameter("@Type", "NCR"));
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+ Grid1.RecordCount = tb.Rows.Count;
+ var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+
+ var dataInTempAll = from x in Funs.DB.Sys_CQMS_DataInTemp
+ where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == "NCR"
+ select x;
+ for (int i = 0; i < Grid1.Rows.Count; i++)
+ {
+ var dataInTemp = dataInTempAll.FirstOrDefault(x => x.TempId == Grid1.Rows[i].DataKeys[0].ToString());
+ if (dataInTemp != null)
+ {
+ if (!string.IsNullOrEmpty(dataInTemp.ToopValue))
+ {
+ Grid1.Rows[i].RowCssClass = "red";
+ }
+ }
+ }
+ var errData = from x in dataInTempAll where x.ToopValue != null select x;
+ this.lbDataCout.Text = errData.Count().ToString();
+ }
+ #endregion
+
+ #region 双击事件
+ ///
+ /// Grid行双击事件
+ ///
+ ///
+ ///
+ protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+ return;
+ }
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("NCRManagementDataInNewEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
+ }
+ #endregion
+
+ #region 导入信息 维护
+ ///
+ /// 导入信息编辑
+ ///
+ ///
+ ///
+ protected void btnMenuEdit_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+ return;
+ }
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("NCRManagementDataInNewEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
+ }
+
+ ///
+ /// 删除按钮
+ ///
+ ///
+ ///
+ protected void btnMenuDelete_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+ return;
+ }
+
+ foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+ {
+ string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+ BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByDataInTempID(rowID);
+ }
+
+ ShowNotify("删除成功！", MessageBoxIcon.Success);
+ this.BindGrid();
+ }
+ #endregion
+
+ #region 分页 排序
+ ///
+ /// 分页
+ ///
+ ///
+ ///
+ protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ 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)
+ {
+ BindGrid();
+ }
+ #endregion
+
+ #region 文件上传
+ ///
+ /// 文件上传
+ ///
+ ///
+ ///
+ protected void imgbtnImport_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ if (this.FileExcel.HasFile == false)
+ {
+ ShowNotify("请选择Excel文件!", MessageBoxIcon.Warning);
+ return;
+ }
+ string IsXls = Path.GetExtension(this.FileExcel.FileName).ToString().Trim().ToLower();
+ if (IsXls != ".xls" && IsXls != ".xlsx")
+ {
+ ShowNotify("只能选择Excel文件!", MessageBoxIcon.Warning);
+ return;
+ }
+ string rootPath = Server.MapPath("~/");
+ string initFullPath = rootPath + Const.ExcelUrl;
+ if (!Directory.Exists(initFullPath))
+ {
+ Directory.CreateDirectory(initFullPath);
+ }
+ //指定上传文件名称
+ this.hdfileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+ //上传文件路径
+ string filePath = initFullPath + this.hdfileName.Text;
+ //文件上传服务器
+ this.FileExcel.PostedFile.SaveAs(filePath);
+ //文件上传服务器后的名称
+ string fileName = rootPath + Const.ExcelUrl + this.hdfileName.Text;
+ //读取Excel
+ DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true);
+ //验证Excel读取是否有误
+ if (!string.IsNullOrEmpty(errorInfos))
+ {
+ ShowNotify(errorInfos, MessageBoxIcon.Warning);
+ return;
+ }
+
+ if (ds.Tables.Count > 0)
+ {
+ for (int i = 1; i < ds.Tables[0].Rows.Count; i++)
+ {
+ Sys_CQMS_DataInTemp newDataInTemp = new Sys_CQMS_DataInTemp();
+ newDataInTemp.TempId = SQLHelper.GetNewID(typeof(Model.Sys_CQMS_DataInTemp));
+ newDataInTemp.ProjectId = this.CurrUser.LoginProjectId;
+ newDataInTemp.UserId = this.CurrUser.UserId;
+ newDataInTemp.Time = System.DateTime.Now;
+ newDataInTemp.Type = "NCR";
+ newDataInTemp.RowNo = i + 2;
+ newDataInTemp.Value1 = ds.Tables[0].Rows[i][0].ToString();
+ newDataInTemp.Value2 = ds.Tables[0].Rows[i][1].ToString();
+ newDataInTemp.Value3 = ds.Tables[0].Rows[i][2].ToString();
+ newDataInTemp.Value4 = ds.Tables[0].Rows[i][3].ToString();
+ newDataInTemp.Value5 = ds.Tables[0].Rows[i][4].ToString();
+ newDataInTemp.Value6 = ds.Tables[0].Rows[i][5].ToString();
+ newDataInTemp.Value7 = ds.Tables[0].Rows[i][6].ToString();
+ newDataInTemp.Value8 = ds.Tables[0].Rows[i][7].ToString();
+ newDataInTemp.Value9 = ds.Tables[0].Rows[i][8].ToString();
+ newDataInTemp.Value10 = ds.Tables[0].Rows[i][9].ToString();
+ newDataInTemp.Value11 = ds.Tables[0].Rows[i][10].ToString();
+ newDataInTemp.Value12 = ds.Tables[0].Rows[i][11].ToString();
+ newDataInTemp.Value13 = ds.Tables[0].Rows[i][12].ToString();
+ newDataInTemp.Value14 = ds.Tables[0].Rows[i][13].ToString();
+ newDataInTemp.Value15 = ds.Tables[0].Rows[i][14].ToString();
+
+ BLL.Sys_CQMS_DataInTempService.AddDataInTemp(newDataInTemp);
+ }
+ this.BindGrid();
+ ShowNotify("数据已导入临时表！", MessageBoxIcon.Success);
+ }
+ else
+ {
+ Alert.ShowInTop("导入数据为空！", MessageBoxIcon.Success);
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ Alert.ShowInTop("'" + ex.Message + "'", MessageBoxIcon.Warning);
+ }
+ }
+ #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("NCR管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+ Response.ContentType = "application/excel";
+ Response.ContentEncoding = System.Text.Encoding.UTF8;
+ Response.Write(GetGridTableHtml(Grid1));
+ Response.End();
+ }
+ #endregion
+
+ #region 保存审核事件
+ ///
+ /// 保存审核事件
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ Thread t = new Thread(new ThreadStart(() => { btnSaveMethod(this.CurrUser.LoginProjectId, this.CurrUser.UserId, "NCR"); }));
+ t.Start();
+ if (percent.ContainsKey(this.CurrUser.UserId))
+ {
+ percent[CurrUser.UserId] = 0;
+ }
+ else
+ {
+ percent.Add(CurrUser.UserId, 0);
+
+ }
+ PageContext.RegisterStartupScript("printX()");
+ }
+ protected void btnRefresh_Click(object sender, EventArgs e)
+ {
+ this.BindGrid();
+ }
+
+ protected void btnSaveMethod(string LoginProjectId, string UserId, string IsPDMS)
+ {
+ var oldViewInfos = from x in Funs.DB.Comprehensive_NCRManagement
+ where x.ProjectId == this.CurrUser.LoginProjectId
+ select x;
+
+ var units = from x in Funs.DB.Base_Unit
+ join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
+ where y.ProjectId == this.CurrUser.LoginProjectId
+ select x;
+
+ var cns = from x in Funs.DB.Base_CNProfessional select x;
+
+ var unitWorks = from x in Funs.DB.WBS_UnitWork
+ where x.ProjectId == this.CurrUser.LoginProjectId
+ && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
+ select x;
+
+ var users = from x in Funs.DB.Project_ProjectUser
+ join y in Funs.DB.Sys_User on x.UserId equals y.UserId
+ where x.ProjectId == this.CurrUser.LoginProjectId
+ && x.UnitId == BLL.Const.UnitId_CWCEC
+ select y;
+
+ var dataInTemp = from x in Funs.DB.Sys_CQMS_DataInTemp
+ where x.ProjectId == LoginProjectId && x.UserId == UserId && x.Type == "NCR"
+ select x;
+ int okCount = 0;
+ int i = 0;
+ int ir = dataInTemp.Count();
+ string erreMessage = "";
+ foreach (var tempData in dataInTemp)
+ {
+ if (tempData != null)
+ {
+ i++;
+ percent[UserId] = (int)(100 * i / ir);
+ string errInfo = string.Empty;
+
+ Model.Comprehensive_NCRManagement Ins = new Model.Comprehensive_NCRManagement();
+ if (!string.IsNullOrEmpty(tempData.Value1))
+ {
+ var unit = units.FirstOrDefault(x => x.UnitName == tempData.Value1);
+ if (unit == null)
+ {
+ errInfo += "发出单位[" + tempData.Value1 + "]不存在；";
+ }
+ else
+ {
+ Ins.SendUnit = unit.UnitId;
+ }
+ }
+ else
+ {
+ errInfo += "发出单位为必填项；";
+ }
+ if (!string.IsNullOrEmpty(tempData.Value2))
+ {
+ var cn = cns.Where(x => x.ProfessionalName == tempData.Value2).FirstOrDefault();
+ if (cn == null)
+ {
+ errInfo += "专业名称[" + tempData.Value2 + "]不存在；";
+ }
+ else
+ {
+ Ins.CNProfessionalId = cn.CNProfessionalId;
+ }
+ }
+ else
+ {
+ errInfo += "专业名称为必填项；";
+ }
+ if (!string.IsNullOrEmpty(tempData.Value3))
+ {
+ Ins.NCRCode = tempData.Value3;
+ }
+ else
+ {
+ errInfo += "NCR单号为必填项；";
+ }
+ if (!string.IsNullOrEmpty(tempData.Value4))
+ {
+ string unitIds = string.Empty;
+ string[] reunit = tempData.Value4.Split(',');
+ foreach (string unitWork in reunit)
+ {
+ var u = unitWorks.Where(x => x.UnitWorkName == unitWork.Trim()).FirstOrDefault();
+ if (u == null)
+ {
+ errInfo += "单位工程名称[" + unitWork.Trim() + "]不存在；";
+ }
+ else
+ {
+ var q = BLL.UnitWorkService.GetUnitWorkByUnitWorkName(this.CurrUser.LoginProjectId, unitWork.Trim()).UnitWorkId;
+ unitIds += q + ",";
+ }
+ }
+ if (!string.IsNullOrEmpty(unitIds))
+ {
+ unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
+ }
+ Ins.UnitWorkId = unitIds;
+ }
+ if (!string.IsNullOrEmpty(tempData.Value5))//主要内容
+ {
+ Ins.Contents = tempData.Value5;
+ }
+ if (!string.IsNullOrEmpty(tempData.Value6.Trim()))
+ {
+ if (tempData.Value6.Trim() != "过程监督不到位" && tempData.Value6.Trim() != "质量缺陷" && tempData.Value6.Trim() != "质量管理问题" && tempData.Value6.Trim() != "不按设计要求施工" && tempData.Value6.Trim() != "不按程序施工" && tempData.Value6.Trim() != "成品保护不到位")
+ {
+ errInfo += "问题类别[" + tempData.Value6.Trim() + "]错误；";
+ }
+ else
+ {
+ Ins.Problem = tempData.Value6.Trim();
+ }
+ }
+ if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//改进措施
+ {
+ Ins.Measure = tempData.Value7.Trim();
+ }
+ if (!string.IsNullOrEmpty(tempData.Value8.Trim()))
+ {
+ try
+ {
+ Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value8.Trim());
+ if (Ins.IssuedDate == null)
+ {
+ errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误；";
+ }
+ }
+ catch (Exception)
+ {
+ errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误；";
+ }
+ }
+ if (!string.IsNullOrEmpty(tempData.Value9.Trim()))
+ {
+ string unitIds = string.Empty;
+ string[] reunit = tempData.Value9.Split(',');
+ foreach (string unitName in reunit)
+ {
+ var u = units.Where(x => x.UnitName == unitName.Trim()).FirstOrDefault();
+ if (u == null)
+ {
+ errInfo += "接收单位[" + unitName.Trim() + "]不存在；";
+ }
+ else
+ {
+ unitIds += u.UnitId + ",";
+ }
+ }
+ if (!string.IsNullOrEmpty(unitIds))
+ {
+ unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
+ }
+ Ins.ReceiveUnit = unitIds;
+ }
+ if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
+ {
+ if (tempData.Value10.Trim() != "整改中" && tempData.Value10.Trim() != "已闭合")
+ {
+ errInfo += "实时状态[" + tempData.Value10.Trim() + "]错误；";
+ }
+ else
+ {
+ Ins.ImplementationFrontState = tempData.Value10.Trim();
+ }
+ }
+ if (!string.IsNullOrEmpty(tempData.Value11))
+ {
+ try
+ {
+ Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value11);
+ if (Ins.ClosedDate == null)
+ {
+ errInfo += "要求关闭日期[" + tempData.Value11.Trim() + "]错误；";
+ }
+ }
+ catch (Exception)
+ {
+ errInfo += "要求关闭日期[" + tempData.Value11.Trim() + "]错误；";
+ }
+ }
+ if (!string.IsNullOrEmpty(tempData.Value12))
+ {
+ try
+ {
+ Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value12);
+ if (Ins.CompleteDate == null)
+ {
+ errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误；";
+ }
+ }
+ catch (Exception)
+ {
+ errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误；";
+ }
+ }
+ if (!string.IsNullOrEmpty(tempData.Value13.Trim()))//责任人
+ {
+ Ins.ResponsibleMan = tempData.Value13.Trim();
+ }
+ if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//监督人
+ {
+ var user = users.FirstOrDefault(x => x.UserName == tempData.Value14.Trim());
+ if (user != null)
+ {
+ Ins.Supervisor = user.UserId;
+ }
+ else
+ {
+ errInfo += "监督人[" + tempData.Value14.Trim() + "]错误；";
+ }
+ }
+ if (!string.IsNullOrEmpty(tempData.Value15))
+ {
+ try
+ {
+ Ins.RemarkCode = Convert.ToInt32(tempData.Value15);
+ }
+ catch (Exception)
+ {
+ errInfo += "标志编号[" + tempData.Value15 + "]格式错误；";
+ }
+ }
+ else
+ {
+ errInfo += "标志编号为必填项；";
+ }
+ if (string.IsNullOrEmpty(errInfo)) ////所有信息正确的话 插入数据
+ {
+ Ins.ProjectId = LoginProjectId;
+ Ins.Status = BLL.Const.Comprehensive_Compile;
+ Ins.CompileMan = this.CurrUser.UserId;
+ var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value15));
+ if (isExitISOValue != null) ///已存在
+ {
+ Ins.NCRManagementId = isExitISOValue.NCRManagementId;
+ BLL.NCRManagementService.UpdateNCRManagement(Ins);
+ }
+ else
+ {
+ Ins.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement));
+ BLL.NCRManagementService.AddNCRManagement(Ins);
+ }
+ BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByDataInTempID(tempData.TempId);
+ okCount++;
+ }
+
+ if (!string.IsNullOrEmpty(errInfo))
+ {
+ tempData.ToopValue = errInfo;
+ BLL.Sys_CQMS_DataInTempService.UpdateDataInTemp(tempData);
+ erreMessage += errInfo + ";";
+ }
+ }
+ }
+ }
+ #endregion
+
+ #region 删除所有数据事件
+ ///
+ /// 删除所有数据事件
+ ///
+ ///
+ ///
+ protected void btnAllDelete_Click(object sender, EventArgs e)
+ {
+ //先删除临时表中 该人员以前导入的数据
+ BLL.Sys_CQMS_DataInTempService.DeleteDataInTempByProjectIdUserId(this.CurrUser.LoginProjectId, this.CurrUser.UserId, "NCR");
+ this.BindGrid();
+ ShowNotify("删除成功！", MessageBoxIcon.Success);
+ this.lbDataCout.Text = string.Empty;
+ }
+ #endregion
+
+ #region 模版导入说明 下载
+ ///
+ /// 下载模版
+ ///
+ ///
+ ///
+ protected void imgbtnUpload_Click(object sender, EventArgs e)
+ {
+ string rootPath = Server.MapPath("~/");
+ string uploadfilepath = rootPath + Const.NCRManagementDataInUrl;
+ string filePath = Const.NCRManagementDataInUrl;
+ 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
+
+ public static Dictionary percent { get; set; }
+ public static Dictionary url { get; set; }
+
+ [System.Web.Services.WebMethod]
+ public static int getPercent(string id)
+ {
+ return percent[id];
+ }
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.designer.cs
new file mode 100644
index 00000000..fcb9cc48
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNew.aspx.designer.cs
@@ -0,0 +1,249 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive {
+
+
+ public partial class NCRManagementDataInNew {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// id 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.HiddenField id;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// hdfileName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.HiddenField hdfileName;
+
+ ///
+ /// FileExcel 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.FileUpload FileExcel;
+
+ ///
+ /// imgbtnImport 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button imgbtnImport;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// btnSave 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSave;
+
+ ///
+ /// btnRefresh 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnRefresh;
+
+ ///
+ /// btnAllDelete 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnAllDelete;
+
+ ///
+ /// btnOut 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnOut;
+
+ ///
+ /// imgbtnUpload 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button imgbtnUpload;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// ToolbarSeparator1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+ ///
+ /// ToolbarText1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarText ToolbarText1;
+
+ ///
+ /// ddlPageSize 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlPageSize;
+
+ ///
+ /// lbDataCout 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label lbDataCout;
+
+ ///
+ /// Window1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window1;
+
+ ///
+ /// Window2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window2;
+
+ ///
+ /// ContentPanel3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ContentPanel ContentPanel3;
+
+ ///
+ /// Menu1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Menu Menu1;
+
+ ///
+ /// btnMenuEdit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuEdit;
+
+ ///
+ /// btnMenuDelete 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuDelete;
+
+ ///
+ /// ScriptManager2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.ScriptManager ScriptManager2;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx
new file mode 100644
index 00000000..afc9e884
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx
@@ -0,0 +1,83 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NCRManagementDataInNewEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.NCRManagementDataInNewEdit" %>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs
new file mode 100644
index 00000000..2a1688cd
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.cs
@@ -0,0 +1,291 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+ public partial class NCRManagementDataInNewEdit : PageBase
+ {
+ #region 定义项
+ ///
+ /// 临时表主键
+ ///
+ public string TempId
+ {
+ get
+ {
+ return (string)ViewState["TempId"];
+ }
+ set
+ {
+ ViewState["TempId"] = value;
+ }
+ }
+ #endregion
+
+ #region 加载页面
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ this.TempId = Request.Params["TempId"];
+ this.txtValue1.Focus();
+ var dataInTemp = BLL.Sys_CQMS_DataInTempService.GetDataInTempByTempId(this.TempId);
+ if (dataInTemp != null)
+ {
+ this.txtValue1.Text = dataInTemp.Value1;
+ this.txtValue2.Text = dataInTemp.Value2;
+ this.txtValue3.Text = dataInTemp.Value3;
+ this.txtValue4.Text = dataInTemp.Value4;
+ this.txtValue5.Text = dataInTemp.Value5;
+ this.txtValue6.Text = dataInTemp.Value6;
+ this.txtValue7.Text = dataInTemp.Value7;
+ this.txtValue8.Text = dataInTemp.Value8;
+ this.txtValue9.Text = dataInTemp.Value9;
+ this.txtValue10.Text = dataInTemp.Value10;
+ this.txtValue11.Text = dataInTemp.Value11;
+ this.txtValue12.Text = dataInTemp.Value12;
+ this.txtValue13.Text = dataInTemp.Value13;
+ this.txtValue14.Text = dataInTemp.Value14;
+ this.txtValue15.Text = dataInTemp.Value15;
+
+ this.lbErrCout.Text = dataInTemp.ToopValue;
+ }
+ }
+ }
+ #endregion
+
+ #region 保存按钮
+ ///
+ /// 保存按钮
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ var dataInTemp = BLL.Sys_CQMS_DataInTempService.GetDataInTempByTempId(this.TempId);
+ if (this.ckAll.Checked)
+ {
+ var allDataInTemp = from x in Funs.DB.Sys_CQMS_DataInTemp where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == "NCR" select x;
+ if (dataInTemp.Value1 != this.txtValue1.Text.Trim())
+ {
+ var tempValue1 = allDataInTemp.Where(x => x.Value1 == dataInTemp.Value1 || (x.Value1 == null && dataInTemp.Value1 == null));
+ if (tempValue1 != null)
+ {
+ foreach (var item in tempValue1)
+ {
+ item.Value1 = this.txtValue1.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value2 != this.txtValue2.Text.Trim())
+ {
+ var tempValue2 = allDataInTemp.Where(x => x.Value2 == dataInTemp.Value2 || (x.Value2 == null && dataInTemp.Value2 == null));
+ if (tempValue2 != null)
+ {
+ foreach (var item in tempValue2)
+ {
+ item.Value2 = this.txtValue2.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value3 != this.txtValue3.Text.Trim())
+ {
+ var tempValue3 = allDataInTemp.Where(x => x.Value3 == dataInTemp.Value3 || (x.Value3 == null && dataInTemp.Value3 == null));
+ if (tempValue3 != null)
+ {
+ foreach (var item in tempValue3)
+ {
+ item.Value3 = this.txtValue3.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value5 != this.txtValue5.Text.Trim())
+ {
+ var tempValue5 = allDataInTemp.Where(x => x.Value5 == dataInTemp.Value5 || (x.Value5 == null && dataInTemp.Value5 == null));
+ if (tempValue5 != null)
+ {
+ foreach (var item in tempValue5)
+ {
+ item.Value5 = this.txtValue5.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value6 != this.txtValue6.Text.Trim())
+ {
+ var tempValue6 = allDataInTemp.Where(x => x.Value6 == dataInTemp.Value6 || (x.Value6 == null && dataInTemp.Value6 == null));
+ if (tempValue6 != null)
+ {
+ foreach (var item in tempValue6)
+ {
+ item.Value6 = this.txtValue6.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value7 != this.txtValue7.Text.Trim())
+ {
+ var tempValue7 = allDataInTemp.Where(x => x.Value7 == dataInTemp.Value7 || (x.Value7 == null && dataInTemp.Value7 == null));
+ if (tempValue7 != null)
+ {
+ foreach (var item in tempValue7)
+ {
+ item.Value7 = this.txtValue7.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value8 != this.txtValue8.Text.Trim())
+ {
+ var tempValue8 = allDataInTemp.Where(x => x.Value8 == dataInTemp.Value8 || (x.Value8 == null && dataInTemp.Value8 == null));
+ if (tempValue8 != null)
+ {
+ foreach (var item in tempValue8)
+ {
+ item.Value8 = this.txtValue8.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value9 != this.txtValue9.Text.Trim())
+ {
+ var tempValue9 = allDataInTemp.Where(x => x.Value9 == dataInTemp.Value9 || (x.Value9 == null && dataInTemp.Value9 == null));
+ if (tempValue9 != null)
+ {
+ foreach (var item in tempValue9)
+ {
+ item.Value9 = this.txtValue9.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value10 != this.txtValue10.Text.Trim())
+ {
+ var tempValue10 = allDataInTemp.Where(x => x.Value10 == dataInTemp.Value10 || (x.Value10 == null && dataInTemp.Value10 == null));
+ if (tempValue10 != null)
+ {
+ foreach (var item in tempValue10)
+ {
+ item.Value10 = this.txtValue10.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value11 != this.txtValue11.Text.Trim())
+ {
+ var tempValue11 = allDataInTemp.Where(x => x.Value11 == dataInTemp.Value11 || (x.Value11 == null && dataInTemp.Value11 == null));
+ if (tempValue11 != null)
+ {
+ foreach (var item in tempValue11)
+ {
+ item.Value11 = this.txtValue11.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value12 != this.txtValue12.Text.Trim())
+ {
+ var tempValue12 = allDataInTemp.Where(x => x.Value12 == dataInTemp.Value12 || (x.Value12 == null && dataInTemp.Value12 == null));
+ if (tempValue12 != null)
+ {
+ foreach (var item in tempValue12)
+ {
+ item.Value12 = this.txtValue12.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value13 != this.txtValue13.Text.Trim())
+ {
+ var tempValue13 = allDataInTemp.Where(x => x.Value13 == dataInTemp.Value13 || (x.Value13 == null && dataInTemp.Value13 == null));
+ if (tempValue13 != null)
+ {
+ foreach (var item in tempValue13)
+ {
+ item.Value13 = this.txtValue13.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value14 != this.txtValue14.Text.Trim())
+ {
+ var tempValue14 = allDataInTemp.Where(x => x.Value14 == dataInTemp.Value14 || (x.Value14 == null && dataInTemp.Value14 == null));
+ if (tempValue14 != null)
+ {
+ foreach (var item in tempValue14)
+ {
+ item.Value14 = this.txtValue14.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value15 != this.txtValue15.Text.Trim())
+ {
+ var tempValue15 = allDataInTemp.Where(x => x.Value15 == dataInTemp.Value15 || (x.Value15 == null && dataInTemp.Value15 == null));
+ if (tempValue15 != null)
+ {
+ foreach (var item in tempValue15)
+ {
+ item.Value15 = this.txtValue15.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue);
+ if (toopValue != null)
+ {
+ foreach (var item in toopValue)
+ {
+ item.ToopValue = null;
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ else
+ {
+ Model.Sys_CQMS_DataInTemp newDataInTemp = new Model.Sys_CQMS_DataInTemp();
+ newDataInTemp.ProjectId = this.CurrUser.ProjectId;
+ newDataInTemp.UserId = this.CurrUser.UserId;
+ newDataInTemp.Time = System.DateTime.Now;
+ newDataInTemp.Type = "NCR";
+ newDataInTemp.Value1 = this.txtValue1.Text.Trim();
+ newDataInTemp.Value2 = this.txtValue2.Text.Trim();
+ newDataInTemp.Value3 = this.txtValue3.Text.Trim();
+ newDataInTemp.Value4 = this.txtValue4.Text.Trim();
+ newDataInTemp.Value5 = this.txtValue5.Text.Trim();
+ newDataInTemp.Value6 = this.txtValue6.Text.Trim();
+ newDataInTemp.Value7 = this.txtValue7.Text.Trim();
+ newDataInTemp.Value8 = this.txtValue8.Text.Trim();
+ newDataInTemp.Value9 = this.txtValue9.Text.Trim();
+ newDataInTemp.Value10 = this.txtValue10.Text.Trim();
+ newDataInTemp.Value11 = this.txtValue11.Text.Trim();
+ newDataInTemp.Value12 = this.txtValue12.Text.Trim();
+ newDataInTemp.Value13 = this.txtValue13.Text.Trim();
+ newDataInTemp.Value14 = this.txtValue14.Text.Trim();
+ newDataInTemp.Value15 = this.txtValue15.Text.Trim();
+ if (!string.IsNullOrEmpty(this.TempId))
+ {
+ newDataInTemp.TempId = this.TempId;
+ newDataInTemp.ToopValue = null;
+ BLL.Sys_CQMS_DataInTempService.UpdateDataInTemp(newDataInTemp);
+ }
+ }
+ ShowNotify("信息修改完成！", MessageBoxIcon.Success);
+ PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs
new file mode 100644
index 00000000..d81bdf52
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataInNewEdit.aspx.designer.cs
@@ -0,0 +1,222 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive {
+
+
+ public partial class NCRManagementDataInNewEdit {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// SimpleForm1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form SimpleForm1;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// btnSave 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSave;
+
+ ///
+ /// txtValue1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue1;
+
+ ///
+ /// txtValue2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue2;
+
+ ///
+ /// txtValue3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue3;
+
+ ///
+ /// txtValue4 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue4;
+
+ ///
+ /// txtValue5 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue5;
+
+ ///
+ /// txtValue6 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue6;
+
+ ///
+ /// txtValue7 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue7;
+
+ ///
+ /// txtValue8 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue8;
+
+ ///
+ /// txtValue9 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue9;
+
+ ///
+ /// txtValue10 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue10;
+
+ ///
+ /// txtValue11 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue11;
+
+ ///
+ /// txtValue12 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue12;
+
+ ///
+ /// txtValue13 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue13;
+
+ ///
+ /// txtValue14 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue14;
+
+ ///
+ /// txtValue15 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue15;
+
+ ///
+ /// ckAll 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox ckAll;
+
+ ///
+ /// lbErrCout 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea lbErrCout;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/FakesAssemblies/ThoughtWorks.QRCode.Fakes.dll b/SGGL/FineUIPro.Web/FakesAssemblies/ThoughtWorks.QRCode.Fakes.dll
index 9277f8821e3f7aed9d262e0b1efaadfbda1c103c..e5384a2e5b8f91f8f3a5eaa15a6cc65948a7ada7 100644
GIT binary patch
delta 93
zcmZpe!Pzi_b3zAmxzUcs?ycR7iO&Rf%>8M;&yvG?%j7#6B|3M$Z~ya*@k@*jP(?Ze
v5HJC;3?l;rM-meQhYJ%!P_Rp|zHBk;6JHP4wH*iVhWGFbZyN@A3
delta 93
zcmZpe!Pzi_b3zC6(})R;-CMgE6Q2oW#ypfOeNy4Q=f0NjvTE)P+y6Xc{1T%BRFTdA
v1WZ6I!^ptEk;KHn;ljia6zmc#K4E_E)FtoT=DXj@t@(Ll#daANrYGzG?G_|s
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index f18ebe7c..2eaf6a4d 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -481,6 +481,8 @@
+
+
@@ -7824,6 +7826,20 @@
NCRManagementDataIn.aspx
+
+ NCRManagementDataInNew.aspx
+ ASPXCodeBehind
+
+
+ NCRManagementDataInNew.aspx
+
+
+ NCRManagementDataInNewEdit.aspx
+ ASPXCodeBehind
+
+
+ NCRManagementDataInNewEdit.aspx
+
NCRManagementEdit.aspx
ASPXCodeBehind