chenxy пре 4 година
родитељ
комит
ec4fdda6c4
2 измењених фајлова са 32 додато и 2 уклоњено
  1. 21 0
      PCLCommunication/ConnSetting.cs
  2. 11 2
      PCLCommunication/FrmMelsecA1EAscii.cs

+ 21 - 0
PCLCommunication/ConnSetting.cs

@@ -510,6 +510,27 @@ namespace PCLCommunication
             }
         }
 
+        public static bool GetSystemSetting()
+        {
+            IDataAccess dataAccess = null;
+            try
+            {
+                dataAccess = DataAccessFactory.CreateDataAccess(_oracleString, DataBaseType.Oracle);
+                string se_flag = dataAccess.ExecuteScalar("select t.settingvalue from tp_mst_systemsetting t where t.settingcode = ''") + "";
+                return (se_flag == "1");
+            }
+            catch (Exception ex)
+            {
+                // todo log
+                LogOut.Error(null, ex);
+                return false;
+            }
+            finally
+            {
+                dataAccess?.Close();
+            }
+        }
+
 
         public static bool DeletePLC(string guid)
         {

+ 11 - 2
PCLCommunication/FrmMelsecA1EAscii.cs

@@ -787,12 +787,21 @@ namespace PCLCommunication
                                 this.lblUsercode.Text = INIUtil.Read("iBOSS.MES", "UserCode", ConnSetting.INI_PATH_UserCode);
                                 ConnSetting.MESInfo.UserCode = this.lblUsercode.Text;
                             }
+                            //string se_result = SmartDeviceProxy.Instance.Invoke<string>(
+                            //    p => p.CheckSecurityCodeByBarcode(
+                            //        ConnSetting.MESInfo.AccountCode,
+                            //        ConnSetting.MESInfo.UserCode,
+                            //        barcode,
+                            //        se_code
+                            //        ));
+
                             string se_result = SmartDeviceProxy.Instance.Invoke<string>(
-                                p => p.CheckSecurityCodeByBarcode(
+                                p => p.UpdateSecurityCodeByBarcode(
                                     ConnSetting.MESInfo.AccountCode,
                                     ConnSetting.MESInfo.UserCode,
                                     barcode,
-                                    se_code
+                                    se_code,
+                                    ConnSetting.MESInfo.Procedures[0]
                                     ));
 
                             // 返回状态(成功、失败)