test 331
This commit is contained in:
1 parent
2b56f8e7d3
commit
60cafc4f8c
6 files changed
+384
-91
No files matched your search
@@ -87,7 +87,7 @@ namespace WindowsFormsApp1.server
|
||||
headers.Add("泄漏量");
|
||||
break;
|
||||
case "potting":
|
||||
case "thermalaste":
|
||||
case "thermapaste":
|
||||
headers.Add("胶重");
|
||||
break;
|
||||
case "vacuum":
|
||||
@@ -155,7 +155,7 @@ namespace WindowsFormsApp1.server
|
||||
// 回写对应PLC
|
||||
if (statusCode > 0)
|
||||
PlcData.Write_Status = (short)statusCode;
|
||||
if (eventName == "SN_Release")
|
||||
if (eventName == "SN_Release" || eventName == "SN_CheckIn")
|
||||
PlcData.Write_stSN = res.SN.Value;
|
||||
if (eventName == "SN_FeedingCheck")
|
||||
{
|
||||
@@ -208,9 +208,9 @@ namespace WindowsFormsApp1.server
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogExecute.logNet.WriteError($"{eventName} 接口请求失败: {ex.Message}");
|
||||
return ApiFormResult.Sucess(mesresult.PASS, true, "PASS", PlcData, DateTime.Now);
|
||||
//return ApiFormResult.Sucess(mesresult.PASS, true, "PASS", PlcData, DateTime.Now);
|
||||
|
||||
//throw new Exception(ex.Message);
|
||||
throw new Exception(ex.Message);
|
||||
}
|
||||
return ApiFormResult.Sucess(mesresult.PASS, false, "", PlcData, DateTime.Now);
|
||||
}
|
||||
@@ -280,6 +280,7 @@ namespace WindowsFormsApp1.server
|
||||
/// <returns></returns>
|
||||
public ApiFormResult SN_FeedingCheck(string url, plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
OtherData.JS_SN = PlcData.Read_MaterialCode2;
|
||||
//判断是否为胶水站,是查询materialscan中上线的胶水码
|
||||
var station = Init.t_Line.lineremark2.ToLower();
|
||||
switch (station)
|
||||
@@ -333,6 +334,8 @@ namespace WindowsFormsApp1.server
|
||||
/// <returns></returns>
|
||||
public ApiFormResult Link_Comp(string url, plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
|
||||
OtherData.JS_SN = PlcData.Read_MaterialCode2;
|
||||
// 组装 request json
|
||||
var request = new
|
||||
{
|
||||
@@ -832,7 +835,7 @@ namespace WindowsFormsApp1.server
|
||||
{
|
||||
dcInfo = new DCInfoItem();
|
||||
dcInfo.Item = stationid == "CCD" ? "CCD" : $"{Init.t_Line.lineremark2}_CCD";
|
||||
dcInfo.Value = PlcData.Read_UploadData0.ToString();
|
||||
dcInfo.Value = logresult;
|
||||
dcInfo.Result = result;
|
||||
sninfo.DC_INFO.Add(dcInfo);
|
||||
if (!"Assy2,Assy3".Contains(stationid))
|
||||
@@ -1128,6 +1131,7 @@ namespace WindowsFormsApp1.server
|
||||
public const int Fail = 1001;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#region checkout class
|
||||
// 根对象类
|
||||
|
||||
Reference in new issue
Block a user