From 17884a161520180458bc05deb24feeff25d493fc Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Mon, 20 Dec 2021 09:45:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85-=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BC=96=E5=8F=B7=E6=94=B9=E6=88=90=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs index cd1b039..2eff8be 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs @@ -104,6 +104,8 @@ namespace QMAPP.WinForm.Forms.Operation private string _371BiaoPiBarCodeRegex = string.Empty; //表皮码 private string _316BiaoPiBarCodeRegex = string.Empty; //表皮码 + private string _AutoMachineCode = string.Empty; //自动扫码的配置设备编号 + #endregion #region 窗体构造函数 @@ -117,6 +119,7 @@ namespace QMAPP.WinForm.Forms.Operation _showDetailError = System.Configuration.ConfigurationManager.AppSettings["是否显示异常详细信息"]?.ToLower(); _lowCfgAutoSwitchLoc = GetAppConfigValue("AutomationLocAdd"); //查找所有 需要自动填充的工位 _ipGJBarCodeRegex = GetAppConfigValue("AutomationBarCodeRegex"); //查找所有 需要自动填充的工位 + _AutoMachineCode = GetAppConfigValue("MachineCode"); //查找所有 需要自动填充的工位 var str__cfgAutoInputLocs = GetAppConfigValue("AutoInputLocAdd"); //查找所有 需要自动填充的工位 if (str__cfgAutoInputLocs.Split(';').Length > 0) @@ -2180,7 +2183,7 @@ namespace QMAPP.WinForm.Forms.Operation else { - if ("DPWELDING_L".Contains(_operationServiceParam.machineInfo.MACHINECODDE)) + if (_AutoMachineCode.Contains(_operationServiceParam.machineInfo.MACHINECODDE)) { List list = QMFrameWork.Common.Serialization.JsonConvertHelper.GetDeserialize>(message); if (list.Count <= 0)