增加漏气写入

HG5000.3/PLC_S/Core/PLC_S_Core.cs

@@ -246,6 +246,9 @@ namespace PLC_S
         //xuwei add 2024-04-13 增加修磨标识位
         public string Add_GoodsLeak7Code;
         public string Add_GoodsLeak7CodeNum;
+        //xuwei add 2024-04-23 增加漏气标识位
+        public string Add_GoodsLeak1Code;
+        public string Add_GoodsLeak1CodeNum;
         //xuwei end
     }
 

HG5000.3/PLC_S/ServerModel/GoodsLevel_CF.cs

@@ -284,6 +284,10 @@ namespace PLC_S.ServerModel
                     SET_GoodsLeak7(e, plc_s, logKeyT, plc, leak7);
                     //xuwei end
 
+                    //xuwei add 2024-04-23 漏气（int）【1：合格、2：不合格】 
+                    SET_GoodsLeak1(e, plc_s, logKeyT, plc, Convert.ToInt32(leak1));
+                    //xuwei end
+
                     //2.状态（int）【0：无，1:PLC等待读取；2.PLC读取完成】
                     outputMessage = $"[{e.Content}]SET_F_Code=[1]{plc_s.Add_F_Code + plc_s.Add_F_CodeNum}";
                     Logger.Trace(outputMessage, logKeyT, logger_t);
@@ -340,7 +344,7 @@ namespace PLC_S.ServerModel
             //return outputMessage;
         }
 
-        //xuwei add 2024-04-23 增加修磨写入
+        //xuwei add 2024-04-13 增加修磨写入
         private void SET_GoodsLeak7(ReceiveSession e, PLC_S_GL_CF plc_s, string logKeyT, SocketClient<SiemensS7_1200Model> plc, int code)
         {
             if (!string.IsNullOrEmpty(plc_s.Add_GoodsLeak7Code) && !string.IsNullOrEmpty(plc_s.Add_GoodsLeak7CodeNum))
@@ -355,6 +359,21 @@ namespace PLC_S.ServerModel
             }
         }
 
+        //xuwei add 2024-04-23 增加漏气写入
+        private void SET_GoodsLeak1(ReceiveSession e, PLC_S_GL_CF plc_s, string logKeyT, SocketClient<SiemensS7_1200Model> plc, int code)
+        {
+            if (!string.IsNullOrEmpty(plc_s.Add_GoodsLeak1Code) && !string.IsNullOrEmpty(plc_s.Add_GoodsLeak1CodeNum))
+            {
+                string outputMessage = $"[{e.Content}]SET_GoodsLeak1=[{code}]{plc_s.Add_GoodsLeak1Code + plc_s.Add_GoodsLeak1CodeNum}";
+                Logger.Trace(outputMessage, logKeyT, logger_t);
+                FormLogShow?.ShowLog(outputMessage);
+                PLCResult p_r = plc.Write<short>(plc_s.Add_GoodsLeak1Code, plc_s.Add_GoodsLeak1CodeNum, (short)(code));
+                outputMessage = $"[{e.Content}]END_GoodsLeak1=[{p_r}]{plc_s.Add_GoodsLeak1Code + plc_s.Add_GoodsLeak1CodeNum}";
+                Logger.Trace(outputMessage, logKeyT, logger_t);
+                FormLogShow?.ShowLog(outputMessage);
+            }
+        }
+
         private static void GetLevelCode(string flag, string gtid, string level,
             string leak1, string leak2, string leak3, out int code, out string codeName)
         {
@@ -584,6 +603,10 @@ namespace PLC_S.ServerModel
                     plc_s.Add_GoodsLeak7Code = ini.Read(flag, "Add_GoodsLeak7Code");
                     plc_s.Add_GoodsLeak7CodeNum = ini.Read(flag, "Add_GoodsLeak7CodeNum");
 
+                    //xuwei add 2024-04-23 增加漏气标识
+                    plc_s.Add_GoodsLeak1Code = ini.Read(flag, "Add_GoodsLeak1Code");
+                    plc_s.Add_GoodsLeak1CodeNum = ini.Read(flag, "Add_GoodsLeak1CodeNum");
+
                     PLC_FLAGS.Add(flag, plc_s);
                     return plc_s;
                 }