|
@@ -2863,7 +2863,7 @@ namespace TeamAAS_VP.Core
|
|
|
string saveppid = "NA";
|
|
string saveppid = "NA";
|
|
|
string names = currentProduct.Name;
|
|
string names = currentProduct.Name;
|
|
|
if (stationConfig.SaveCsvPPID) saveppid = ppid;
|
|
if (stationConfig.SaveCsvPPID) saveppid = ppid;
|
|
|
- Dictionary<string, double> adjacentDiffDict = GetAdjacentDiffDict(keyData,names);
|
|
|
|
|
|
|
+
|
|
|
// Dictionary<string, double> adjacentDiffDict1 = GetAdjacentDiffDict(keyData1);
|
|
// Dictionary<string, double> adjacentDiffDict1 = GetAdjacentDiffDict(keyData1);
|
|
|
//判断锁付路径字符串是否为空，如果不为空则保存，否则不保存
|
|
//判断锁付路径字符串是否为空，如果不为空则保存，否则不保存
|
|
|
if (!string.IsNullOrEmpty(stationConfig.SaveCsvPath))
|
|
if (!string.IsNullOrEmpty(stationConfig.SaveCsvPath))
|
|
@@ -2889,13 +2889,13 @@ namespace TeamAAS_VP.Core
|
|
|
{
|
|
{
|
|
|
PPID = saveppid,
|
|
PPID = saveppid,
|
|
|
PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
|
|
PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
|
|
|
- PROCESS_START_TIME = _LastMesCheckTime[i].ToString("o"),
|
|
|
|
|
|
|
+ PROCESS_START_TIME = _LastMesCheckTime[i].ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
CTQ_NAME = item.PhotoName,
|
|
CTQ_NAME = item.PhotoName,
|
|
|
CTQ_VALUE = item.ResultData.Replace(",", ";"),
|
|
CTQ_VALUE = item.ResultData.Replace(",", ";"),
|
|
|
//CTQ_VALUEE=item.ResultData1,
|
|
//CTQ_VALUEE=item.ResultData1,
|
|
|
CTQ_LSL = item.DownLimit,
|
|
CTQ_LSL = item.DownLimit,
|
|
|
CTQ_USL = item.UpLimit,
|
|
CTQ_USL = item.UpLimit,
|
|
|
- PROCESS_END_TIME = serverTimeResult.Now.ToString("o"),
|
|
|
|
|
|
|
+ PROCESS_END_TIME = serverTimeResult.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
|
|
SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
|
|
|
COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
|
|
COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
|
|
|
REVISION = stationConfig.DataInfo.REVISION + "_" + stage,//
|
|
REVISION = stationConfig.DataInfo.REVISION + "_" + stage,//
|
|
@@ -2915,6 +2915,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
}
|
|
|
if (stationConfig.SaveCsvkeyData)
|
|
if (stationConfig.SaveCsvkeyData)
|
|
|
{
|
|
{
|
|
|
|
|
+ Dictionary<string, double> adjacentDiffDict = GetAdjacentDiffDict(keyData, names);
|
|
|
foreach (var items in adjacentDiffDict)
|
|
foreach (var items in adjacentDiffDict)
|
|
|
{
|
|
{
|
|
|
string pairkey = items.Key;
|
|
string pairkey = items.Key;
|
|
@@ -2923,12 +2924,12 @@ namespace TeamAAS_VP.Core
|
|
|
{
|
|
{
|
|
|
PPID = saveppid,
|
|
PPID = saveppid,
|
|
|
PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
|
|
PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
|
|
|
- PROCESS_START_TIME = _LastMesCheckTime[i].ToString("o"),
|
|
|
|
|
|
|
+ PROCESS_START_TIME = _LastMesCheckTime[i].ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
CTQ_NAME = pairkey,
|
|
CTQ_NAME = pairkey,
|
|
|
CTQ_VALUE = diffvalue,
|
|
CTQ_VALUE = diffvalue,
|
|
|
CTQ_LSL = "-0.3",
|
|
CTQ_LSL = "-0.3",
|
|
|
CTQ_USL = "0.3",
|
|
CTQ_USL = "0.3",
|
|
|
- PROCESS_END_TIME = serverTimeResult.Now.ToString("o"),
|
|
|
|
|
|
|
+ PROCESS_END_TIME = serverTimeResult.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
|
|
SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
|
|
|
COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
|
|
COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
|
|
|
REVISION = stationConfig.DataInfo.REVISION + "_" + stage,//
|
|
REVISION = stationConfig.DataInfo.REVISION + "_" + stage,//
|
|
@@ -2954,12 +2955,12 @@ namespace TeamAAS_VP.Core
|
|
|
{
|
|
{
|
|
|
PPID = saveppid,
|
|
PPID = saveppid,
|
|
|
PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
|
|
PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
|
|
|
- PROCESS_START_TIME = _LastMesCheckTime[i].ToString("o"),
|
|
|
|
|
|
|
+ PROCESS_START_TIME = _LastMesCheckTime[i].ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
CTQ_NAME = pairkey1,
|
|
CTQ_NAME = pairkey1,
|
|
|
CTQ_VALUE = diffvalue1,
|
|
CTQ_VALUE = diffvalue1,
|
|
|
CTQ_LSL = "0",
|
|
CTQ_LSL = "0",
|
|
|
CTQ_USL = "0.3",
|
|
CTQ_USL = "0.3",
|
|
|
- PROCESS_END_TIME = serverTimeResult.Now.ToString("o"),
|
|
|
|
|
|
|
+ PROCESS_END_TIME = serverTimeResult.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
|
|
SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
|
|
|
COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
|
|
COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
|
|
|
REVISION = stationConfig.DataInfo.REVISION + "_" + stage,//
|
|
REVISION = stationConfig.DataInfo.REVISION + "_" + stage,//
|
|
@@ -3077,7 +3078,7 @@ namespace TeamAAS_VP.Core
|
|
|
bool tp = WriteProductLogTP(DFC, ProductMainSN);
|
|
bool tp = WriteProductLogTP(DFC, ProductMainSN);
|
|
|
if (kb)
|
|
if (kb)
|
|
|
{
|
|
{
|
|
|
- SendTaskMessage($"保存KB键盘格JMP数据成功", MessageLevel.Error);
|
|
|
|
|
|
|
+ SendTaskMessage($"保存KB键盘格JMP数据成功", MessageLevel.Debug);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
@@ -3085,7 +3086,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
}
|
|
|
if (tp)
|
|
if (tp)
|
|
|
{
|
|
{
|
|
|
- SendTaskMessage($"保存TP键盘格JMP数据成功", MessageLevel.Error);
|
|
|
|
|
|
|
+ SendTaskMessage($"保存TP键盘格JMP数据成功", MessageLevel.Debug);
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
@@ -3094,7 +3095,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
- SendTaskMessage($"未启用保存键盘格JMP数据,保存失败", MessageLevel.Error);
|
|
|
|
|
|
|
+ SendTaskMessage($"未启用保存键盘格JMP数据", MessageLevel.Info);
|
|
|
}
|
|
}
|
|
|
lock (_stateLock)
|
|
lock (_stateLock)
|
|
|
{
|
|
{
|
