lu
2024-10-29 fdebc0e6cb9c3ef1dbf33933cdc77e5b90032b5a
整体细微优化
已修改9个文件
209 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookCk.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookItems.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            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();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = 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();
@@ -452,8 +452,6 @@
            this.gvMx1guid.Name = "gvMx1guid";
            this.gvMx1guid.OptionsColumn.ReadOnly = true;
            this.gvMx1guid.Tag = "query_a.guid";
            this.gvMx1guid.Visible = true;
            this.gvMx1guid.VisibleIndex = 0;
            this.gvMx1guid.Width = 100;
            // 
            // tabMxPage1
@@ -518,8 +516,6 @@
            this.gvAbtGuid.MinWidth = 50;
            this.gvAbtGuid.Name = "gvAbtGuid";
            this.gvAbtGuid.OptionsColumn.ReadOnly = true;
            this.gvAbtGuid.Visible = true;
            this.gvAbtGuid.VisibleIndex = 1;
            this.gvAbtGuid.Width = 94;
            // 
            // gvMxDel
@@ -529,16 +525,16 @@
            this.gvMxDel.MinWidth = 80;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 2;
            this.gvMxDel.VisibleIndex = 0;
            this.gvMxDel.Width = 94;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
@@ -637,9 +633,9 @@
            this.lb_ischeck.Appearance.Options.UseFont = true;
            this.lb_ischeck.Location = new System.Drawing.Point(606, 91);
            this.lb_ischeck.Name = "lb_ischeck";
            this.lb_ischeck.Size = new System.Drawing.Size(68, 21);
            this.lb_ischeck.Size = new System.Drawing.Size(102, 21);
            this.lb_ischeck.TabIndex = 319;
            this.lb_ischeck.Text = "检验标志";
            this.lb_ischeck.Text = "是否提交检验";
            // 
            // gv_ischeck
            // 
@@ -731,13 +727,13 @@
            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
            this.gv_checkDate.Caption = "提交日期 ";
            this.gv_checkDate.FieldName = "checkDate";
            this.gv_checkDate.MinWidth = 50;
            this.gv_checkDate.MinWidth = 200;
            this.gv_checkDate.Name = "gv_checkDate";
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.check_date";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 7;
            this.gv_checkDate.Width = 71;
            this.gv_checkDate.Width = 200;
            // 
            // gv_checkUser
            // 
@@ -806,13 +802,13 @@
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "创建时间 ";
            this.gv_createDate.FieldName = "createDate";
            this.gv_createDate.MinWidth = 50;
            this.gv_createDate.MinWidth = 200;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 5;
            this.gv_createDate.Width = 71;
            this.gv_createDate.Width = 200;
            // 
            // gv_createBy
            // 
@@ -859,6 +855,7 @@
            // 
            // txt_billNo
            // 
            this.txt_billNo.Enabled = false;
            this.txt_billNo.Location = new System.Drawing.Point(98, 14);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -872,27 +869,27 @@
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "到货单号 ";
            this.gv_billNo.FieldName = "billNo";
            this.gv_billNo.MinWidth = 50;
            this.gv_billNo.MinWidth = 110;
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.bill_no";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 3;
            this.gv_billNo.Width = 71;
            this.gv_billNo.Width = 110;
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = "MES_INV_ITEM_ARN,check_date,fstatus,check_user";
            this.toolBarMenu1.chkParameter = "MES_INV_ITEM_ARN,check_date,fstatus,check_user,chk_mesInviArn";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.rptParameter = "rpt_InvItem{}";
            this.toolBarMenu1.Size = new System.Drawing.Size(1233, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
            this.toolBarMenu1.xlsOutParameter = "xlsOut_InvItem{}";
            // 
            // gcMain
            // 
@@ -1026,7 +1023,7 @@
            // 
            // txt_fType
            // 
            this.txt_fType.Location = new System.Drawing.Point(685, 53);
            this.txt_fType.Location = new System.Drawing.Point(714, 53);
            this.txt_fType.Name = "txt_fType";
            this.txt_fType.Properties.Caption = "";
            this.txt_fType.Size = new System.Drawing.Size(35, 24);
@@ -1034,7 +1031,7 @@
            // 
            // txt_urgentFlag
            // 
            this.txt_urgentFlag.Location = new System.Drawing.Point(685, 16);
            this.txt_urgentFlag.Location = new System.Drawing.Point(714, 16);
            this.txt_urgentFlag.Name = "txt_urgentFlag";
            this.txt_urgentFlag.Properties.Caption = "";
            this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
@@ -1051,10 +1048,10 @@
            // txt_ischeck
            // 
            this.txt_ischeck.Enabled = false;
            this.txt_ischeck.Location = new System.Drawing.Point(685, 89);
            this.txt_ischeck.Location = new System.Drawing.Point(714, 89);
            this.txt_ischeck.Name = "txt_ischeck";
            this.txt_ischeck.Properties.Caption = "是否提交检验";
            this.txt_ischeck.Size = new System.Drawing.Size(118, 24);
            this.txt_ischeck.Properties.Caption = "";
            this.txt_ischeck.Size = new System.Drawing.Size(47, 24);
            this.txt_ischeck.TabIndex = 447;
            // 
            // txt_depotsCode
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Security.Cryptography;
using System.Text;
using System.Windows.Forms;
using DevExpress.DataAccess.DataFederation;
@@ -56,9 +55,15 @@
            };
            this.txt_depotsCode.KeyFile = "depotCode";
            this.txt_suppNo.KeyFile = "suppNo";
            //选择需要入库的明细
            btnSelect.Click += (s, e) =>
            {
                var frm = new SelectCgMx();
                if (string.IsNullOrEmpty(this.txt_suppNo.GetId()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商,才能选择来料明细!");
                    return;
                }
                var frm = new SelectCgMx(this.txt_suppNo.GetCode());
                frm.UpdateParent += (ss, ee) =>
                {
                    var lst = new List<string>();
@@ -82,12 +87,6 @@
                frm.ShowDialog();
            };
        }
        private void ToolBarMenu1_btnFjianYanClick1(object sender, EventArgs e)
        {
            throw new NotImplementedException();
        }
        /// <summary>
        ///     反检验
        /// </summary>
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -74,7 +74,6 @@
            this.txt_changereason = new DevExpress.XtraEditors.TextEdit();
            this.gv_changereason = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_checkFalg = new DevExpress.XtraEditors.LabelControl();
            this.txt_checkFalg = new DevExpress.XtraEditors.TextEdit();
            this.gv_checkFalg = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_checkBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -168,13 +167,13 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_checkFalg = new DevExpress.XtraEditors.CheckEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_changereason.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ebelnK3id.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
@@ -212,6 +211,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).BeginInit();
            this.SuspendLayout();
            // 
            // gvMx1demandDocumentLineId
@@ -710,7 +710,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1361, 291);
            this.tabMxPage1.Size = new System.Drawing.Size(1361, 317);
            this.tabMxPage1.Text = "采购单明细";
            // 
            // gcMx1
@@ -719,7 +719,7 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1361, 291);
            this.gcMx1.Size = new System.Drawing.Size(1361, 317);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -809,20 +809,11 @@
            // 
            this.lb_checkFalg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkFalg.Appearance.Options.UseFont = true;
            this.lb_checkFalg.Location = new System.Drawing.Point(1029, 212);
            this.lb_checkFalg.Location = new System.Drawing.Point(789, 183);
            this.lb_checkFalg.Name = "lb_checkFalg";
            this.lb_checkFalg.Size = new System.Drawing.Size(73, 21);
            this.lb_checkFalg.TabIndex = 387;
            this.lb_checkFalg.Text = "审核标识 ";
            //
            // txt_checkFalg
            //
            this.txt_checkFalg.Location = new System.Drawing.Point(1109, 208);
            this.txt_checkFalg.Name = "txt_checkFalg";
            this.txt_checkFalg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkFalg.Properties.Appearance.Options.UseFont = true;
            this.txt_checkFalg.Size = new System.Drawing.Size(174, 28);
            this.txt_checkFalg.TabIndex = 387;
            // 
            // gv_checkFalg
            // 
@@ -830,7 +821,7 @@
            this.gv_checkFalg.AppearanceCell.Options.UseFont = true;
            this.gv_checkFalg.Caption = "审核标识 ";
            this.gv_checkFalg.FieldName = "checkFalg";
            this.gv_checkFalg.MinWidth = 100;
            this.gv_checkFalg.MinWidth = 80;
            this.gv_checkFalg.Name = "gv_checkFalg";
            this.gv_checkFalg.OptionsColumn.AllowEdit = false;
            this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
@@ -858,13 +849,13 @@
            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
            this.gv_checkDate.Caption = "审核日期 ";
            this.gv_checkDate.FieldName = "checkDate";
            this.gv_checkDate.MinWidth = 100;
            this.gv_checkDate.MinWidth = 120;
            this.gv_checkDate.Name = "gv_checkDate";
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 25;
            this.gv_checkDate.Width = 100;
            this.gv_checkDate.Width = 120;
            // 
            // lb_ebelnK3id
            // 
@@ -910,13 +901,13 @@
            this.gv_erpCheckDate.AppearanceCell.Options.UseFont = true;
            this.gv_erpCheckDate.Caption = "审核时间 ";
            this.gv_erpCheckDate.FieldName = "erpCheckDate";
            this.gv_erpCheckDate.MinWidth = 100;
            this.gv_erpCheckDate.MinWidth = 200;
            this.gv_erpCheckDate.Name = "gv_erpCheckDate";
            this.gv_erpCheckDate.OptionsColumn.AllowEdit = false;
            this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
            this.gv_erpCheckDate.Visible = true;
            this.gv_erpCheckDate.VisibleIndex = 24;
            this.gv_erpCheckDate.Width = 100;
            this.gv_erpCheckDate.Width = 200;
            // 
            // lb_erpCheckBy
            // 
@@ -1009,13 +1000,13 @@
            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateDate.Caption = "最后修改时间 ";
            this.gv_lastupdateDate.FieldName = "lastupdateDate";
            this.gv_lastupdateDate.MinWidth = 100;
            this.gv_lastupdateDate.MinWidth = 200;
            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 21;
            this.gv_lastupdateDate.Width = 100;
            this.gv_lastupdateDate.Width = 200;
            // 
            // lb_createDate
            // 
@@ -1108,13 +1099,13 @@
            this.gv_cancellationDate.AppearanceCell.Options.UseFont = true;
            this.gv_cancellationDate.Caption = "作废日期 ";
            this.gv_cancellationDate.FieldName = "cancellationDate";
            this.gv_cancellationDate.MinWidth = 100;
            this.gv_cancellationDate.MinWidth = 200;
            this.gv_cancellationDate.Name = "gv_cancellationDate";
            this.gv_cancellationDate.OptionsColumn.AllowEdit = false;
            this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
            this.gv_cancellationDate.Visible = true;
            this.gv_cancellationDate.VisibleIndex = 18;
            this.gv_cancellationDate.Width = 100;
            this.gv_cancellationDate.Width = 200;
            // 
            // lb_cancellationPerson
            // 
@@ -1424,13 +1415,13 @@
            this.gv_qtyAcceptance.AppearanceCell.Options.UseFont = true;
            this.gv_qtyAcceptance.Caption = "数量验收 ";
            this.gv_qtyAcceptance.FieldName = "qtyAcceptance";
            this.gv_qtyAcceptance.MinWidth = 50;
            this.gv_qtyAcceptance.MinWidth = 100;
            this.gv_qtyAcceptance.Name = "gv_qtyAcceptance";
            this.gv_qtyAcceptance.OptionsColumn.AllowEdit = false;
            this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE";
            this.gv_qtyAcceptance.Visible = true;
            this.gv_qtyAcceptance.VisibleIndex = 9;
            this.gv_qtyAcceptance.Width = 50;
            this.gv_qtyAcceptance.Width = 100;
            // 
            // lb_purchaseGroup
            // 
@@ -1755,7 +1746,7 @@
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1328, 531);
            this.gcMain.Size = new System.Drawing.Size(1363, 531);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -1805,11 +1796,12 @@
            // 
            this.gv_factory.Caption = "工厂";
            this.gv_factory.FieldName = "factory";
            this.gv_factory.MinWidth = 25;
            this.gv_factory.MinWidth = 60;
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 0;
            this.gv_factory.Width = 25;
            this.gv_factory.Width = 60;
            // 
            // xtraTabControl1
            // 
@@ -1828,7 +1820,7 @@
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1328, 570);
            this.xtraTabPage1.Size = new System.Drawing.Size(1363, 570);
            this.xtraTabPage1.Text = "数据查询";
            // 
            // pageBar1
@@ -1840,7 +1832,7 @@
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.RowsCount = 50;
            this.pageBar1.Size = new System.Drawing.Size(1328, 39);
            this.pageBar1.Size = new System.Drawing.Size(1363, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            // 
@@ -1856,10 +1848,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 247);
            this.tabMx.Location = new System.Drawing.Point(0, 221);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1363, 323);
            this.tabMx.Size = new System.Drawing.Size(1363, 349);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -1867,12 +1859,12 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_checkFalg);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_changereason);
            this.panel1.Controls.Add(this.txt_changereason);
            this.panel1.Controls.Add(this.lb_checkFalg);
            this.panel1.Controls.Add(this.txt_checkFalg);
            this.panel1.Controls.Add(this.lb_ebelnK3id);
            this.panel1.Controls.Add(this.txt_ebelnK3id);
            this.panel1.Controls.Add(this.lb_erpCheckDate);
@@ -1933,12 +1925,20 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1363, 247);
            this.panel1.Size = new System.Drawing.Size(1363, 221);
            this.panel1.TabIndex = 1;
            //
            // txt_checkFalg
            //
            this.txt_checkFalg.Location = new System.Drawing.Point(871, 182);
            this.txt_checkFalg.Name = "txt_checkFalg";
            this.txt_checkFalg.Properties.Caption = "";
            this.txt_checkFalg.Size = new System.Drawing.Size(94, 24);
            this.txt_checkFalg.TabIndex = 451;
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(823, 189);
            this.labelControl11.Location = new System.Drawing.Point(920, 185);
            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1949,7 +1949,7 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(874, 189);
            this.lbGuid.Location = new System.Drawing.Point(971, 185);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
@@ -1967,7 +1967,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_changereason.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ebelnK3id.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
@@ -2006,6 +2005,7 @@
            this.tabMx.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkFalg.Properties)).EndInit();
            this.ResumeLayout(false);
        }
@@ -2068,7 +2068,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_changereason;
        private DevExpress.XtraEditors.LabelControl lb_checkFalg;
        private DevExpress.XtraEditors.TextEdit txt_checkFalg;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkFalg;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkBy;
        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
@@ -2181,5 +2180,6 @@
        private DevExpress.XtraEditors.TextEdit txt_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
        private DevExpress.XtraEditors.CheckEdit txt_checkFalg;
    }
}
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -16,7 +16,11 @@
        private readonly string _webServiceName = "MesRohInDataManager/";
        public SelectCgMx()
        /// <summary>
        /// 供应商编号
        /// </summary>
        /// <param name="supp_no"></param>
        public SelectCgMx(string supp_no)
        {
            InitializeComponent();
            pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -40,7 +44,6 @@
                        list.Add(_guid);
                    }
                }
                UpdateParent?.Invoke(this,
                    new UpdateParentEventArgs { StringList = list });
                Close();
DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
@@ -68,35 +68,40 @@
            // 
            this.gridColumn1.Caption = "仓库ID";
            this.gridColumn1.FieldName = "depotId";
            this.gridColumn1.MaxWidth = 100;
            this.gridColumn1.MinWidth = 80;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.UnboundDataType = typeof(short);
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 0;
            this.gridColumn1.Width = 80;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "仓库编号";
            this.gridColumn2.FieldName = "depotCode";
            this.gridColumn2.MinWidth = 80;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.UnboundDataType = typeof(string);
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 80;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "仓库名称";
            this.gridColumn3.FieldName = "depotName";
            this.gridColumn3.MinWidth = 100;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 100;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "guid";
            this.gridColumn4.FieldName = "guid";
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            // 
            // UcLookCk
            // 
DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -12,6 +12,7 @@
        public UcLookCk()
        {
            InitializeComponent();
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
@@ -88,6 +89,11 @@
        public void SetIdOrCode(string Code)
        {
            if (Code == "-1")
            {
                lookSearchSupplier.EditValue = null;
                return;
            }
            if (KeyFile == "depotId")
                lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim()));
            else
DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -19,6 +19,7 @@
        public UcLookItems()
        {
            InitializeComponent();
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
@@ -104,6 +105,11 @@
        public void SetIdOrCode(string Code)
        {
            if (Code == "-1")
            {
                lookSearchSupplier.EditValue = null;
                return;
            }
            if (KeyFile == "id")
                lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim()));
            else
DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
@@ -30,9 +30,9 @@
        {
            this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
@@ -63,38 +63,43 @@
            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn1
            //
            this.gridColumn1.Caption = "供应商ID";
            this.gridColumn1.FieldName = "id";
            this.gridColumn1.MaxWidth = 100;
            this.gridColumn1.MinWidth = 80;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.UnboundDataType = typeof(short);
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 0;
            this.gridColumn1.Width = 100;
            //
            // gridColumn2
            // 
            this.gridColumn2.Caption = "供应商编号";
            this.gridColumn2.FieldName = "suppNo";
            this.gridColumn2.MinWidth = 80;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 80;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "供应商名称";
            this.gridColumn3.FieldName = "suppName";
            this.gridColumn3.MinWidth = 100;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 2;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "供应商ID";
            this.gridColumn1.FieldName = "id";
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.UnboundDataType = typeof(short);
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 0;
            this.gridColumn3.Width = 100;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "guid";
            this.gridColumn4.FieldName = "guid";
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            // 
            // UcLookSupplier
            // 
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -13,6 +13,7 @@
        public UcLookSupplier()
        {
            InitializeComponent();
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
            getSuppler();
@@ -89,6 +90,11 @@
        public void SetIdOrCode(string Code)
        {
            if (Code == "-1")
            {
                lookSearchSupplier.EditValue = null;
                return;
            }
            if (KeyFile == "id")
                lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim()));
            else