6222增加修磨标识

HG5000.3/PLC_S/Core/PLC_S_Core.cs

@@ -243,6 +243,10 @@ namespace PLC_S
         public string Add_F_CodeNum;
         public string Add_Error;
         public string Add_ErrorNum;
+        //xuwei add 2024-04-13 增加修磨标识位
+        public string Add_GoodsLeak7Code;
+        public string Add_GoodsLeak7CodeNum;
+        //xuwei end
     }
 
     /// <summary>

HG5000.3/PLC_S/ServerModel/GoodsLevel_CF.cs

@@ -249,6 +249,10 @@ namespace PLC_S.ServerModel
                     string leak1 = codeRow["LEAKFLAG1"].ToString();
                     string leak2 = codeRow["LEAKFLAG2"].ToString();
                     string leak3 = codeRow["LEAKFLAG3"].ToString();
+
+                    // xuwei add 2024-04-13 修磨合格标识
+                    int leak7 = Convert.ToInt32(codeRow["LEAKFLAG7"]);
+
                     string gtid = codeRow["goodstypeid"].ToString();
                     // 1次品、2漏气、3重烧、4副品[盖子]、5良品
                     int code;
@@ -276,6 +280,10 @@ namespace PLC_S.ServerModel
                     //1. 产品分级（int）【1次品、2漏气、3重烧、4副品[盖子]、5良品（智能）,6良品（连体）】
                     SET_GoodsLevel(e, plc_s, logKeyT, plc, code);
 
+                    //xuwei add 2024-04-13 修磨（int）【1：合格、2：不合格】 
+                    SET_GoodsLeak7(e, plc_s, logKeyT, plc, leak7);
+                    //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);
@@ -332,6 +340,21 @@ namespace PLC_S.ServerModel
             //return outputMessage;
         }
 
+        //xuwei add 2024-04-23 增加修磨写入
+        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))
+            {
+                string outputMessage = $"[{e.Content}]SET_GoodsLeak7=[{code}]{plc_s.Add_GoodsLeak7Code + plc_s.Add_GoodsLeak7CodeNum}";
+                Logger.Trace(outputMessage, logKeyT, logger_t);
+                FormLogShow?.ShowLog(outputMessage);
+                PLCResult p_r = plc.Write<short>(plc_s.Add_GoodsLeak7Code, plc_s.Add_GoodsLeak7CodeNum, (short)(code));
+                outputMessage = $"[{e.Content}]END_GoodsLeak7=[{p_r}]{plc_s.Add_GoodsLeak7Code + plc_s.Add_GoodsLeak7CodeNum}";
+                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)
         {
@@ -511,7 +534,7 @@ namespace PLC_S.ServerModel
             {
                 dataAccess = PLC_S_DataAccess.GetDataAccess(e);
 
-                string sqlString = "select gdd.GOODSLEVELTYPEID,g.goodstypeid, gdd.LEAKFLAG1, gdd.LEAKFLAG2, gdd.LEAKFLAG3\n" +
+                string sqlString = "select gdd.GOODSLEVELTYPEID,g.goodstypeid, gdd.LEAKFLAG1, gdd.LEAKFLAG2, gdd.LEAKFLAG3, decode(gdd.LEAKFLAG7,'1','1','2')\n" +
                 "  from tp_pm_groutingdailydetail gdd\n" +
                 "  inner join tp_mst_goods g on g.goodsid = gdd.goodsid\n" +
                 " where gdd.barcode = :barcode";
@@ -556,6 +579,10 @@ namespace PLC_S.ServerModel
                     plc_s.Add_F_CodeNum = ini.Read(flag, "Add_F_CodeNum");
                     plc_s.Add_Error = ini.Read(flag, "Add_Error");
                     plc_s.Add_ErrorNum = ini.Read(flag, "Add_ErrorNum");
+                    
+                    //xuwei add 2024-04-13 增加修磨标识
+                    plc_s.Add_GoodsLeak7Code = ini.Read(flag, "Add_GoodsLeak7Code");
+                    plc_s.Add_GoodsLeak7CodeNum = ini.Read(flag, "Add_GoodsLeak7CodeNum");
 
                     PLC_FLAGS.Add(flag, plc_s);
                     return plc_s;