1、logo调整
2、质量管理NCR管理补充字段问题原因分析
This commit is contained in:
@@ -248,6 +248,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
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();
|
||||
newDataInTemp.Value16 = ds.Tables[0].Rows[i][15].ToString();
|
||||
|
||||
BLL.Sys_CQMS_DataInTempService.AddDataInTemp(newDataInTemp);
|
||||
}
|
||||
@@ -432,29 +433,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
Ins.Problem = tempData.Value6.Trim();
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//改进措施
|
||||
if (!string.IsNullOrEmpty(tempData.Value7.Trim()))//问题原因分析
|
||||
{
|
||||
Ins.Measure = tempData.Value7.Trim();
|
||||
Ins.ReasonAnalysis = tempData.Value7.Trim();
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value8.Trim()))
|
||||
if (!string.IsNullOrEmpty(tempData.Value8.Trim()))//改进措施
|
||||
{
|
||||
Ins.Measure = tempData.Value8.Trim();
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value9.Trim()))
|
||||
{
|
||||
try
|
||||
{
|
||||
Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value8.Trim());
|
||||
Ins.IssuedDate = Funs.GetNewDateTime(tempData.Value9.Trim());
|
||||
if (Ins.IssuedDate == null)
|
||||
{
|
||||
errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误;";
|
||||
errInfo += "下发日期[" + tempData.Value9.Trim() + "]错误;";
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
errInfo += "下发日期[" + tempData.Value8.Trim() + "]错误;";
|
||||
errInfo += "下发日期[" + tempData.Value9.Trim() + "]错误;";
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value9.Trim()))
|
||||
if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
|
||||
{
|
||||
string unitIds = string.Empty;
|
||||
string[] reunit = tempData.Value9.Split(',');
|
||||
string[] reunit = tempData.Value10.Split(',');
|
||||
foreach (string unitName in reunit)
|
||||
{
|
||||
var u = units.Where(x => x.UnitName == unitName.Trim()).FirstOrDefault();
|
||||
@@ -473,54 +478,54 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
}
|
||||
Ins.ReceiveUnit = unitIds;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value10.Trim()))
|
||||
if (!string.IsNullOrEmpty(tempData.Value11.Trim()))
|
||||
{
|
||||
if (tempData.Value10.Trim() != "整改中" && tempData.Value10.Trim() != "已闭合")
|
||||
if (tempData.Value11.Trim() != "整改中" && tempData.Value11.Trim() != "已闭合")
|
||||
{
|
||||
errInfo += "实时状态[" + tempData.Value10.Trim() + "]错误;";
|
||||
errInfo += "实时状态[" + tempData.Value11.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() + "]错误;";
|
||||
Ins.ImplementationFrontState = tempData.Value11.Trim();
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value12))
|
||||
{
|
||||
try
|
||||
{
|
||||
Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value12);
|
||||
if (Ins.CompleteDate == null)
|
||||
Ins.ClosedDate = Funs.GetNewDateTime(tempData.Value12);
|
||||
if (Ins.ClosedDate == null)
|
||||
{
|
||||
errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误;";
|
||||
errInfo += "要求关闭日期[" + tempData.Value12.Trim() + "]错误;";
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
errInfo += "完成日期[" + tempData.Value12.Trim() + "]错误;";
|
||||
errInfo += "要求关闭日期[" + tempData.Value12.Trim() + "]错误;";
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value13.Trim()))//责任人
|
||||
if (!string.IsNullOrEmpty(tempData.Value13))
|
||||
{
|
||||
Ins.ResponsibleMan = tempData.Value13.Trim();
|
||||
try
|
||||
{
|
||||
Ins.CompleteDate = Funs.GetNewDateTime(tempData.Value13);
|
||||
if (Ins.CompleteDate == null)
|
||||
{
|
||||
errInfo += "完成日期[" + tempData.Value13.Trim() + "]错误;";
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
errInfo += "完成日期[" + tempData.Value13.Trim() + "]错误;";
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//监督人
|
||||
if (!string.IsNullOrEmpty(tempData.Value14.Trim()))//责任人
|
||||
{
|
||||
string[] strs = tempData.Value14.Trim().Split(',');
|
||||
Ins.ResponsibleMan = tempData.Value14.Trim();
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value15.Trim()))//监督人
|
||||
{
|
||||
string[] strs = tempData.Value15.Trim().Split(',');
|
||||
bool b = true;
|
||||
string supervisor = string.Empty;
|
||||
foreach (var item in strs)
|
||||
@@ -544,15 +549,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tempData.Value15))
|
||||
if (!string.IsNullOrEmpty(tempData.Value16))
|
||||
{
|
||||
try
|
||||
{
|
||||
Ins.RemarkCode = Convert.ToInt32(tempData.Value15);
|
||||
Ins.RemarkCode = Convert.ToInt32(tempData.Value16);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
errInfo += "标志编号[" + tempData.Value15 + "]格式错误;";
|
||||
errInfo += "标志编号[" + tempData.Value16 + "]格式错误;";
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -564,7 +569,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
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));
|
||||
var isExitISOValue = oldViewInfos.FirstOrDefault(x => x.RemarkCode == Funs.GetNewIntOrZero(tempData.Value16));
|
||||
if (isExitISOValue != null) ///已存在
|
||||
{
|
||||
Ins.NCRManagementId = isExitISOValue.NCRManagementId;
|
||||
|
||||
Reference in New Issue
Block a user