|
|
@@ -179,7 +179,7 @@ namespace UAS_PLCDataReader.PublicMethod
|
|
|
//更新设备运行状态
|
|
|
sql.Append("update DeviceRunstatus set ");
|
|
|
//更新设备工作时间
|
|
|
- sql1.Append("merge into deviceworktime a using (select '"+Decode+ "' decode,sysdate time from dual) b on(trunc(a.dwt_indate)=trunc(b.time) and a.dwt_decode = b.decode) when matched then update set ");
|
|
|
+ sql1.Append("merge into deviceworktime a using (select '" + Decode + "' decode,sysdate time from dual) b on(trunc(a.dwt_indate)=trunc(b.time) and a.dwt_decode = b.decode) when matched then update set ");
|
|
|
foreach (var item in ItemData)
|
|
|
{
|
|
|
switch (item.Key)
|
|
|
@@ -271,48 +271,53 @@ namespace UAS_PLCDataReader.PublicMethod
|
|
|
case "WAITTIME":
|
|
|
if (item.Value != "")
|
|
|
{
|
|
|
- sql.Append("dwt_waittime='" + item.Value + "',");
|
|
|
+ sql1.Append("dwt_waittime='" + item.Value + "',");
|
|
|
}
|
|
|
break;
|
|
|
case "BREAKTIME":
|
|
|
if (item.Value != "")
|
|
|
{
|
|
|
- sql.Append("dwt_breaktime='" + item.Value + "',");
|
|
|
+ sql1.Append("dwt_breaktime='" + item.Value + "',");
|
|
|
}
|
|
|
break;
|
|
|
case "MANSTOPTIME":
|
|
|
if (item.Value != "")
|
|
|
{
|
|
|
- sql.Append("dwt_manstoptime='" + item.Value + "',");
|
|
|
+ sql1.Append("dwt_manstoptime='" + item.Value + "',");
|
|
|
}
|
|
|
break;
|
|
|
case "WORKTIME":
|
|
|
if (item.Value != "")
|
|
|
{
|
|
|
- sql.Append("dwt_worktime='" + item.Value + "',");
|
|
|
+ sql1.Append("dwt_worktime='" + item.Value + "',");
|
|
|
}
|
|
|
break;
|
|
|
case "STARTTIME":
|
|
|
if (item.Value != "")
|
|
|
{
|
|
|
- sql.Append("dwt_starttime='" + item.Value + "',");
|
|
|
+ sql1.Append("dwt_starttime='" + item.Value + "',");
|
|
|
}
|
|
|
break;
|
|
|
case "RUNTIME":
|
|
|
if (item.Value != "")
|
|
|
{
|
|
|
- sql.Append("dwt_runtime='" + item.Value + "',");
|
|
|
+ sql1.Append("dwt_runtime='" + item.Value + "',");
|
|
|
}
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
|
}
|
|
|
+ if (item.Key.Contains("BADDETAIL"))
|
|
|
+ {
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select bgd_badcode from badgroup left join BADGROUPDETAIL on bg_id=bgd_bgid order by bgd_detno", "select");
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
//更新设别运行状态
|
|
|
sql.Append("dr_updatedate=sysdate where dr_decode='" + Decode + "'");
|
|
|
Main.QueueUpdateDevice.Enqueue(sql.ToString());
|
|
|
//更新设备工作时长
|
|
|
- sql1.Append("dwt_indate=sysdate when not matched then insert (dwt_id,dwt_decode,dwt_indate) values(deviceworktime_seq.nextval,'"+Decode+"',sysdate)");
|
|
|
+ sql1.Append("dwt_indate=sysdate when not matched then insert (dwt_id,dwt_decode,dwt_indate) values(deviceworktime_seq.nextval,'" + Decode + "',sysdate)");
|
|
|
Main.QueueUpdateDevice.Enqueue(sql1.ToString());
|
|
|
}
|
|
|
|