|
|
@@ -2767,7 +2767,7 @@ namespace TeamAAS_VP.Core
|
|
|
if (revisionItem != null)
|
|
|
{
|
|
|
revision[i] = revisionItem.Replace("stage=", "").Trim();
|
|
|
- SendTaskMessage($"revision：{revision[i]}", MessageLevel.Info);
|
|
|
+ SendTaskMessage($"stage：{revision[i]}", MessageLevel.Info);
|
|
|
}
|
|
|
|
|
|
LogHelper.WriteLogMes($"询问mes成功");
|
|
|
@@ -2939,7 +2939,7 @@ namespace TeamAAS_VP.Core
|
|
|
else assyPresRes = false;
|
|
|
DFC.Clear();
|
|
|
|
|
|
- string upLimitValue = "", downLimitValue = "", midValue = "", saveppid = "";
|
|
|
+ string upLimitValue = "NA", downLimitValue = "NA", midValue = "NA", saveppid = "NA";
|
|
|
if (stationConfig.SaveCsvPPID) saveppid = ppid[i];
|
|
|
foreach (var item in gapDict)
|
|
|
{
|
|
|
@@ -2978,19 +2978,19 @@ namespace TeamAAS_VP.Core
|
|
|
PROCESS_END_TIME = serverTimeResult.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
|
|
|
COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
|
|
|
- REVISION = stationConfig.DataInfo.REVISION,
|
|
|
+ REVISION = stationConfig.DataInfo.REVISION+"_"+ revision[i],
|
|
|
WO = wo[i],
|
|
|
MFG_LOT = stationConfig.DataInfo.MFG_LOT,
|
|
|
MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
|
|
|
PROCESS_OUTCOME = "Pass",
|
|
|
PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
|
|
|
CTQ_UNIT_OF_MEASURE = "mm",
|
|
|
- ERROR_MESSAGE = "",
|
|
|
- PD_ATTR_01 = midValue,
|
|
|
- PD_ATTR_02 = ProductMainSN[i],
|
|
|
+ ERROR_MESSAGE = "NA",
|
|
|
+ PD_ATTR_01 = ProductMainSN[i],
|
|
|
+ PD_ATTR_02 = midValue,
|
|
|
PD_ATTR_03 = PartSN,
|
|
|
- PD_ATTR_04 = "",
|
|
|
- PD_ATTR_05 = "",
|
|
|
+ PD_ATTR_04 = "NA",
|
|
|
+ PD_ATTR_05 = "NA",
|
|
|
});
|
|
|
}
|
|
|
|
|
|
@@ -3007,7 +3007,7 @@ namespace TeamAAS_VP.Core
|
|
|
PROCESS_END_TIME = serverTimeResult.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
|
|
|
COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
|
|
|
- REVISION = stationConfig.DataInfo.REVISION,
|
|
|
+ REVISION = stationConfig.DataInfo.REVISION + "_" + revision[i],
|
|
|
WO = wo[i],
|
|
|
MFG_LOT = stationConfig.DataInfo.MFG_LOT,
|
|
|
MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
|
|
|
@@ -3015,11 +3015,11 @@ namespace TeamAAS_VP.Core
|
|
|
PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
|
|
|
CTQ_UNIT_OF_MEASURE = "kg",
|
|
|
ERROR_MESSAGE = assyPresRes ? "" : "Assy_Pressure OOS",
|
|
|
- PD_ATTR_01 = midValue,
|
|
|
- PD_ATTR_02 = ProductMainSN[i],
|
|
|
+ PD_ATTR_01 = ProductMainSN[i],
|
|
|
+ PD_ATTR_02 = midValue,
|
|
|
PD_ATTR_03 = PartSN,
|
|
|
- PD_ATTR_04 = "",
|
|
|
- PD_ATTR_05 = "",
|
|
|
+ PD_ATTR_04 = "NA",
|
|
|
+ PD_ATTR_05 = "NA",
|
|
|
});
|
|
|
#endregion
|
|
|
}
|
|
|
@@ -3054,7 +3054,7 @@ namespace TeamAAS_VP.Core
|
|
|
}
|
|
|
else presRes = false;
|
|
|
DFC.Clear();
|
|
|
- string midValue = "", saveppid = "";
|
|
|
+ string midValue = "NA", saveppid = "NA";
|
|
|
midValue = ((currentProduct.GlobalParamEx.DownPressure.PressureDownLimit + currentProduct.GlobalParamEx.DownPressure.PressureUpLimit) / 2).ToString("F3");
|
|
|
if (stationConfig.SaveCsvPPID) saveppid = ppid[i];
|
|
|
DFC.Add(new DataFormCtq
|
|
|
@@ -3069,7 +3069,7 @@ namespace TeamAAS_VP.Core
|
|
|
PROCESS_END_TIME = serverTimeResult.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
|
|
|
COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
|
|
|
- REVISION = stationConfig.DataInfo.REVISION,
|
|
|
+ REVISION = stationConfig.DataInfo.REVISION + "_" + revision[i],
|
|
|
WO = wo[i],
|
|
|
MFG_LOT = stationConfig.DataInfo.MFG_LOT,
|
|
|
MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
|
|
|
@@ -3077,11 +3077,11 @@ namespace TeamAAS_VP.Core
|
|
|
PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
|
|
|
CTQ_UNIT_OF_MEASURE = "kg",
|
|
|
ERROR_MESSAGE = presRes ? "" : "Pressure OOS",
|
|
|
- PD_ATTR_01 = midValue,
|
|
|
- PD_ATTR_02 = ProductMainSN[i],
|
|
|
- PD_ATTR_03 = "",
|
|
|
- PD_ATTR_04 = "",
|
|
|
- PD_ATTR_05 = "",
|
|
|
+ PD_ATTR_01 = ProductMainSN[i],
|
|
|
+ PD_ATTR_02 = midValue,
|
|
|
+ PD_ATTR_03 = "NA",
|
|
|
+ PD_ATTR_04 = "NA",
|
|
|
+ PD_ATTR_05 = "NA",
|
|
|
});
|
|
|
midValue = ((currentProduct.GlobalParamEx.DownPressure.PressureTime + currentProduct.GlobalParamEx.DownPressure.PressureTime) / 2).ToString("F3");
|
|
|
DFC.Add(new DataFormCtq
|
|
|
@@ -3096,19 +3096,19 @@ namespace TeamAAS_VP.Core
|
|
|
PROCESS_END_TIME = serverTimeResult.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
|
|
|
COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
|
|
|
- REVISION = stationConfig.DataInfo.REVISION,
|
|
|
+ REVISION = stationConfig.DataInfo.REVISION + "_" + revision[i],
|
|
|
WO = stationConfig.DataInfo.WO,
|
|
|
MFG_LOT = stationConfig.DataInfo.MFG_LOT,
|
|
|
MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
|
|
|
PROCESS_OUTCOME = "Pass",
|
|
|
PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
|
|
|
CTQ_UNIT_OF_MEASURE = "s",
|
|
|
- ERROR_MESSAGE = "",
|
|
|
- PD_ATTR_01 = midValue,
|
|
|
- PD_ATTR_02 = ProductMainSN[i],
|
|
|
- PD_ATTR_03 = "",
|
|
|
- PD_ATTR_04 = "",
|
|
|
- PD_ATTR_05 = "",
|
|
|
+ ERROR_MESSAGE = "NA",
|
|
|
+ PD_ATTR_01 = ProductMainSN[i],
|
|
|
+ PD_ATTR_02 = midValue,
|
|
|
+ PD_ATTR_03 = "NA",
|
|
|
+ PD_ATTR_04 = "NA",
|
|
|
+ PD_ATTR_05 = "NA",
|
|
|
});
|
|
|
#endregion
|
|
|
}
|
