更改部分界面,更新ApiFormResult部分字段
This commit is contained in:
1 parent
c322de2dd7
commit
16586d67aa
12 files changed
+936
-263
No files matched your search
@@ -15,68 +15,68 @@ namespace WindowsFormsApp1.server
|
||||
{
|
||||
public ApiFormResult SN_CheckIN(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult Carrier_Check(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult SN_FeedingCheck(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult Link_Comp(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult SN_Release(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult Glue_CheckOut(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult Get_Para(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult DispatchPara(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult Data_Collection(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult Status(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult Alarm(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult OEEDataCollection(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass, false, "", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS, false, "", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult SN_FileUpload(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass, false, "", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS, false, "", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult Test(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass, false, "", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS, false, "", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult SN_Checkout(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
return ApiFormResult.Sucess(mesresult.pass, false, "", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS, false, "", PlcData,DateTime.Now);
|
||||
}
|
||||
public ApiFormResult Initialization(plcdata PlcData, otherdata OtherData)
|
||||
{
|
||||
PlcData.Write_Status = 3;
|
||||
return ApiFormResult.Sucess(mesresult.pass,false,"", PlcData);
|
||||
return ApiFormResult.Sucess(mesresult.PASS,false,"", PlcData,DateTime.Now);
|
||||
}
|
||||
|
||||
public ApiFormResult CallFunctionByName(string functionName, plcdata plcdata,otherdata otherdata)
|
||||
@@ -95,7 +95,7 @@ namespace WindowsFormsApp1.server
|
||||
else
|
||||
{
|
||||
LogExecute.logNet.WriteError($"未找到对应的函数{functionName}");
|
||||
return ApiFormResult.Error(mesresult.none, false, $"未找到对应的函数{functionName}", null);
|
||||
return ApiFormResult.Error(mesresult.NONE, false, $"未找到对应的函数{functionName}", null,DateTime.Now);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,13 +11,14 @@ namespace WindowsFormsApp1.server
|
||||
{
|
||||
public class ApiFormResult
|
||||
{
|
||||
private ApiFormResult(bool success, mesresult mesresult, bool isShow, string msg, plcdata data)
|
||||
private ApiFormResult(bool success, mesresult mesresult, bool isShow, string msg, plcdata data,DateTime requesttime)
|
||||
{
|
||||
Success = success;
|
||||
Msg = msg;
|
||||
Data = data;
|
||||
Mesresult = mesresult;
|
||||
IsShow = isShow;
|
||||
Requesttime = requesttime;
|
||||
}
|
||||
|
||||
public bool Success { get; set; }
|
||||
@@ -28,15 +29,17 @@ namespace WindowsFormsApp1.server
|
||||
|
||||
public bool IsShow { get; set; }
|
||||
|
||||
public static ApiFormResult Sucess(mesresult mesresult, bool isShow, string msg, plcdata data)
|
||||
public DateTime Requesttime { get; set; }
|
||||
|
||||
public static ApiFormResult Sucess(mesresult mesresult, bool isShow, string msg, plcdata data, DateTime requesttime)
|
||||
{
|
||||
return new ApiFormResult(true, mesresult, isShow, msg, data);
|
||||
return new ApiFormResult(true, mesresult, isShow, msg, data, requesttime);
|
||||
}
|
||||
|
||||
|
||||
public static ApiFormResult Error(mesresult mesresult, bool isShow, string msg, plcdata data)
|
||||
public static ApiFormResult Error(mesresult mesresult, bool isShow, string msg, plcdata data, DateTime requesttime)
|
||||
{
|
||||
return new ApiFormResult(false, mesresult, isShow, msg, data);
|
||||
return new ApiFormResult(false, mesresult, isShow, msg, data,requesttime);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user