lu
2025-03-31 38d4f408d644ce8ab316cf429d212a3d09fb8934
投入
已添加1个文件
已修改5个文件
680 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs 633 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/checkbox2_32x324.png 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -28,16 +28,16 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition25 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition27 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition28 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition29 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition30 = 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();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layTop1 = new DevExpress.XtraLayout.LayoutControl();
@@ -67,11 +67,15 @@
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
            this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
            this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -91,7 +95,7 @@
            this.label2 = new System.Windows.Forms.Label();
            this.label1 = new System.Windows.Forms.Label();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -102,16 +106,13 @@
            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -127,10 +128,6 @@
            this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
            this.splitMx1.Panel1.SuspendLayout();
@@ -169,11 +166,15 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).BeginInit();
            this.panel3.SuspendLayout();
            this.panel2.SuspendLayout();
@@ -181,16 +182,12 @@
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage2.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            this.xtraTabPage3.SuspendLayout();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            this.SuspendLayout();
            // 
            // splitMx1
@@ -210,12 +207,13 @@
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.Size = new System.Drawing.Size(1367, 619);
            this.splitMx1.SplitterPosition = 184;
            this.splitMx1.SplitterPosition = 191;
            this.splitMx1.TabIndex = 0;
            // 
            // splitTop1
            // 
            this.splitTop1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitTop1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            this.splitTop1.Location = new System.Drawing.Point(0, 0);
            this.splitTop1.Name = "splitTop1";
            // 
@@ -237,8 +235,9 @@
            this.splitTop1.Panel2.Controls.Add(this.panel4);
            this.splitTop1.Panel2.Controls.Add(this.panel1);
            this.splitTop1.Panel2.Text = "Panel2";
            this.splitTop1.Size = new System.Drawing.Size(1367, 184);
            this.splitTop1.SplitterPosition = 750;
            this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitTop1.Size = new System.Drawing.Size(1367, 191);
            this.splitTop1.SplitterPosition = 527;
            this.splitTop1.TabIndex = 0;
            // 
            // layTop1
@@ -265,144 +264,148 @@
            this.layTop1.Name = "layTop1";
            this.layTop1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500);
            this.layTop1.Root = this.Root;
            this.layTop1.Size = new System.Drawing.Size(750, 184);
            this.layTop1.Size = new System.Drawing.Size(828, 191);
            this.layTop1.TabIndex = 0;
            this.layTop1.Text = "layoutControl1";
            // 
            // textEdit1
            // 
            this.textEdit1.Location = new System.Drawing.Point(114, 12);
            this.textEdit1.Location = new System.Drawing.Point(84, 12);
            this.textEdit1.Name = "textEdit1";
            this.textEdit1.Size = new System.Drawing.Size(71, 24);
            this.textEdit1.Size = new System.Drawing.Size(126, 24);
            this.textEdit1.StyleController = this.layTop1;
            this.textEdit1.TabIndex = 4;
            // 
            // textEdit2
            // 
            this.textEdit2.Location = new System.Drawing.Point(114, 40);
            this.textEdit2.Location = new System.Drawing.Point(84, 40);
            this.textEdit2.Name = "textEdit2";
            this.textEdit2.Size = new System.Drawing.Size(71, 24);
            this.textEdit2.Size = new System.Drawing.Size(126, 24);
            this.textEdit2.StyleController = this.layTop1;
            this.textEdit2.TabIndex = 5;
            // 
            // textEdit3
            // 
            this.textEdit3.Location = new System.Drawing.Point(114, 68);
            this.textEdit3.Location = new System.Drawing.Point(84, 68);
            this.textEdit3.Name = "textEdit3";
            this.textEdit3.Size = new System.Drawing.Size(71, 24);
            this.textEdit3.Size = new System.Drawing.Size(126, 24);
            this.textEdit3.StyleController = this.layTop1;
            this.textEdit3.TabIndex = 6;
            // 
            // textEdit4
            // 
            this.textEdit4.Location = new System.Drawing.Point(114, 96);
            this.textEdit4.Location = new System.Drawing.Point(84, 96);
            this.textEdit4.Name = "textEdit4";
            this.textEdit4.Size = new System.Drawing.Size(248, 24);
            this.textEdit4.Size = new System.Drawing.Size(328, 24);
            this.textEdit4.StyleController = this.layTop1;
            this.textEdit4.TabIndex = 7;
            // 
            // textEdit5
            // 
            this.textEdit5.Location = new System.Drawing.Point(114, 124);
            this.textEdit5.Location = new System.Drawing.Point(84, 124);
            this.textEdit5.Name = "textEdit5";
            this.textEdit5.Size = new System.Drawing.Size(248, 24);
            this.textEdit5.Size = new System.Drawing.Size(328, 24);
            this.textEdit5.StyleController = this.layTop1;
            this.textEdit5.TabIndex = 8;
            // 
            // textEdit6
            // 
            this.textEdit6.Location = new System.Drawing.Point(114, 152);
            this.textEdit6.Location = new System.Drawing.Point(84, 152);
            this.textEdit6.Name = "textEdit6";
            this.textEdit6.Size = new System.Drawing.Size(71, 24);
            this.textEdit6.Size = new System.Drawing.Size(126, 24);
            this.textEdit6.StyleController = this.layTop1;
            this.textEdit6.TabIndex = 9;
            // 
            // textEdit7
            // 
            this.textEdit7.Location = new System.Drawing.Point(291, 12);
            this.textEdit7.Location = new System.Drawing.Point(286, 12);
            this.textEdit7.Name = "textEdit7";
            this.textEdit7.Size = new System.Drawing.Size(71, 24);
            this.textEdit7.Size = new System.Drawing.Size(126, 24);
            this.textEdit7.StyleController = this.layTop1;
            this.textEdit7.TabIndex = 10;
            // 
            // textEdit8
            // 
            this.textEdit8.Location = new System.Drawing.Point(291, 40);
            this.textEdit8.Location = new System.Drawing.Point(286, 40);
            this.textEdit8.Name = "textEdit8";
            this.textEdit8.Size = new System.Drawing.Size(71, 24);
            this.textEdit8.Size = new System.Drawing.Size(126, 24);
            this.textEdit8.StyleController = this.layTop1;
            this.textEdit8.TabIndex = 11;
            // 
            // textEdit9
            // 
            this.textEdit9.Location = new System.Drawing.Point(291, 68);
            this.textEdit9.Location = new System.Drawing.Point(286, 68);
            this.textEdit9.Name = "textEdit9";
            this.textEdit9.Size = new System.Drawing.Size(71, 24);
            this.textEdit9.Size = new System.Drawing.Size(126, 24);
            this.textEdit9.StyleController = this.layTop1;
            this.textEdit9.TabIndex = 12;
            // 
            // textEdit10
            // 
            this.textEdit10.Location = new System.Drawing.Point(468, 12);
            this.textEdit10.Location = new System.Drawing.Point(488, 12);
            this.textEdit10.Name = "textEdit10";
            this.textEdit10.Size = new System.Drawing.Size(71, 24);
            this.textEdit10.Size = new System.Drawing.Size(126, 24);
            this.textEdit10.StyleController = this.layTop1;
            this.textEdit10.TabIndex = 13;
            // 
            // textEdit11
            // 
            this.textEdit11.Location = new System.Drawing.Point(468, 40);
            this.textEdit11.Location = new System.Drawing.Point(690, 12);
            this.textEdit11.Name = "textEdit11";
            this.textEdit11.Size = new System.Drawing.Size(71, 24);
            this.textEdit11.Size = new System.Drawing.Size(126, 24);
            this.textEdit11.StyleController = this.layTop1;
            this.textEdit11.TabIndex = 14;
            // 
            // textEdit12
            // 
            this.textEdit12.Location = new System.Drawing.Point(468, 68);
            this.textEdit12.Location = new System.Drawing.Point(488, 68);
            this.textEdit12.Name = "textEdit12";
            this.textEdit12.Size = new System.Drawing.Size(71, 24);
            this.textEdit12.Size = new System.Drawing.Size(126, 24);
            this.textEdit12.StyleController = this.layTop1;
            this.textEdit12.TabIndex = 15;
            // 
            // textEdit13
            // 
            this.textEdit13.Location = new System.Drawing.Point(645, 12);
            this.textEdit13.Location = new System.Drawing.Point(488, 40);
            this.textEdit13.Name = "textEdit13";
            this.textEdit13.Size = new System.Drawing.Size(72, 24);
            this.textEdit13.Size = new System.Drawing.Size(126, 24);
            this.textEdit13.StyleController = this.layTop1;
            this.textEdit13.TabIndex = 16;
            // 
            // textEdit14
            // 
            this.textEdit14.Location = new System.Drawing.Point(645, 40);
            this.textEdit14.Location = new System.Drawing.Point(690, 40);
            this.textEdit14.Name = "textEdit14";
            this.textEdit14.Size = new System.Drawing.Size(72, 24);
            this.textEdit14.Size = new System.Drawing.Size(126, 24);
            this.textEdit14.StyleController = this.layTop1;
            this.textEdit14.TabIndex = 17;
            // 
            // textEdit15
            // 
            this.textEdit15.Location = new System.Drawing.Point(645, 68);
            this.textEdit15.Location = new System.Drawing.Point(690, 68);
            this.textEdit15.Name = "textEdit15";
            this.textEdit15.Size = new System.Drawing.Size(72, 24);
            this.textEdit15.Size = new System.Drawing.Size(126, 24);
            this.textEdit15.StyleController = this.layTop1;
            this.textEdit15.TabIndex = 18;
            // 
            // simpleButton1
            // 
            this.simpleButton1.Location = new System.Drawing.Point(366, 96);
            this.simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
            this.simpleButton1.Appearance.Options.UseBackColor = true;
            this.simpleButton1.Location = new System.Drawing.Point(416, 96);
            this.simpleButton1.Name = "simpleButton1";
            this.simpleButton1.Size = new System.Drawing.Size(173, 80);
            this.simpleButton1.Size = new System.Drawing.Size(198, 83);
            this.simpleButton1.StyleController = this.layTop1;
            this.simpleButton1.TabIndex = 19;
            this.simpleButton1.Text = "良品";
            // 
            // simpleButton2
            // 
            this.simpleButton2.Location = new System.Drawing.Point(543, 96);
            this.simpleButton2.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
            this.simpleButton2.Appearance.Options.UseBackColor = true;
            this.simpleButton2.Location = new System.Drawing.Point(618, 96);
            this.simpleButton2.Name = "simpleButton2";
            this.simpleButton2.Size = new System.Drawing.Size(174, 80);
            this.simpleButton2.Size = new System.Drawing.Size(198, 83);
            this.simpleButton2.StyleController = this.layTop1;
            this.simpleButton2.TabIndex = 20;
            this.simpleButton2.Text = "不良品";
@@ -420,50 +423,50 @@
            this.layoutControlItem8,
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem11,
            this.layoutControlItem12,
            this.layoutControlItem13,
            this.layoutControlItem14,
            this.layoutControlItem15,
            this.layoutControlItem5,
            this.layoutControlItem6,
            this.layoutControlItem16,
            this.layoutControlItem17});
            this.layoutControlItem17,
            this.layoutControlItem13,
            this.layoutControlItem11});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition17.Width = 100D;
            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition18.Width = 100D;
            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition19.Width = 100D;
            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition20.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[] {
            columnDefinition17,
            columnDefinition18,
            columnDefinition19,
            columnDefinition20});
            rowDefinition25.Height = 100D;
            rowDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition26.Height = 100D;
            rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition27.Height = 100D;
            rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition28.Height = 100D;
            rowDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition29.Height = 100D;
            rowDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition30.Height = 100D;
            rowDefinition30.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;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition25,
            rowDefinition26,
            rowDefinition27,
            rowDefinition28,
            rowDefinition29,
            rowDefinition30});
            this.Root.Size = new System.Drawing.Size(729, 188);
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(828, 191);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -471,9 +474,9 @@
            this.layoutControlItem1.Control = this.textEdit1;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(177, 28);
            this.layoutControlItem1.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem1.Text = "工单编号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem2
            // 
@@ -481,9 +484,9 @@
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(177, 28);
            this.layoutControlItem2.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem2.Text = "工序";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem3
            // 
@@ -491,9 +494,9 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(177, 28);
            this.layoutControlItem3.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem3.Text = "操作者";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem4
            // 
@@ -502,113 +505,166 @@
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(354, 28);
            this.layoutControlItem4.Size = new System.Drawing.Size(404, 28);
            this.layoutControlItem4.Text = "打条码";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.textEdit7;
            this.layoutControlItem7.Location = new System.Drawing.Point(177, 0);
            this.layoutControlItem7.Location = new System.Drawing.Point(202, 0);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(177, 28);
            this.layoutControlItem7.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem7.Text = "产品编码";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.textEdit8;
            this.layoutControlItem8.Location = new System.Drawing.Point(177, 28);
            this.layoutControlItem8.Location = new System.Drawing.Point(202, 28);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(177, 28);
            this.layoutControlItem8.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem8.Text = "班次";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.textEdit9;
            this.layoutControlItem9.Location = new System.Drawing.Point(177, 56);
            this.layoutControlItem9.Location = new System.Drawing.Point(202, 56);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(177, 28);
            this.layoutControlItem9.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem9.Text = "工位";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.textEdit10;
            this.layoutControlItem10.Location = new System.Drawing.Point(354, 0);
            this.layoutControlItem10.Location = new System.Drawing.Point(404, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.Size = new System.Drawing.Size(177, 28);
            this.layoutControlItem10.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem10.Text = "产品名称";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.textEdit11;
            this.layoutControlItem11.Location = new System.Drawing.Point(354, 28);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(177, 28);
            this.layoutControlItem11.Text = "产品规格";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.textEdit12;
            this.layoutControlItem12.Location = new System.Drawing.Point(354, 56);
            this.layoutControlItem12.Location = new System.Drawing.Point(404, 56);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(177, 28);
            this.layoutControlItem12.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem12.Text = "设备编码";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.textEdit13;
            this.layoutControlItem13.Location = new System.Drawing.Point(531, 0);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(178, 28);
            this.layoutControlItem13.Text = "线别";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.textEdit14;
            this.layoutControlItem14.Location = new System.Drawing.Point(531, 28);
            this.layoutControlItem14.Location = new System.Drawing.Point(606, 28);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(178, 28);
            this.layoutControlItem14.Text = "计划开始时间";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem14.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem14.Text = "计划时间";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.textEdit15;
            this.layoutControlItem15.Location = new System.Drawing.Point(531, 56);
            this.layoutControlItem15.Location = new System.Drawing.Point(606, 56);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(178, 28);
            this.layoutControlItem15.Text = "实际开始时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            this.layoutControlItem15.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem15.Text = "实际时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.textEdit5;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 112);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem5.Size = new System.Drawing.Size(404, 28);
            this.layoutControlItem5.Text = "当前条码";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.textEdit6;
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 140);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem6.Size = new System.Drawing.Size(202, 31);
            this.layoutControlItem6.Text = "扫工位码";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem16
            //
            this.layoutControlItem16.Control = this.simpleButton1;
            this.layoutControlItem16.Location = new System.Drawing.Point(404, 84);
            this.layoutControlItem16.MaxSize = new System.Drawing.Size(0, 100);
            this.layoutControlItem16.MinSize = new System.Drawing.Size(41, 100);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 3;
            this.layoutControlItem16.Size = new System.Drawing.Size(202, 87);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "良品按钮";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            //
            // layoutControlItem17
            //
            this.layoutControlItem17.Control = this.simpleButton2;
            this.layoutControlItem17.Location = new System.Drawing.Point(606, 84);
            this.layoutControlItem17.MaxSize = new System.Drawing.Size(0, 100);
            this.layoutControlItem17.MinSize = new System.Drawing.Size(56, 100);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem17.OptionsTableLayoutItem.RowSpan = 3;
            this.layoutControlItem17.Size = new System.Drawing.Size(202, 87);
            this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem17.Text = "不良品按钮";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem17.TextVisible = false;
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.textEdit13;
            this.layoutControlItem13.Location = new System.Drawing.Point(404, 28);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem13.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem13.Text = "线别";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.textEdit11;
            this.layoutControlItem11.Location = new System.Drawing.Point(606, 0);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.Size = new System.Drawing.Size(202, 28);
            this.layoutControlItem11.Text = "产品规格";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
            // 
            // simpleButton7
            // 
            this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            this.simpleButton7.Appearance.Options.UseBackColor = true;
            this.simpleButton7.Location = new System.Drawing.Point(122, 122);
            this.simpleButton7.Location = new System.Drawing.Point(122, 126);
            this.simpleButton7.Name = "simpleButton7";
            this.simpleButton7.Size = new System.Drawing.Size(86, 37);
            this.simpleButton7.Size = new System.Drawing.Size(86, 50);
            this.simpleButton7.TabIndex = 10;
            this.simpleButton7.Text = "设备";
            // 
@@ -616,9 +672,9 @@
            // 
            this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            this.simpleButton6.Appearance.Options.UseBackColor = true;
            this.simpleButton6.Location = new System.Drawing.Point(425, 122);
            this.simpleButton6.Location = new System.Drawing.Point(425, 126);
            this.simpleButton6.Name = "simpleButton6";
            this.simpleButton6.Size = new System.Drawing.Size(86, 37);
            this.simpleButton6.Size = new System.Drawing.Size(86, 50);
            this.simpleButton6.TabIndex = 9;
            this.simpleButton6.Text = "取消";
            // 
@@ -626,9 +682,9 @@
            // 
            this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            this.simpleButton5.Appearance.Options.UseBackColor = true;
            this.simpleButton5.Location = new System.Drawing.Point(223, 122);
            this.simpleButton5.Location = new System.Drawing.Point(223, 126);
            this.simpleButton5.Name = "simpleButton5";
            this.simpleButton5.Size = new System.Drawing.Size(86, 37);
            this.simpleButton5.Size = new System.Drawing.Size(86, 50);
            this.simpleButton5.TabIndex = 8;
            this.simpleButton5.Text = "品质";
            // 
@@ -636,9 +692,9 @@
            // 
            this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            this.simpleButton4.Appearance.Options.UseBackColor = true;
            this.simpleButton4.Location = new System.Drawing.Point(324, 122);
            this.simpleButton4.Location = new System.Drawing.Point(324, 126);
            this.simpleButton4.Name = "simpleButton4";
            this.simpleButton4.Size = new System.Drawing.Size(86, 37);
            this.simpleButton4.Size = new System.Drawing.Size(86, 50);
            this.simpleButton4.TabIndex = 7;
            this.simpleButton4.Text = "其它";
            // 
@@ -646,24 +702,25 @@
            // 
            this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            this.simpleButton3.Appearance.Options.UseBackColor = true;
            this.simpleButton3.Location = new System.Drawing.Point(21, 122);
            this.simpleButton3.Location = new System.Drawing.Point(21, 126);
            this.simpleButton3.Name = "simpleButton3";
            this.simpleButton3.Size = new System.Drawing.Size(86, 37);
            this.simpleButton3.Size = new System.Drawing.Size(86, 50);
            this.simpleButton3.TabIndex = 6;
            this.simpleButton3.Text = "物料";
            // 
            // progressBarControl1
            // 
            this.progressBarControl1.Location = new System.Drawing.Point(21, 93);
            this.progressBarControl1.Location = new System.Drawing.Point(21, 88);
            this.progressBarControl1.Name = "progressBarControl1";
            this.progressBarControl1.Size = new System.Drawing.Size(489, 22);
            this.progressBarControl1.TabIndex = 5;
            // 
            // panel3
            // 
            this.panel3.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
            this.panel3.Controls.Add(this.label5);
            this.panel3.Controls.Add(this.label6);
            this.panel3.Location = new System.Drawing.Point(411, 15);
            this.panel3.Location = new System.Drawing.Point(411, 7);
            this.panel3.Name = "panel3";
            this.panel3.Size = new System.Drawing.Size(99, 71);
            this.panel3.TabIndex = 4;
@@ -688,9 +745,10 @@
            // 
            // panel2
            // 
            this.panel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
            this.panel2.Controls.Add(this.label3);
            this.panel2.Controls.Add(this.label4);
            this.panel2.Location = new System.Drawing.Point(281, 15);
            this.panel2.Location = new System.Drawing.Point(281, 7);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(99, 71);
            this.panel2.TabIndex = 3;
@@ -715,9 +773,10 @@
            // 
            // panel4
            // 
            this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
            this.panel4.Controls.Add(this.label7);
            this.panel4.Controls.Add(this.label8);
            this.panel4.Location = new System.Drawing.Point(151, 15);
            this.panel4.Location = new System.Drawing.Point(151, 7);
            this.panel4.Name = "panel4";
            this.panel4.Size = new System.Drawing.Size(99, 71);
            this.panel4.TabIndex = 2;
@@ -742,9 +801,10 @@
            // 
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
            this.panel1.Controls.Add(this.label2);
            this.panel1.Controls.Add(this.label1);
            this.panel1.Location = new System.Drawing.Point(21, 15);
            this.panel1.Location = new System.Drawing.Point(21, 7);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(99, 71);
            this.panel1.TabIndex = 0;
@@ -772,19 +832,19 @@
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage2;
            this.tabMx.Size = new System.Drawing.Size(1367, 423);
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1367, 416);
            this.tabMx.TabIndex = 4;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage2,
            this.xtraTabPage3});
            this.tabMxPage1,
            this.tabMxPage2});
            // 
            // tabMxPage2
            // tabMxPage1
            // 
            this.tabMxPage2.Controls.Add(this.gcMx1);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1365, 391);
            this.tabMxPage2.Text = "退货物料明细";
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1365, 384);
            this.tabMxPage1.Text = "良品名称";
            // 
            // gcMx1
            // 
@@ -792,7 +852,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(1365, 391);
            this.gcMx1.Size = new System.Drawing.Size(1365, 384);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -809,13 +869,10 @@
            this.gvMx2itemNo,
            this.gridColumn5,
            this.gridColumn6,
            this.gvMx2quantity,
            this.gridColumn3,
            this.gvMx2tlQty,
            this.gvMx2depotCode,
            this.gvMx2remark,
            this.gvMx2ebelnK3id,
            this.gvMx2lineK3id,
            this.gvMx2itemOutId,
            this.gridColumn2,
            this.gridColumn1,
            this.gridColumn14,
            this.gridColumn15});
            this.gvMx1.GridControl = this.gcMx1;
@@ -845,7 +902,7 @@
            // gvMx2status
            // 
            this.gvMx2status.AppearanceCell.Options.UseFont = true;
            this.gvMx2status.Caption = "完结";
            this.gvMx2status.Caption = "工单编号";
            this.gvMx2status.FieldName = "status";
            this.gvMx2status.MaxWidth = 50;
            this.gvMx2status.MinWidth = 50;
@@ -859,7 +916,7 @@
            // gvMx2pbillNo
            // 
            this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2pbillNo.Caption = "到货单号";
            this.gvMx2pbillNo.Caption = "追溯码";
            this.gvMx2pbillNo.FieldName = "pbillNo";
            this.gvMx2pbillNo.Name = "gvMx2pbillNo";
            this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
@@ -871,7 +928,7 @@
            // gvMx2workLine
            // 
            this.gvMx2workLine.AppearanceCell.Options.UseFont = true;
            this.gvMx2workLine.Caption = "行号 ";
            this.gvMx2workLine.Caption = "物料条码";
            this.gvMx2workLine.FieldName = "workLine";
            this.gvMx2workLine.Name = "gvMx2workLine";
            this.gvMx2workLine.OptionsColumn.ReadOnly = true;
@@ -912,90 +969,44 @@
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 94;
            // 
            // gvMx2quantity
            // gridColumn3
            // 
            this.gvMx2quantity.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
            this.gvMx2quantity.AppearanceCell.Options.UseForeColor = true;
            this.gvMx2quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gvMx2quantity.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx2quantity.Caption = "申请数量 ";
            this.gvMx2quantity.FieldName = "quantity";
            this.gvMx2quantity.Name = "gvMx2quantity";
            this.gvMx2quantity.Tag = "query_a.quantity";
            this.gvMx2quantity.Visible = true;
            this.gvMx2quantity.VisibleIndex = 6;
            this.gvMx2quantity.Width = 94;
            this.gridColumn3.Caption = "数量";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 7;
            this.gridColumn3.Width = 94;
            // 
            // gvMx2tlQty
            // 
            this.gvMx2tlQty.AppearanceCell.Options.UseFont = true;
            this.gvMx2tlQty.Caption = "已扫数量 ";
            this.gvMx2tlQty.Caption = "单位";
            this.gvMx2tlQty.FieldName = "tlQty";
            this.gvMx2tlQty.Name = "gvMx2tlQty";
            this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
            this.gvMx2tlQty.Tag = "query_a.tl_qty";
            this.gvMx2tlQty.Visible = true;
            this.gvMx2tlQty.VisibleIndex = 7;
            this.gvMx2tlQty.VisibleIndex = 6;
            this.gvMx2tlQty.Width = 94;
            // 
            // gvMx2depotCode
            // gridColumn2
            // 
            this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
            this.gvMx2depotCode.Caption = "仓库编码";
            this.gvMx2depotCode.FieldName = "depotCode";
            this.gvMx2depotCode.Name = "gvMx2depotCode";
            this.gvMx2depotCode.OptionsColumn.ReadOnly = true;
            this.gvMx2depotCode.Tag = "query_a.depot_code";
            this.gvMx2depotCode.Visible = true;
            this.gvMx2depotCode.VisibleIndex = 8;
            this.gvMx2depotCode.Width = 94;
            this.gridColumn2.Caption = "工序";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 8;
            this.gridColumn2.Width = 94;
            // 
            // gvMx2remark
            // gridColumn1
            // 
            this.gvMx2remark.AppearanceCell.Options.UseFont = true;
            this.gvMx2remark.Caption = "备注信息 ";
            this.gvMx2remark.FieldName = "remark";
            this.gvMx2remark.Name = "gvMx2remark";
            this.gvMx2remark.OptionsColumn.ReadOnly = true;
            this.gvMx2remark.Tag = "query_a.remark";
            this.gvMx2remark.Visible = true;
            this.gvMx2remark.VisibleIndex = 9;
            this.gvMx2remark.Width = 94;
            //
            // gvMx2ebelnK3id
            //
            this.gvMx2ebelnK3id.AppearanceCell.Options.UseFont = true;
            this.gvMx2ebelnK3id.Caption = "采购单ID ";
            this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
            this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
            this.gvMx2ebelnK3id.OptionsColumn.ReadOnly = true;
            this.gvMx2ebelnK3id.Tag = "query_a.ebeln_k3id";
            this.gvMx2ebelnK3id.Visible = true;
            this.gvMx2ebelnK3id.VisibleIndex = 10;
            this.gvMx2ebelnK3id.Width = 94;
            //
            // gvMx2lineK3id
            //
            this.gvMx2lineK3id.AppearanceCell.Options.UseFont = true;
            this.gvMx2lineK3id.Caption = "采购单行ID ";
            this.gvMx2lineK3id.FieldName = "lineK3id";
            this.gvMx2lineK3id.Name = "gvMx2lineK3id";
            this.gvMx2lineK3id.OptionsColumn.ReadOnly = true;
            this.gvMx2lineK3id.Tag = "query_a.line_k3id";
            this.gvMx2lineK3id.Visible = true;
            this.gvMx2lineK3id.VisibleIndex = 11;
            this.gvMx2lineK3id.Width = 94;
            //
            // gvMx2itemOutId
            //
            this.gvMx2itemOutId.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemOutId.Caption = "出库ID ";
            this.gvMx2itemOutId.FieldName = "itemOutId";
            this.gvMx2itemOutId.Name = "gvMx2itemOutId";
            this.gvMx2itemOutId.OptionsColumn.ReadOnly = true;
            this.gvMx2itemOutId.Tag = "query_a.item_out_id";
            this.gvMx2itemOutId.Width = 94;
            this.gridColumn1.Caption = "备注";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 9;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn14
            // 
@@ -1004,7 +1015,7 @@
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 12;
            this.gridColumn14.VisibleIndex = 10;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn15
@@ -1014,15 +1025,15 @@
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 13;
            this.gridColumn15.VisibleIndex = 11;
            this.gridColumn15.Width = 94;
            // 
            // xtraTabPage3
            // tabMxPage2
            // 
            this.xtraTabPage3.Controls.Add(this.gcMx2);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1248, 358);
            this.xtraTabPage3.Text = "退货物料扫码明细";
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1365, 391);
            this.tabMxPage2.Text = "不良品明细";
            // 
            // gcMx2
            // 
@@ -1030,7 +1041,7 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1248, 358);
            this.gcMx2.Size = new System.Drawing.Size(1365, 391);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -1194,59 +1205,6 @@
            this.gridColumn17.VisibleIndex = 11;
            this.gridColumn17.Width = 94;
            // 
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.textEdit5;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 112);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem5.Size = new System.Drawing.Size(354, 28);
            this.layoutControlItem5.Text = "当前条码";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.textEdit6;
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 140);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem6.Size = new System.Drawing.Size(177, 28);
            this.layoutControlItem6.Text = "扫工位码";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem16
            //
            this.layoutControlItem16.Control = this.simpleButton1;
            this.layoutControlItem16.Location = new System.Drawing.Point(354, 84);
            this.layoutControlItem16.MaxSize = new System.Drawing.Size(0, 100);
            this.layoutControlItem16.MinSize = new System.Drawing.Size(41, 100);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 3;
            this.layoutControlItem16.Size = new System.Drawing.Size(177, 84);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "良品按钮";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            //
            // layoutControlItem17
            //
            this.layoutControlItem17.Control = this.simpleButton2;
            this.layoutControlItem17.Location = new System.Drawing.Point(531, 84);
            this.layoutControlItem17.MaxSize = new System.Drawing.Size(0, 100);
            this.layoutControlItem17.MinSize = new System.Drawing.Size(56, 100);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem17.OptionsTableLayoutItem.RowSpan = 3;
            this.layoutControlItem17.Size = new System.Drawing.Size(178, 84);
            this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem17.Text = "不良品按钮";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem17.TextVisible = false;
            //
            // Frm_Work01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1257,7 +1215,7 @@
            this.MinimizeBox = false;
            this.Name = "Frm_Work01";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "工序采集";
            this.Text = "工序采集-投入";
            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
            this.splitMx1.Panel1.ResumeLayout(false);
@@ -1297,11 +1255,15 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).EndInit();
            this.panel3.ResumeLayout(false);
            this.panel3.PerformLayout();
@@ -1313,16 +1275,12 @@
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage2.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            this.xtraTabPage3.ResumeLayout(false);
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1332,7 +1290,7 @@
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraEditors.SplitContainerControl splitTop1;
        private DevExpress.XtraTab.XtraTabControl tabMx;
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
@@ -1343,16 +1301,10 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2tlQty;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotCode;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebelnK3id;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lineK3id;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemOutId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
@@ -1393,9 +1345,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraEditors.SimpleButton simpleButton1;
@@ -1422,5 +1372,10 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
    }
}
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -16,6 +16,7 @@
        public Frm_Work01()
        {
            InitializeComponent();
        }
    }
}
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1817,6 +1817,7 @@
    <None Include="Resources\calculatenow.svg" />
    <None Include="Resources\subreport_32x32.png" />
    <None Include="Resources\subreport_16x16.png" />
    <None Include="Resources\checkbox2_32x324.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -463,6 +463,16 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap checkbox2_32x324 {
            get {
                object obj = ResourceManager.GetObject("checkbox2_32x324", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap checkbuttons_16x16 {
            get {
                object obj = ResourceManager.GetObject("checkbuttons_16x16", resourceCulture);
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -265,6 +265,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -288,6 +293,11 @@
  </data>
  <data name="operatingsystem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -471,8 +481,8 @@
  <data name="properties_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\properties_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="subreport_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\subreport_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="user_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_16x161.png;System.Drawing.Bitmap,
@@ -506,9 +516,6 @@
    <value>..\Resources\find_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="subreport_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\subreport_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -833,10 +840,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
@@ -988,6 +993,9 @@
  <data name="lookup&amp;reference_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x324" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x324.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -1007,12 +1015,7 @@
  <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/Resources/checkbox2_32x324.png