代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -5,9 +5,6 @@ using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Check
|
||||
{
|
||||
|
||||
@@ -1,11 +1,6 @@
|
||||
using BLL;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Check
|
||||
{
|
||||
@@ -126,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Check
|
||||
{
|
||||
MaterialAcceptance.MaterialAcceptanceId = MaterialAcceptanceId;
|
||||
CheckMaterialacceptanceService.UpdateCheck_MaterialAcceptance(MaterialAcceptance);
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -144,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Check
|
||||
MaterialAcceptance.CompileMan = this.CurrUser.PersonId;
|
||||
MaterialAcceptance.CompileDate = DateTime.Now;
|
||||
CheckMaterialacceptanceService.AddCheck_MaterialAcceptance(MaterialAcceptance);
|
||||
|
||||
|
||||
}
|
||||
LogService.AddSys_Log(CurrUser, MaterialAcceptance.PlanCode, MaterialAcceptance.MaterialAcceptanceId, Const.CheckMaterialacceptanceMenuId, "修改总包施工质量计划");
|
||||
if (saveType == "submit")
|
||||
@@ -179,7 +174,7 @@ namespace FineUIPro.Web.CQMS.Check
|
||||
{
|
||||
if (validate())
|
||||
{
|
||||
|
||||
|
||||
SaveMainPlan("submit");
|
||||
|
||||
}
|
||||
|
||||
@@ -5,9 +5,6 @@ using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
{
|
||||
|
||||
@@ -5,8 +5,6 @@ using System.Data;
|
||||
using System.Data.OleDb;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
@@ -213,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
result += (i + 2).ToString() + "," + "交底负责单位" + "," + "[" + row3 + "]不存在!" + "|";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
string row5 = pds.Rows[i][5].ToString();
|
||||
if (!string.IsNullOrEmpty(row5))
|
||||
{
|
||||
@@ -240,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
string row8 = pds.Rows[i][8].ToString();
|
||||
if (string.IsNullOrEmpty(row8))
|
||||
{
|
||||
@@ -412,7 +410,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
string row0 = pds.Rows[i][0].ToString().Trim();
|
||||
string row3 = pds.Rows[i][3].ToString().Trim();
|
||||
var cn = cns.Where(y => y.ProfessionalName == row0).FirstOrDefault();
|
||||
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode ==Funs.GetNewInt( pds.Rows[i][8].ToString().Trim())
|
||||
oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][8].ToString().Trim())
|
||||
).FirstOrDefault();
|
||||
if (oldViewInfo == null)
|
||||
{
|
||||
@@ -421,7 +419,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
des.ProjectId = this.CurrUser.LoginProjectId;
|
||||
des.CNProfessionalId = cn.CNProfessionalId;
|
||||
des.DisclosureCode = pds.Rows[i][1].ToString().Trim();
|
||||
des.DisclosureName= pds.Rows[i][2].ToString().Trim();
|
||||
des.DisclosureName = pds.Rows[i][2].ToString().Trim();
|
||||
des.UnitId = units.Where(x => x.UnitName == row3.Trim()).FirstOrDefault().UnitId;
|
||||
des.DisclosureMan = pds.Rows[i][4].ToString().Trim();
|
||||
des.DisclosureDate = Funs.GetNewDateTime(pds.Rows[i][5].ToString().Trim());
|
||||
|
||||
@@ -421,7 +421,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
}
|
||||
Ins.UnitWorkId = unitIds;
|
||||
}
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(tempData.Value8.Trim()))
|
||||
{
|
||||
Ins.AttendMan = tempData.Value8.Trim();
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
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
|
||||
{
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
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
|
||||
{
|
||||
@@ -124,7 +120,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
newCon.AttendMan = this.txtAttendMan.Text.Trim();
|
||||
newCon.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
|
||||
newCon.DisclosurePersonNum = Funs.GetNewInt(this.txtDisclosurePersonNum.Text.Trim());
|
||||
|
||||
|
||||
if (string.IsNullOrEmpty(this.ConTechnologyDisclosureId))
|
||||
{
|
||||
newCon.ConTechnologyDisclosureId = SQLHelper.GetNewID(typeof(Model.Comprehensive_ConTechnologyDisclosure));
|
||||
|
||||
@@ -4,9 +4,6 @@ using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
{
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
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
|
||||
{
|
||||
@@ -118,12 +114,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
{
|
||||
//类别
|
||||
this.drpType.DataValueField = "Value";
|
||||
this.drpType.DataTextField= "Text";
|
||||
this.drpType.DataSource= BLL.DropListService.drpQualityAssuranceTypeList();
|
||||
this.drpType.DataTextField = "Text";
|
||||
this.drpType.DataSource = BLL.DropListService.drpQualityAssuranceTypeList();
|
||||
this.drpType.DataBind();
|
||||
Funs.FineUIPleaseSelect(this.drpType);
|
||||
|
||||
Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpCompileMan, this.ProjectId,string.Empty, true);
|
||||
Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpCompileMan, this.ProjectId, string.Empty, true);
|
||||
this.drpCompileMan.SelectedValue = this.CurrUser.PersonId;
|
||||
}
|
||||
|
||||
@@ -135,7 +131,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
/// <param name="e"></param>
|
||||
protected void btnSave_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (this.drpType.SelectedValue==BLL.Const._Null)
|
||||
if (this.drpType.SelectedValue == BLL.Const._Null)
|
||||
{
|
||||
Alert.ShowInTop("请选择类别", MessageBoxIcon.Warning);
|
||||
return;
|
||||
|
||||
@@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
strSql += " AND C.DraCode='" + txtDraCode.Text.Trim() + "'";
|
||||
|
||||
}
|
||||
|
||||
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
Grid1.RecordCount = tb.Rows.Count;
|
||||
|
||||
@@ -5,8 +5,6 @@ using System.Data;
|
||||
using System.Data.OleDb;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
using BLL;
|
||||
using FineUIPro.Web.ProjectData;
|
||||
using Model;
|
||||
using NPOI.SS.Formula.Functions;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
@@ -9,9 +7,6 @@ using System.Data.SqlClient;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
{
|
||||
@@ -421,7 +416,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
|
||||
}
|
||||
Ins.ReceiveUnits = unitIds;
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value6.Trim()))
|
||||
{
|
||||
Ins.Remarks = tempData.Value6.Trim();
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
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
|
||||
{
|
||||
|
||||
@@ -58,9 +58,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
this.drpUnitWorkIds.SelectedValueArray = model.UnitWorkId.Split(',');
|
||||
}
|
||||
this.txtDraCode.Text = model.DraCode;
|
||||
|
||||
|
||||
this.txtReviewDate.Text = model.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", model.ReviewDate) : "";
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(model.ReceiveUnits))
|
||||
{
|
||||
this.drpUnitIds.SelectedValueArray = model.ReceiveUnits.Split(',');
|
||||
@@ -99,8 +99,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
}
|
||||
//else
|
||||
//{
|
||||
//this.btnSave.Hidden = false;
|
||||
//this.btnSubmit.Hidden = false;
|
||||
//this.btnSave.Hidden = false;
|
||||
//this.btnSubmit.Hidden = false;
|
||||
//}
|
||||
}
|
||||
}
|
||||
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId)));
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId)));
|
||||
//}
|
||||
}
|
||||
#endregion
|
||||
|
||||
@@ -4,9 +4,6 @@ using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.ManageReport
|
||||
{
|
||||
|
||||
@@ -181,8 +181,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
|
||||
else
|
||||
{
|
||||
Model.InformationProject_QualityWorkSummaryReport oldReport = (from x in Funs.DB.InformationProject_QualityWorkSummaryReport
|
||||
where x.ProjectId == report.ProjectId && x.YearId == report.YearId
|
||||
select x).FirstOrDefault();
|
||||
where x.ProjectId == report.ProjectId && x.YearId == report.YearId
|
||||
select x).FirstOrDefault();
|
||||
if (oldReport == null)
|
||||
{
|
||||
this.QualityWorkSummaryReportId = SQLHelper.GetNewID(typeof(Model.InformationProject_QualityWorkSummaryReport));
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.ManageReport
|
||||
@@ -263,7 +261,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
|
||||
{
|
||||
if (!string.IsNullOrEmpty(this.txtQuarterTotal.Text.Trim()) && !string.IsNullOrEmpty(txtQuarterFirstPassNum.Text.Trim()))
|
||||
{
|
||||
txtQuarterFirstPassRate.Text = (Funs.GetNewDecimalOrZero(txtQuarterFirstPassNum.Text.Trim()) / Funs.GetNewDecimalOrZero(this.txtQuarterTotal.Text.Trim())*100).ToString();
|
||||
txtQuarterFirstPassRate.Text = (Funs.GetNewDecimalOrZero(txtQuarterFirstPassNum.Text.Trim()) / Funs.GetNewDecimalOrZero(this.txtQuarterTotal.Text.Trim()) * 100).ToString();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -280,7 +278,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
|
||||
{
|
||||
if (!string.IsNullOrEmpty(this.txtYearTotal.Text.Trim()) && !string.IsNullOrEmpty(this.txtYearFirstPassNum.Text.Trim()))
|
||||
{
|
||||
this.txtYearFirstPassRate.Text = (Funs.GetNewDecimalOrZero(this.txtYearFirstPassNum.Text.Trim()) / Funs.GetNewDecimalOrZero(this.txtYearTotal.Text.Trim())*100).ToString();
|
||||
this.txtYearFirstPassRate.Text = (Funs.GetNewDecimalOrZero(this.txtYearFirstPassNum.Text.Trim()) / Funs.GetNewDecimalOrZero(this.txtYearTotal.Text.Trim()) * 100).ToString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -5,8 +5,6 @@ using System.Data;
|
||||
using System.Data.OleDb;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
@@ -199,7 +197,7 @@ namespace FineUIPro.Web.CQMS.Material
|
||||
//else
|
||||
//{
|
||||
if (!string.IsNullOrEmpty(row2))
|
||||
{
|
||||
{
|
||||
var mainItem = mainItems.FirstOrDefault(x => x.MainItemName == row2);
|
||||
if (mainItem == null)
|
||||
{
|
||||
|
||||
@@ -3,7 +3,6 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -3,7 +3,6 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
using BLL;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -4,7 +4,6 @@ using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -116,7 +116,7 @@ namespace FineUIPro.Web.CQMS.Material
|
||||
}
|
||||
else
|
||||
{
|
||||
var oldView = Funs.DB.Material_Material.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId== Material.UnitId && x.ArrivalDate == Material.ArrivalDate
|
||||
var oldView = Funs.DB.Material_Material.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == Material.UnitId && x.ArrivalDate == Material.ArrivalDate
|
||||
&& x.MaterialName == Material.MaterialName && x.SpecificationAndModel == Material.SpecificationAndModel);
|
||||
if (oldView == null)
|
||||
{
|
||||
|
||||
@@ -5,8 +5,6 @@ using System.Data;
|
||||
using System.Data.OleDb;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
@@ -161,13 +159,13 @@ namespace FineUIPro.Web.CQMS.Material
|
||||
var oldViewInfos = from x in Funs.DB.Material_Material
|
||||
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
select new { x.ProjectId,y.UnitName,x.MaterialName,x.SpecificationAndModel,x.ArrivalDate};
|
||||
select new { x.ProjectId, y.UnitName, x.MaterialName, x.SpecificationAndModel, x.ArrivalDate };
|
||||
var units = from x in Funs.DB.Base_Unit
|
||||
select x;
|
||||
var mainItems = from x in Funs.DB.ProjectData_MainItem where x.ProjectId == this.CurrUser.LoginProjectId select x;
|
||||
for (int i = 0; i < ir; i++)
|
||||
{
|
||||
var oldViewInfo = oldViewInfos.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitName== pds.Rows[i][1].ToString()
|
||||
var oldViewInfo = oldViewInfos.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.UnitName == pds.Rows[i][1].ToString()
|
||||
&& x.MaterialName == pds.Rows[i][3].ToString() && x.SpecificationAndModel == pds.Rows[i][4].ToString() && x.ArrivalDate == Funs.GetNewDateTime(pds.Rows[i][10].ToString()));
|
||||
if (oldViewInfo == null)
|
||||
{
|
||||
|
||||
@@ -3,7 +3,6 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -3,7 +3,6 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
@@ -86,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 搜索
|
||||
/// </summary>
|
||||
|
||||
@@ -190,7 +190,7 @@ namespace FineUIPro.Web.CQMS.Material
|
||||
}
|
||||
if (buttonList.Contains(BLL.Const.BtnDelete))
|
||||
{
|
||||
//this.btnMenuDel.Hidden = false;
|
||||
//this.btnMenuDel.Hidden = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
@@ -214,7 +210,7 @@ namespace FineUIPro.Web.CQMS.Material
|
||||
materialTest.CompileDate = DateTime.Now;
|
||||
CQMS_MaterialTestService.UpdateMaterialTest(materialTest);
|
||||
Model.Material_Inspection inspection = BLL.CQMS_InspectionService.GetInspectionByInspectionId(materialTest.InspectionId);
|
||||
if (inspection != null)
|
||||
if (inspection != null)
|
||||
{
|
||||
if (inspection.State == BLL.Const.Inspection_SpotCheck) //若状态为正在抽检,则更新报验单状态为总包工程师审核
|
||||
{
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using BLL;
|
||||
using System;
|
||||
using System;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Material
|
||||
{
|
||||
|
||||
@@ -4,7 +4,6 @@ using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Meeting
|
||||
{
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Meeting
|
||||
{
|
||||
@@ -391,14 +386,14 @@ namespace FineUIPro.Web.CQMS.Meeting
|
||||
if (this.drpHandleType.SelectedValue == Const.CQMSMeeting_Complete) //审批完成
|
||||
{
|
||||
var getSitePerson = (from x in Funs.DB.SitePerson_Person
|
||||
join z in Funs.DB.Project_ProjectUnit on x.UnitId equals z.UnitId
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.ProjectPersonStates_1 && x.RoleIds != null
|
||||
&& z.UnitType == Const.ProjectUnitType_2
|
||||
select new
|
||||
{
|
||||
x.PersonId,
|
||||
RoleNames = BLL.RoleService.getRoleNamesRoleIds(x.RoleIds)
|
||||
}).AsEnumerable();
|
||||
join z in Funs.DB.Project_ProjectUnit on x.UnitId equals z.UnitId
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId && x.States == Const.ProjectPersonStates_1 && x.RoleIds != null
|
||||
&& z.UnitType == Const.ProjectUnitType_2
|
||||
select new
|
||||
{
|
||||
x.PersonId,
|
||||
RoleNames = BLL.RoleService.getRoleNamesRoleIds(x.RoleIds)
|
||||
}).AsEnumerable();
|
||||
var list = getSitePerson.Where(x => !x.RoleNames.Contains("安全"));
|
||||
foreach (var item in list)
|
||||
{
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
using BLL;
|
||||
using Aspose.Words;
|
||||
using BLL;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Aspose.Words;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Meeting
|
||||
{
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Meeting
|
||||
{
|
||||
|
||||
@@ -4,7 +4,6 @@ using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Meeting
|
||||
{
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Meeting
|
||||
{
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
using BLL;
|
||||
using Aspose.Words;
|
||||
using BLL;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Aspose.Words;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Meeting
|
||||
{
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Meeting
|
||||
{
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BLL;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
using BLL;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Models
|
||||
{
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using BLL;
|
||||
using System;
|
||||
using System;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.PersonManage
|
||||
{
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.PersonManage
|
||||
{
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.PersonManage
|
||||
{
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
using Model;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.PersonManage
|
||||
{
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.PersonManage
|
||||
{
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using BLL;
|
||||
using System;
|
||||
using System;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.PersonManage
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
using BLL;
|
||||
using FineUIPro.Web.ZHGL.Plan;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Plan
|
||||
{
|
||||
@@ -242,7 +240,7 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
}
|
||||
string id = Grid1.SelectedRowID;
|
||||
var ins = BLL.CQMS_MainPlanService.GetMainPlanByMainPlanId(id);
|
||||
if (File.Exists(Funs.RootPath+ins.FilePath))
|
||||
if (File.Exists(Funs.RootPath + ins.FilePath))
|
||||
{
|
||||
File.Delete(Funs.RootPath + ins.FilePath);
|
||||
|
||||
@@ -397,9 +395,9 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
{
|
||||
var ins = BLL.CQMS_MainPlanService.GetMainPlanByMainPlanId(Grid1.SelectedRowID);
|
||||
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/OnlineEditing.aspx?UserId={0}&PCUrl={1}", this.CurrUser.PersonId, ins.FilePath,"查看 -")));
|
||||
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/IndexOffice.aspx?cmd={0}|CQMSMainPlan", Grid1.SelectedRowID, "查看 -")));
|
||||
// PageContext.RegisterStartupScript(Window1.GetHideReference());
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/OnlineEditing.aspx?UserId={0}&PCUrl={1}", this.CurrUser.PersonId, ins.FilePath, "查看 -")));
|
||||
// PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/IndexOffice.aspx?cmd={0}|CQMSMainPlan", Grid1.SelectedRowID, "查看 -")));
|
||||
// PageContext.RegisterStartupScript(Window1.GetHideReference());
|
||||
|
||||
}
|
||||
else
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
using System.IO;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Plan
|
||||
{
|
||||
@@ -66,7 +63,7 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
hdId.Text = this.MainPlanId;
|
||||
txtPlanCode.Text = MainPlan.PlanCode;
|
||||
txtFileName.Text = MainPlan.FileName;
|
||||
|
||||
|
||||
List<string> list = BLL.CQMS_MainPlanApproveService.GetAudit3PersonIds(MainPlanId);
|
||||
if (list.Count > 0)
|
||||
{
|
||||
@@ -112,7 +109,7 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
this.btnSubmit.Visible = false;
|
||||
this.next.Hidden = true;
|
||||
}
|
||||
|
||||
|
||||
drpHandleType_SelectedIndexChanged(null, null);
|
||||
}
|
||||
else
|
||||
@@ -120,7 +117,7 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
string prefix = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId) + "-ZBJH-";
|
||||
txtPlanCode.Text = BLL.SQLHelper.RunProcNewId("SpGetThreeNumber", "Plan_MainPlan", "PlanCode", this.CurrUser.LoginProjectId, prefix);
|
||||
txtFileName.Text = "总包施工质量计划";
|
||||
drpHandleType.DataSource = BLL.CQMS_MainPlanService.GetDHandleTypeByState(BLL.Const.MainPlan_Compile,string.Empty);
|
||||
drpHandleType.DataSource = BLL.CQMS_MainPlanService.GetDHandleTypeByState(BLL.Const.MainPlan_Compile, string.Empty);
|
||||
drpHandleType.DataBind();
|
||||
drpHandleType_SelectedIndexChanged(null, null);
|
||||
}
|
||||
@@ -416,7 +413,7 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
}
|
||||
}
|
||||
LogService.AddSys_Log(CurrUser, MainPlan.PlanCode, MainPlan.MainPlanId, Const.MainPlanMenuId, "修改总包施工质量计划");
|
||||
if (saveType== "submit")
|
||||
if (saveType == "submit")
|
||||
{
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
|
||||
|
||||
@@ -487,13 +484,13 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
{
|
||||
Directory.CreateDirectory(newPath);
|
||||
}
|
||||
if (drpCompanyTemplate.SelectedValue!=Const._Null)
|
||||
if (drpCompanyTemplate.SelectedValue != Const._Null)
|
||||
{
|
||||
var template = BLL.Base_CompanytemplateService.GetBase_CompanyTemplateById(drpCompanyTemplate.SelectedValue);
|
||||
File.Copy(rootPath + template.FilePath, path);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/IndexOffice.aspx?cmd={0}|CQMSMainPlan", MainPlanId, "查看 -")));
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetHideReference());
|
||||
}
|
||||
@@ -531,9 +528,9 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
if (!File.Exists(Funs.RootPath + MainPlan.FilePath))
|
||||
{
|
||||
|
||||
drpCompanyTemplate.Hidden= false;
|
||||
drpCompanyTemplate.Hidden = false;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -544,18 +541,18 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
}
|
||||
protected void btnEditWord_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(MainPlanId))
|
||||
{
|
||||
Model.Plan_MainPlan MainPlan = BLL.CQMS_MainPlanService.GetMainPlanByMainPlanId(MainPlanId);
|
||||
if (!File.Exists(Funs.RootPath + MainPlan.FilePath))
|
||||
{
|
||||
GetCompanyTemplate();
|
||||
//PageContext.RegisterStartupScript(Confirm.GetShowReference("是否使用公司模板?",
|
||||
// String.Empty,
|
||||
// MessageBoxIcon.Question,
|
||||
// PageManager1.GetCustomEventReference("Yes"), // 第一个参数 false 用来指定当前不是AJAX请求
|
||||
// PageManager1.GetCustomEventReference("No")));
|
||||
//PageContext.RegisterStartupScript(Confirm.GetShowReference("是否使用公司模板?",
|
||||
// String.Empty,
|
||||
// MessageBoxIcon.Question,
|
||||
// PageManager1.GetCustomEventReference("Yes"), // 第一个参数 false 用来指定当前不是AJAX请求
|
||||
// PageManager1.GetCustomEventReference("No")));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Plan
|
||||
{
|
||||
|
||||
@@ -5,7 +5,6 @@ using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Plan
|
||||
{
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using BLL;
|
||||
using FineUIPro.Web.ZHGL.Plan;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
@@ -78,7 +77,7 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
HFSubPlanId.Text = SubPlanId;
|
||||
Model.Plan_SubPlan SubPlan = CQMS_SubPlanService.GetSubPlanBySubPlanId(SubPlanId);
|
||||
txtCode.Text = SubPlan.Code;
|
||||
|
||||
|
||||
if (!string.IsNullOrEmpty(SubPlan.UnitId))
|
||||
{
|
||||
drpUnit.SelectedValue = SubPlan.UnitId;
|
||||
@@ -535,7 +534,7 @@ namespace FineUIPro.Web.CQMS.Plan
|
||||
CQMS_SubPlanService.AddSubPlan(SubPlan);
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (saveType == "submit")
|
||||
{
|
||||
Model.Plan_SubPlanApprove approve1 = new Model.Plan_SubPlanApprove();
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Plan
|
||||
{
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Plan
|
||||
{
|
||||
|
||||
@@ -37,9 +37,9 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
this.ucTree.ProjectId = this.ProjectId;
|
||||
// if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId) )
|
||||
// {
|
||||
this.panelLeftRegion.Hidden = true;
|
||||
////权限按钮方法
|
||||
this.GetButtonPower();
|
||||
this.panelLeftRegion.Hidden = true;
|
||||
////权限按钮方法
|
||||
this.GetButtonPower();
|
||||
// }
|
||||
btnNew.OnClientClick = Window1.GetShowReference("QCGroupRegistrationEdit.aspx") + "return false;";
|
||||
BindGrid();
|
||||
@@ -166,8 +166,8 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
|
||||
{
|
||||
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
|
||||
var QCGroupRegistration = BLL.QCManage_QCGroupRegistrationService.GetQCGroupRegistrationByQCGroupRegistrationId(rowID);
|
||||
|
||||
var QCGroupRegistration = BLL.QCManage_QCGroupRegistrationService.GetQCGroupRegistrationByQCGroupRegistrationId(rowID);
|
||||
|
||||
if (QCGroupRegistration != null)
|
||||
{
|
||||
if (QCGroupRegistration.IsUpdate == true)
|
||||
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
BLL.QCManage_QCGroupRegistrationService.DeleteQCGroupRegistrationById(rowID);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
BindGrid();
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
{
|
||||
@@ -59,13 +52,15 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
if (!string.IsNullOrEmpty(QCGroupRegistration.AwardType))
|
||||
{
|
||||
drpAwardType.SelectedValue = QCGroupRegistration.AwardType;
|
||||
if (QCGroupRegistration.AwardType == "1") {
|
||||
if (QCGroupRegistration.AwardType == "1")
|
||||
{
|
||||
drpAwardLevel.Items.Add(new ListItem("鲁班奖", "1"));
|
||||
drpAwardLevel.Items.Add(new ListItem("国优奖", "2"));
|
||||
drpAwardLevel.Items.Add(new ListItem("省部级", "3"));
|
||||
drpAwardLevel.Items.Add(new ListItem("市级", "4"));
|
||||
}
|
||||
else if (QCGroupRegistration.AwardType == "2") {
|
||||
else if (QCGroupRegistration.AwardType == "2")
|
||||
{
|
||||
drpAwardLevel.Items.Add(new ListItem("省部级", "5"));
|
||||
drpAwardLevel.Items.Add(new ListItem("集团级", "6"));
|
||||
drpAwardLevel.Items.Add(new ListItem("企业级", "7"));
|
||||
@@ -159,20 +154,22 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
}
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
|
||||
}
|
||||
|
||||
|
||||
protected void Change_AwardType(object sender, EventArgs eventArgs)
|
||||
{
|
||||
|
||||
|
||||
drpAwardLevel.Items.Clear();
|
||||
drpAwardLevel.Items.Add(new ListItem("-请选择-", ""));
|
||||
|
||||
if (drpAwardType.SelectedValue == "1") {
|
||||
|
||||
if (drpAwardType.SelectedValue == "1")
|
||||
{
|
||||
drpAwardLevel.Items.Add(new ListItem("鲁班奖", "1"));
|
||||
drpAwardLevel.Items.Add(new ListItem("国优奖", "2"));
|
||||
drpAwardLevel.Items.Add(new ListItem("省部级", "3"));
|
||||
drpAwardLevel.Items.Add(new ListItem("市级", "4"));
|
||||
}
|
||||
else if (drpAwardType.SelectedValue == "2") {
|
||||
else if (drpAwardType.SelectedValue == "2")
|
||||
{
|
||||
drpAwardLevel.Items.Add(new ListItem("省部级", "5"));
|
||||
drpAwardLevel.Items.Add(new ListItem("集团级", "6"));
|
||||
drpAwardLevel.Items.Add(new ListItem("企业级", "7"));
|
||||
@@ -182,8 +179,8 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
{
|
||||
drpAwardLevel.SelectedIndex = 0;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
{
|
||||
@@ -58,13 +51,15 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
if (!string.IsNullOrEmpty(QCGroupRegistration.AwardType))
|
||||
{
|
||||
drpAwardType.SelectedValue = QCGroupRegistration.AwardType;
|
||||
if (QCGroupRegistration.AwardType == "1") {
|
||||
if (QCGroupRegistration.AwardType == "1")
|
||||
{
|
||||
drpAwardLevel.Items.Add(new ListItem("鲁班奖", "1"));
|
||||
drpAwardLevel.Items.Add(new ListItem("国优奖", "2"));
|
||||
drpAwardLevel.Items.Add(new ListItem("省部级", "3"));
|
||||
drpAwardLevel.Items.Add(new ListItem("市级", "4"));
|
||||
}
|
||||
else if (QCGroupRegistration.AwardType == "2") {
|
||||
else if (QCGroupRegistration.AwardType == "2")
|
||||
{
|
||||
drpAwardLevel.Items.Add(new ListItem("省部级", "5"));
|
||||
drpAwardLevel.Items.Add(new ListItem("集团级", "6"));
|
||||
drpAwardLevel.Items.Add(new ListItem("企业级", "7"));
|
||||
@@ -102,19 +97,21 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
}
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/QCGroupRegistration&menuId={1}", hdId.Text, BLL.Const.ProjectQCGroupRegistrationListMenuId)));
|
||||
}
|
||||
|
||||
|
||||
protected void Change_AwardType(object sender, EventArgs eventArgs)
|
||||
{
|
||||
|
||||
|
||||
drpAwardLevel.Items.Clear();
|
||||
drpAwardLevel.Items.Add(new ListItem("-请选择-", ""));
|
||||
|
||||
if (drpAwardType.SelectedValue == "1") {
|
||||
|
||||
if (drpAwardType.SelectedValue == "1")
|
||||
{
|
||||
drpAwardLevel.Items.Add(new ListItem("国家级", "1"));
|
||||
drpAwardLevel.Items.Add(new ListItem("省部级", "2"));
|
||||
drpAwardLevel.Items.Add(new ListItem("市级", "3"));
|
||||
}
|
||||
else if (drpAwardType.SelectedValue == "2") {
|
||||
else if (drpAwardType.SelectedValue == "2")
|
||||
{
|
||||
drpAwardLevel.Items.Add(new ListItem("省部级", "4"));
|
||||
drpAwardLevel.Items.Add(new ListItem("集团级", "5"));
|
||||
drpAwardLevel.Items.Add(new ListItem("企业级", "6"));
|
||||
@@ -124,7 +121,7 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
{
|
||||
drpAwardLevel.SelectedIndex = 0;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,10 +3,6 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
{
|
||||
@@ -67,11 +63,11 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
/// <param name="e"></param>
|
||||
//protected void changeTree(object sender, EventArgs e)
|
||||
//{
|
||||
//this.ProjectId = this.ucTree.ProjectId;
|
||||
//this.GetButtonPower();
|
||||
//if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
|
||||
//{
|
||||
//}
|
||||
//this.ProjectId = this.ucTree.ProjectId;
|
||||
//this.GetButtonPower();
|
||||
//if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
|
||||
//{
|
||||
//}
|
||||
// this.BindGrid();
|
||||
//}
|
||||
/// <summary>
|
||||
@@ -156,8 +152,8 @@ namespace FineUIPro.Web.CQMS.QualityActivity.QCManage
|
||||
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
|
||||
{
|
||||
BindGrid();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 统计按钮
|
||||
/// </summary>
|
||||
|
||||
@@ -4,7 +4,6 @@ using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.RewardAndPunish
|
||||
{
|
||||
@@ -66,7 +65,7 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish
|
||||
strSql += " AND ins.UnitId=@UnitId";
|
||||
listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
|
||||
}
|
||||
if (this.rblType.SelectedValue != "0")
|
||||
if (this.rblType.SelectedValue != "0")
|
||||
{
|
||||
strSql += " AND ins.Type=@Type";
|
||||
listStr.Add(new SqlParameter("@Type", rblType.SelectedValue));
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.RewardAndPunish
|
||||
{
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.RewardAndPunish
|
||||
{
|
||||
|
||||
@@ -98,7 +98,7 @@ namespace FineUIPro.Web.CQMS.Technique
|
||||
/// <param name="menuId"></param>
|
||||
private void BoundTree(TreeNodeCollection nodes, string menuId)
|
||||
{
|
||||
var dt = BLL.RectifyService.GetRectifyBySupRectifyId(menuId,"1");
|
||||
var dt = BLL.RectifyService.GetRectifyBySupRectifyId(menuId, "1");
|
||||
if (dt.Count() > 0)
|
||||
{
|
||||
TreeNode tn = null;
|
||||
@@ -388,7 +388,7 @@ namespace FineUIPro.Web.CQMS.Technique
|
||||
BindGrid();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region 导出
|
||||
/// <summary>
|
||||
/// 关闭导出窗口
|
||||
@@ -549,7 +549,7 @@ namespace FineUIPro.Web.CQMS.Technique
|
||||
{
|
||||
this.btnDelete.Hidden = false;
|
||||
this.btnMenuDelete.Hidden = false;
|
||||
}
|
||||
}
|
||||
if (buttonList.Contains(BLL.Const.BtnOut))
|
||||
{
|
||||
this.btnSelectColumns.Hidden = false;
|
||||
|
||||
@@ -106,7 +106,7 @@ namespace FineUIPro.Web.CQMS.Technique
|
||||
rectify.SupRectifyId = this.SupRectifyId;
|
||||
rectify.RectifyId = SQLHelper.GetNewID(typeof(Model.Technique_Rectify));
|
||||
BLL.RectifyService.AddRectify(rectify);
|
||||
|
||||
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, rectify.RectifyName, rectify.RectifyId, BLL.Const.CQMSRectifyMenuId, Const.BtnAdd);
|
||||
}
|
||||
else
|
||||
@@ -118,7 +118,7 @@ namespace FineUIPro.Web.CQMS.Technique
|
||||
}
|
||||
rectify.RectifyId = this.RectifyId;
|
||||
BLL.RectifyService.UpdateRectify(rectify);
|
||||
|
||||
|
||||
BLL.LogService.AddSys_Log(this.CurrUser, rectify.RectifyName, rectify.RectifyId, BLL.Const.CQMSRectifyMenuId, Const.BtnModify);
|
||||
}
|
||||
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
|
||||
|
||||
@@ -135,7 +135,7 @@ namespace FineUIPro.Web.CQMS.Technique
|
||||
SaveData();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region 获取按钮权限
|
||||
/// <summary>
|
||||
/// 获取按钮权限
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
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.Technique
|
||||
{
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Technical
|
||||
{
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Technical
|
||||
{
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Train
|
||||
{
|
||||
|
||||
@@ -1,12 +1,4 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
using System;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Train
|
||||
{
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Train
|
||||
{
|
||||
@@ -49,7 +42,7 @@ namespace FineUIPro.Web.CQMS.Train
|
||||
TrainPlanId = Request.Params["TrainPlanId"];
|
||||
BLL.CQMSTrainObjectService.InitTrainObjectDropDownList(this.drpPlanTrainPersons, true);
|
||||
BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpRealTrainPersons, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true);
|
||||
BLL.SitePerson_PersonService.InitSitePersonByUnitTypeRoletIdsDropDownList(this.drpHostMan,this.CurrUser.LoginProjectId, Const.ProjectUnitType_1, Const.QAManager + "," + Const.CQEngineer, true);
|
||||
BLL.SitePerson_PersonService.InitSitePersonByUnitTypeRoletIdsDropDownList(this.drpHostMan, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1, Const.QAManager + "," + Const.CQEngineer, true);
|
||||
BLL.CQMSTrainTypeService.InitTrainTypeDropDownList(this.drpTrainType, true);
|
||||
if (!string.IsNullOrEmpty(TrainPlanId))
|
||||
{
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
using BLL;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.Train
|
||||
{
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
using BLL;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Web.UI.WebControls;
|
||||
using Model;
|
||||
|
||||
namespace FineUIPro.Web.CQMS.WBS
|
||||
{
|
||||
@@ -52,7 +49,7 @@ namespace FineUIPro.Web.CQMS.WBS
|
||||
var controlItemAndCycle = BLL.ControlItemAndCycleService.GetControlItemAndCycleById(dataId);
|
||||
if (controlItemAndCycle != null)
|
||||
{
|
||||
discloseName= controlItemAndCycle.ControlItemContent;
|
||||
discloseName = controlItemAndCycle.ControlItemContent;
|
||||
}
|
||||
}
|
||||
technicalDisclose.DiscloseName = discloseName;
|
||||
|
||||
Reference in New Issue
Block a user