|
|
@ -365,7 +365,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel |
|
|
|
} |
|
|
|
catch (Exception EX) { LogGing.ERRDATA(EX); } |
|
|
|
try |
|
|
|
{//处理呼叫请求列表(202》203)
|
|
|
|
{//处理呼叫请求列表完成发送后(202》203)
|
|
|
|
if (Dyelot_CALL.Select("State='202'").Count() > 0) |
|
|
|
{ |
|
|
|
DataRow row = Dyelot_CALL.Select("State='202'").First(); |
|
|
@ -395,7 +395,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel |
|
|
|
} |
|
|
|
catch (Exception EX) { LogGing.ERRDATA(EX); } |
|
|
|
try |
|
|
|
{//检查呼叫回复列表(203=>301)
|
|
|
|
{//检查呼叫回复列表确认是否完成(203=>301)
|
|
|
|
if (Dyelot_CALL.Select("State='203'").Count() > 0) |
|
|
|
{ |
|
|
|
DataTable dt = new DataTable(); |
|
|
@ -429,6 +429,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel |
|
|
|
Row.BeginEdit(); |
|
|
|
Row["State"] = 301; |
|
|
|
Row["Amount"] = data.Field<float>("Amount"); |
|
|
|
Row["DispenseStartTime"] = data.Field<DateTime>("DispenseStartTime").ToString("yyyy/MM/dd HH:mm:ss"); |
|
|
|
Row["DispenseEndTime"] = data.Field<DateTime>("DispenseEndTime").ToString("yyyy/MM/dd HH:mm:ss"); |
|
|
|
Row.EndEdit(); |
|
|
|
} |
|
|
@ -486,6 +487,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel |
|
|
|
Row.BeginEdit(); |
|
|
|
Row["State"] = 301; |
|
|
|
Row["Amount"] = data.Field<float>("Amount"); |
|
|
|
Row["DispenseStartTime"] = data.Field<DateTime>("DispenseStartTime").ToString("yyyy/MM/dd HH:mm:ss"); |
|
|
|
Row["DispenseEndTime"] = data.Field<DateTime>("DispenseEndTime").ToString("yyyy/MM/dd HH:mm:ss"); |
|
|
|
Row.EndEdit(); |
|
|
|
} |
|
|
@ -536,6 +538,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel |
|
|
|
Row.BeginEdit(); |
|
|
|
Row["State"] = 301; |
|
|
|
Row["Amount"] = data.Field<float>("Amount"); |
|
|
|
Row["DispenseStartTime"] = data.Field<DateTime>("DispenseStartTime").ToString("yyyy/MM/dd HH:mm:ss"); |
|
|
|
Row["DispenseEndTime"] = data.Field<DateTime>("DispenseEndTime").ToString("yyyy/MM/dd HH:mm:ss"); |
|
|
|
Row.EndEdit(); |
|
|
|
} |
|
|
@ -569,6 +572,29 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel |
|
|
|
} |
|
|
|
} |
|
|
|
catch (Exception EX) { LogGing.ERRDATA(EX); } |
|
|
|
try |
|
|
|
{//301列表发送完成至染机(203=>301)
|
|
|
|
foreach (DataRow row in Dyelot_CALL.Select("State='301' OR State='309'")) |
|
|
|
{ |
|
|
|
Dictionary<string, object> Product_ = new Dictionary<string, object>();//缓存函数
|
|
|
|
Product_.Add("State", row.Field<int>("State")); |
|
|
|
Product_.Add("Step", row.Field<int>("Step")); |
|
|
|
Product_.Add("Dyelot", row.Field<string>("Dyelot")); |
|
|
|
Product_.Add("ProductCode", row.Field<string>("ProductCode")); |
|
|
|
Product_.Add("Amount", row.Field<object>("Amount")); |
|
|
|
Product_.Add("DispenseEndTime", row.Field<object>("DispenseEndTime")); |
|
|
|
|
|
|
|
MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString |
|
|
|
{ |
|
|
|
ID = Convert.ToInt16(MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, |
|
|
|
"ID", "Name='" + row.Field<string>("Machine") + "'")), |
|
|
|
DAT = "SC828" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, |
|
|
|
"SYSKEY", "Name='" + row.Field<string>("Machine") + "'") + Product_.ToJsonString() |
|
|
|
}); |
|
|
|
Dyelot_CALL.Rows.Remove(row); |
|
|
|
} |
|
|
|
} |
|
|
|
catch (Exception EX) { LogGing.ERRDATA(EX); } |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|