1
This commit is contained in:
@@ -377,14 +377,28 @@
|
|||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(q.MIDWelder_QualifiedProjectCode))
|
if (!string.IsNullOrEmpty(q.MIDWelder_QualifiedProjectCode))
|
||||||
{
|
{
|
||||||
|
if (q.MIDWelder_QualifiedProjectCode.Contains("+") || q.MIDWelder_QualifiedProjectCode.Contains("+") || q.MIDWelder_QualifiedProjectCode.Contains("和"))
|
||||||
|
{
|
||||||
|
string[] codes = null;
|
||||||
if (q.MIDWelder_QualifiedProjectCode.Contains("+"))
|
if (q.MIDWelder_QualifiedProjectCode.Contains("+"))
|
||||||
{
|
{
|
||||||
string[] codes = q.MIDWelder_QualifiedProjectCode.Split('+');
|
codes = q.MIDWelder_QualifiedProjectCode.Split('+');
|
||||||
|
}
|
||||||
|
if (q.MIDWelder_QualifiedProjectCode.Contains("+"))
|
||||||
|
{
|
||||||
|
codes = q.MIDWelder_QualifiedProjectCode.Split('+');
|
||||||
|
}
|
||||||
|
if (q.MIDWelder_QualifiedProjectCode.Contains("和"))
|
||||||
|
{
|
||||||
|
codes = q.MIDWelder_QualifiedProjectCode.Split('和');
|
||||||
|
}
|
||||||
|
|
||||||
foreach (string c in codes)
|
foreach (string c in codes)
|
||||||
{
|
{
|
||||||
var oldCode = from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.First().WED_ID && x.QualifiedProjectCode == c && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x;
|
var oldCode = from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.First().WED_ID && x.QualifiedProjectCode == c && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x;
|
||||||
if (oldCode.Count() == 0)
|
if (oldCode.Count() == 0)
|
||||||
{
|
{
|
||||||
|
m++;
|
||||||
Model.HJGL_BS_WelderQualifiedProject welderQualifiedProject = new Model.HJGL_BS_WelderQualifiedProject();
|
Model.HJGL_BS_WelderQualifiedProject welderQualifiedProject = new Model.HJGL_BS_WelderQualifiedProject();
|
||||||
welderQualifiedProject.WelderQualifiedProjectId = SQLHelper.GetNewID(typeof(Model.HJGL_BS_WelderQualifiedProject));
|
welderQualifiedProject.WelderQualifiedProjectId = SQLHelper.GetNewID(typeof(Model.HJGL_BS_WelderQualifiedProject));
|
||||||
welderQualifiedProject.WED_ID = s.First().WED_ID;
|
welderQualifiedProject.WED_ID = s.First().WED_ID;
|
||||||
@@ -397,6 +411,7 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
k++;
|
||||||
string welderQualifiedProjectId = oldCode.First().WelderQualifiedProjectId;
|
string welderQualifiedProjectId = oldCode.First().WelderQualifiedProjectId;
|
||||||
DateTime? limitDate = q.MIDWelder_LimitDate;
|
DateTime? limitDate = q.MIDWelder_LimitDate;
|
||||||
BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedLimitDate(welderQualifiedProjectId, limitDate, q.MIDWelder_sfxgjgbl, q.MIDWelder_jjsybl, q.MIDWelder_jjsy);
|
BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedLimitDate(welderQualifiedProjectId, limitDate, q.MIDWelder_sfxgjgbl, q.MIDWelder_jjsybl, q.MIDWelder_jjsy);
|
||||||
@@ -408,6 +423,7 @@
|
|||||||
var oldCode = from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.First().WED_ID && x.QualifiedProjectCode == q.MIDWelder_QualifiedProjectCode && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x;
|
var oldCode = from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.First().WED_ID && x.QualifiedProjectCode == q.MIDWelder_QualifiedProjectCode && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x;
|
||||||
if (oldCode.Count() == 0)
|
if (oldCode.Count() == 0)
|
||||||
{
|
{
|
||||||
|
n++;
|
||||||
Model.HJGL_BS_WelderQualifiedProject welderQualifiedProject = new Model.HJGL_BS_WelderQualifiedProject();
|
Model.HJGL_BS_WelderQualifiedProject welderQualifiedProject = new Model.HJGL_BS_WelderQualifiedProject();
|
||||||
welderQualifiedProject.WelderQualifiedProjectId = SQLHelper.GetNewID(typeof(Model.HJGL_BS_WelderQualifiedProject));
|
welderQualifiedProject.WelderQualifiedProjectId = SQLHelper.GetNewID(typeof(Model.HJGL_BS_WelderQualifiedProject));
|
||||||
welderQualifiedProject.WED_ID = s.First().WED_ID;
|
welderQualifiedProject.WED_ID = s.First().WED_ID;
|
||||||
@@ -420,15 +436,23 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
l++;
|
||||||
string welderQualifiedProjectId = oldCode.First().WelderQualifiedProjectId;
|
string welderQualifiedProjectId = oldCode.First().WelderQualifiedProjectId;
|
||||||
DateTime? limitDate = q.MIDWelder_LimitDate;
|
DateTime? limitDate = q.MIDWelder_LimitDate;
|
||||||
BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedLimitDate(welderQualifiedProjectId, limitDate, q.MIDWelder_sfxgjgbl, q.MIDWelder_jjsybl, q.MIDWelder_jjsy);
|
BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedLimitDate(welderQualifiedProjectId, limitDate, q.MIDWelder_sfxgjgbl, q.MIDWelder_jjsybl, q.MIDWelder_jjsy);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 回写表OAM_UesrQualified
|
// 回写表OAM_UesrQualified
|
||||||
long welder_ID = q.MIDWelder_ID;
|
long welder_ID = q.MIDWelder_ID;
|
||||||
bool isSync = true;
|
bool isSync = true;
|
||||||
BLL.HJGL_WelderQualifiedProjectService.UpdateOAWelderQue(welder_ID, isSync);
|
BLL.HJGL_WelderQualifiedProjectService.UpdateOAWelderQue(welder_ID, isSync);
|
||||||
|
|
||||||
|
//List<SqlParameter> listStr = new List<SqlParameter>();
|
||||||
|
//listStr.Add(new SqlParameter("@MIDWelder_ID", q.MIDWelder_ID));
|
||||||
|
//SqlParameter[] parameter = listStr.ToArray();
|
||||||
|
//BLL.SQLHelper.ExecutSql("UPDATE dbo.OAM_UesrQualified SET IsSync=1 WHERE MIDWelder_ID=@MIDWelder_ID", parameter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<FineUIPro DebugMode="false" Theme="Cupertino"/>
|
<FineUIPro DebugMode="false" Theme="Cupertino"/>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<!--连接字符串-->
|
<!--连接字符串-->
|
||||||
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
|
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
|
||||||
<!--系统名称-->
|
<!--系统名称-->
|
||||||
<add key="SystemName" value="诺必达焊接管理系统"/>
|
<add key="SystemName" value="诺必达焊接管理系统"/>
|
||||||
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
|
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user