lu
2025-05-30 606301cef5356197f93c54d8b1c77b345149c7c2
异常备注
已添加9个文件
已修改13个文件
739 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeCk.Designer.cs 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeCk.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeFqc.Designer.cs 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeFqc.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeQc.Designer.cs 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeQc.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.Designer.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRk.Designer.cs 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRk.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeXianChang.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs 158 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs 92 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcDictionaryComBox.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeCk.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
namespace Gs.DevApp.DevFrm.QC
{
    partial class DefectCodeCk
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("仓库基础资料");
            this.SuspendLayout();
            //
            // defectCode1
            //
            this.defectCode1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.defectCode1.Location = new System.Drawing.Point(0, 0);
            this.defectCode1.Name = "defectCode1";
            this.defectCode1.Size = new System.Drawing.Size(1001, 568);
            this.defectCode1.TabIndex = 0;
            //
            // DefectCodeDic
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1001, 568);
            this.Controls.Add(this.defectCode1);
            this.Name = "DefectCodeDic";
            this.Text = "字典-仓库基础资料";
            this.ResumeLayout(false);
        }
        #endregion
        private DefectCode defectCode1;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeCk.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
{
    public partial class DefectCodeCk : DevExpress.XtraEditors.XtraForm
    {
        public DefectCodeCk()
        {
            InitializeComponent();
        }
    }
}
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeDic.Designer.cs
@@ -46,7 +46,7 @@
            this.ClientSize = new System.Drawing.Size(1001, 568);
            this.Controls.Add(this.defectCode1);
            this.Name = "DefectCodeDic";
            this.Text = "DefectCodeDic";
            this.Text = "字典-普通信息";
            this.ResumeLayout(false);
        }
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeFqc.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
namespace Gs.DevApp.DevFrm.QC
{
    partial class DefectCodeFqc
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("FQC信息");
            this.SuspendLayout();
            //
            // defectCode1
            //
            this.defectCode1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.defectCode1.Location = new System.Drawing.Point(0, 0);
            this.defectCode1.Name = "defectCode1";
            this.defectCode1.Size = new System.Drawing.Size(1001, 568);
            this.defectCode1.TabIndex = 0;
            //
            // DefectCodeDic
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1001, 568);
            this.Controls.Add(this.defectCode1);
            this.Name = "DefectCodeDic";
            this.Text = "字典-FQC信息";
            this.ResumeLayout(false);
        }
        #endregion
        private DefectCode defectCode1;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeFqc.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
{
    public partial class DefectCodeFqc : DevExpress.XtraEditors.XtraForm
    {
        public DefectCodeFqc()
        {
            InitializeComponent();
        }
    }
}
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeQc.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
namespace Gs.DevApp.DevFrm.QC
{
    partial class DefectCodeQc
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("QC基础资料");
            this.SuspendLayout();
            //
            // defectCode1
            //
            this.defectCode1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.defectCode1.Location = new System.Drawing.Point(0, 0);
            this.defectCode1.Name = "defectCode1";
            this.defectCode1.Size = new System.Drawing.Size(1001, 568);
            this.defectCode1.TabIndex = 0;
            //
            // DefectCodeDic
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1001, 568);
            this.Controls.Add(this.defectCode1);
            this.Name = "DefectCodeDic";
            this.Text = "字典-QC信息";
            this.ResumeLayout(false);
        }
        #endregion
        private DefectCode defectCode1;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeQc.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
{
    public partial class DefectCodeQc : DevExpress.XtraEditors.XtraForm
    {
        public DefectCodeQc()
        {
            InitializeComponent();
        }
    }
}
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.Designer.cs
@@ -30,6 +30,7 @@
        {
            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("认证信息");
            this.SuspendLayout();
            // 
            // defectCode1
            // 
@@ -39,14 +40,14 @@
            this.defectCode1.Size = new System.Drawing.Size(1001, 568);
            this.defectCode1.TabIndex = 0;
            // 
            // DefectCodeDic
            // DefectCodeRenZheng
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1001, 568);
            this.Controls.Add(this.defectCode1);
            this.Name = "DefectCodeDic";
            this.Text = "DefectCodeDic";
            this.Name = "DefectCodeRenZheng";
            this.Text = "字典-认证信息";
            this.ResumeLayout(false);
        }
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRenZheng.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRk.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
namespace Gs.DevApp.DevFrm.QC
{
    partial class DefectCodeRk
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("其它入库资料");
            this.SuspendLayout();
            //
            // defectCode1
            //
            this.defectCode1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.defectCode1.Location = new System.Drawing.Point(0, 0);
            this.defectCode1.Name = "defectCode1";
            this.defectCode1.Size = new System.Drawing.Size(1001, 568);
            this.defectCode1.TabIndex = 0;
            //
            // DefectCodeDic
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1001, 568);
            this.Controls.Add(this.defectCode1);
            this.Name = "DefectCodeDic";
            this.Text = "字典-仓库基础资料";
            this.ResumeLayout(false);
        }
        #endregion
        private DefectCode defectCode1;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeRk.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
{
    public partial class DefectCodeRk : DevExpress.XtraEditors.XtraForm
    {
        public DefectCodeRk()
        {
            InitializeComponent();
        }
    }
}
DevApp/Gs.DevApp/DevFrm/QC/DefectCodeXianChang.Designer.cs
@@ -28,7 +28,7 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("现场信息");
            this.defectCode1 = new Gs.DevApp.DevFrm.QC.DefectCode("现场基础资料");
            this.SuspendLayout();
            // 
            // defectCode1
@@ -46,7 +46,7 @@
            this.ClientSize = new System.Drawing.Size(1001, 568);
            this.Controls.Add(this.defectCode1);
            this.Name = "DefectCodeDic";
            this.Text = "DefectCodeDic";
            this.Text = "字典-现场信息";
            this.ResumeLayout(false);
        }
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
@@ -36,7 +36,7 @@
                getMode(strGuid);
                this.Text = "更新【" + txt_defectName.Text + "】";
                txt_sType.Enabled = false;
                txt_defectCode.Enabled = false;
                txt_defectCode.ReadOnly = true;
                return;
            }
            //这是增加子项
@@ -45,7 +45,7 @@
                getMode(strUpGuid);
                this.Text = "增加【" + txt_defectName.Text + "】的子项目";
                txt_sType.Enabled = false;
                txt_defectCode.Enabled = true;
                txt_defectCode.ReadOnly = false;
                txt_defectCode.Text = "";
                txt_defectName.Text = "";
                return;
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -30,22 +30,22 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -846,13 +846,13 @@
            // 
            // txt_fngDesc
            // 
            this.txt_fngDesc.BtnTxt = "异常备注";
            this.txt_fngDesc.BtnTxt = "异常描述";
            this.txt_fngDesc.Location = new System.Drawing.Point(12, 162);
            this.txt_fngDesc.Name = "txt_fngDesc";
            this.txt_fngDesc.Size = new System.Drawing.Size(656, 57);
            this.txt_fngDesc.TabIndex = 815;
            this.txt_fngDesc.TextTxt = "";
            this.txt_fngDesc.WhereTxt = "s_type=\'IQC缺陷描述\' and pid<>\'00000000-0000-0000-0000-000000000000\'";
            this.txt_fngDesc.WhereTxt = " a.s_type=\'QC异常描述\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
            // 
            // btnYcReport
            // 
@@ -1171,41 +1171,41 @@
            this.layoutControlItem29});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition11.Width = 100D;
            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12.Width = 100D;
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition9,
            columnDefinition10,
            columnDefinition11,
            columnDefinition12});
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition12.Height = 100D;
            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition13.Height = 100D;
            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition14.Height = 100D;
            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition15.Height = 31D;
            rowDefinition15.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 31D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.AutoSize;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition9,
            rowDefinition10,
            rowDefinition11,
            rowDefinition12,
            rowDefinition13,
            rowDefinition14,
            rowDefinition15});
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6,
            rowDefinition7});
            this.Root.Size = new System.Drawing.Size(1342, 231);
            this.Root.TextVisible = false;
            // 
@@ -1585,7 +1585,7 @@
            this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
            this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
            this.gvMx1fspecRequ.Visible = true;
            this.gvMx1fspecRequ.VisibleIndex = 3;
            this.gvMx1fspecRequ.VisibleIndex = 2;
            this.gvMx1fspecRequ.Width = 120;
            // 
            // gvMx1fupAllow
@@ -1597,7 +1597,7 @@
            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
            this.gvMx1fupAllow.Tag = "query_a.fup_allow";
            this.gvMx1fupAllow.Visible = true;
            this.gvMx1fupAllow.VisibleIndex = 4;
            this.gvMx1fupAllow.VisibleIndex = 3;
            this.gvMx1fupAllow.Width = 50;
            // 
            // gvMx1fstand
@@ -1609,7 +1609,7 @@
            this.gvMx1fstand.Name = "gvMx1fstand";
            this.gvMx1fstand.Tag = "query_a.fstand";
            this.gvMx1fstand.Visible = true;
            this.gvMx1fstand.VisibleIndex = 5;
            this.gvMx1fstand.VisibleIndex = 4;
            this.gvMx1fstand.Width = 70;
            // 
            // gvMx1fdownAllow
@@ -1621,7 +1621,7 @@
            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
            this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
            this.gvMx1fdownAllow.Visible = true;
            this.gvMx1fdownAllow.VisibleIndex = 6;
            this.gvMx1fdownAllow.VisibleIndex = 5;
            this.gvMx1fdownAllow.Width = 50;
            // 
            // gvMx1freQty
@@ -1633,7 +1633,7 @@
            this.gvMx1freQty.Name = "gvMx1freQty";
            this.gvMx1freQty.Tag = "query_a.fre_qty";
            this.gvMx1freQty.Visible = true;
            this.gvMx1freQty.VisibleIndex = 7;
            this.gvMx1freQty.VisibleIndex = 6;
            this.gvMx1freQty.Width = 50;
            // 
            // gvMx1checkQyt
@@ -1645,7 +1645,7 @@
            this.gvMx1checkQyt.Name = "gvMx1checkQyt";
            this.gvMx1checkQyt.Tag = "query_a.check_qyt";
            this.gvMx1checkQyt.Visible = true;
            this.gvMx1checkQyt.VisibleIndex = 8;
            this.gvMx1checkQyt.VisibleIndex = 7;
            this.gvMx1checkQyt.Width = 60;
            // 
            // gvMx1fenterQty
@@ -1657,7 +1657,7 @@
            this.gvMx1fenterQty.Name = "gvMx1fenterQty";
            this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
            this.gvMx1fenterQty.Visible = true;
            this.gvMx1fenterQty.VisibleIndex = 9;
            this.gvMx1fenterQty.VisibleIndex = 8;
            this.gvMx1fenterQty.Width = 60;
            // 
            // gvMx1fcheckResu
@@ -1673,7 +1673,7 @@
            this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
            this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
            this.gvMx1fcheckResu.Visible = true;
            this.gvMx1fcheckResu.VisibleIndex = 10;
            this.gvMx1fcheckResu.VisibleIndex = 9;
            this.gvMx1fcheckResu.Width = 94;
            // 
            // gvMx1fngRate
@@ -1685,7 +1685,7 @@
            this.gvMx1fngRate.Name = "gvMx1fngRate";
            this.gvMx1fngRate.Tag = "query_a.fng_rate";
            this.gvMx1fngRate.Visible = true;
            this.gvMx1fngRate.VisibleIndex = 11;
            this.gvMx1fngRate.VisibleIndex = 10;
            this.gvMx1fngRate.Width = 94;
            // 
            // gvMx1fngQty
@@ -1697,7 +1697,7 @@
            this.gvMx1fngQty.Name = "gvMx1fngQty";
            this.gvMx1fngQty.Tag = "query_a.fng_qty";
            this.gvMx1fngQty.Visible = true;
            this.gvMx1fngQty.VisibleIndex = 12;
            this.gvMx1fngQty.VisibleIndex = 11;
            this.gvMx1fngQty.Width = 50;
            // 
            // gvMx1sampleSizeNo
@@ -1709,7 +1709,7 @@
            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
            this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
            this.gvMx1sampleSizeNo.Visible = true;
            this.gvMx1sampleSizeNo.VisibleIndex = 13;
            this.gvMx1sampleSizeNo.VisibleIndex = 12;
            this.gvMx1sampleSizeNo.Width = 200;
            // 
            // gvMx1fcheckLevel
@@ -1721,7 +1721,7 @@
            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
            this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
            this.gvMx1fcheckLevel.Visible = true;
            this.gvMx1fcheckLevel.VisibleIndex = 14;
            this.gvMx1fcheckLevel.VisibleIndex = 13;
            this.gvMx1fcheckLevel.Width = 200;
            // 
            // gvMx1facLevel
@@ -1733,7 +1733,7 @@
            this.gvMx1facLevel.Name = "gvMx1facLevel";
            this.gvMx1facLevel.Tag = "query_a.fac_level";
            this.gvMx1facLevel.Visible = true;
            this.gvMx1facLevel.VisibleIndex = 15;
            this.gvMx1facLevel.VisibleIndex = 14;
            this.gvMx1facLevel.Width = 200;
            // 
            // splitYangLi
@@ -2027,23 +2027,23 @@
            this.layoutControlItem19});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition13.Width = 100D;
            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition14.Width = 100D;
            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition15.Width = 100D;
            columnDefinition16.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition16.Width = 110D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition8.Width = 110D;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition13,
            columnDefinition14,
            columnDefinition15,
            columnDefinition16});
            rowDefinition16.Height = 100D;
            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition16});
            rowDefinition8});
            this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
            this.layoutControlGroup1.TextVisible = false;
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -797,7 +797,7 @@
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(1106, 58);
            this.layoutControlItem3.Text = "不合格描述";
            this.layoutControlItem3.Text = "异常描述";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
            // 
            // tabMx
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -711,7 +711,7 @@
            this.txt_qt003.Size = new System.Drawing.Size(222, 24);
            this.txt_qt003.TabIndex = 333;
            this.txt_qt003.TextTxt = "其它入库(QTRKD01_SYS)";
            this.txt_qt003.WhereTxt = "s_type=\'其它入库单据类型\'  and pid<>\'00000000-0000-0000-0000-000000000000\'";
            this.txt_qt003.WhereTxt = "a.s_type=\'其它入库单据类型\' and  a.pid<>\'00000000-0000-0000-0000-000000000000\'";
            // 
            // lbGuid
            // 
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -31,17 +31,17 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -556,7 +556,7 @@
            this.txt_badReson.Size = new System.Drawing.Size(410, 57);
            this.txt_badReson.TabIndex = 26;
            this.txt_badReson.TextTxt = "";
            this.txt_badReson.WhereTxt = "s_type=\'现场维修不良原因\'   and pid<>\'00000000-0000-0000-0000-000000000000\'";
            this.txt_badReson.WhereTxt = " a.s_type=\'工序不良原因\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
            // 
            // txt_badDescription
            // 
@@ -576,7 +576,7 @@
            this.txt_repairMethd.Size = new System.Drawing.Size(411, 115);
            this.txt_repairMethd.TabIndex = 24;
            this.txt_repairMethd.TextTxt = "";
            this.txt_repairMethd.WhereTxt = "s_type=\'现场维修不良对策\' and pid<>\'00000000-0000-0000-0000-000000000000\'";
            this.txt_repairMethd.WhereTxt = " a.s_type=\'工序不良对策\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
            // 
            // lbGuid
            // 
@@ -706,41 +706,41 @@
            this.layoutControlItem3});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition12.Height = 100D;
            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition13.Height = 100D;
            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition14.Height = 100D;
            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition8,
            rowDefinition9,
            rowDefinition10,
            rowDefinition11,
            rowDefinition12,
            rowDefinition13,
            rowDefinition14});
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6,
            rowDefinition7});
            this.Root.Size = new System.Drawing.Size(849, 226);
            this.Root.TextVisible = false;
            // 
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -49,7 +49,7 @@
            };
            btnBad.Click += (s, e) =>
            {
                UcDictionarySelect frm = new UcDictionarySelect("不良描述", " s_type='工序采集不良项目' and pid<>'00000000-0000-0000-0000-000000000000'");
                UcDictionarySelect frm = new UcDictionarySelect("工序不良描述", " a.s_type='工序不良描述' and pid<>'00000000-0000-0000-0000-000000000000'");
                frm.UpdateParent += (ss, ee) =>
                {
                    System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
@@ -59,7 +59,7 @@
        private bool getConfigDianJian()
        {
            //这是电检数据的路径
            string _where = " and 1=1 and  defect_code='7001'";
            string _where = " and 1=1 and  defect_code='1008'";
            var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
            var json = JsonConvert.SerializeObject(pgq);
            try
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -425,17 +425,23 @@
    <Compile Include="DevFrm\QC\DefectCode.Designer.cs">
      <DependentUpon>DefectCode.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCodeDic.cs">
    <Compile Include="DevFrm\QC\DefectCodeCk.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCodeDic.Designer.cs">
      <DependentUpon>DefectCodeDic.cs</DependentUpon>
    <Compile Include="DevFrm\QC\DefectCodeCk.Designer.cs">
      <DependentUpon>DefectCodeCk.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCodeRenZheng.cs">
    <Compile Include="DevFrm\QC\DefectCodeQc.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCodeRenZheng.Designer.cs">
      <DependentUpon>DefectCodeRenZheng.cs</DependentUpon>
    <Compile Include="DevFrm\QC\DefectCodeQc.Designer.cs">
      <DependentUpon>DefectCodeQc.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCodeRk.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCodeRk.Designer.cs">
      <DependentUpon>DefectCodeRk.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCodeXianChang.cs">
      <SubType>Form</SubType>
@@ -1353,9 +1359,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\DefectCode.resx">
      <DependentUpon>DefectCode.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\DefectCodeDic.resx">
      <DependentUpon>DefectCodeDic.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
      <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
DevApp/Gs.DevApp/UserControl/UcDictionaryComBox.cs
@@ -69,12 +69,11 @@
        {
            txt_qt003.Properties.Items.Clear();
            string _where = " and 1=1 and " + strWhere;
            var pgq = new PageQueryModel(1, 999999, "a.defect_name", "asc", "", _where);
            var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn =
                    UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
                var strReturn = UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                foreach (DataRow row in dt.Rows) {
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
@@ -83,7 +83,7 @@
        /// </summary>
        private void getTree()
        {
            string _where = " and 1=1 and " + this.strWhere;
            string _where = " and 1=1 and a.type1=1 and " + this.strWhere;
            var pgq = new PageQueryModel(1, 999999, "a.defect_name", "asc", "", _where);
            var json = JsonConvert.SerializeObject(pgq);
            try