From baf93a2f2470f6a07d2cf54e9eece26d9a241cf1 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Wed, 23 Nov 2022 11:18:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0018D=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8F=8A=E5=8F=91=E8=BF=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/QMAPP.Web/App_Data/Menu.xml | 17 +- APP/QMAPP.Web/Web.config | 10 +- APPMD/QMAPP.MD.Web/Web.config | 4 +- APPQ5/QMAPP.FJC.BLL/Andon/AndonCallBLL.cs | 2 - APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs | 24 ++ APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs | 10 +- APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs | 190 ++++++++++ APPQ5/QMAPP.FJC.Web/Web.config | 4 +- APPQ5/QMAPP.WinForm/App.config | 12 +- .../QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs | 189 +++++++--- .../Forms/TianJin/TJFrmPlace.designer.cs | 330 ++++++++++-------- .../TianJin/TJPrintPlanLabel.Designer.cs | 22 +- .../Forms/TianJin/TJPrintPlanLabel.cs | 68 +++- .../Forms/TianJin/TJPrintPlanLabel.resx | 70 ++++ Exchange/QM.ServiceHost/QM.ServiceHost.csproj | 23 +- ProcessFileSyncService/App.config | 2 +- ServicesCenter/WCF/MsgSendService/App.config | 2 +- .../WCF/QMFrameWork.WebServiceHost/Web.config | 9 +- .../WindowsServices/OpcService/app.config | 2 +- 19 files changed, 760 insertions(+), 230 deletions(-) diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml index 064d720..1226a1d 100644 --- a/APP/QMAPP.Web/App_Data/Menu.xml +++ b/APP/QMAPP.Web/App_Data/Menu.xml @@ -298,7 +298,7 @@ --> - + 查询 添加 @@ -313,6 +313,21 @@ 下载模板 + diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index e7055d8..8a0bfb0 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -51,10 +51,12 @@ --> - - - + + + diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config index dfba128..0d6a996 100644 --- a/APPMD/QMAPP.MD.Web/Web.config +++ b/APPMD/QMAPP.MD.Web/Web.config @@ -31,8 +31,10 @@ - + + + - + - + diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 4d2bced..21cf3f1 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -2,11 +2,11 @@ - + @@ -19,11 +19,13 @@ --> - + + diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index c86f8c3..2936cab 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -348,7 +348,7 @@ namespace QMAPP.WinForm.Forms.TianJin try { timeRefew.Enabled = true; - //UserBuffer.Interval = CtlApp.GetInterval(QM.Config.CustomConfig.GetItem("RefreshTime")); + //UserBuffer.Interval = CtlApp.GetInterval(QM.Convvvvvvvvvvvn'n'n'n'n'n'n'n'n'n'n'n'n'n'n'n'n'n'nfig.CustomConfig.GetItem("RefreshTime")); UserBuffer.Interval = CtlApp.GetInterval(QMAPP.WinForm.Common.LocalSetting.Settings["RefreshTime","20"]); timeRefew.Interval = UserBuffer.Interval; //BarcodeTime = int.Parse(QM.Config.CustomConfig.GetItem("BarcodeTime")); @@ -366,12 +366,20 @@ namespace QMAPP.WinForm.Forms.TianJin if (!string.IsNullOrEmpty(pFisType)) { if (pFisType.Equals("01")) + { + rb_hx.Checked = true; + } + else if(pFisType.Equals("02")) { rb_dx.Checked = true; } + else if (pFisType.Equals("03")) + { + ra_hx.Checked = true; + } else { - rb_dx.Checked = true; + ra_dx.Checked = true; } } @@ -776,6 +784,14 @@ namespace QMAPP.WinForm.Forms.TianJin { strprodtype = "( 右 )"; } + else if (pFisType == "03") + { + strprodtype = "( 前 )"; + } + else if (pFisType == "04") + { + strprodtype = "( 后 )"; + } //提交数据处理 foreach (DataRow dr in tbl.Rows) { @@ -987,12 +1003,20 @@ namespace QMAPP.WinForm.Forms.TianJin //#region "隐藏了rb_hx 和rb_dx，全部根据pFisType判断，生产线的设置使用按钮进行设置" if (pFisType == "01") { - strprodtype = "( 混 )"; + strprodtype = "( 左 )"; } else if (pFisType == "02") { - strprodtype = "( 单 )"; + strprodtype = "( 右 )"; } + else if (pFisType == "03") + { + strprodtype = "( 前 )"; + } + else if (pFisType == "04") + { + strprodtype = "( 后 )"; + } prin.Print(rowindex, nfpastecard, strprodtype); ClearContainer(); GetInitData(); @@ -1195,31 +1219,59 @@ namespace QMAPP.WinForm.Forms.TianJin plan.LINENO = "770B"; else plan.LINENO = "018D"; - foreach (var s in "R,F".Split(',')) + if (plan.LINENO == "770B") { - plan.PID = Guid.NewGuid().ToString(); + foreach (var s in "R,F".Split(',')) + { + plan.PID = Guid.NewGuid().ToString(); - plan.MATERIAL_CODE = mach.Substring(0, mach.Length - 1) + s + mach.Substring(mach.Length - 1,1); + plan.MATERIAL_CODE = mach.Substring(0, mach.Length - 1) + s + mach.Substring(mach.Length - 1, 1); - foreach (var rule in _barcodeRules) - { - if (System.Text.RegularExpressions.Regex.IsMatch(plan.MATERIAL_CODE + "1", rule.REGEX)) + foreach (var rule in _barcodeRules) { - plan.MATERIAL_CODE = rule.MATERIAL_CODE; + if (System.Text.RegularExpressions.Regex.IsMatch(plan.MATERIAL_CODE + "1", rule.REGEX)) + { + plan.MATERIAL_CODE = rule.MATERIAL_CODE; + } + } + var RESULT = agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_Insert", plan); + if (RESULT.IsSuccess == true) + { + agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_PutOut", plan.PID); } } - - var RESULT = agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_Insert", plan); - if (RESULT.IsSuccess == true) + } + else + { + foreach (var s in "L,R".Split(',')) { - agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_PutOut", plan.PID); + plan.PID = Guid.NewGuid().ToString(); + plan.MATERIAL_CODE = mach.Substring(0, mach.Length - 1) + mach.Substring(mach.Length - 1, 1) + s; + + foreach (var rule in _barcodeRules) + { + if (System.Text.RegularExpressions.Regex.IsMatch(plan.MATERIAL_CODE + "1", rule.REGEX)) + { + plan.MATERIAL_CODE = rule.MATERIAL_CODE; + } + } + + var RESULT = agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_Insert", plan); + if (RESULT.IsSuccess == true) + { + agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_PutOut", plan.PID); + } } } + txtCode.Text = ""; + txtCode.Focus(); return; } else { + txtCode.Text = ""; + txtCode.Focus(); return; } } @@ -1329,8 +1381,6 @@ namespace QMAPP.WinForm.Forms.TianJin return; #endregion - - } @@ -1445,8 +1495,6 @@ namespace QMAPP.WinForm.Forms.TianJin } if (signal != false) { - #region 去数据库查询相关产品信息，外来零件忽略此步骤 - #region 校验是否有重复的扫过的条码 //------------------校验是否有重复的扫过的条码------ @@ -1473,7 +1521,7 @@ namespace QMAPP.WinForm.Forms.TianJin FISDataCompare(Code, ProMaterial, MOULD_CODE); #endregion - #endregion + } else { @@ -2045,6 +2093,14 @@ namespace QMAPP.WinForm.Forms.TianJin { strprodtype = "( 右 )"; } + else if (pFisType == "03") + { + strprodtype = "( 前 )"; + } + else if (pFisType == "04") + { + strprodtype = "( 后 )"; + } DataTable dt = new DataTable(); dt.Columns.Add("ROWINDEX"); @@ -2297,38 +2353,87 @@ namespace QMAPP.WinForm.Forms.TianJin /// /// /// - int signal = 0; + //int signal = 0; private void rb_hx_CheckedChanged(object sender, EventArgs e) { if (dgvNF.Rows.Count > 0) { - if (rb_hx.Checked == true && signal == 0) - { - signal++; - rb_dx.Checked = true; - } - else if (rb_dx.Checked == true && signal == 0) - { - signal++; - rb_hx.Checked = true; - } lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!"; - signal = 0; return; } lberror.Text = ""; - QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = rb_hx.Checked ? "01" : "02"; - if (this.rb_hx.Checked == true) + QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"]= "01"; + + //混 + pFisType = "01"; + WORKCENTER_CODE = "IPFY01"; + + GetInitData(); + GetLastPastCard(); + } + /// + /// 右侧门板 + /// + /// + /// + private void rb_dx_CheckedChanged(object sender, EventArgs e) + { + if (dgvNF.Rows.Count > 0) { - //混 - pFisType = "01"; - WORKCENTER_CODE = "IPFY01"; + lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!"; + return; } - else - { //单 - pFisType = "02"; - WORKCENTER_CODE = "IPFY02"; + lberror.Text = ""; + QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = "01"; + + //混 + pFisType = "02"; + WORKCENTER_CODE = "IPFY02"; + + GetInitData(); + GetLastPastCard(); + } + /// + /// 018前门 + /// + /// + /// + private void ra_hx_CheckedChanged(object sender, EventArgs e) + { + if (dgvNF.Rows.Count > 0) + { + lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!"; + return; + } + lberror.Text = ""; + QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = "03"; + + //混 + pFisType = "03"; + WORKCENTER_CODE = "IPFY03"; + + GetInitData(); + GetLastPastCard(); + } + /// + /// 018后门 + /// + /// + /// + private void ra_dx_CheckedChanged(object sender, EventArgs e) + { + if (dgvNF.Rows.Count > 0) + { + lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!"; + return; } + lberror.Text = ""; + QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = "04"; + + //混 + pFisType = "04"; + WORKCENTER_CODE = "IPFY04"; + GetInitData(); GetLastPastCard(); } @@ -2460,5 +2565,7 @@ namespace QMAPP.WinForm.Forms.TianJin else return null; } + + } } diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs index 6725ecb..957df4e 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.panel1 = new System.Windows.Forms.FlowLayoutPanel(); @@ -42,6 +42,8 @@ this.rb_hx = new System.Windows.Forms.RadioButton(); this.rb_dx = new System.Windows.Forms.RadioButton(); this.lblCount = new System.Windows.Forms.Label(); + this.ra_hx = new System.Windows.Forms.RadioButton(); + this.ra_dx = new System.Windows.Forms.RadioButton(); this.dgvMATChange = new System.Windows.Forms.DataGridView(); this.PLAN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.REQUESTID = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -56,6 +58,19 @@ this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panel4 = new System.Windows.Forms.Panel(); this.dgvNF = new System.Windows.Forms.DataGridView(); + this.CODE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.PRODNO_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.CARSETDESC_CN_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.MOULDCODE = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.CREATEDATE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SEQ = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dgcPRODUCT_PID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tpContainer = new System.Windows.Forms.TableLayoutPanel(); this.panel3 = new System.Windows.Forms.FlowLayoutPanel(); this.btnPrint_NF = new System.Windows.Forms.Button(); @@ -75,19 +90,6 @@ this.timeRefew = new System.Windows.Forms.Timer(this.components); this.panel7 = new System.Windows.Forms.Panel(); this.panel8 = new System.Windows.Forms.Panel(); - this.CODE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.PRODNO_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CARSETDESC_CN_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.MOULDCODE = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.CREATEDATE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.SEQ = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dgcPRODUCT_PID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -146,6 +148,8 @@ this.panel1.Controls.Add(this.rb_hx); this.panel1.Controls.Add(this.rb_dx); this.panel1.Controls.Add(this.lblCount); + this.panel1.Controls.Add(this.ra_hx); + this.panel1.Controls.Add(this.ra_dx); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; @@ -230,6 +234,7 @@ this.rb_dx.TabIndex = 6; this.rb_dx.Text = "右侧门板"; this.rb_dx.UseVisualStyleBackColor = true; + this.rb_dx.CheckedChanged += new System.EventHandler(this.rb_dx_CheckedChanged); // // lblCount // @@ -243,6 +248,28 @@ this.lblCount.TabIndex = 21; this.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // ra_hx + // + this.ra_hx.AutoSize = true; + this.ra_hx.Location = new System.Drawing.Point(666, 3); + this.ra_hx.Name = "ra_hx"; + this.ra_hx.Size = new System.Drawing.Size(77, 16); + this.ra_hx.TabIndex = 22; + this.ra_hx.Text = "018前门板"; + this.ra_hx.UseVisualStyleBackColor = true; + this.ra_hx.CheckedChanged += new System.EventHandler(this.ra_hx_CheckedChanged); + // + // ra_dx + // + this.ra_dx.AutoSize = true; + this.ra_dx.Location = new System.Drawing.Point(3, 32); + this.ra_dx.Name = "ra_dx"; + this.ra_dx.Size = new System.Drawing.Size(77, 16); + this.ra_dx.TabIndex = 23; + this.ra_dx.Text = "018后门板"; + this.ra_dx.UseVisualStyleBackColor = true; + this.ra_dx.CheckedChanged += new System.EventHandler(this.ra_dx_CheckedChanged); + // // dgvMATChange // this.dgvMATChange.AllowUserToAddRows = false; @@ -261,18 +288,17 @@ this.PID, this.clscanstate, this.STATE}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvMATChange.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0); + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvMATChange.DefaultCellStyle = dataGridViewCellStyle5; this.dgvMATChange.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvMATChange.Location = new System.Drawing.Point(0, 0); - this.dgvMATChange.MultiSelect = true; this.dgvMATChange.Name = "dgvMATChange"; this.dgvMATChange.ReadOnly = true; this.dgvMATChange.RowHeadersWidth = 40; @@ -423,15 +449,15 @@ this.Column11, this.Column13, this.dgcPRODUCT_PID}); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvNF.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0); + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvNF.DefaultCellStyle = dataGridViewCellStyle6; this.dgvNF.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvNF.Location = new System.Drawing.Point(0, 0); this.dgvNF.Name = "dgvNF"; @@ -443,6 +469,123 @@ this.dgvNF.Size = new System.Drawing.Size(460, 364); this.dgvNF.TabIndex = 0; // + // CODE_NF + // + this.CODE_NF.DataPropertyName = "SANBARCODE"; + this.CODE_NF.HeaderText = "条码号"; + this.CODE_NF.Name = "CODE_NF"; + this.CODE_NF.ReadOnly = true; + this.CODE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.CODE_NF.Width = 57; + // + // PRODNO_NF + // + this.PRODNO_NF.DataPropertyName = "PRODNO"; + this.PRODNO_NF.HeaderText = "零件号"; + this.PRODNO_NF.Name = "PRODNO_NF"; + this.PRODNO_NF.ReadOnly = true; + this.PRODNO_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.PRODNO_NF.Width = 57; + // + // CARSETDESC_CN_NF + // + this.CARSETDESC_CN_NF.DataPropertyName = "CARSETDESC_CN"; + this.CARSETDESC_CN_NF.HeaderText = "总成描述"; + this.CARSETDESC_CN_NF.Name = "CARSETDESC_CN_NF"; + this.CARSETDESC_CN_NF.ReadOnly = true; + this.CARSETDESC_CN_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.CARSETDESC_CN_NF.Width = 69; + // + // MOULDCODE + // + this.MOULDCODE.DataPropertyName = "MOULDCODE"; + this.MOULDCODE.HeaderText = "位置"; + this.MOULDCODE.Name = "MOULDCODE"; + this.MOULDCODE.ReadOnly = true; + this.MOULDCODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.MOULDCODE.Width = 45; + // + // CREATEDATE_NF + // + this.CREATEDATE_NF.DataPropertyName = "SCANDATE"; + this.CREATEDATE_NF.HeaderText = "扫描时间"; + this.CREATEDATE_NF.Name = "CREATEDATE_NF"; + this.CREATEDATE_NF.ReadOnly = true; + this.CREATEDATE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.CREATEDATE_NF.Width = 69; + // + // Column1 + // + this.Column1.DataPropertyName = "PASTEDETAILED_CARD_KEY"; + this.Column1.HeaderText = "Column1"; + this.Column1.Name = "Column1"; + this.Column1.ReadOnly = true; + this.Column1.Visible = false; + this.Column1.Width = 82; + // + // SEQ + // + this.SEQ.DataPropertyName = "SEQ"; + this.SEQ.HeaderText = "SEQ"; + this.SEQ.Name = "SEQ"; + this.SEQ.ReadOnly = true; + this.SEQ.Visible = false; + this.SEQ.Width = 58; + // + // Column2 + // + this.Column2.DataPropertyName = "FIS_KEY"; + this.Column2.HeaderText = "Column2"; + this.Column2.Name = "Column2"; + this.Column2.ReadOnly = true; + this.Column2.Visible = false; + this.Column2.Width = 82; + // + // Column3 + // + this.Column3.DataPropertyName = "PASTE_CARD_KEY"; + this.Column3.HeaderText = "Column3"; + this.Column3.Name = "Column3"; + this.Column3.ReadOnly = true; + this.Column3.Visible = false; + this.Column3.Width = 82; + // + // Column7 + // + this.Column7.DataPropertyName = "VIN"; + this.Column7.HeaderText = "Column7"; + this.Column7.Name = "Column7"; + this.Column7.ReadOnly = true; + this.Column7.Visible = false; + this.Column7.Width = 82; + // + // Column11 + // + this.Column11.DataPropertyName = "DGVROWINDEX"; + this.Column11.HeaderText = "Column11"; + this.Column11.Name = "Column11"; + this.Column11.ReadOnly = true; + this.Column11.Visible = false; + this.Column11.Width = 88; + // + // Column13 + // + this.Column13.DataPropertyName = "LINENO"; + this.Column13.HeaderText = "Column13"; + this.Column13.Name = "Column13"; + this.Column13.ReadOnly = true; + this.Column13.Visible = false; + this.Column13.Width = 88; + // + // dgcPRODUCT_PID + // + this.dgcPRODUCT_PID.DataPropertyName = "PRODUCT_PID"; + this.dgcPRODUCT_PID.HeaderText = "产品主键"; + this.dgcPRODUCT_PID.Name = "dgcPRODUCT_PID"; + this.dgcPRODUCT_PID.ReadOnly = true; + this.dgcPRODUCT_PID.Visible = false; + this.dgcPRODUCT_PID.Width = 88; + // // tpContainer // this.tpContainer.BackColor = System.Drawing.SystemColors.ControlDark; @@ -650,123 +793,6 @@ this.panel8.Size = new System.Drawing.Size(1239, 50); this.panel8.TabIndex = 19; // - // CODE_NF - // - this.CODE_NF.DataPropertyName = "SANBARCODE"; - this.CODE_NF.HeaderText = "条码号"; - this.CODE_NF.Name = "CODE_NF"; - this.CODE_NF.ReadOnly = true; - this.CODE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.CODE_NF.Width = 57; - // - // PRODNO_NF - // - this.PRODNO_NF.DataPropertyName = "PRODNO"; - this.PRODNO_NF.HeaderText = "零件号"; - this.PRODNO_NF.Name = "PRODNO_NF"; - this.PRODNO_NF.ReadOnly = true; - this.PRODNO_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.PRODNO_NF.Width = 57; - // - // CARSETDESC_CN_NF - // - this.CARSETDESC_CN_NF.DataPropertyName = "CARSETDESC_CN"; - this.CARSETDESC_CN_NF.HeaderText = "总成描述"; - this.CARSETDESC_CN_NF.Name = "CARSETDESC_CN_NF"; - this.CARSETDESC_CN_NF.ReadOnly = true; - this.CARSETDESC_CN_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.CARSETDESC_CN_NF.Width = 69; - // - // MOULDCODE - // - this.MOULDCODE.DataPropertyName = "MOULDCODE"; - this.MOULDCODE.HeaderText = "位置"; - this.MOULDCODE.Name = "MOULDCODE"; - this.MOULDCODE.ReadOnly = true; - this.MOULDCODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.MOULDCODE.Width = 45; - // - // CREATEDATE_NF - // - this.CREATEDATE_NF.DataPropertyName = "SCANDATE"; - this.CREATEDATE_NF.HeaderText = "扫描时间"; - this.CREATEDATE_NF.Name = "CREATEDATE_NF"; - this.CREATEDATE_NF.ReadOnly = true; - this.CREATEDATE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.CREATEDATE_NF.Width = 69; - // - // Column1 - // - this.Column1.DataPropertyName = "PASTEDETAILED_CARD_KEY"; - this.Column1.HeaderText = "Column1"; - this.Column1.Name = "Column1"; - this.Column1.ReadOnly = true; - this.Column1.Visible = false; - this.Column1.Width = 82; - // - // SEQ - // - this.SEQ.DataPropertyName = "SEQ"; - this.SEQ.HeaderText = "SEQ"; - this.SEQ.Name = "SEQ"; - this.SEQ.ReadOnly = true; - this.SEQ.Visible = false; - this.SEQ.Width = 58; - // - // Column2 - // - this.Column2.DataPropertyName = "FIS_KEY"; - this.Column2.HeaderText = "Column2"; - this.Column2.Name = "Column2"; - this.Column2.ReadOnly = true; - this.Column2.Visible = false; - this.Column2.Width = 82; - // - // Column3 - // - this.Column3.DataPropertyName = "PASTE_CARD_KEY"; - this.Column3.HeaderText = "Column3"; - this.Column3.Name = "Column3"; - this.Column3.ReadOnly = true; - this.Column3.Visible = false; - this.Column3.Width = 82; - // - // Column7 - // - this.Column7.DataPropertyName = "VIN"; - this.Column7.HeaderText = "Column7"; - this.Column7.Name = "Column7"; - this.Column7.ReadOnly = true; - this.Column7.Visible = false; - this.Column7.Width = 82; - // - // Column11 - // - this.Column11.DataPropertyName = "DGVROWINDEX"; - this.Column11.HeaderText = "Column11"; - this.Column11.Name = "Column11"; - this.Column11.ReadOnly = true; - this.Column11.Visible = false; - this.Column11.Width = 88; - // - // Column13 - // - this.Column13.DataPropertyName = "LINENO"; - this.Column13.HeaderText = "Column13"; - this.Column13.Name = "Column13"; - this.Column13.ReadOnly = true; - this.Column13.Visible = false; - this.Column13.Width = 88; - // - // dgcPRODUCT_PID - // - this.dgcPRODUCT_PID.DataPropertyName = "PRODUCT_PID"; - this.dgcPRODUCT_PID.HeaderText = "产品主键"; - this.dgcPRODUCT_PID.Name = "dgcPRODUCT_PID"; - this.dgcPRODUCT_PID.ReadOnly = true; - this.dgcPRODUCT_PID.Visible = false; - this.dgcPRODUCT_PID.Width = 88; - // // TJFrmPlace // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -860,5 +886,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column11; private System.Windows.Forms.DataGridViewTextBoxColumn Column13; private System.Windows.Forms.DataGridViewTextBoxColumn dgcPRODUCT_PID; + private System.Windows.Forms.RadioButton ra_hx; + private System.Windows.Forms.RadioButton ra_dx; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs index d0370f6..7bad796 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs @@ -78,6 +78,7 @@ this.dtpCREATEDATESTART = new DateTimePickerA(); this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.SelectStripButton = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).BeginInit(); this.tpContent.SuspendLayout(); this.tpPlanList.SuspendLayout(); @@ -273,6 +274,7 @@ this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom; this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SelectStripButton, this.toolStripButton2, this.toolStripButton1, this.tsbPrint, @@ -341,7 +343,7 @@ this.tsmiSuspendOrder.Image = global::QMAPP.WinForm.Resource1.stop; this.tsmiSuspendOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7); this.tsmiSuspendOrder.Name = "tsmiSuspendOrder"; - this.tsmiSuspendOrder.Size = new System.Drawing.Size(144, 26); + this.tsmiSuspendOrder.Size = new System.Drawing.Size(184, 26); this.tsmiSuspendOrder.Text = "挂起工单"; this.tsmiSuspendOrder.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.tsmiSuspendOrder.Click += new System.EventHandler(this.tsmiSuspendOrder_Click); @@ -351,7 +353,7 @@ this.tsmiCancelSuspend.Image = global::QMAPP.WinForm.Resource1.back; this.tsmiCancelSuspend.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7); this.tsmiCancelSuspend.Name = "tsmiCancelSuspend"; - this.tsmiCancelSuspend.Size = new System.Drawing.Size(144, 26); + this.tsmiCancelSuspend.Size = new System.Drawing.Size(184, 26); this.tsmiCancelSuspend.Text = "取消挂起"; this.tsmiCancelSuspend.Click += new System.EventHandler(this.tsmiCancelSuspend_Click); // @@ -360,7 +362,7 @@ this.tsmiDeleteOrder.Image = global::QMAPP.WinForm.Resource1.delete; this.tsmiDeleteOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7); this.tsmiDeleteOrder.Name = "tsmiDeleteOrder"; - this.tsmiDeleteOrder.Size = new System.Drawing.Size(144, 26); + this.tsmiDeleteOrder.Size = new System.Drawing.Size(184, 26); this.tsmiDeleteOrder.Text = "删除工单"; this.tsmiDeleteOrder.Click += new System.EventHandler(this.tsmiDeleteOrder_Click); // @@ -446,7 +448,6 @@ // // timer1 // - this.timer1.Enabled = true; this.timer1.Interval = 1000; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // @@ -543,6 +544,18 @@ this.label5.TabIndex = 22; this.label5.Text = "至"; // + // SelectStripButton + // + this.SelectStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.SelectStripButton.Font = new System.Drawing.Font("微软雅黑", 12F); + this.SelectStripButton.Image = ((System.Drawing.Image)(resources.GetObject("SelectStripButton.Image"))); + this.SelectStripButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.SelectStripButton.ImageTransparentColor = System.Drawing.Color.White; + this.SelectStripButton.Name = "SelectStripButton"; + this.SelectStripButton.Size = new System.Drawing.Size(94, 67); + this.SelectStripButton.Text = "刷新"; + this.SelectStripButton.Click += new System.EventHandler(this.SelectStripButton_Click); + // // TJPrintPlanLabel // this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F); @@ -619,5 +632,6 @@ private DateTimePickerA dtpCREATEDATESTART; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label5; + private System.Windows.Forms.ToolStripButton SelectStripButton; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs index 16149e3..0cda044 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs @@ -23,6 +23,7 @@ namespace QMAPP.WinForm.Forms.TianJin List cbsource = null; private string planMATERIAL_CODE = string.Empty; + private string FR = string.Empty; /// /// @@ -126,10 +127,40 @@ namespace QMAPP.WinForm.Forms.TianJin //{ // searchModel.EndTime = Convert.ToDateTime((this.dtpCREATEDATEEND.Value).ToString("yyyy-MM-dd") + " 23:59:59"); //} - #region 服务查询 - var orderlist = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString()); - #endregion - this.dgvPlan.DataSource = orderlist; + if (cbRoutes.Text.Contains("018D")) + { + var count = Convert.ToInt32(cbListRowcount.Text) / 2; + var orderlist =new List(); + var orderlistF = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted018DF", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString()); + var orderlistR = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted018DR", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString()); + for (var i = 0; i < count; i++) + { + if (string.IsNullOrEmpty(FR) || FR == "前") + { + if (i < orderlistF.Count) + orderlist.Add(orderlistF[i]); + if (i < orderlistR.Count) + orderlist.Add(orderlistR[i]); + } + else if (FR == "后") + { + if (i < orderlistR.Count) + orderlist.Add(orderlistR[i]); + if (i < orderlistF.Count) + orderlist.Add(orderlistF[i]); + } + } + this.dgvPlan.DataSource = orderlist; + + } + else + { + #region 服务查询 + var orderlist = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString()); + #endregion + this.dgvPlan.DataSource = orderlist; + } + } catch (Exception ex) { @@ -169,7 +200,7 @@ namespace QMAPP.WinForm.Forms.TianJin { if (!tsbOrderOperation.DropDown.Visible) { - timecounter += 1; + timecounter = 1; if (timecounter > int.Parse("20"))//计时达到刷新时间 { BindPlanView(); @@ -482,7 +513,7 @@ namespace QMAPP.WinForm.Forms.TianJin var orders2 = new List(); var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem; orders2.Add(order2); - if (orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7)) + if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7))&& !orders[0].MATERIAL_CODE.Contains("018D")) { MessageBox.Show("计划工单即将变换配置，请注意！"); } @@ -531,7 +562,10 @@ namespace QMAPP.WinForm.Forms.TianJin InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString()); WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo); - + if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("前")) + FR = "后"; + else if(orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("后")) + FR = "前"; BindPlanView(); tsbPrint.Enabled = true; @@ -650,7 +684,7 @@ namespace QMAPP.WinForm.Forms.TianJin for (var i = 0; i < count; i++) { - System.Threading.Thread.Sleep(3000); + System.Threading.Thread.Sleep(1000); var orders = new List(); @@ -662,7 +696,7 @@ namespace QMAPP.WinForm.Forms.TianJin var orders2 = new List(); var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i + 1].DataBoundItem; orders2.Add(order2); - if (orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7)) + if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7)) && !orders[0].MATERIAL_CODE.Contains("018D")) { MessageBox.Show("计划工单即将变换配置，请注意！"); } @@ -701,7 +735,7 @@ namespace QMAPP.WinForm.Forms.TianJin //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo); - PrintLabel(labels); + //PrintLabel(labels); //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo); //变更打印状态 0=>1 @@ -709,7 +743,10 @@ namespace QMAPP.WinForm.Forms.TianJin //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始插入记录" + labeldata.OrderNo); InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString()); - + if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("前")) + FR = "后"; + else if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("后")) + FR = "前"; //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 插入结束" + labeldata.OrderNo); } @@ -732,6 +769,15 @@ namespace QMAPP.WinForm.Forms.TianJin { BindPlanView(); } + /// + /// 刷新 + /// + /// + /// + private void SelectStripButton_Click(object sender, EventArgs e) + { + BindPlanView(); + } } class Direction { public string Code { get; set; } diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx index 07453f3..f1b8096 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx @@ -154,6 +154,76 @@ 17, 17 + + + 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 + Ae6xxmll7eSUAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Exchange/QM.ServiceHost/QM.ServiceHost.csproj b/Exchange/QM.ServiceHost/QM.ServiceHost.csproj index 703702a..0950d10 100644 --- a/Exchange/QM.ServiceHost/QM.ServiceHost.csproj +++ b/Exchange/QM.ServiceHost/QM.ServiceHost.csproj @@ -18,6 +18,21 @@ SAK SAK SAK + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true x86 @@ -138,7 +153,13 @@ QM.Exchange.Core - + + + False + .NET Framework 3.5 SP1 + false + + - + diff --git a/ServicesCenter/WCF/MsgSendService/App.config b/ServicesCenter/WCF/MsgSendService/App.config index 8139e15..56ed977 100644 --- a/ServicesCenter/WCF/MsgSendService/App.config +++ b/ServicesCenter/WCF/MsgSendService/App.config @@ -10,7 +10,7 @@ - + diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index 241a38a..9c369ed 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -63,10 +63,11 @@ - + @@ -85,6 +86,8 @@ + + diff --git a/ServicesCenter/WindowsServices/OpcService/app.config b/ServicesCenter/WindowsServices/OpcService/app.config index a92e36e..eba0984 100644 --- a/ServicesCenter/WindowsServices/OpcService/app.config +++ b/ServicesCenter/WindowsServices/OpcService/app.config @@ -10,7 +10,7 @@ - +