Browse Source

施釉后,绑定防伪码

chenxy 4 years ago
parent
commit
866c99bbb3

+ 26 - 0
Curtain.Net.Sockets/PLC/Core/PLCMessage.cs

@@ -1,5 +1,6 @@
 
 using System;
+using System.Windows.Forms;
 
 namespace Curtain.Net.Sockets.PLC
 {
@@ -171,6 +172,15 @@ namespace Curtain.Net.Sockets.PLC
         /// </summary>
         [NonSerialized]
         public byte[] ContentBytes;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+		public override string ToString()
+        {
+            return $"PLCMessage[{MessageType}][{Command}]";
+        }
     }
 
     /// <summary>
@@ -202,6 +212,14 @@ namespace Curtain.Net.Sockets.PLC
             get;
             set;
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+		public override string ToString()
+        {
+            return $"PLCMessage[{MessageType}][{Value}]";
+        }
     }
 
     /// <summary>
@@ -234,5 +252,13 @@ namespace Curtain.Net.Sockets.PLC
             get;
             set;
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return $"PLCMessage[{MessageType}][{Value}]";
+        }
     }
 }

+ 4 - 4
HG5020.3/PLC_S/PLC_S_INI/PLC_S_GLA_A.ini

@@ -86,8 +86,8 @@ Add_G_T_NUM=300.18
 Add_G_P_CODE=D
 Add_G_P_NUM=300.22
 ;防伪码(为空时,不启用防伪码)
-Add_SE_Code1=
-Add_SE_Code1Num=200.0
+Add_SE_Code1=D
+Add_SE_Code1Num=300.24
 Add_SE_Code2=D
 Add_SE_Code2Num=200.0
 
@@ -121,7 +121,7 @@ Add_G_T_NUM=300.18
 Add_G_P_CODE=D
 Add_G_P_NUM=300.22
 ;防伪码(为空时,不启用防伪码)
-Add_SE_Code1=
-Add_SE_Code1Num=200.0
+Add_SE_Code1=D
+Add_SE_Code1Num=300.24
 Add_SE_Code2=D
 Add_SE_Code2Num=200.0

+ 6 - 3
HG5020.3/PLC_S/ServerModel/Glazing_After.cs

@@ -434,7 +434,10 @@ update tp_pm_groutingdailydetail set
                     //FormLogShow?.ShowLog(outputMessage);
 
                     string se_code = null;
-                    if (!string.IsNullOrWhiteSpace(se1_result.Data) && !se1_result.Data.StartsWith("0"))
+                    if (!string.IsNullOrWhiteSpace(se1_result.Data) &&
+                        !se1_result.Data.StartsWith("0") &&
+                        se1_result.Data != "ERROR"
+                        )
                     {
                         se_code = se1_result.Data;
                     }
@@ -453,7 +456,7 @@ update tp_pm_groutingdailydetail set
                             usercode,
                             barcode,
                             se_code,
-                            plc_s.P_ID+""
+                            plc_s.P_ID + ""
                             ));
 
                     outputMessage = $"[{e.Content}]SE_Result=[{result}]{se_code}";
@@ -525,7 +528,7 @@ update tp_pm_groutingdailydetail set
                 Logger.Trace(outputMessage, logKeyT, logger_t);
                 FormLogShow?.ShowLog(outputMessage);
                 PLCResult p_r = plc?.Write<short>(plc_s.Add_FlagCode, plc_s.Add_FlagCodeNum, (short)2);
-                outputMessage = $"[{e.Content}]END_F_Code=[{p_r}]{plc_s.Add_FlagCode + plc_s.Add_FlagCodeNum}";
+                outputMessage = $"[{e.Content}]END_F_Code=[{p_r.ToString()}]{plc_s.Add_FlagCode + plc_s.Add_FlagCodeNum}";
                 Logger.Trace(outputMessage, logKeyT, logger_t);
                 FormLogShow?.ShowLog(outputMessage);
 

+ 4 - 1
HG5020.3/PLC_S/ServerModel/GoodsLevel_QR2.cs

@@ -329,7 +329,10 @@ namespace PLC_S.ServerModel
                     //FormLogShow?.ShowLog(outputMessage);
 
                     string se_code = "";
-                    if (!string.IsNullOrWhiteSpace(se1_result.Data) && !se1_result.Data.StartsWith("0"))
+                    if (!string.IsNullOrWhiteSpace(se1_result.Data) &&
+                        !se1_result.Data.StartsWith("0") &&
+                        se1_result.Data != "ERROR"
+                        )
                     {
                         se_code = se1_result.Data;
                     }

+ 3 - 0
HG5020.3/PLC_WF/F_PLC_M.cs

@@ -212,6 +212,7 @@ namespace PLC_WF
             {
                 PLCResult<string> rr = _client.Read<string>(this.txtCode.Text, txtNumber.Text, Convert.ToInt32(txtLength.Text));
                 this.txtMessage.Text += JsonHelper.FromObject(rr) + "\r\n";
+                this.txtMessage.Text += $"[{rr}]" + "\r\n";
             }
             catch (Exception ex)
             {
@@ -260,6 +261,7 @@ namespace PLC_WF
             {
                 PLCResult rr = _client.Write<short>(this.txtW_Code.Text, txtW_Num.Text, Convert.ToInt16(txtW_Value.Text));
                 this.txtMessage.Text += JsonHelper.FromObject(rr) + "\r\n";
+                this.txtMessage.Text += $"{rr}" + "\r\n";
             }
             catch (Exception ex)
             {
@@ -384,6 +386,7 @@ namespace PLC_WF
                 PLCResult rr = _client.Write<string>(txtW_Code.Text, txtW_Num.Text,
                     txtW_Value.Text);
                 this.txtMessage.Text += JsonHelper.FromObject(rr) + "\r\n";
+                this.txtMessage.Text += $"{rr}" + "\r\n";
             }
             catch (Exception ex)
             {