浏览代码

bug修复

WIN-GH9CEESPLTB\Administrator 1 月之前
父节点
当前提交
df07759e4a
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. 7 2
      MainForm/FaForm/Form_Home.cs
  2. 1 0
      MainForm/FaForm/Form_Home_SaveData.cs

+ 7 - 2
MainForm/FaForm/Form_Home.cs

@@ -4899,9 +4899,11 @@ namespace MainForm
 
 
                         //测试
                         //测试
                         stPLC_MesData.mesCommFrmPLC.cmd = 1;
                         stPLC_MesData.mesCommFrmPLC.cmd = 1;
+
                         stPLC_MesData.BarcodeSet.strCarrierBarcode = "A123456";
                         stPLC_MesData.BarcodeSet.strCarrierBarcode = "A123456";
                         stPLC_MesData.BarcodeSet.strPCBBarcode = "123456";
                         stPLC_MesData.BarcodeSet.strPCBBarcode = "123456";
                         stPLC_MesData.iotData.BeatAction = 1;
                         stPLC_MesData.iotData.BeatAction = 1;
+                        stPLC_MesData.iotData.BeatAction = 2;
 
 
                         #region 一次性读取所有数据
                         #region 一次性读取所有数据
 
 
@@ -4919,9 +4921,12 @@ namespace MainForm
                             xmDeviceStateData.left = (xmDeviceStateInt < 0 || xmDeviceStateInt > 7)
                             xmDeviceStateData.left = (xmDeviceStateInt < 0 || xmDeviceStateInt > 7)
                                 ? XiaomiDeviceState.Unknown
                                 ? XiaomiDeviceState.Unknown
                                 : (XiaomiDeviceState)xmDeviceStateInt;
                                 : (XiaomiDeviceState)xmDeviceStateInt;
-
-                            s5PLCData["a5OEEType"] = stPLC_MesData.iotData.BeatAction; // 节拍
+                            // 节拍
+                            s5PLCData["a5OEEType"] = stPLC_MesData.iotData.BeatAction; 
+                            //载具码
                             CarrierBarcode=stPLC_MesData.BarcodeSet.strCarrierBarcode.ToString();
                             CarrierBarcode=stPLC_MesData.BarcodeSet.strCarrierBarcode.ToString();
+                            //报警信息
+                            _FaultDatas = stPLC_MesData.iotData.fault_codes;
                         }
                         }
 
 
                         #endregion 一次性读取所有数据
                         #endregion 一次性读取所有数据

+ 1 - 0
MainForm/FaForm/Form_Home_SaveData.cs

@@ -901,6 +901,7 @@ namespace MainForm
                     try
                     try
                     {
                     {
                         StationInputBeginRequest oee = new StationInputBeginRequest();
                         StationInputBeginRequest oee = new StationInputBeginRequest();
+
                         switch (deviceOEE.ToString())
                         switch (deviceOEE.ToString())
                         {
                         {
                             /// 上料开始:beat_log/business/OEE/station_input_begin
                             /// 上料开始:beat_log/business/OEE/station_input_begin