助修工位

PLC/PLC_S/PLC_S_INI/PLC_S_PW.ini

@@ -1,7 +1,8 @@
 ;1厂2楼除尘房[1201]2-20机械修坯助修
 [PW1201]
 P_ID=57
-USER_CDOE=A,H2,H4
+;USER_CDOE=USER_CODE,H2,H4
+USER_CDOE=WS_ID,1,2
 IP=172.18.134.16
 Port=4500
 Thread_Sleep=1000

PLC/PLC_S/ServerModel/PieceWork.cs

@@ -340,11 +340,22 @@ namespace PLC_S.ServerModel
                         return;
                     }
 
-                    outputMessage = $"[{e.Content}]usercode_s=[{plc_s.USER_CDOE}]";
-                    Logger.Trace(outputMessage, logKeyT, logger_t);
-                    FormLogShow?.ShowLog(outputMessage);
+                    //outputMessage = $"[{e.Content}]usercode_s=[{plc_s.USER_CDOE}]";
+                    //Logger.Trace(outputMessage, logKeyT, logger_t);
+                    //FormLogShow?.ShowLog(outputMessage);
 
                     string usercode = plc_s.USER_CDOES[room_num];
+                    using (IDataAccess dataAccess = PLC_S_DataAccess.GetDataAccess(e))
+                    {
+                        string sqlString = $@"
+                            SELECT t.usercode
+                              FROM tp_mst_workstation t
+                             WHERE t.workstationid = {usercode}
+                            ";
+
+                        usercode = dataAccess.ExecuteScalar(sqlString) + "";
+                    }
+
                     outputMessage = $"[{e.Content}]usercode=[{usercode}]";
                     Logger.Trace(outputMessage, logKeyT, logger_t);
                     FormLogShow?.ShowLog(outputMessage);