2#打磨

Curtain.Net.Sockets/PLC/Core/PLCResult.cs

@@ -136,6 +136,14 @@ namespace Curtain.Net.Sockets.PLC
         {
             this.Data = data;
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+		public override string ToString()
+        {
+            return $"PLCResult[{Successed}][{(Successed ? Data + "" : Message)}]";
+        }
     }
 
     /*

HG5020.1-2/PLC_S/PLC_S_INI/PLC_S_GC_DM1_.ini

@@ -29,14 +29,14 @@ Add_FlagCodeNum=801
 
 ;（计件2-0改洗）
 [GC_DM1_5]
-IP=172.18.26.40
-Port=8080
+IP=172.18.26.81
+Port=102
 LINE_NO=0
 WS_ID=2205
 WS_NAME=2#打磨完成
 WS_USER=
 P_ID=2
 Add_GoodsCode=D
-Add_GoodsCodeNum=800
+Add_GoodsCodeNum=0
 Add_FlagCode=D
-Add_FlagCodeNum=801
+Add_FlagCodeNum=22.0

HG5020.1-2/PLC_S/ServerModel/GoodsCode_DM2201.cs

@@ -271,8 +271,8 @@ namespace PLC_S_1.ServerModel
                     //outputMessage = $"[{e.Content}]SET_GoodsCode=[{plc_code}]{plc_s.Add_GoodsCode + plc_s.Add_GoodsCodeNum}";
                     //Logger.Trace(outputMessage, logKeyT, logger_t);
                     //FormLogShow?.ShowLog(outputMessage);
-                    plc.Write<int>(plc_s.Add_GoodsCode, plc_s.Add_GoodsCodeNum, (plc_code.ToInt32()));
-                    outputMessage = $"[{e.Content}]END_GoodsCode=[{plc_code}]{plc_s.Add_GoodsCode + plc_s.Add_GoodsCodeNum}";
+                    PLCResult pr = plc.Write<int>(plc_s.Add_GoodsCode, plc_s.Add_GoodsCodeNum, (plc_code.ToInt32()));
+                    outputMessage = $"[{e.Content}]END_GoodsCode=[{pr}]{plc_s.Add_GoodsCode}{plc_s.Add_GoodsCodeNum}";
                     Logger.Trace(outputMessage, logKeyT, logger_t);
                     FormLogShow?.ShowLog(outputMessage);
 

HG5020.1-2/PLC_S/ServerModel/GoodsCode_DM2205.cs

@@ -13,6 +13,7 @@ using Curtain.Log;
 using Curtain.Net.Sockets.PLC;
 using Curtain.Net.Sockets.PLC.Model;
 using Curtain.Net.Sockets.PLC.Model.Melsec;
+using Curtain.Net.Sockets.PLC.Model.Siemens;
 
 using PLC_S_1.Proxy;
 
@@ -156,7 +157,7 @@ namespace PLC_S_1.ServerModel
 
             //
 
-            SocketClient<MelsecA1EAsciiModel> plc = null;
+            SocketClient<SiemensS7_1200Model> plc = null;
             Logger LoggerT = Logger.CreateLogger(logKeyT, logger_t);
             lock (LoggerT)
             {
@@ -216,7 +217,7 @@ namespace PLC_S_1.ServerModel
                     Logger.Trace(outputMessage, logKeyT, logger_t);
                     FormLogShow?.ShowLog(outputMessage);
 
-                    plc = new SocketClient<MelsecA1EAsciiModel>();
+                    plc = new SocketClient<SiemensS7_1200Model>();
                     plc.Connect(plc_s.IP, plc_s.Port);
                     //outputMessage = $"[{e.Content}]PLC_Connect=[{plc_s.IP}:{plc_s.Port}]";
                     //Logger.Trace(outputMessage, logKeyT, logger_t);
@@ -343,14 +344,14 @@ namespace PLC_S_1.ServerModel
         }
 
         private void SendFlag(PLC_S_GC_DM1 plc_s, ReceiveSession e, string loggerNameT,
-            string loggerNameE, SocketClient<MelsecA1EAsciiModel> plc, int errorcode)
+            string loggerNameE, SocketClient<SiemensS7_1200Model> plc, int errorcode)
         {
             try
             {
                 //using (SocketClient<SiemensS7_1200Model> plc = new SocketClient<SiemensS7_1200Model>())
                 {
                     //0：复位 1：成功 2：条码格式错误或不存在 3：产品不可到达 4：MES系统异常 5：产品型号识别码未设置
-                    string outputMessage = $"[{e.Content}]SET_F_CODE=[{errorcode}]{plc_s.Add_FlagCode + plc_s.Add_FlagCodeNum}[1：成功 2：条码格式错误或不存在 3：产品不可到达 4：MES系统异常]";
+                    string outputMessage = $"[{e.Content}]SET_F_CODE=[{errorcode}]{plc_s.Add_FlagCode}{plc_s.Add_FlagCodeNum}[1：成功 2：条码格式错误或不存在 3：产品不可到达 4：MES系统异常]";
                     Logger.Trace(outputMessage, loggerNameT, logger_t);
                     FormLogShow?.ShowLog(outputMessage);
                     PLCResult result = plc?.Write<int>(plc_s.Add_FlagCode, plc_s.Add_FlagCodeNum, errorcode);