diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index 132eddc..27558e4 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -47,10 +47,10 @@ - + - + + diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config index 64df405..450d9bc 100644 --- a/APPMD/QMAPP.MD.Web/Web.config +++ b/APPMD/QMAPP.MD.Web/Web.config @@ -34,10 +34,11 @@ - + - - + + + diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/DictController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/DictController.cs index c06857d..b73a7e2 100644 --- a/APPQ5/QMAPP.FJC.Web/Controllers/DictController.cs +++ b/APPQ5/QMAPP.FJC.Web/Controllers/DictController.cs @@ -1175,7 +1175,7 @@ namespace QMAPP.FJC.Web.Controllers public ActionResult GetMachineList(string workcentercode) { QMAPP.FJC.Entity.Basic.MachineInfo info = new Entity.Basic.MachineInfo(); - info.WORKCENTER_CODE = workcentercode; + info.WORKCENTER_CODE = workcentercode.Replace("PA",""); List list = new List(); ServiceAgent wcfAgent = this.GetServiceAgent(); try @@ -1186,8 +1186,22 @@ namespace QMAPP.FJC.Web.Controllers ("MachineInfoBLL_GetMachineInfoList", info); foreach (QMAPP.FJC.Entity.Basic.MachineInfo item in dataResult) { - item.MACHINENAME = item.MACHINECODDE + "/" + item.MACHINENAME; - list.Add(item); + if (workcentercode.Contains("PA")) + { + if (item.MACHINECODDE.Contains("PA")) + { + item.MACHINENAME = item.MACHINECODDE + "/" + item.MACHINENAME; + list.Add(item); + } + } + else + { + if (!item.MACHINECODDE.Contains("PA")) + { + item.MACHINENAME = item.MACHINECODDE + "/" + item.MACHINENAME; + list.Add(item); + } + } } //} list.Insert(0, new QMAPP.FJC.Entity.Basic.MachineInfo() { MACHINECODDE = "", MACHINENAME = this.EmptyItemTitle }); diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config index bd1d5f3..eba9334 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -38,10 +38,10 @@ - + - + + diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index bbd0e51..08f8a86 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -10,7 +10,7 @@ - + @@ -209,7 +209,7 @@ --> - + diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/HintMassageForm.cs b/APPQ5/QMAPP.WinForm/Forms/Injection/HintMassageForm.cs new file mode 100644 index 0000000..7b4d613 --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/Injection/HintMassageForm.cs @@ -0,0 +1,97 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using QMAPP.FJC.Entity.Operation; +using QMAPP.Entity; +using QMAPP.ServicesAgent; +using QMAPP.MD.Entity; +using QMAPP.FJC.Entity.Basic; +using QMAPP.WinForm.Common; +using QMAPP.FJC.Entity; +using QMAPP.FJC.Entity.BZD; + +namespace QMAPP.WinForm.Forms.Injection +{ + public partial class HintMassageForm : Form + { + //获取服务代理 + QMAPP.ServicesAgent.ServiceAgent _agent = ClientContext.GetServiceAgent(); + + List _bzdConfig = null; + + Product _CurrentProduct = null; + //private OperationForm _parentForm; + //string _Msg = string.Empty; + public HintMassageForm(string Msg) + { + InitializeComponent(); + string[] Msg_str = Msg.Split('!'); + foreach (var str in Msg_str) + { + label1.Text += str+" \r\n"; + } + + label1.ForeColor = Color.Red; + infolabel.Text = ""; + infolabel.ForeColor = Color.Red; + //_parentForm = parentForm; + } + + #region 打印按钮 + + /// + /// 打印按钮 + /// + /// + /// + private void button1_Click(object sender, EventArgs e) + { + try + { + this.DialogResult = DialogResult.OK; + this.Close(); + + //string MakeUpBZD = ""; + //DataTable dataTable = _agent.InvokeServiceFunction(B9IPCService.BZDConfigBLL_GetAppConfigValue.ToString(), "MakeUpBZD"); + //if (dataTable.Rows.Count > 0) + //{ + // MakeUpBZD = dataTable.Rows[0]["Value"].ToString(); + //} + + //if (string.IsNullOrEmpty(MakeUpBZD)) + // MakeUpBZD = "admin"; + //if (string.IsNullOrEmpty(txtMainCode.Text)) + //{ + // infolabel.Text = "请输入密码！"; + // this.Show(); + + //} + //if (txtMainCode.Text == MakeUpBZD) + //{ + + + //} + //else + //{ + // infolabel.Text = "密码输入错误！"; + // this.Show(); + + //} + + } + catch (Exception exception) + { + //MessageBox.Show("打印失败！"); + throw; + } + } + + #endregion + + } +} \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/HintMassageForm.designer.cs b/APPQ5/QMAPP.WinForm/Forms/Injection/HintMassageForm.designer.cs new file mode 100644 index 0000000..7679a82 --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/Injection/HintMassageForm.designer.cs @@ -0,0 +1,100 @@ +namespace QMAPP.WinForm.Forms.Injection +{ + partial class HintMassageForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); + this.infolabel = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("宋体", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(216, 100); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(0, 37); + this.label1.TabIndex = 0; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button1.Location = new System.Drawing.Point(316, 324); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(240, 81); + this.button1.TabIndex = 5; + this.button1.Text = "确认"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // infolabel + // + this.infolabel.AutoSize = true; + this.infolabel.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.infolabel.ForeColor = System.Drawing.Color.Red; + this.infolabel.Location = new System.Drawing.Point(283, 170); + this.infolabel.Name = "infolabel"; + this.infolabel.Size = new System.Drawing.Size(0, 31); + this.infolabel.TabIndex = 6; + // + // label2 + // + this.label2.Location = new System.Drawing.Point(246, 11); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(75, 18); + this.label2.TabIndex = 0; + // + // HintMassageForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(841, 440); + this.ControlBox = false; + this.Controls.Add(this.label2); + this.Controls.Add(this.infolabel); + this.Controls.Add(this.button1); + this.Controls.Add(this.label1); + this.Name = "HintMassageForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "总成装配条码打印"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Label infolabel; + private System.Windows.Forms.Label label2; + } +} \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/HintMassageForm.resx b/APPQ5/QMAPP.WinForm/Forms/Injection/HintMassageForm.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/Injection/HintMassageForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/SlushMoldingPrintForOldNewForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/Injection/SlushMoldingPrintForOldNewForm.Designer.cs index 9dbad91..d482faf 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Injection/SlushMoldingPrintForOldNewForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Injection/SlushMoldingPrintForOldNewForm.Designer.cs @@ -28,12 +28,12 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.lblLock = new System.Windows.Forms.LinkLabel(); this.label12 = new System.Windows.Forms.Label(); @@ -259,6 +259,7 @@ this.comColor.Name = "comColor"; this.comColor.Size = new System.Drawing.Size(247, 32); this.comColor.TabIndex = 3; + this.comColor.SelectedIndexChanged += new System.EventHandler(this.comColor_SelectedIndexChanged); // // label11 // @@ -341,14 +342,14 @@ this.DGView.AllowUserToDeleteRows = false; this.DGView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.DGView.BackgroundColor = System.Drawing.SystemColors.ButtonFace; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.DGView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.DGView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.MAINCODE, @@ -359,14 +360,14 @@ this.DGView.Location = new System.Drawing.Point(3, 29); this.DGView.Name = "DGView"; this.DGView.ReadOnly = true; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle6; this.DGView.RowTemplate.Height = 23; this.DGView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.DGView.Size = new System.Drawing.Size(708, 762); @@ -376,8 +377,8 @@ // this.MAINCODE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.MAINCODE.DataPropertyName = "MAINCODE"; - dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F); - this.MAINCODE.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F); + this.MAINCODE.DefaultCellStyle = dataGridViewCellStyle2; this.MAINCODE.FillWeight = 48.95314F; this.MAINCODE.HeaderText = "条码信息"; this.MAINCODE.Name = "MAINCODE"; @@ -388,8 +389,8 @@ // this.COLOR.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.COLOR.DataPropertyName = "MATERIAL_NAME"; - dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 15.75F); - this.COLOR.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15.75F); + this.COLOR.DefaultCellStyle = dataGridViewCellStyle3; this.COLOR.FillWeight = 99.90437F; this.COLOR.HeaderText = "表皮颜色"; this.COLOR.Name = "COLOR"; @@ -400,8 +401,8 @@ // this.PRODUCTCODE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.PRODUCTCODE.DataPropertyName = "PRODUCTCODE"; - dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle4; this.PRODUCTCODE.FillWeight = 48.95314F; this.PRODUCTCODE.HeaderText = "零件号"; this.PRODUCTCODE.Name = "PRODUCTCODE"; @@ -412,11 +413,11 @@ // this.CREATETIME.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.CREATETIME.DataPropertyName = "CREATETIME"; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 15.75F); - dataGridViewCellStyle11.Format = "f"; - dataGridViewCellStyle11.NullValue = null; - this.CREATETIME.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F); + dataGridViewCellStyle5.Format = "f"; + dataGridViewCellStyle5.NullValue = null; + this.CREATETIME.DefaultCellStyle = dataGridViewCellStyle5; this.CREATETIME.FillWeight = 48.95314F; this.CREATETIME.HeaderText = "操作时间"; this.CREATETIME.Name = "CREATETIME"; diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/SlushMoldingPrintForOldNewForm.cs b/APPQ5/QMAPP.WinForm/Forms/Injection/SlushMoldingPrintForOldNewForm.cs index 2023906..921bea7 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Injection/SlushMoldingPrintForOldNewForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Injection/SlushMoldingPrintForOldNewForm.cs @@ -37,6 +37,8 @@ namespace QMAPP.WinForm.Forms.Injection /// public string CarType { set; get; } + public string ColorPrint = string.Empty; + List moldConfigList; QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); @@ -46,7 +48,10 @@ namespace QMAPP.WinForm.Forms.Injection /// public List List_tSWeighRecores = new List(); - private string _cfgSlushMolding = null;// 称重区间 + private string _cfgSlushMoldingVW371 = null;// 称重区间 + private string _cfgSlushMoldingVW3712 = null;// 预警区间 + private string _cfgSlushMoldingVW371PA = null;// 称重区间 + private string _cfgSlushMoldingVW371PA2 = null;// 预警区间 /// /// 新建 @@ -54,10 +59,17 @@ namespace QMAPP.WinForm.Forms.Injection public SlushMoldingPrintForOldNewForm() { InitializeComponent(); - //infolabel.Text = $"重量13245，超出100-300安全区间!"; + //infolabel.Text = $"重量13245，超出100-300标准范围! \r\n请尽快调整重量!"; + //infolabel.ForeColor = Color.Coral; + infolabel.Text = ""; infolabel.ForeColor = Color.Red; - _cfgSlushMolding = GetAppConfigValue("SlushMolding"); + + _cfgSlushMoldingVW371 = GetAppConfigValue("SLUSHMOLDING"); + _cfgSlushMoldingVW3712 = GetAppConfigValue("SLUSHMOLDING2"); + _cfgSlushMoldingVW371PA = GetAppConfigValue("SLUSHMOLDINGPA"); + _cfgSlushMoldingVW371PA2 = GetAppConfigValue("SLUSHMOLDINGPA2"); + btnCommSend.Enabled = true; serialPort1.DataReceived += new SerialDataReceivedEventHandler(serialPort1_DataReceived); frmMain_Load(); @@ -80,7 +92,7 @@ namespace QMAPP.WinForm.Forms.Injection private void Form_Load(object sender, EventArgs e) { InitForm(); - + DataPage dataPage = new DataPage(); //获取前台分页设置信息 dataPage.PageIndex = 1; @@ -128,14 +140,16 @@ namespace QMAPP.WinForm.Forms.Injection this.comColor.ValueMember = "KEY"; this.comColor.SelectedValue = "1"; //this.comColor.Enabled = false; + + ColorPrint = this.comColor.SelectedValue.ToString(); + ////AB腔 this.comPosition.DataSource = basicData.GetDictionaryList(EnumGeter.DictKind.CAVITYTYPE.ToString()); this.comPosition.DisplayMember = "VALUE"; this.comPosition.ValueMember = "KEY"; - //this.comPosition.SelectedIndex = 0; - //this.comPosition.Enabled = false; - + + #endregion //加工日期 if (string.IsNullOrEmpty(this.dtpDate.Text)) @@ -218,83 +232,83 @@ namespace QMAPP.WinForm.Forms.Injection #region 加载保存信息 //for (int i = 0; i < 2; i++)//一次出2个码 //{ - //零件属性 - Product recorder = new Product(); - ProductAttribute productAttribute = new ProductAttribute(); - //搪塑机编号 - productAttribute.VAL1 = machineInfo.MACHINENUM; - //产品类型（车型）成都固定 - productAttribute.VAL2 = "V"; - //高低配 成都无，且固定 - productAttribute.VAL3 = "B"; - //颜色 - productAttribute.VAL4 = this.comColor.SelectedValue.ToString(); - - string[] cb = new string[] { }; - if (!string.IsNullOrEmpty(this.cBoxModelCode.Text)) - { - cb = this.cBoxModelCode.Text.Split('+'); - } - if (cb.Length <= 0) - { - MessageBox.Show("模腔出错！"); - return; - } + //零件属性 + Product recorder = new Product(); + ProductAttribute productAttribute = new ProductAttribute(); + //搪塑机编号 + productAttribute.VAL1 = machineInfo.MACHINENUM; + //产品类型（车型）成都固定 + productAttribute.VAL2 = "V"; + //高低配 成都无，且固定 + productAttribute.VAL3 = "B"; + //颜色 + productAttribute.VAL4 = this.comColor.SelectedValue.ToString(); + + string[] cb = new string[] { }; + if (!string.IsNullOrEmpty(this.cBoxModelCode.Text)) + { + cb = this.cBoxModelCode.Text.Split('+'); + } + if (cb.Length <= 0) + { + MessageBox.Show("模腔出错！"); + return; + } //腔 - - if (this.comPosition.Text == "搪塑B腔")//第一个为模腔号2 - { - //腔 - productAttribute.VAL5 = "B"; - //模腔 - productAttribute.VAL6 = cb[0].PadLeft(2, '0'); - } - else if (this.comPosition.Text == "搪塑A腔") - { - //腔 - productAttribute.VAL5 = "A"; - //模腔 - productAttribute.VAL6 = cb[1].PadLeft(2, '0'); - } + if (this.comPosition.Text == "新搪塑")//第一个为模腔号2 + { + //腔 + productAttribute.VAL5 = "B"; - //加工日期 - if (string.IsNullOrEmpty(this.dtpDate.Text.Trim())) - { - productAttribute.VAL7 = Convert.ToDateTime(DateTime.Now).ToString("yyyy-MM-dd HH:mm:ss"); - } - else - { - productAttribute.VAL7 = Convert.ToDateTime(this.dtpDate.Text.Trim()).ToString("yyyy-MM-dd HH:mm:ss"); - } + //模腔 + productAttribute.VAL6 = cb[0].PadLeft(2, '0'); + } + else if (this.comPosition.Text == "老搪塑") + { + //腔 + productAttribute.VAL5 = "A"; + //模腔 + productAttribute.VAL6 = cb[1].PadLeft(2, '0'); + } + + //加工日期 + if (string.IsNullOrEmpty(this.dtpDate.Text.Trim())) + { + productAttribute.VAL7 = Convert.ToDateTime(DateTime.Now).ToString("yyyy-MM-dd HH:mm:ss"); + } + else + { + productAttribute.VAL7 = Convert.ToDateTime(this.dtpDate.Text.Trim()).ToString("yyyy-MM-dd HH:mm:ss"); + } - recorder.MACHINECODDE = machineInfo.MACHINECODDE; - recorder.MACHINENAME = machineInfo.MACHINENAME; - recorder.PRODUCTSOURCE = EnumGeter.PRODUCTSOURCE.SELFMADE.GetHashCode().ToString(); - recorder.PRODUCTTYPE = EnumGeter.ProductType.biaopi.GetHashCode().ToString(); - - ////添加加物料号 - //QMAPP.ServicesAgent.ServiceAgent agents = ClientContext.GetServiceAgent(); - //DataResult materialcode = agents.InvokeServiceFunction>(B9BasicService.MaterialCodeBLL_GetMaterialCode.ToString(), productAttribute.VAL2); - //recorder.MATERIAL_CODE = materialcode.Result.ToString(); - - recorder.STATUS = EnumGeter.PRODUCTSTAUTS.QUALIFIED.GetHashCode().ToString(); - recorder.CURRENTPROCESS = EnumGeter.ProcessType.lengdaoruohua.GetHashCode().ToString(); - //ToDo:选择生产线 - //成都固定生产线 - recorder.PRODUCELINE = "IPVW371"; - - recorder.OUTFLAG = EnumGeter.PRODUCTOUTFLAG.INLIBRARY.GetHashCode().ToString(); - recorder.USINGSTATE = EnumGeter.PRODUCTUSESTATE.UNUSED.GetHashCode().ToString(); - recorder.PRODUCESHIFTTCODE = ClientContext.produceShift.PRODUCESHIFTTCODE; - recorder.PRODUCESHIFTNAME = ClientContext.produceShift.PRODUCESHIFTNAME; - recorder.CAPACITY = 1; - recorder.USINGCOUNT = 0; - recorder.PRODUCTATTRIBUTE = productAttribute; - recorder.AddM = this.cbM.Checked; - listRecorder.Add(recorder); + recorder.MACHINECODDE = machineInfo.MACHINECODDE; + recorder.MACHINENAME = machineInfo.MACHINENAME; + recorder.PRODUCTSOURCE = EnumGeter.PRODUCTSOURCE.SELFMADE.GetHashCode().ToString(); + recorder.PRODUCTTYPE = EnumGeter.ProductType.biaopi.GetHashCode().ToString(); + + ////添加加物料号 + //QMAPP.ServicesAgent.ServiceAgent agents = ClientContext.GetServiceAgent(); + //DataResult materialcode = agents.InvokeServiceFunction>(B9BasicService.MaterialCodeBLL_GetMaterialCode.ToString(), productAttribute.VAL2); + //recorder.MATERIAL_CODE = materialcode.Result.ToString(); + + recorder.STATUS = EnumGeter.PRODUCTSTAUTS.QUALIFIED.GetHashCode().ToString(); + recorder.CURRENTPROCESS = EnumGeter.ProcessType.lengdaoruohua.GetHashCode().ToString(); + //ToDo:选择生产线 + //成都固定生产线 + recorder.PRODUCELINE = "IPVW371"; + + recorder.OUTFLAG = EnumGeter.PRODUCTOUTFLAG.INLIBRARY.GetHashCode().ToString(); + recorder.USINGSTATE = EnumGeter.PRODUCTUSESTATE.UNUSED.GetHashCode().ToString(); + recorder.PRODUCESHIFTTCODE = ClientContext.produceShift.PRODUCESHIFTTCODE; + recorder.PRODUCESHIFTNAME = ClientContext.produceShift.PRODUCESHIFTNAME; + recorder.CAPACITY = 1; + recorder.USINGCOUNT = 0; + recorder.PRODUCTATTRIBUTE = productAttribute; + recorder.AddM = this.cbM.Checked; + listRecorder.Add(recorder); //} #region 保存 @@ -323,7 +337,7 @@ namespace QMAPP.WinForm.Forms.Injection //保存成功 if (result_Save.IsSuccess) { - + WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff") + "--条码插入成功"); #region 打印条码 this.DialogResult = System.Windows.Forms.DialogResult.OK; @@ -331,7 +345,15 @@ namespace QMAPP.WinForm.Forms.Injection foreach (PrintCode item in result_Save.Result) { QM.Assist.LabelInfo ll = new QM.Assist.LabelInfo(); - ll.BarCode = item.MAINCODE + ",*" + item.PRODUCTCODE + "*" + "," + item.COLOR_CODE; + if (this.comColor.Text.Contains("PA")) + { + ll.BarCode = item.MAINCODE + ",*" + item.PRODUCTCODE + "*" + "," + item.COLOR_CODE + ",VW371PA仪表板表皮"; + } + else + { + ll.BarCode = item.MAINCODE + ",*" + item.PRODUCTCODE + "*" + "," + item.COLOR_CODE + ",VW371仪表板表皮"; + } + QM.Assist.PrintUtil.LabelList2.Add(ll); @@ -351,7 +373,6 @@ namespace QMAPP.WinForm.Forms.Injection row.Cells["MAINCODE"].Value = item.MAINCODE; row.Cells["PRODUCTCODE"].Value = item.PRODUCTCODE; row.Cells["COLOR"].Value = item.COLOR_CODE; - row.Cells["COLOR"].Value = item.COLOR_CODE; row.Cells["CREATETIME"].Value = DateTime.Now; if (DGView.Rows.Count > 200) { @@ -359,18 +380,19 @@ namespace QMAPP.WinForm.Forms.Injection } #region 保存称重记录 - + var Entity = new TSWeighRecore(); Entity.MATERIAL_CODE = item.PRODUCTCODE; Entity.PColour = item.COLOR_CODE; Entity.ProductCode = item.MAINCODE; List_tSWeighRecores.Add(Entity); + #endregion } - + WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff") + "--打印开始"); QM.Assist.PrintUtil pu = new QM.Assist.PrintUtil(); pu.PrintLabel2(System.Configuration.ConfigurationManager.AppSettings["proPath"].ToString @@ -380,6 +402,8 @@ namespace QMAPP.WinForm.Forms.Injection #endregion + WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff") + "--打印结束,重置界面"); + #region 重新设置当前使用和列表信息 var Station = comMouldNumber.SelectedItem; @@ -418,6 +442,7 @@ namespace QMAPP.WinForm.Forms.Injection } else { + WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff") + "--条码插入失败"); MessageBox.Show(result_Save.Msg); } } @@ -559,7 +584,7 @@ namespace QMAPP.WinForm.Forms.Injection #endregion #region - + /// /// /// @@ -570,9 +595,9 @@ namespace QMAPP.WinForm.Forms.Injection { myRtb.AppendText(strTemp + System.Environment.NewLine); } - /// - /// 所有的串口类型 - /// + /// + /// 所有的串口类型 + /// public enum HardwareEnum { Win32_Processor, @@ -636,7 +661,7 @@ namespace QMAPP.WinForm.Forms.Injection List stringList = new List(); try { - + ManagementObjectSearcher managementObjectSearcher = new ManagementObjectSearcher("select * from " + (object)hardType); foreach (ManagementBaseObject managementBaseObject in managementObjectSearcher.Get()) @@ -688,8 +713,8 @@ namespace QMAPP.WinForm.Forms.Injection { MessageBox.Show("frmMain_Load!"); } - - + + } public string CodeName = string.Empty; @@ -715,7 +740,7 @@ namespace QMAPP.WinForm.Forms.Injection { MessageBox.Show("comboBox1_SelectedIndexChanged!"); } - + } public string Weigh_str = string.Empty; private SerialPort serialPort1 = new SerialPort(); @@ -754,13 +779,27 @@ namespace QMAPP.WinForm.Forms.Injection for (int index = 0; index < numArray1.Length; ++index) str = (int)numArray1[index] >= 16 ? str + Convert.ToString(numArray1[index], 16) + " " : str + "0" + Convert.ToString(numArray1[index], 16) + " "; - + if ((int)numArray2[0] == (int)numArray1[bytesToRead - 2] && (int)numArray2[1] == (int)numArray1[bytesToRead - 1]) { - if (!string.IsNullOrEmpty(_cfgSlushMolding)) + var cfgSlushMolding_STR = ""; + var cfgSlushMolding2_STR = ""; + if (this.comColor.Text.Contains("PA")) { - var SP = _cfgSlushMolding.Split(','); + cfgSlushMolding_STR = _cfgSlushMoldingVW371PA; + cfgSlushMolding2_STR = _cfgSlushMoldingVW371PA2; + } + else + { + cfgSlushMolding_STR = _cfgSlushMoldingVW371; + cfgSlushMolding2_STR = _cfgSlushMoldingVW3712; + } + + WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff") + "--接受到信号--" + cfgSlushMolding_STR); + if (!string.IsNullOrEmpty(cfgSlushMolding_STR) && !string.IsNullOrEmpty(cfgSlushMolding2_STR)) + { + var SP = cfgSlushMolding_STR.Split(','); var SP_Begin = Convert.ToInt32(SP[0]); var SP_End = Convert.ToInt32(SP[1]); Weigh_str = str.ToUpper(); @@ -769,36 +808,65 @@ namespace QMAPP.WinForm.Forms.Injection Weigh_str = Weigh_str.Substring(Weigh_str.Length - 11, 2) + Weigh_str.Substring(Weigh_str.Length - 8, 2); Weigh_str = Convert.ToInt32(Weigh_str, 16).ToString(); var Weigh_Num = Convert.ToInt32(Weigh_str); - if (SP_Begin <= Weigh_Num && Weigh_Num <= SP_End) + if (Weigh_Num >= 10000) + Weigh_Num = 0; + var state = true; + var state2 = true; + if (SP_Begin > Weigh_Num || Weigh_Num > SP_End) { - SaveProduct(); - foreach (var t in List_tSWeighRecores) - { - t.Weigh = Weigh_str; - agent.InvokeServiceFunction>(QMAPP.ServicesAgent.DictService.TSWeighRecoreBLL_Insert.ToString(), t); - } - List_tSWeighRecores = new List(); - this.TBRCV.Text = str.ToUpper(); + this.TBRCV.Text = $"重量{Weigh_Num}，超出{cfgSlushMolding_STR}标准范围!重量不合格,报废"; + infolabel.Text = $"重量{Weigh_Num}，超出{cfgSlushMolding_STR}标准范围! \r\n重量不合格,报废"; + infolabel.ForeColor = Color.Red; + + HintMassageForm psd = new HintMassageForm($"重量{Weigh_Num}，超出{cfgSlushMolding_STR}标准范围!重量不合格,报废"); + + var result = psd.ShowDialog(); + + state = false; } - else + WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff") + "--标准范围内"); + SaveProduct(); + foreach (var t in List_tSWeighRecores) + { + t.Weigh = Weigh_str; + agent.InvokeServiceFunction>(QMAPP.ServicesAgent.DictService.TSWeighRecoreBLL_Insert.ToString(), t); + } + List_tSWeighRecores = new List(); + this.TBRCV.Text = str.ToUpper(); + + var SP2 = cfgSlushMolding2_STR.Split(','); + var SP_Begin2 = Convert.ToInt32(SP2[0]); + var SP_End2 = Convert.ToInt32(SP2[1]); + WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff") + "--预警区间--" + cfgSlushMolding2_STR); + if ((SP_End2 <= Weigh_Num || Weigh_Num <= SP_Begin2) && state == true) { - this.TBRCV.Text = $"重量{Weigh_Num}，超出{_cfgSlushMolding}安全区间!"; - infolabel.Text = $"重量{Weigh_Num}，超出{_cfgSlushMolding}安全区间!"; + this.TBRCV.Text = $"重量{Weigh_Num}!到达{SP_End2},{SP_End}预警区间!请尽快调整重量！"; + infolabel.Text = $"重量{Weigh_Num}!到达{SP_End2},{SP_End}预警区间 \r\n请尽快调整重量！"; + infolabel.ForeColor = Color.Coral; + state2 = false; } - + if (state == true && state2 == true) + { + this.TBRCV.Text = ""; + infolabel.Text = ""; + } + WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff") + "--完成"); + } else { - this.TBRCV.Text = "未配置安全区间"; - infolabel.Text = "未配置安全区间"; + this.TBRCV.Text = "未配置标准范围"; + infolabel.Text = "未配置标准范围"; + infolabel.ForeColor = Color.Red; } - + } else { Weigh_str = "接收错误"; this.TBRCV.Text = str.ToUpper() + "接收错误 CRC有误"; infolabel.Text = str.ToUpper() + "接收错误 CRC有误"; + infolabel.ForeColor = Color.Red; } } catch @@ -836,7 +904,7 @@ namespace QMAPP.WinForm.Forms.Injection MessageBox.Show("strToToHexByte!"); return new byte[] { }; } - + } public static byte[] addCrcHexByte(byte[] strHexByte) { @@ -866,7 +934,7 @@ namespace QMAPP.WinForm.Forms.Injection MessageBox.Show("addCrcHexByte!"); return new byte[] { }; } - + } public static byte[] callcrc(byte[] ss, int num) { @@ -900,9 +968,9 @@ namespace QMAPP.WinForm.Forms.Injection MessageBox.Show("callcrc!"); return new byte[] { }; } - + } - + /// /// 打开设备通讯 /// @@ -912,6 +980,10 @@ namespace QMAPP.WinForm.Forms.Injection { try { + //HintMassageForm psd = new HintMassageForm($"重量13245!超出100-300标准范围!请尽快调整重量!"); + + //var result = psd.ShowDialog(); + if (CodeName == "") { comboBox1_SelectedIndexChanged(sender, e); @@ -934,7 +1006,7 @@ namespace QMAPP.WinForm.Forms.Injection { MessageBox.Show("btnCom_Click!"); } - + } /// @@ -944,7 +1016,8 @@ namespace QMAPP.WinForm.Forms.Injection /// private void btnCommSend_Click(object sender, EventArgs e) { - try { + try + { //btnCom_Click(); if (serialPort1.IsOpen) { @@ -969,7 +1042,7 @@ namespace QMAPP.WinForm.Forms.Injection { MessageBox.Show("btnCommSend_Click!"); } - + } #endregion @@ -988,5 +1061,28 @@ namespace QMAPP.WinForm.Forms.Injection return null; } + + + private void comColor_SelectedIndexChanged(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(ColorPrint) && ColorPrint != this.comColor.SelectedValue.ToString()) + { + UpdatePasswordForm psd = new UpdatePasswordForm(); + var color = this.comColor.SelectedValue.ToString(); + var result = psd.ShowDialog(); + if (result.ToString() != "OK") + { + if (color != ColorPrint) + { + this.comColor.SelectedValue = ColorPrint; + } + } + else + { + ColorPrint = this.comColor.SelectedValue.ToString(); + } + } + + } } } diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/UpdatePasswordForm.cs b/APPQ5/QMAPP.WinForm/Forms/Injection/UpdatePasswordForm.cs new file mode 100644 index 0000000..e40741f --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/Injection/UpdatePasswordForm.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using QMAPP.FJC.Entity.Operation; +using QMAPP.Entity; +using QMAPP.ServicesAgent; +using QMAPP.MD.Entity; +using QMAPP.FJC.Entity.Basic; +using QMAPP.WinForm.Common; +using QMAPP.FJC.Entity; +using QMAPP.FJC.Entity.BZD; + +namespace QMAPP.WinForm.Forms.Injection +{ + public partial class UpdatePasswordForm : Form + { + //获取服务代理 + QMAPP.ServicesAgent.ServiceAgent _agent = ClientContext.GetServiceAgent(); + + List _bzdConfig = null; + + Product _CurrentProduct = null; + + public UpdatePasswordForm() + { + InitializeComponent(); + infolabel.Text = ""; + infolabel.ForeColor = Color.Red; + } + + + #region 打印按钮 + + /// + /// 打印按钮 + /// + /// + /// + private void button1_Click(object sender, EventArgs e) + { + try + { + string MakeUpBZD = ""; + DataTable dataTable = _agent.InvokeServiceFunction(B9IPCService.BZDConfigBLL_GetAppConfigValue.ToString(), "MakeUpBZD"); + if (dataTable.Rows.Count > 0) + { + MakeUpBZD = dataTable.Rows[0]["Value"].ToString(); + } + + if (string.IsNullOrEmpty(MakeUpBZD)) + MakeUpBZD = "admin"; + if (string.IsNullOrEmpty(txtMainCode.Text)) + { + infolabel.Text = "请输入密码！"; + this.Show(); + + } + if (txtMainCode.Text == MakeUpBZD) + { + this.DialogResult = DialogResult.OK; + this.Close(); + + } + else + { + infolabel.Text = "密码输入错误！"; + this.Show(); + + } + + } + catch (Exception exception) + { + //MessageBox.Show("打印失败！"); + throw; + } + } + + #endregion + + } +} \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/UpdatePasswordForm.designer.cs b/APPQ5/QMAPP.WinForm/Forms/Injection/UpdatePasswordForm.designer.cs new file mode 100644 index 0000000..8e02baf --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/Injection/UpdatePasswordForm.designer.cs @@ -0,0 +1,126 @@ +namespace QMAPP.WinForm.Forms.Injection +{ + partial class UpdatePasswordForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.txtMainCode = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.infolabel = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("宋体", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(184, 30); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(245, 37); + this.label1.TabIndex = 0; + this.label1.Text = "信息变更确认"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(27, 127); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(106, 24); + this.label3.TabIndex = 2; + this.label3.Text = "输入密码"; + // + // txtMainCode + // + this.txtMainCode.BackColor = System.Drawing.SystemColors.Window; + this.txtMainCode.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtMainCode.Location = new System.Drawing.Point(153, 122); + this.txtMainCode.Name = "txtMainCode"; + this.txtMainCode.PasswordChar = '*'; + this.txtMainCode.Size = new System.Drawing.Size(341, 35); + this.txtMainCode.TabIndex = 4; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.button1.Location = new System.Drawing.Point(520, 122); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(123, 35); + this.button1.TabIndex = 5; + this.button1.Text = "确认"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // infolabel + // + this.infolabel.AutoSize = true; + this.infolabel.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.infolabel.ForeColor = System.Drawing.Color.Red; + this.infolabel.Location = new System.Drawing.Point(157, 170); + this.infolabel.Name = "infolabel"; + this.infolabel.Size = new System.Drawing.Size(0, 31); + this.infolabel.TabIndex = 6; + // + // label2 + // + this.label2.Location = new System.Drawing.Point(246, 11); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(75, 18); + this.label2.TabIndex = 0; + // + // UpdatePasswordForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(665, 235); + this.Controls.Add(this.label2); + this.Controls.Add(this.infolabel); + this.Controls.Add(this.button1); + this.Controls.Add(this.txtMainCode); + this.Controls.Add(this.label3); + this.Controls.Add(this.label1); + this.Name = "UpdatePasswordForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "信息变更确认"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox txtMainCode; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Label infolabel; + private System.Windows.Forms.Label label2; + } +} \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/UpdatePasswordForm.resx b/APPQ5/QMAPP.WinForm/Forms/Injection/UpdatePasswordForm.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/APPQ5/QMAPP.WinForm/Forms/Injection/UpdatePasswordForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs index e94d177..98a9e45 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs @@ -29,37 +29,37 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OperationForm)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle60 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle55 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle56 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle57 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle59 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel2 = new System.Windows.Forms.Panel(); this.tBMat = new System.Windows.Forms.TextBox(); this.cBoxVAN = new System.Windows.Forms.CheckBox(); @@ -111,7 +111,7 @@ this.btnEditProduct = new System.Windows.Forms.ToolStripButton(); this.btnRefresh = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.panel4 = new System.Windows.Forms.Panel(); this.plInfo = new System.Windows.Forms.Panel(); this.gbMlist = new System.Windows.Forms.GroupBox(); @@ -415,14 +415,14 @@ this.DGView.AllowUserToDeleteRows = false; this.DGView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.DGView.BackgroundColor = System.Drawing.SystemColors.ButtonFace; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle31.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold); + dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31; this.DGView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.DGView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgcMouldCode, @@ -435,28 +435,28 @@ this.davalue, this.daresult, this.Pid}); - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle11.Padding = new System.Windows.Forms.Padding(0, 0, 14, 0); - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.DGView.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle41.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle41.Padding = new System.Windows.Forms.Padding(0, 0, 14, 0); + dataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.DGView.DefaultCellStyle = dataGridViewCellStyle41; this.DGView.Dock = System.Windows.Forms.DockStyle.Fill; this.DGView.GridColor = System.Drawing.SystemColors.ControlDarkDark; this.DGView.Location = new System.Drawing.Point(0, 0); this.DGView.Name = "DGView"; this.DGView.ReadOnly = true; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle42.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle42.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle42.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle42.SelectionBackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle42.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle42; this.DGView.RowTemplate.Height = 30; this.DGView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.DGView.Size = new System.Drawing.Size(1698, 127); @@ -467,9 +467,9 @@ // dgcMouldCode // this.dgcMouldCode.DataPropertyName = "MouldCode"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold); - this.dgcMouldCode.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle32.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold); + this.dgcMouldCode.DefaultCellStyle = dataGridViewCellStyle32; this.dgcMouldCode.HeaderText = "模架编号"; this.dgcMouldCode.Name = "dgcMouldCode"; this.dgcMouldCode.ReadOnly = true; @@ -479,8 +479,8 @@ // dgcMouldName // this.dgcMouldName.DataPropertyName = "MouldName"; - dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 15.25F, System.Drawing.FontStyle.Bold); - this.dgcMouldName.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle33.Font = new System.Drawing.Font("微软雅黑", 15.25F, System.Drawing.FontStyle.Bold); + this.dgcMouldName.DefaultCellStyle = dataGridViewCellStyle33; this.dgcMouldName.HeaderText = "模架"; this.dgcMouldName.Name = "dgcMouldName"; this.dgcMouldName.ReadOnly = true; @@ -489,8 +489,8 @@ // daname // this.daname.DataPropertyName = "DAName"; - dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F); - this.daname.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle34.Font = new System.Drawing.Font("宋体", 15.75F); + this.daname.DefaultCellStyle = dataGridViewCellStyle34; this.daname.HeaderText = "采集项名称"; this.daname.Name = "daname"; this.daname.ReadOnly = true; @@ -499,8 +499,8 @@ // statename // this.statename.DataPropertyName = "StateName"; - dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statename.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle35.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statename.DefaultCellStyle = dataGridViewCellStyle35; this.statename.HeaderText = "采集时序"; this.statename.Name = "statename"; this.statename.ReadOnly = true; @@ -510,8 +510,8 @@ // datype // this.datype.DataPropertyName = "DAType"; - dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F); - this.datype.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle36.Font = new System.Drawing.Font("宋体", 15.75F); + this.datype.DefaultCellStyle = dataGridViewCellStyle36; this.datype.HeaderText = "数据类型"; this.datype.Name = "datype"; this.datype.ReadOnly = true; @@ -521,8 +521,8 @@ // this.materialtypename.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.materialtypename.DataPropertyName = "MaterialCode"; - dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F); - this.materialtypename.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle37.Font = new System.Drawing.Font("宋体", 15.75F); + this.materialtypename.DefaultCellStyle = dataGridViewCellStyle37; this.materialtypename.FillWeight = 50F; this.materialtypename.HeaderText = "物料类型"; this.materialtypename.Name = "materialtypename"; @@ -532,8 +532,8 @@ // this.dgcDAMaterialCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dgcDAMaterialCode.DataPropertyName = "MaterialName"; - dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgcDAMaterialCode.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle38.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcDAMaterialCode.DefaultCellStyle = dataGridViewCellStyle38; this.dgcDAMaterialCode.FillWeight = 50F; this.dgcDAMaterialCode.HeaderText = "物料名称"; this.dgcDAMaterialCode.Name = "dgcDAMaterialCode"; @@ -543,8 +543,8 @@ // this.davalue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.davalue.DataPropertyName = "DAValue"; - dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 15.75F); - this.davalue.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle39.Font = new System.Drawing.Font("宋体", 15.75F); + this.davalue.DefaultCellStyle = dataGridViewCellStyle39; this.davalue.HeaderText = "采集值"; this.davalue.Name = "davalue"; this.davalue.ReadOnly = true; @@ -552,8 +552,8 @@ // daresult // this.daresult.DataPropertyName = "DAResult"; - dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 15.75F); - this.daresult.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle40.Font = new System.Drawing.Font("宋体", 15.75F); + this.daresult.DefaultCellStyle = dataGridViewCellStyle40; this.daresult.HeaderText = "结果"; this.daresult.Name = "daresult"; this.daresult.ReadOnly = true; @@ -588,7 +588,7 @@ this.btnEditProduct, this.btnRefresh, this.toolStripButton1, - this.toolStripButton4}); + this.toolStripButton3}); this.toolStrip1.Location = new System.Drawing.Point(0, 380); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(1698, 70); @@ -812,16 +812,17 @@ this.toolStripButton1.Text = "缺陷统计卡"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // - // toolStripButton4 + // toolStripButton3 // - this.toolStripButton4.AutoSize = false; - this.toolStripButton4.Font = new System.Drawing.Font("微软雅黑", 12F); - this.toolStripButton4.Image = global::QMAPP.WinForm.Resource1.print1; - this.toolStripButton4.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.White; - this.toolStripButton4.Name = "toolStripButton4"; - this.toolStripButton4.Size = new System.Drawing.Size(140, 60); - this.toolStripButton4.Text = "补打总成码"; + this.toolStripButton3.AutoSize = false; + this.toolStripButton3.Font = new System.Drawing.Font("微软雅黑", 12F); + this.toolStripButton3.Image = global::QMAPP.WinForm.Resource1.print1; + this.toolStripButton3.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.White; + this.toolStripButton3.Name = "toolStripButton3"; + this.toolStripButton3.Size = new System.Drawing.Size(140, 60); + this.toolStripButton3.Text = "补打总成码"; + this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // // panel4 // @@ -1042,14 +1043,14 @@ this.dgvPlan.AllowUserToDeleteRows = false; this.dgvPlan.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.dgvPlan.BackgroundColor = System.Drawing.SystemColors.ButtonFace; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle43.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43; this.dgvPlan.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvPlan.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgcOrderNo, @@ -1067,16 +1068,16 @@ this.dgvPlan.Location = new System.Drawing.Point(0, 0); this.dgvPlan.Name = "dgvPlan"; this.dgvPlan.ReadOnly = true; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle21.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle21; - dataGridViewCellStyle22.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); - this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle22; + dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle51.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle51.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle51.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle51.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle51.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle51.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle51; + dataGridViewCellStyle52.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); + this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle52; this.dgvPlan.RowTemplate.Height = 23; this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvPlan.Size = new System.Drawing.Size(1525, 27); @@ -1087,8 +1088,8 @@ // dgcOrderNo // this.dgcOrderNo.DataPropertyName = "ORDERPLAN_NO"; - dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle44.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle44; this.dgcOrderNo.HeaderText = "订单号"; this.dgcOrderNo.Name = "dgcOrderNo"; this.dgcOrderNo.ReadOnly = true; @@ -1097,8 +1098,8 @@ // dgcSeq // this.dgcSeq.DataPropertyName = "SEQ"; - dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle45.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle45; this.dgcSeq.HeaderText = "顺序号"; this.dgcSeq.Name = "dgcSeq"; this.dgcSeq.ReadOnly = true; @@ -1107,8 +1108,8 @@ // dgcMaterialCode // this.dgcMaterialCode.DataPropertyName = "MATERIAL_CODE"; - dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle46.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle46; this.dgcMaterialCode.HeaderText = "零件号"; this.dgcMaterialCode.Name = "dgcMaterialCode"; this.dgcMaterialCode.ReadOnly = true; @@ -1117,8 +1118,8 @@ // dgcMaterialName // this.dgcMaterialName.DataPropertyName = "MATERIAL_NAME"; - dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle47.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle47; this.dgcMaterialName.HeaderText = "零件描述"; this.dgcMaterialName.Name = "dgcMaterialName"; this.dgcMaterialName.ReadOnly = true; @@ -1126,8 +1127,8 @@ // // dgcState // - dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgcState.DefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle48.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcState.DefaultCellStyle = dataGridViewCellStyle48; this.dgcState.HeaderText = "工单状态"; this.dgcState.MinimumWidth = 80; this.dgcState.Name = "dgcState"; @@ -1137,8 +1138,8 @@ // dgcPlanDate // this.dgcPlanDate.DataPropertyName = "PLAN_DATE"; - dataGridViewCellStyle19.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle49.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle49; this.dgcPlanDate.HeaderText = "计划日期"; this.dgcPlanDate.Name = "dgcPlanDate"; this.dgcPlanDate.ReadOnly = true; @@ -1147,8 +1148,8 @@ // dgcShift // this.dgcShift.DataPropertyName = "SHIFT_CODE"; - dataGridViewCellStyle20.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcShift.DefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle50.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcShift.DefaultCellStyle = dataGridViewCellStyle50; this.dgcShift.HeaderText = "班次"; this.dgcShift.Name = "dgcShift"; this.dgcShift.ReadOnly = true; @@ -1322,14 +1323,14 @@ this.DGViewProList.AllowUserToDeleteRows = false; this.DGViewProList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.DGViewProList.BackgroundColor = System.Drawing.SystemColors.ButtonFace; - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle23.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DGViewProList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle23; + dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle53.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle53.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle53.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle53.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle53.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DGViewProList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle53; this.DGViewProList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.DGViewProList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.PRODUCTCODE, @@ -1346,14 +1347,14 @@ this.DGViewProList.Location = new System.Drawing.Point(0, 0); this.DGViewProList.Name = "DGViewProList"; this.DGViewProList.ReadOnly = true; - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle30.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.DGViewProList.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; + dataGridViewCellStyle60.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle60.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle60.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle60.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle60.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle60.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle60.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.DGViewProList.RowHeadersDefaultCellStyle = dataGridViewCellStyle60; this.DGViewProList.RowTemplate.Height = 23; this.DGViewProList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.DGViewProList.Size = new System.Drawing.Size(1690, 27); @@ -1364,8 +1365,8 @@ // this.PRODUCTCODE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.PRODUCTCODE.DataPropertyName = "PRODUCTCODE"; - dataGridViewCellStyle24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle24; + dataGridViewCellStyle54.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle54; this.PRODUCTCODE.FillWeight = 29.82234F; this.PRODUCTCODE.HeaderText = "条码"; this.PRODUCTCODE.Name = "PRODUCTCODE"; @@ -1376,8 +1377,8 @@ // this.PRODUCTCODESTR.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.PRODUCTCODESTR.DataPropertyName = "PRODUCTCODESTR"; - dataGridViewCellStyle25.Font = new System.Drawing.Font("宋体", 15.75F); - this.PRODUCTCODESTR.DefaultCellStyle = dataGridViewCellStyle25; + dataGridViewCellStyle55.Font = new System.Drawing.Font("宋体", 15.75F); + this.PRODUCTCODESTR.DefaultCellStyle = dataGridViewCellStyle55; this.PRODUCTCODESTR.HeaderText = "骨架条码"; this.PRODUCTCODESTR.Name = "PRODUCTCODESTR"; this.PRODUCTCODESTR.ReadOnly = true; @@ -1388,8 +1389,8 @@ // this.MOLDNUMBER.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.MOLDNUMBER.DataPropertyName = "MOLDNUMBER"; - dataGridViewCellStyle26.Font = new System.Drawing.Font("宋体", 15.75F); - this.MOLDNUMBER.DefaultCellStyle = dataGridViewCellStyle26; + dataGridViewCellStyle56.Font = new System.Drawing.Font("宋体", 15.75F); + this.MOLDNUMBER.DefaultCellStyle = dataGridViewCellStyle56; this.MOLDNUMBER.FillWeight = 380.7106F; this.MOLDNUMBER.HeaderText = "模架号"; this.MOLDNUMBER.Name = "MOLDNUMBER"; @@ -1400,8 +1401,8 @@ // this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn2.DataPropertyName = "OPERATESTATETEXT"; - dataGridViewCellStyle27.Font = new System.Drawing.Font("宋体", 15.75F); - this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle27; + dataGridViewCellStyle57.Font = new System.Drawing.Font("宋体", 15.75F); + this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle57; this.dataGridViewTextBoxColumn2.FillWeight = 29.82234F; this.dataGridViewTextBoxColumn2.HeaderText = "加工状态"; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; @@ -1412,8 +1413,8 @@ // this.Column5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.Column5.DataPropertyName = "CREATEDATE"; - dataGridViewCellStyle28.Font = new System.Drawing.Font("宋体", 15.75F); - this.Column5.DefaultCellStyle = dataGridViewCellStyle28; + dataGridViewCellStyle58.Font = new System.Drawing.Font("宋体", 15.75F); + this.Column5.DefaultCellStyle = dataGridViewCellStyle58; this.Column5.FillWeight = 29.82234F; this.Column5.HeaderText = "加工时间"; this.Column5.Name = "Column5"; @@ -1424,8 +1425,8 @@ // this.OPERATEDDATE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.OPERATEDDATE.DataPropertyName = "OPERATEDDATE"; - dataGridViewCellStyle29.Font = new System.Drawing.Font("宋体", 15.75F); - this.OPERATEDDATE.DefaultCellStyle = dataGridViewCellStyle29; + dataGridViewCellStyle59.Font = new System.Drawing.Font("宋体", 15.75F); + this.OPERATEDDATE.DefaultCellStyle = dataGridViewCellStyle59; this.OPERATEDDATE.FillWeight = 29.82234F; this.OPERATEDDATE.HeaderText = "加工完成时间"; this.OPERATEDDATE.Name = "OPERATEDDATE"; @@ -1615,6 +1616,6 @@ private System.Windows.Forms.CheckBox cBoxVAN; private System.Windows.Forms.TextBox tBMat; private System.Windows.Forms.ToolStripButton btnSignInfo; - private System.Windows.Forms.ToolStripButton toolStripButton4; + private System.Windows.Forms.ToolStripButton toolStripButton3; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs index eb0eb8d..13b7b02 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs @@ -3648,5 +3648,6 @@ namespace QMAPP.WinForm.Forms.Operation frm.ShowDialog(); } #endregion + } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx index 883eec3..e52e3a1 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx @@ -505,89 +505,89 @@ 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 - AAAASUVORK5CYII= + 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 + AABJRU5ErkJggg== @@ -599,6 +599,15 @@ True + + True + + + True + + + True + True diff --git a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj index 2904d64..90aeed3 100644 --- a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj +++ b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj @@ -283,6 +283,18 @@ DPShipment.cs + + Form + + + HintMassageForm.cs + + + Form + + + UpdatePasswordForm.cs + Form @@ -1071,6 +1083,12 @@ DPShipment.cs + + HintMassageForm.cs + + + UpdatePasswordForm.cs + InjectionMoldingPasswordForm.cs diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index 16d8ddf..0b3e916 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -66,7 +66,7 @@ - +