1
lu
2024-10-25 682ba554722ee374bd8b5a15a1bdb6d61be241cc
1
已修改10个文件
311 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.resx 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmLogin.resx 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Organization.resx 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.resx 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -773,10 +773,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(972, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = "xlsOut_unit{}";
            // 
            // gcMain
            // 
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.resx
@@ -59,8 +59,7 @@
              : using a System.ComponentModel.TypeConverter
              : and then encoded with base64 encoding.
      -->
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
                xmlns="">
  <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>
@@ -68,11 +67,9 @@
                    <xsd:element name="metadata">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
                            </xsd:sequence>
                            <xsd:attribute name="name" use="required"
                                           type="xsd:string"/>
              <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"/>
@@ -87,28 +84,21 @@
                    <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: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 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:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required"/>
              <xsd:attribute name="name" type="xsd:string" use="required" />
                        </xsd:complexType>
                    </xsd:element>
                </xsd:choice>
@@ -122,13 +112,9 @@
        <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>
    <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>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
</root>
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -41,6 +41,7 @@
            this.btnLogin = new DevExpress.XtraEditors.SimpleButton();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.label1 = new System.Windows.Forms.Label();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txtUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.ckRemember.Properties)).BeginInit();
@@ -202,6 +203,17 @@
            this.labelControl1.TabIndex = 231;
            this.labelControl1.Text = "登录帐号:";
            // 
            // label1
            //
            this.label1.AutoSize = true;
            this.label1.BackColor = System.Drawing.Color.Transparent;
            this.label1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.label1.Location = new System.Drawing.Point(13, 779);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(163, 21);
            this.label1.TabIndex = 245;
            this.label1.Text = "技术支持:广深科技";
            //
            // FrmLogin
            // 
            this.Appearance.BackColor = System.Drawing.Color.Black;
@@ -211,6 +223,7 @@
            this.BackgroundImageLayoutStore = System.Windows.Forms.ImageLayout.None;
            this.BackgroundImageStore = global::Gs.DevApp.Properties.Resources.login_bg6;
            this.ClientSize = new System.Drawing.Size(782, 806);
            this.Controls.Add(this.label1);
            this.Controls.Add(this.lbVersion);
            this.Controls.Add(this.panel1);
            this.DoubleBuffered = true;
@@ -242,5 +255,6 @@
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private System.Windows.Forms.ComboBox comOrg;
        private System.Windows.Forms.Label label1;
    }
}
DevApp/Gs.DevApp/DevFrm/FrmLogin.resx
@@ -59,8 +59,7 @@
              : using a System.ComponentModel.TypeConverter
              : and then encoded with base64 encoding.
      -->
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
                xmlns="">
  <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>
@@ -68,11 +67,9 @@
                    <xsd:element name="metadata">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
                            </xsd:sequence>
                            <xsd:attribute name="name" use="required"
                                           type="xsd:string"/>
              <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"/>
@@ -87,28 +84,21 @@
                    <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: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 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:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required"/>
              <xsd:attribute name="name" type="xsd:string" use="required" />
                        </xsd:complexType>
                    </xsd:element>
                </xsd:choice>
@@ -122,20 +112,13 @@
        <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>
    <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>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
    <assembly alias="System.Drawing"
              name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
    <data name="btnCancel.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="btnCancel.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABF0RVh0VGl0
            bGUAQ2xvc2U7RXhpdDsFGf+FAAAArElEQVQ4T7XSOwoCQRCE4c0E8XEDQTMRA+/gTTykGBuYGm6olxBE
@@ -144,9 +127,7 @@
            9JyvWfGPVOx3Bc1ZdQWpA3U147gCvgAAAABJRU5ErkJggg==
        </value>
    </data>
    <data name="btnLogin.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="btnLogin.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0
            bGUATmV3O05ld0VtcGxveWVlO05ld1BlcnNvbjveWVScAAAA3ElEQVQ4T5WOPQ5BQRSF3wYsgohCJXRq
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -342,18 +342,19 @@
        {
            var dataTable = new DataTable();
            dataTable.Columns.Add("docCode", typeof(string));
            dataTable.Rows.Add("DH(到货单)");
            dataTable.Rows.Add("QO(报价单)");
            dataTable.Rows.Add("PO(采购订单)");
            dataTable.Rows.Add("IA(库存调整)");
            dataTable.Rows.Add("IO(出库单)");
            dataTable.Rows.Add("AR(应收款)");
            dataTable.Rows.Add("SO(销售订单)");
            dataTable.Rows.Add("AP(应付款)");
            dataTable.Rows.Add("IV(销售发票)");
            dataTable.Rows.Add("IV(销售发票)");
            dataTable.Rows.Add("IN(入库)");
            dataTable.Rows.Add("PN(生产库)");
            dataTable.Rows.Add("DH(采购到货单)");
            dataTable.Rows.Add("DH(采购检验单)");
            //dataTable.Rows.Add("QO(报价单)");
            //dataTable.Rows.Add("PO(采购订单)");
            //dataTable.Rows.Add("IA(库存调整)");
            //dataTable.Rows.Add("IO(出库单)");
            //dataTable.Rows.Add("AR(应收款)");
            //dataTable.Rows.Add("SO(销售订单)");
            //dataTable.Rows.Add("AP(应付款)");
            //dataTable.Rows.Add("IV(销售发票)");
            //dataTable.Rows.Add("IV(销售发票)");
            //dataTable.Rows.Add("IN(入库)");
            //dataTable.Rows.Add("PN(生产库)");
            txt_docCode.Properties.DataSource = dataTable;
            txt_docCode.Properties.DisplayMember = "docCode"; // 显示的列
            txt_docCode.Properties.ValueMember = "docCode"; // 实际值的列
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -41,7 +41,6 @@
            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
            this.txt_isStatus = new System.Windows.Forms.CheckBox();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
            this.txt_factory = new DevExpress.XtraEditors.TextEdit();
            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
@@ -61,6 +60,7 @@
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_name = new DevExpress.XtraEditors.TextEdit();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.txt_isStatus = new System.Windows.Forms.CheckBox();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -82,11 +82,11 @@
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(772, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            // 
            // xtraTabControl1
            // 
@@ -216,17 +216,6 @@
            this.labelControl13.Size = new System.Drawing.Size(68, 21);
            this.labelControl13.TabIndex = 139;
            this.labelControl13.Text = "审核人:";
            //
            // txt_isStatus
            //
            this.txt_isStatus.AutoSize = true;
            this.txt_isStatus.Checked = true;
            this.txt_isStatus.CheckState = System.Windows.Forms.CheckState.Checked;
            this.txt_isStatus.Location = new System.Drawing.Point(134, 250);
            this.txt_isStatus.Name = "txt_isStatus";
            this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
            this.txt_isStatus.TabIndex = 138;
            this.txt_isStatus.UseVisualStyleBackColor = true;
            // 
            // labelControl10
            // 
@@ -415,6 +404,17 @@
            this.labelControl2.TabIndex = 2;
            this.labelControl2.Text = "组织名称:";
            // 
            // txt_isStatus
            //
            this.txt_isStatus.AutoSize = true;
            this.txt_isStatus.Checked = true;
            this.txt_isStatus.CheckState = System.Windows.Forms.CheckState.Checked;
            this.txt_isStatus.Location = new System.Drawing.Point(134, 250);
            this.txt_isStatus.Name = "txt_isStatus";
            this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
            this.txt_isStatus.TabIndex = 138;
            this.txt_isStatus.UseVisualStyleBackColor = true;
            //
            // Organization
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -466,12 +466,12 @@
        private DevExpress.XtraEditors.TextEdit txt_factory;
        private DevExpress.XtraEditors.LabelControl labelControl9;
        private DevExpress.XtraEditors.LabelControl labelControl10;
        private System.Windows.Forms.CheckBox txt_isStatus;
        private DevExpress.XtraEditors.TextEdit txt_checkDate;
        private DevExpress.XtraEditors.TextEdit txt_checkBy;
        private DevExpress.XtraEditors.LabelControl labelControl14;
        private DevExpress.XtraEditors.LabelControl labelControl13;
        private DevExpress.XtraEditors.LabelControl labelControl15;
        private System.Windows.Forms.Label txt_checkStatus;
        private System.Windows.Forms.CheckBox txt_isStatus;
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/Organization.resx
@@ -59,8 +59,7 @@
              : using a System.ComponentModel.TypeConverter
              : and then encoded with base64 encoding.
      -->
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
                xmlns="">
  <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>
@@ -68,11 +67,9 @@
                    <xsd:element name="metadata">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
                            </xsd:sequence>
                            <xsd:attribute name="name" use="required"
                                           type="xsd:string"/>
              <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"/>
@@ -87,28 +84,21 @@
                    <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: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 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:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required"/>
              <xsd:attribute name="name" type="xsd:string" use="required" />
                        </xsd:complexType>
                    </xsd:element>
                </xsd:choice>
@@ -122,13 +112,9 @@
        <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>
    <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>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
</root>
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1cgRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -128,10 +128,10 @@
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.txt_ischeck = new DevExpress.XtraEditors.CheckEdit();
            this.txt_sapstatus = new DevExpress.XtraEditors.CheckEdit();
            this.ucLookCk1 = new Gs.DevApp.UserControl.UcLookCk();
            this.txt_depotsCode = new Gs.DevApp.UserControl.UcLookCk();
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
            this.ucLookSupplier1 = new Gs.DevApp.UserControl.UcLookSupplier();
            this.txt_suppNo = new Gs.DevApp.UserControl.UcLookSupplier();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
@@ -411,10 +411,12 @@
            // 
            // gvMx1quantity
            // 
            this.gvMx1quantity.AppearanceCell.BorderColor = System.Drawing.Color.Blue;
            this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1quantity.AppearanceCell.Options.UseBorderColor = true;
            this.gvMx1quantity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
            this.gvMx1quantity.AppearanceCell.Options.UseForeColor = true;
            this.gvMx1quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1quantity.Caption = "收货数量 ";
            this.gvMx1quantity.FieldName = "quantity";
            this.gvMx1quantity.MinWidth = 100;
@@ -570,10 +572,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1385,10 +1387,10 @@
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.txt_ischeck);
            this.panel1.Controls.Add(this.txt_sapstatus);
            this.panel1.Controls.Add(this.ucLookCk1);
            this.panel1.Controls.Add(this.txt_depotsCode);
            this.panel1.Controls.Add(this.labelControl3);
            this.panel1.Controls.Add(this.btnSelect);
            this.panel1.Controls.Add(this.ucLookSupplier1);
            this.panel1.Controls.Add(this.txt_suppNo);
            this.panel1.Controls.Add(this.labelControl1);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
@@ -1437,13 +1439,13 @@
            this.txt_sapstatus.Size = new System.Drawing.Size(27, 24);
            this.txt_sapstatus.TabIndex = 446;
            // 
            // ucLookCk1
            // txt_depotsCode
            // 
            this.ucLookCk1.Location = new System.Drawing.Point(98, 86);
            this.ucLookCk1.Margin = new System.Windows.Forms.Padding(0);
            this.ucLookCk1.Name = "ucLookCk1";
            this.ucLookCk1.Size = new System.Drawing.Size(215, 34);
            this.ucLookCk1.TabIndex = 445;
            this.txt_depotsCode.Location = new System.Drawing.Point(98, 86);
            this.txt_depotsCode.Margin = new System.Windows.Forms.Padding(0);
            this.txt_depotsCode.Name = "txt_depotsCode";
            this.txt_depotsCode.Size = new System.Drawing.Size(215, 34);
            this.txt_depotsCode.TabIndex = 445;
            // 
            // labelControl3
            // 
@@ -1464,13 +1466,13 @@
            this.btnSelect.TabIndex = 443;
            this.btnSelect.Text = "去选择";
            // 
            // ucLookSupplier1
            // txt_suppNo
            // 
            this.ucLookSupplier1.Location = new System.Drawing.Point(98, 50);
            this.ucLookSupplier1.Margin = new System.Windows.Forms.Padding(0);
            this.ucLookSupplier1.Name = "ucLookSupplier1";
            this.ucLookSupplier1.Size = new System.Drawing.Size(215, 28);
            this.ucLookSupplier1.TabIndex = 440;
            this.txt_suppNo.Location = new System.Drawing.Point(98, 50);
            this.txt_suppNo.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppNo.Name = "txt_suppNo";
            this.txt_suppNo.Size = new System.Drawing.Size(215, 28);
            this.txt_suppNo.TabIndex = 440;
            // 
            // labelControl1
            // 
@@ -1651,10 +1653,10 @@
 private DevExpress.XtraGrid.Columns.GridColumn gv_id;
 private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private UserControl.UcLookSupplier ucLookSupplier1;
        private UserControl.UcLookSupplier txt_suppNo;
        private DevExpress.XtraEditors.SimpleButton btnSelect;
        private DevExpress.XtraEditors.LabelControl labelControl3;
        private UserControl.UcLookCk ucLookCk1;
        private UserControl.UcLookCk txt_depotsCode;
        private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
        private DevExpress.XtraEditors.LabelControl lb_remark;
        private DevExpress.XtraEditors.TextEdit txt_remark;
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -49,9 +49,9 @@
                    e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
                e.Graphics.DrawString(str, f, Brushes.Gray, r);
            };
            ucLookSupplier1.EditChanged += (s, e) =>
            txt_suppNo.EditChanged += (s, e) =>
            {
                var ddd = ucLookSupplier1.GetValue();
                var ddd = txt_suppNo.GetValue();
                //  lbSupplierName.Text = ddd[1];
            };
            btnSelect.Click += (s, e) =>
@@ -72,9 +72,9 @@
                };
                frm.ShowDialog();
            };
            ucLookCk1.EditChanged += (s, e) =>
            txt_depotsCode.EditChanged += (s, e) =>
            {
                var ddd = ucLookCk1.GetValue();
                var ddd = txt_depotsCode.GetValue();
                //lbCkName.Text = ddd[1];
            };
        }
@@ -264,19 +264,19 @@
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            var _ckCode = ucLookCk1.GetValue()[2]; //仓库编号 depots_code
            var _gysCode = ucLookSupplier1.GetValue()[2]; //供应商编号
            var _ckCode = txt_depotsCode.GetValue()[2]; //仓库编号 depots_code
            var _gysCode = txt_suppNo.GetValue()[2]; //供应商编号
            if (string.IsNullOrEmpty(_ckCode))
            {
                MsgHelper.Warning("请选择仓库!");
                ucLookCk1.Focus();
                txt_depotsCode.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_gysCode))
            {
                MsgHelper.Warning("请选择供应商!");
                ucLookSupplier1.Focus();
                txt_suppNo.Focus();
                return;
            }
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.resx
@@ -59,8 +59,7 @@
              : using a System.ComponentModel.TypeConverter
              : and then encoded with base64 encoding.
      -->
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
                xmlns="">
  <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>
@@ -68,11 +67,9 @@
                    <xsd:element name="metadata">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
                            </xsd:sequence>
                            <xsd:attribute name="name" use="required"
                                           type="xsd:string"/>
              <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"/>
@@ -87,28 +84,21 @@
                    <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: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 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:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required"/>
              <xsd:attribute name="name" type="xsd:string" use="required" />
                        </xsd:complexType>
                    </xsd:element>
                </xsd:choice>
@@ -122,13 +112,9 @@
        <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>
    <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>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
</root>