|
|
@@ -2216,6 +2216,7 @@ namespace TeamAAS_VP.Core
|
|
|
code = plc.ReadNode<string>(string.Format(addressConfig.In_Code.Address, i));
|
|
|
}
|
|
|
productSn = code;
|
|
|
+
|
|
|
|
|
|
//询问mes
|
|
|
if (state == 1)
|
|
|
@@ -2478,8 +2479,8 @@ namespace TeamAAS_VP.Core
|
|
|
SendTaskMessage($"mes开始ADD", MessageLevel.Info);
|
|
|
//上传mes
|
|
|
//这里现在上传的结果都是锁付站的，如果存在其他附属站的数据需要上传时，将不适用，要根据实际情况进行调整
|
|
|
- //(bool isSuccess, string response) = await _mesService.SubmitGetAsync(ProductMainSN[i], "", dataToMes, resultIndex == 1 ? true : false, _LastMesCheckTime[i], serverTimeResult.Now);
|
|
|
- (bool isSuccess, string response) = await _mesService.SubmitGetExAsync(ProductMainSN[i], "", dataToMes, resultToMes, _LastMesCheckTime[i], serverTimeResult.Now);
|
|
|
+ (bool isSuccess, string response) = await _mesService.SubmitGetAsync(ProductMainSN[i], "", dataToMes, resultIndex == 1 ? true : false, _LastMesCheckTime[i], serverTimeResult.Now);
|
|
|
+ //(bool isSuccess, string response) = await _mesService.SubmitGetExAsync(ProductMainSN[i], "", dataToMes, resultToMes, _LastMesCheckTime[i], serverTimeResult.Now);
|
|
|
if (isSuccess)
|
|
|
{
|
|
|
LogHelper.WriteLogMes($"上传mes成功");
|
|
|
@@ -2524,12 +2525,12 @@ namespace TeamAAS_VP.Core
|
|
|
PPID = ProductMainSN[i],
|
|
|
ScrewNum = lockResult.Number,
|
|
|
PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
|
|
|
- PROCESS_START_TIME = _LastMesCheckTime[i].ToString(),
|
|
|
+ PROCESS_START_TIME = _LastMesCheckTime[i].ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
CTQ_NAME = "Torque",
|
|
|
CTQ_VALUE = lockResult.LockTorque,
|
|
|
CTQ_LSL = lockResult.TargetTorqueLowerLimit,
|
|
|
CTQ_USL = lockResult.TargetTorqueUpperLimit,
|
|
|
- PROCESS_END_TIME = serverTimeResult.Now.ToString(),
|
|
|
+ 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,
|
|
|
@@ -2546,12 +2547,12 @@ namespace TeamAAS_VP.Core
|
|
|
PPID = ProductMainSN[i],
|
|
|
ScrewNum = lockResult.Number,
|
|
|
PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
|
|
|
- PROCESS_START_TIME = _LastMesCheckTime[i].ToString(),
|
|
|
+ PROCESS_START_TIME = _LastMesCheckTime[i].ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
CTQ_NAME = "Turn",
|
|
|
CTQ_VALUE = lockResult.LockTurns,
|
|
|
CTQ_LSL = lockResult.TargetTurnsLowerLimit,
|
|
|
CTQ_USL = lockResult.TargetTurnsUpperLimit,
|
|
|
- PROCESS_END_TIME = serverTimeResult.Now.ToString(),
|
|
|
+ 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,
|
|
|
@@ -2568,12 +2569,12 @@ namespace TeamAAS_VP.Core
|
|
|
PPID = ProductMainSN[i],
|
|
|
ScrewNum = lockResult.Number,
|
|
|
PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
|
|
|
- PROCESS_START_TIME = _LastMesCheckTime[i].ToString(),
|
|
|
+ PROCESS_START_TIME = _LastMesCheckTime[i].ToString("yyyy-MM-ddTHH:mm:ss.fffffff") + "+08:00",
|
|
|
CTQ_NAME = "Pressure",
|
|
|
CTQ_VALUE = lockResult.Pressure,
|
|
|
CTQ_LSL = stationConfig.DataInfo.CTQ_LSL_Pressure,
|
|
|
CTQ_USL = stationConfig.DataInfo.CTQ_USL_Pressure,
|
|
|
- PROCESS_END_TIME = serverTimeResult.Now.ToString(),
|
|
|
+ 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,
|
