From 29587623fe105593d7bb8d43dd30619e947943bb Mon Sep 17 00:00:00 2001 From: bnala Date: Wed, 19 Feb 2025 20:27:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8F=8D=E9=A6=88=E7=9A=84re?= =?UTF-8?q?sult?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WindowsFormsApp1/MainForm.cs | 30 ++++++++++++++---- WindowsFormsApp1/db/MES_PLC.db | Bin 139264 -> 139264 bytes .../form/SerialPort_Manage.Designer.cs | 2 +- WindowsFormsApp1/mod/server/otherdata.cs | 11 +++++-- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/WindowsFormsApp1/MainForm.cs b/WindowsFormsApp1/MainForm.cs index fddd083..ce53c77 100644 --- a/WindowsFormsApp1/MainForm.cs +++ b/WindowsFormsApp1/MainForm.cs @@ -139,16 +139,22 @@ namespace WindowsFormsApp1 if (oldstatus != PlcData.Read_Status || (Plc_Time - oldPlcstatus_LastTime).TotalSeconds > 5) { //反馈状态 + Init.Plcstatus = PlcData.Read_Status; + Init.Plcstatus_LastTime = DateTime.Now; otherdata.Plc_Status = PlcData.Read_Status; var statusresult = apiClient.CallFunctionByName("Status", PlcData, otherdata); if (statusresult.Success) { - Init.Plcstatus = PlcData.Read_Status; - Init.Plcstatus_LastTime = DateTime.Now; MES链接状态.Text = "MES链接状态:OK"; MES链接状态.BackColor = SystemColors.Control; MES通讯时间.Text = "MES通讯时间:" + DateTime.Now.ToString("MM-dd HH:mm:ss"); MES_MsgfORM("Status", statusresult.Mesresult, statusresult.Requesttime); + if (statusresult.Mesresult != mesresult.PASS) + { + PlcData.Write_Status = 1001; + siemensHelp.WriteAddress(plcaddress, PlcData); + continue; + } } else { @@ -168,15 +174,21 @@ namespace WindowsFormsApp1 ///////////////////////////////测试用 list.Add("M03CVSO-01"); otherdata.Plc_ErrorMsgs = list; + Init.Plcstatus = PlcData.Read_Status; + Init.Plcstatus_LastTime = DateTime.Now; var statusresult = apiClient.CallFunctionByName("Alarm", PlcData, otherdata); if (statusresult.Success) { - Init.Plcstatus = PlcData.Read_Status; - Init.Plcstatus_LastTime = DateTime.Now; MES链接状态.Text = "MES链接状态:OK"; MES链接状态.BackColor = SystemColors.Control; MES通讯时间.Text = "MES通讯时间:" + DateTime.Now.ToString("MM-dd HH:mm:ss"); MES_MsgfORM("Alarm", statusresult.Mesresult, statusresult.Requesttime); + if (statusresult.Mesresult != mesresult.PASS) + { + PlcData.Write_Status = 1001; + siemensHelp.WriteAddress(plcaddress, PlcData); + continue; + } } else { @@ -230,7 +242,7 @@ namespace WindowsFormsApp1 if(nowinterface.code == "SN_CheckIN") { 请扫描LOT号.Enabled = true; - ScanPort.Read(); + //ScanPort.Read(); } @@ -243,7 +255,7 @@ namespace WindowsFormsApp1 var result = apiClient.CallFunctionByName(nowinterface.code,PlcData, otherdata); if (result.Success) { - var writeresult = siemensHelp.WriteAddress(Init.t_Plcaddresses.FindAll(a => a.plcid == Plc.id),PlcData); + var writeresult = siemensHelp.WriteAddress(plcaddress, PlcData); if (!writeresult.Success) { PLC链接状态.Text = "PLC链接状态:NG"; @@ -256,6 +268,12 @@ namespace WindowsFormsApp1 MES链接状态.Text = "MES链接状态:OK"; MES链接状态.BackColor = SystemColors.Control; MES通讯时间.Text = "MES通讯时间:" + DateTime.Now.ToString("MM-dd HH:mm:ss"); + if (result.Mesresult != mesresult.PASS) + { + PlcData.Write_Status = 1001; + siemensHelp.WriteAddress(plcaddress, PlcData); + continue; + } } } else diff --git a/WindowsFormsApp1/db/MES_PLC.db b/WindowsFormsApp1/db/MES_PLC.db index 15b4cabf0769bfd4863e145a4a5b95d7cef816ee..b20bc4b993fda414ac6374da50ef9077ed830a42 100644 GIT binary patch delta 1898 zcmc(gO-vI(6vt<`rMq1yj|NK>ZP}KO4U{0ejUT9}6{|6*5NM(pBH7BS)uknM!Jr|u z#g7;d+AJ|1MDePT7#s9JVu*>Ck{E+rNPv@|2am?HQ;M`TS>!e>}dYBL?M^wXu;H<`vN|OI_Eba6puMLt&*WBzJcS^}?=t zfp5_A>zmrV9-o)>d5)a)vd*k9bsKd;{Ye#_N#!~%_DD|F=RNDIH8Cvf^oxDnZK8sG zfuJH?lEP_suNV#}1KEMyq9Ps%DA%%mVM*)>Use05_sz(R3y^8i8ysbIIEdjxD=-w1C>$!>rgK2%O!D@vIuB@8!p+;Q>-7t~twiTBYU+8~tSdJ6$`^#) zH0UhEMfLv9nxgF%U1PRJ{kW5}6IZ2yeo^j|NZN=auXHsOnhfJFq033L4{)UgDO zEEduNW$hQlU{lK}cV*;sC@Ae+zW4ImSakX6iy8Sx)95n}t6Xkfl~p zxqNhAXXo;xyI&{YF1>oZJo0|&$?K)ji29-BAd?<#9>F|T&On`$Fs_b9XbpENt(ikG zhc%x-a8<5}ELtKrZfV^Df(5Mm0xrjz%%~+>y@ZQZI^r^w;y)H!>X~w=ha+5`9)B5d zvJqGXSxa92Cpl5}S8{r-Zg0j2Huc;UF@q({pvp{@8uBZcS>_VnHN_0=BMgXlgh0KM xblPxO3AWtkYfp!$x0B7fP@kgCB-^MCFrdcr9<@5zrhZQ9hojT)qSM5X?>E^_C)WS~ delta 443 zcmYL_ODKd<6vywqbA69H#+gZ8Baa#COT^50}gZ^3e!BAJb3X=h_&D@#`zI{iAG)4%_}bJBS&o!3t4Jr@WezeJbRN+P_YyX^vX zZXCIk5YnkZAXh%5?v|M}M-8V_xo1n%D3$GN&N^&^RuFv3`AKJ{&!^UyCf-vMvAMVv zUA8tiV)3LEU5n30LxE6lAQUwJwj!%EXeEibSH{FE^NMZtmXQ7{-b3sq_CN^Px#C;I z&OyZOwUGuX2YkXY9KtiC;2dt?UG|ji3Dg3GEE?r}M5MX~+=$jyI!ygP?XJscgi>5k z(;ZbfzPM_&x#ZaxJ`jA^`0@=JJeZ;u&r~9oNLuTW#T6^q`zt9RD9D^!5QWJh8$YQ5 zTqCq}yGxS}Orl6sF`PEa)SpR8PMfaJaI@}gMQ-M=W;=rAy$bWQ7q%dO_ob^dprFB) pHPK!Sv&m#4j1?60t%!riaWXa`o*% - /// PLC反馈的机台报警 + /// PLC反馈的机台报警(默认获取0位) /// public List Plc_ErrorMsgs { get; set; } @@ -24,15 +24,20 @@ namespace WindowsFormsApp1.mod.server public string FileUploadAddress { get; set; } /// - /// 胶水码 + /// 前端返回的扫码 /// public string JS_SN { get; set; } /// - /// 螺丝枪扭力角度 + /// 螺丝枪扭力 /// public List FinalTorqueValue { get; set; } + /// + /// 螺丝枪角度 + /// + public List FinalAngleValue { get; set; } + /// /// 螺丝枪扭力曲线 ///