bug
lu
昨天 2057778ce796422f1dab4ec011ca66eb1faf66cf
bug
已添加1个文件
已修改11个文件
1182 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs 193 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs 338 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs 250 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.Designer.cs 91 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
@@ -29,13 +29,13 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = 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();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -90,6 +90,7 @@
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -114,7 +115,7 @@
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -259,7 +260,8 @@
            this.gv_checkDate,
            this.gv_reason,
            this.gv_fmrmode,
            this.gridColumn19});
            this.gridColumn19,
            this.gridColumn7});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -274,7 +276,7 @@
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Tag = "org.fnamber";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 0;
            this.gridColumn13.VisibleIndex = 2;
            this.gridColumn13.Width = 250;
            // 
            // gv_status
@@ -288,7 +290,7 @@
            this.gv_status.OptionsColumn.AllowEdit = false;
            this.gv_status.Tag = "query_a.status";
            this.gv_status.Visible = true;
            this.gv_status.VisibleIndex = 1;
            this.gv_status.VisibleIndex = 0;
            this.gv_status.Width = 50;
            // 
            // gv_fType
@@ -302,7 +304,7 @@
            this.gv_fType.OptionsColumn.AllowEdit = false;
            this.gv_fType.Tag = "query_a.f_type";
            this.gv_fType.Visible = true;
            this.gv_fType.VisibleIndex = 2;
            this.gv_fType.VisibleIndex = 1;
            this.gv_fType.Width = 50;
            // 
            // gv_itemOutNo
@@ -314,7 +316,7 @@
            this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
            this.gv_itemOutNo.Tag = "query_a.item_out_no";
            this.gv_itemOutNo.Visible = true;
            this.gv_itemOutNo.VisibleIndex = 3;
            this.gv_itemOutNo.VisibleIndex = 4;
            this.gv_itemOutNo.Width = 100;
            // 
            // gv_suppNo
@@ -326,7 +328,7 @@
            this.gv_suppNo.OptionsColumn.AllowEdit = false;
            this.gv_suppNo.Tag = "query_a.supp_no";
            this.gv_suppNo.Visible = true;
            this.gv_suppNo.VisibleIndex = 4;
            this.gv_suppNo.VisibleIndex = 5;
            this.gv_suppNo.Width = 94;
            // 
            // gridColumn1
@@ -335,7 +337,7 @@
            this.gridColumn1.FieldName = "suppName";
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 5;
            this.gridColumn1.VisibleIndex = 6;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn3
@@ -344,7 +346,7 @@
            this.gridColumn3.FieldName = "createBy";
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.VisibleIndex = 7;
            this.gridColumn3.Width = 94;
            // 
            // gv_createDate
@@ -356,7 +358,7 @@
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 7;
            this.gv_createDate.VisibleIndex = 8;
            this.gv_createDate.Width = 180;
            // 
            // gridColumn4
@@ -365,7 +367,7 @@
            this.gridColumn4.FieldName = "checkUser";
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 8;
            this.gridColumn4.VisibleIndex = 9;
            this.gridColumn4.Width = 94;
            // 
            // gv_checkDate
@@ -377,7 +379,7 @@
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.check_date";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 9;
            this.gv_checkDate.VisibleIndex = 10;
            this.gv_checkDate.Width = 180;
            // 
            // gv_reason
@@ -389,7 +391,7 @@
            this.gv_reason.OptionsColumn.AllowEdit = false;
            this.gv_reason.Tag = "query_a.reason";
            this.gv_reason.Visible = true;
            this.gv_reason.VisibleIndex = 10;
            this.gv_reason.VisibleIndex = 11;
            this.gv_reason.Width = 94;
            // 
            // gv_fmrmode
@@ -401,7 +403,7 @@
            this.gv_fmrmode.OptionsColumn.AllowEdit = false;
            this.gv_fmrmode.Tag = "query_a.fmrmode";
            this.gv_fmrmode.Visible = true;
            this.gv_fmrmode.VisibleIndex = 11;
            this.gv_fmrmode.VisibleIndex = 12;
            this.gv_fmrmode.Width = 94;
            // 
            // gridColumn19
@@ -489,19 +491,19 @@
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(897, 40);
            this.txt_checkUser.Location = new System.Drawing.Point(912, 40);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(196, 24);
            this.txt_checkUser.Size = new System.Drawing.Size(202, 24);
            this.txt_checkUser.StyleController = this.layoutMx1;
            this.txt_checkUser.TabIndex = 513;
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(897, 68);
            this.txt_checkDate.Location = new System.Drawing.Point(912, 68);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(196, 24);
            this.txt_checkDate.Size = new System.Drawing.Size(202, 24);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 252;
            // 
@@ -510,7 +512,7 @@
            this.txt_suppName.Location = new System.Drawing.Point(84, 40);
            this.txt_suppName.Name = "txt_suppName";
            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
            this.txt_suppName.Size = new System.Drawing.Size(195, 24);
            this.txt_suppName.Size = new System.Drawing.Size(200, 24);
            this.txt_suppName.StyleController = this.layoutMx1;
            this.txt_suppName.TabIndex = 523;
            // 
@@ -526,20 +528,20 @@
            "作业不良",
            "供应商物品号错误",
            "采购料号变更"});
            this.txt_reason.Size = new System.Drawing.Size(195, 24);
            this.txt_reason.Size = new System.Drawing.Size(200, 24);
            this.txt_reason.StyleController = this.layoutMx1;
            this.txt_reason.TabIndex = 518;
            // 
            // txt_fmrmode
            // 
            this.txt_fmrmode.Location = new System.Drawing.Point(355, 40);
            this.txt_fmrmode.Location = new System.Drawing.Point(360, 40);
            this.txt_fmrmode.Name = "txt_fmrmode";
            this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_fmrmode.Properties.Items.AddRange(new object[] {
            "退料补料",
            "退料并扣款"});
            this.txt_fmrmode.Size = new System.Drawing.Size(195, 24);
            this.txt_fmrmode.Size = new System.Drawing.Size(200, 24);
            this.txt_fmrmode.StyleController = this.layoutMx1;
            this.txt_fmrmode.TabIndex = 519;
            // 
@@ -548,35 +550,35 @@
            this.txt_itemCgytNo.Location = new System.Drawing.Point(84, 12);
            this.txt_itemCgytNo.Name = "txt_itemCgytNo";
            this.txt_itemCgytNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemCgytNo.Size = new System.Drawing.Size(195, 24);
            this.txt_itemCgytNo.Size = new System.Drawing.Size(200, 24);
            this.txt_itemCgytNo.StyleController = this.layoutMx1;
            this.txt_itemCgytNo.TabIndex = 210;
            // 
            // txt_isOut
            // 
            this.txt_isOut.Location = new System.Drawing.Point(283, 12);
            this.txt_isOut.Location = new System.Drawing.Point(288, 12);
            this.txt_isOut.Name = "txt_isOut";
            this.txt_isOut.Properties.Caption = "委外标识";
            this.txt_isOut.Size = new System.Drawing.Size(267, 24);
            this.txt_isOut.Size = new System.Drawing.Size(272, 24);
            this.txt_isOut.StyleController = this.layoutMx1;
            this.txt_isOut.TabIndex = 525;
            this.txt_isOut.Tag = "readOnly";
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(355, 68);
            this.txt_remark.Location = new System.Drawing.Point(360, 68);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(466, 24);
            this.txt_remark.Size = new System.Drawing.Size(476, 24);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 235;
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(825, 12);
            this.txt_status.Location = new System.Drawing.Point(840, 12);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "审核标识";
            this.txt_status.Size = new System.Drawing.Size(268, 24);
            this.txt_status.Size = new System.Drawing.Size(274, 24);
            this.txt_status.StyleController = this.layoutMx1;
            this.txt_status.TabIndex = 526;
            // 
@@ -590,17 +592,17 @@
            // 
            // txt_createBy
            // 
            this.txt_createBy.Location = new System.Drawing.Point(626, 12);
            this.txt_createBy.Location = new System.Drawing.Point(636, 12);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Size = new System.Drawing.Size(195, 24);
            this.txt_createBy.Size = new System.Drawing.Size(200, 24);
            this.txt_createBy.StyleController = this.layoutMx1;
            this.txt_createBy.TabIndex = 530;
            // 
            // txt_createDate
            // 
            this.txt_createDate.Location = new System.Drawing.Point(626, 40);
            this.txt_createDate.Location = new System.Drawing.Point(636, 40);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Size = new System.Drawing.Size(195, 24);
            this.txt_createDate.Size = new System.Drawing.Size(200, 24);
            this.txt_createDate.StyleController = this.layoutMx1;
            this.txt_createDate.TabIndex = 531;
            // 
@@ -645,30 +647,30 @@
            this.layoutControlItem8});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            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;
            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;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(1105, 104);
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1126, 104);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem2
@@ -677,7 +679,7 @@
            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(271, 28);
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
            this.layoutControlItem2.Text = "供应商";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -686,28 +688,28 @@
            this.layoutControlItem1.Control = this.txt_itemCgytNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
            this.layoutControlItem1.Text = "验退单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_fmrmode;
            this.layoutControlItem3.Location = new System.Drawing.Point(271, 28);
            this.layoutControlItem3.Location = new System.Drawing.Point(276, 28);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 28);
            this.layoutControlItem3.Text = "退料方式";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_isOut;
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 28);
            this.layoutControlItem7.Text = "委外标识";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem7.TextVisible = false;
@@ -715,32 +717,32 @@
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_checkUser;
            this.layoutControlItem9.Location = new System.Drawing.Point(813, 28);
            this.layoutControlItem9.Location = new System.Drawing.Point(828, 28);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem9.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem9.Size = new System.Drawing.Size(278, 28);
            this.layoutControlItem9.Text = "审核人";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_checkDate;
            this.layoutControlItem10.Location = new System.Drawing.Point(813, 56);
            this.layoutControlItem10.Location = new System.Drawing.Point(828, 56);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem10.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 28);
            this.layoutControlItem10.Text = "审核日期";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 28);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
@@ -748,21 +750,21 @@
            // lab_createBy
            // 
            this.lab_createBy.Control = this.txt_createBy;
            this.lab_createBy.Location = new System.Drawing.Point(542, 0);
            this.lab_createBy.Location = new System.Drawing.Point(552, 0);
            this.lab_createBy.Name = "lab_createBy";
            this.lab_createBy.OptionsTableLayoutItem.ColumnIndex = 2;
            this.lab_createBy.Size = new System.Drawing.Size(271, 28);
            this.lab_createBy.Size = new System.Drawing.Size(276, 28);
            this.lab_createBy.Text = "创建人";
            this.lab_createBy.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_createDate;
            this.layoutControlItem15.Location = new System.Drawing.Point(542, 28);
            this.layoutControlItem15.Location = new System.Drawing.Point(552, 28);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 28);
            this.layoutControlItem15.Text = "创建时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -772,19 +774,19 @@
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 56);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 28);
            this.layoutControlItem5.Text = "验退原因";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_remark;
            this.layoutControlItem8.Location = new System.Drawing.Point(271, 56);
            this.layoutControlItem8.Location = new System.Drawing.Point(276, 56);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(542, 28);
            this.layoutControlItem8.Size = new System.Drawing.Size(552, 28);
            this.layoutControlItem8.Text = "验退备注";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -837,6 +839,17 @@
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "单位";
            this.gridColumn2.FieldName = "kcUnit";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.ReadOnly = true;
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 4;
            this.gridColumn2.Width = 94;
            // 
            // gridColumn12
            // 
@@ -1084,16 +1097,15 @@
            this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
            // 
            // gridColumn2
            // gridColumn7
            // 
            this.gridColumn2.Caption = "单位";
            this.gridColumn2.FieldName = "kcUnit";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.ReadOnly = true;
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 4;
            this.gridColumn2.Width = 94;
            this.gridColumn7.Caption = "到货单号";
            this.gridColumn7.FieldName = "taskNo";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.Width = 94;
            // 
            // Frm_MesYanTui
            // 
@@ -1243,5 +1255,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -30,29 +30,29 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            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.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 editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = 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();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -134,7 +134,6 @@
            this.gvMx1checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -152,6 +151,8 @@
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -222,7 +223,7 @@
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = "rpt_InvItem{}";
            this.toolBarMenu1.Size = new System.Drawing.Size(1233, 80);
            this.toolBarMenu1.Size = new System.Drawing.Size(1575, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = "xlsOut_InvItem{}";
@@ -233,7 +234,7 @@
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1233, 602);
            this.xtraTabControl1.Size = new System.Drawing.Size(1575, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
@@ -243,7 +244,7 @@
            // 
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1231, 570);
            this.xtraTabPage1.Size = new System.Drawing.Size(1573, 570);
            this.xtraTabPage1.Text = "数据列表";
            // 
            // split1
@@ -264,7 +265,7 @@
            // 
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1231, 570);
            this.split1.Size = new System.Drawing.Size(1573, 570);
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
            // 
@@ -274,7 +275,7 @@
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1231, 519);
            this.gcMain1.Size = new System.Drawing.Size(1573, 519);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -482,7 +483,7 @@
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1231, 39);
            this.pageBar1.Size = new System.Drawing.Size(1573, 39);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
@@ -490,7 +491,7 @@
            // 
            this.xtraTabPage2.Controls.Add(this.splitMx1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(1231, 570);
            this.xtraTabPage2.Size = new System.Drawing.Size(1573, 570);
            this.xtraTabPage2.Text = "数据详细";
            // 
            // splitMx1
@@ -510,7 +511,7 @@
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1231, 570);
            this.splitMx1.Size = new System.Drawing.Size(1573, 570);
            this.splitMx1.SplitterPosition = 149;
            this.splitMx1.TabIndex = 0;
            // 
@@ -540,7 +541,7 @@
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(758, 132, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1231, 149);
            this.layoutMx1.Size = new System.Drawing.Size(1573, 149);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
@@ -565,10 +566,10 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(401, 76);
            this.txt_remark.Location = new System.Drawing.Point(487, 76);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(212, 24);
            this.txt_remark.Size = new System.Drawing.Size(297, 24);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 240;
            // 
@@ -577,16 +578,16 @@
            this.txt_receiveOrgId.IsReadly = false;
            this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 44);
            this.txt_receiveOrgId.Name = "txt_receiveOrgId";
            this.txt_receiveOrgId.Size = new System.Drawing.Size(211, 24);
            this.txt_receiveOrgId.Size = new System.Drawing.Size(297, 24);
            this.txt_receiveOrgId.TabIndex = 457;
            // 
            // txtSupplierCode
            // 
            this.txtSupplierCode.Location = new System.Drawing.Point(401, 44);
            this.txtSupplierCode.Location = new System.Drawing.Point(487, 44);
            this.txtSupplierCode.Name = "txtSupplierCode";
            this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
            this.txtSupplierCode.Properties.Tag = "";
            this.txtSupplierCode.Size = new System.Drawing.Size(212, 24);
            this.txtSupplierCode.Size = new System.Drawing.Size(297, 24);
            this.txtSupplierCode.StyleController = this.layoutMx1;
            this.txtSupplierCode.TabIndex = 451;
            this.txtSupplierCode.Tag = "readOnly";
@@ -597,7 +598,7 @@
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Properties.Tag = "";
            this.txt_billNo.Size = new System.Drawing.Size(211, 24);
            this.txt_billNo.Size = new System.Drawing.Size(297, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 213;
            this.txt_billNo.Tag = "readOnly";
@@ -608,65 +609,65 @@
            this.txt_suppId.Location = new System.Drawing.Point(99, 76);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(211, 24);
            this.txt_suppId.Size = new System.Drawing.Size(297, 24);
            this.txt_suppId.TabIndex = 440;
            // 
            // txt_fstatus
            // 
            this.txt_fstatus.Location = new System.Drawing.Point(920, 76);
            this.txt_fstatus.Location = new System.Drawing.Point(1176, 76);
            this.txt_fstatus.Name = "txt_fstatus";
            this.txt_fstatus.Properties.Caption = "审核标识";
            this.txt_fstatus.Size = new System.Drawing.Size(299, 24);
            this.txt_fstatus.Size = new System.Drawing.Size(385, 24);
            this.txt_fstatus.StyleController = this.layoutMx1;
            this.txt_fstatus.TabIndex = 458;
            this.txt_fstatus.Tag = "readOnly";
            // 
            // txt_fType
            // 
            this.txt_fType.Location = new System.Drawing.Point(314, 12);
            this.txt_fType.Location = new System.Drawing.Point(400, 12);
            this.txt_fType.Name = "txt_fType";
            this.txt_fType.Properties.Caption = "委外标识";
            this.txt_fType.Size = new System.Drawing.Size(299, 24);
            this.txt_fType.Size = new System.Drawing.Size(384, 24);
            this.txt_fType.StyleController = this.layoutMx1;
            this.txt_fType.TabIndex = 459;
            this.txt_fType.Tag = "readOnly";
            // 
            // txt_createBy
            // 
            this.txt_createBy.Location = new System.Drawing.Point(704, 12);
            this.txt_createBy.Location = new System.Drawing.Point(875, 12);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
            this.txt_createBy.Size = new System.Drawing.Size(212, 24);
            this.txt_createBy.Size = new System.Drawing.Size(297, 24);
            this.txt_createBy.StyleController = this.layoutMx1;
            this.txt_createBy.TabIndex = 461;
            this.txt_createBy.Tag = "readOnly";
            // 
            // txt_createDate
            // 
            this.txt_createDate.Location = new System.Drawing.Point(704, 44);
            this.txt_createDate.Location = new System.Drawing.Point(875, 44);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
            this.txt_createDate.Size = new System.Drawing.Size(212, 24);
            this.txt_createDate.Size = new System.Drawing.Size(297, 24);
            this.txt_createDate.StyleController = this.layoutMx1;
            this.txt_createDate.TabIndex = 462;
            this.txt_createDate.Tag = "readOnly";
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(1007, 12);
            this.txt_checkUser.Location = new System.Drawing.Point(1263, 12);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(212, 24);
            this.txt_checkUser.Size = new System.Drawing.Size(298, 24);
            this.txt_checkUser.StyleController = this.layoutMx1;
            this.txt_checkUser.TabIndex = 463;
            this.txt_checkUser.Tag = "readOnly";
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(1007, 44);
            this.txt_checkDate.Location = new System.Drawing.Point(1263, 44);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(212, 24);
            this.txt_checkDate.Size = new System.Drawing.Size(298, 24);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 464;
            this.txt_checkDate.Tag = "readOnly";
@@ -682,18 +683,18 @@
            // 
            // txt_paperBillNo
            // 
            this.txt_paperBillNo.Location = new System.Drawing.Point(704, 76);
            this.txt_paperBillNo.Location = new System.Drawing.Point(875, 76);
            this.txt_paperBillNo.Name = "txt_paperBillNo";
            this.txt_paperBillNo.Size = new System.Drawing.Size(212, 24);
            this.txt_paperBillNo.Size = new System.Drawing.Size(297, 24);
            this.txt_paperBillNo.StyleController = this.layoutMx1;
            this.txt_paperBillNo.TabIndex = 467;
            // 
            // txt_isSrm
            // 
            this.txt_isSrm.Location = new System.Drawing.Point(920, 108);
            this.txt_isSrm.Location = new System.Drawing.Point(1176, 108);
            this.txt_isSrm.Name = "txt_isSrm";
            this.txt_isSrm.Properties.Caption = "SRM标识";
            this.txt_isSrm.Size = new System.Drawing.Size(299, 24);
            this.txt_isSrm.Size = new System.Drawing.Size(385, 24);
            this.txt_isSrm.StyleController = this.layoutMx1;
            this.txt_isSrm.TabIndex = 468;
            this.txt_isSrm.Tag = "readOnly";
@@ -742,33 +743,33 @@
            this.layoutControlItem6});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            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;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            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;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            this.Root.Size = new System.Drawing.Size(1231, 149);
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(1573, 149);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -777,7 +778,7 @@
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem1.Size = new System.Drawing.Size(302, 32);
            this.layoutControlItem1.Size = new System.Drawing.Size(388, 32);
            this.layoutControlItem1.Text = "收料组织";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -786,7 +787,7 @@
            this.layoutControlItem2.Control = this.txt_billNo;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.Size = new System.Drawing.Size(302, 32);
            this.layoutControlItem2.Size = new System.Drawing.Size(388, 32);
            this.layoutControlItem2.Text = "到货单号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -796,60 +797,60 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(302, 32);
            this.layoutControlItem3.Size = new System.Drawing.Size(388, 32);
            this.layoutControlItem3.Text = "选供应商";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_createBy;
            this.layoutControlItem11.Location = new System.Drawing.Point(605, 0);
            this.layoutControlItem11.Location = new System.Drawing.Point(776, 0);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(303, 32);
            this.layoutControlItem11.Size = new System.Drawing.Size(388, 32);
            this.layoutControlItem11.Text = "建立人员";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_createDate;
            this.layoutControlItem12.Location = new System.Drawing.Point(605, 32);
            this.layoutControlItem12.Location = new System.Drawing.Point(776, 32);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem12.Size = new System.Drawing.Size(303, 32);
            this.layoutControlItem12.Size = new System.Drawing.Size(388, 32);
            this.layoutControlItem12.Text = "建立日期";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_checkUser;
            this.layoutControlItem13.Location = new System.Drawing.Point(908, 0);
            this.layoutControlItem13.Location = new System.Drawing.Point(1164, 0);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(303, 32);
            this.layoutControlItem13.Size = new System.Drawing.Size(389, 32);
            this.layoutControlItem13.Text = "审核人员";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_checkDate;
            this.layoutControlItem14.Location = new System.Drawing.Point(908, 32);
            this.layoutControlItem14.Location = new System.Drawing.Point(1164, 32);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(303, 32);
            this.layoutControlItem14.Size = new System.Drawing.Size(389, 32);
            this.layoutControlItem14.Text = "审核日期";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_fstatus;
            this.layoutControlItem7.Location = new System.Drawing.Point(908, 64);
            this.layoutControlItem7.Location = new System.Drawing.Point(1164, 64);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(303, 32);
            this.layoutControlItem7.Size = new System.Drawing.Size(389, 32);
            this.layoutControlItem7.Text = "提交检验";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem7.TextVisible = false;
@@ -857,10 +858,10 @@
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_fType;
            this.layoutControlItem8.Location = new System.Drawing.Point(302, 0);
            this.layoutControlItem8.Location = new System.Drawing.Point(388, 0);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(303, 32);
            this.layoutControlItem8.Size = new System.Drawing.Size(388, 32);
            this.layoutControlItem8.Text = "委外标识";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
@@ -868,22 +869,22 @@
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txtSupplierCode;
            this.layoutControlItem5.Location = new System.Drawing.Point(302, 32);
            this.layoutControlItem5.Location = new System.Drawing.Point(388, 32);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(303, 32);
            this.layoutControlItem5.Size = new System.Drawing.Size(388, 32);
            this.layoutControlItem5.Text = "供应商编码";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem17
            // 
            this.layoutControlItem17.Control = this.txt_remark;
            this.layoutControlItem17.Location = new System.Drawing.Point(302, 64);
            this.layoutControlItem17.Location = new System.Drawing.Point(388, 64);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem17.Size = new System.Drawing.Size(303, 32);
            this.layoutControlItem17.Size = new System.Drawing.Size(388, 32);
            this.layoutControlItem17.Text = "收料备注";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -895,7 +896,7 @@
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem16.Size = new System.Drawing.Size(302, 33);
            this.layoutControlItem16.Size = new System.Drawing.Size(388, 33);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "选择物料";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -904,22 +905,22 @@
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_paperBillNo;
            this.layoutControlItem4.Location = new System.Drawing.Point(605, 64);
            this.layoutControlItem4.Location = new System.Drawing.Point(776, 64);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(303, 32);
            this.layoutControlItem4.Size = new System.Drawing.Size(388, 32);
            this.layoutControlItem4.Text = "送货单号";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_isSrm;
            this.layoutControlItem6.Location = new System.Drawing.Point(908, 96);
            this.layoutControlItem6.Location = new System.Drawing.Point(1164, 96);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem6.Size = new System.Drawing.Size(303, 33);
            this.layoutControlItem6.Size = new System.Drawing.Size(389, 33);
            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem6.TextVisible = false;
            // 
@@ -929,7 +930,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1231, 409);
            this.tabMx.Size = new System.Drawing.Size(1573, 409);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -938,7 +939,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1229, 377);
            this.tabMxPage1.Size = new System.Drawing.Size(1571, 377);
            this.tabMxPage1.Text = "收料明细";
            // 
            // gcMx1
@@ -951,7 +952,7 @@
            this.repositoryItemButtonEdit1,
            this.repositoryItemButtonEdit2,
            this.rptHistory});
            this.gcMx1.Size = new System.Drawing.Size(1229, 377);
            this.gcMx1.Size = new System.Drawing.Size(1571, 377);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -979,7 +980,6 @@
            this.gvMx1checkDate,
            this.gridColumn3,
            this.gridColumn9,
            this.gridColumn7,
            this.gridColumn6,
            this.gridColumn10,
            this.gridColumn12,
@@ -991,7 +991,9 @@
            this.gridColumn16,
            this.gridColumn2,
            this.gridColumn17,
            this.gridColumn18});
            this.gridColumn18,
            this.gridColumn19,
            this.gridColumn20});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1051,7 +1053,7 @@
            this.gvMx1returnFlag.UnboundDataType = typeof(bool);
            this.gvMx1returnFlag.Visible = true;
            this.gvMx1returnFlag.VisibleIndex = 0;
            this.gvMx1returnFlag.Width = 26;
            this.gvMx1returnFlag.Width = 63;
            // 
            // gvMx1urgentFlag
            // 
@@ -1068,7 +1070,7 @@
            this.gvMx1urgentFlag.UnboundDataType = typeof(bool);
            this.gvMx1urgentFlag.Visible = true;
            this.gvMx1urgentFlag.VisibleIndex = 1;
            this.gvMx1urgentFlag.Width = 25;
            this.gvMx1urgentFlag.Width = 34;
            // 
            // gvMx1isdepsIn
            // 
@@ -1093,7 +1095,7 @@
            this.gvMx1checkStates.Tag = "query_a.check_states";
            this.gvMx1checkStates.Visible = true;
            this.gvMx1checkStates.VisibleIndex = 2;
            this.gvMx1checkStates.Width = 48;
            this.gvMx1checkStates.Width = 66;
            // 
            // gvMx1checkRes
            // 
@@ -1106,7 +1108,7 @@
            this.gvMx1checkRes.Tag = "query_a.check_res";
            this.gvMx1checkRes.Visible = true;
            this.gvMx1checkRes.VisibleIndex = 3;
            this.gvMx1checkRes.Width = 48;
            this.gvMx1checkRes.Width = 66;
            // 
            // gvMx1ebeln
            // 
@@ -1119,7 +1121,7 @@
            this.gvMx1ebeln.Tag = "query_a.ebeln";
            this.gvMx1ebeln.Visible = true;
            this.gvMx1ebeln.VisibleIndex = 4;
            this.gvMx1ebeln.Width = 120;
            this.gvMx1ebeln.Width = 129;
            // 
            // gridColumn8
            // 
@@ -1129,7 +1131,7 @@
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 5;
            this.gridColumn8.Width = 37;
            this.gridColumn8.Width = 53;
            // 
            // gvMx1boardStyle
            // 
@@ -1142,7 +1144,7 @@
            this.gvMx1boardStyle.Tag = "query_a.board_style";
            this.gvMx1boardStyle.Visible = true;
            this.gvMx1boardStyle.VisibleIndex = 6;
            this.gvMx1boardStyle.Width = 96;
            this.gvMx1boardStyle.Width = 73;
            // 
            // gvMx1ebelnQty
            // 
@@ -1155,7 +1157,7 @@
            this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
            this.gvMx1ebelnQty.Visible = true;
            this.gvMx1ebelnQty.VisibleIndex = 7;
            this.gvMx1ebelnQty.Width = 42;
            this.gvMx1ebelnQty.Width = 64;
            // 
            // gvMx1subQty
            // 
@@ -1167,8 +1169,8 @@
            this.gvMx1subQty.OptionsColumn.ReadOnly = true;
            this.gvMx1subQty.Tag = "query_a.sub_qty";
            this.gvMx1subQty.Visible = true;
            this.gvMx1subQty.VisibleIndex = 9;
            this.gvMx1subQty.Width = 42;
            this.gvMx1subQty.VisibleIndex = 11;
            this.gvMx1subQty.Width = 64;
            // 
            // gvMx1quantity
            // 
@@ -1183,8 +1185,8 @@
            this.gvMx1quantity.Name = "gvMx1quantity";
            this.gvMx1quantity.Tag = "yz_quantity_0_edit";
            this.gvMx1quantity.Visible = true;
            this.gvMx1quantity.VisibleIndex = 10;
            this.gvMx1quantity.Width = 42;
            this.gvMx1quantity.VisibleIndex = 12;
            this.gvMx1quantity.Width = 64;
            // 
            // gvMx1memo
            // 
@@ -1200,8 +1202,8 @@
            this.gvMx1memo.OptionsColumn.ReadOnly = true;
            this.gvMx1memo.Tag = "edit";
            this.gvMx1memo.Visible = true;
            this.gvMx1memo.VisibleIndex = 11;
            this.gvMx1memo.Width = 96;
            this.gvMx1memo.VisibleIndex = 13;
            this.gvMx1memo.Width = 110;
            // 
            // gvMx1okRkqty
            // 
@@ -1214,7 +1216,7 @@
            this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
            this.gvMx1okRkqty.Visible = true;
            this.gvMx1okRkqty.VisibleIndex = 8;
            this.gvMx1okRkqty.Width = 42;
            this.gvMx1okRkqty.Width = 64;
            // 
            // gvMx1checkDate
            // 
@@ -1244,19 +1246,8 @@
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 12;
            this.gridColumn9.Width = 26;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "库存单位";
            this.gridColumn7.FieldName = "kcUnit";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 13;
            this.gridColumn7.Width = 26;
            this.gridColumn9.VisibleIndex = 14;
            this.gridColumn9.Width = 40;
            // 
            // gridColumn6
            // 
@@ -1266,8 +1257,8 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 14;
            this.gridColumn6.Width = 96;
            this.gridColumn6.VisibleIndex = 15;
            this.gridColumn6.Width = 119;
            // 
            // gridColumn10
            // 
@@ -1276,8 +1267,8 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 18;
            this.gridColumn10.Width = 25;
            this.gridColumn10.VisibleIndex = 19;
            this.gridColumn10.Width = 43;
            // 
            // gridColumn12
            // 
@@ -1301,15 +1292,17 @@
            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
            this.gvBtnAlawys.MinWidth = 80;
            this.gvBtnAlawys.Name = "gvBtnAlawys";
            this.gvBtnAlawys.Visible = true;
            this.gvBtnAlawys.VisibleIndex = 21;
            this.gvBtnAlawys.Width = 80;
            // 
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1321,16 +1314,16 @@
            this.gvMxDel.MinWidth = 80;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 19;
            this.gvMxDel.Width = 80;
            this.gvMxDel.VisibleIndex = 22;
            this.gvMxDel.Width = 103;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions5.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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);
@@ -1350,8 +1343,8 @@
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 15;
            this.gridColumn15.Width = 50;
            this.gridColumn15.VisibleIndex = 16;
            this.gridColumn15.Width = 89;
            // 
            // gridColumn16
            // 
@@ -1360,8 +1353,8 @@
            this.gridColumn16.MinWidth = 25;
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 16;
            this.gridColumn16.Width = 50;
            this.gridColumn16.VisibleIndex = 17;
            this.gridColumn16.Width = 89;
            // 
            // gridColumn2
            // 
@@ -1370,8 +1363,8 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 17;
            this.gridColumn2.Width = 26;
            this.gridColumn2.VisibleIndex = 18;
            this.gridColumn2.Width = 44;
            // 
            // gridColumn17
            // 
@@ -1381,15 +1374,15 @@
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 20;
            this.gridColumn17.Width = 26;
            this.gridColumn17.Width = 124;
            // 
            // rptHistory
            // 
            this.rptHistory.AutoHeight = false;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
            editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            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)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "记录", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.rptHistory.Name = "rptHistory";
            this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick);
@@ -1413,11 +1406,31 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn19
            //
            this.gridColumn19.Caption = "累积验退";
            this.gridColumn19.FieldName = "ljyt";
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 9;
            this.gridColumn19.Width = 94;
            //
            // gridColumn20
            //
            this.gridColumn20.Caption = "累积仓退";
            this.gridColumn20.FieldName = "ljct";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 10;
            this.gridColumn20.Width = 94;
            //
            // Frm_MesInvItemArn
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1233, 682);
            this.ClientSize = new System.Drawing.Size(1575, 682);
            this.Controls.Add(this.picCheckBox);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
@@ -1548,7 +1561,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
@@ -1583,5 +1595,7 @@
        private DevExpress.XtraEditors.CheckEdit txt_isSrm;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -86,6 +86,7 @@
                        lst = ee.StringList;
                        string strReturn = "";
                        ReturnModel<DataTable> dt;
                        DataTable _oldTable = (DataTable)gcMx1.DataSource;
                        #region è¿™æ˜¯Srm来的单子
                        if (lst == null)
                        {
@@ -106,6 +107,8 @@
                            gvMx1quantity.OptionsColumn.ReadOnly = true;
                            txt_paperBillNo.ReadOnly = true;
                            txt_isSrm.Checked = true;
                            DataTable _newTable = dt.rtnData;
                            _oldTable = _newTable;
                        }
                        #endregion
                        #region è¿™æ˜¯æ™®é€šçš„单
@@ -119,16 +122,14 @@
                            gvMx1quantity.OptionsColumn.ReadOnly = false;
                            txt_paperBillNo.ReadOnly = false;
                            txt_isSrm.Checked = false;
                            DataTable _newTable = dt.rtnData;
                            DataRow[] sourceRows = _newTable.Select();
                            for (int i = 0; i < sourceRows.Length; i++)
                            {
                                _oldTable.ImportRow(sourceRows[i]);
                            }
                        }
                        #endregion
                        DataTable _newTable = dt.rtnData;
                        DataTable _oldTable = (DataTable)gcMx1.DataSource;
                        DataRow[] sourceRows = _newTable.Select();
                        for (int i = 0; i < sourceRows.Length; i++)
                        {
                            _oldTable.ImportRow(sourceRows[i]);
                        }
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = _oldTable;
                        gcMx1.ForceInitialize();
@@ -253,12 +254,14 @@
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                }
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                else
                MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -304,17 +307,17 @@
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(rowGuid);
                ////如果是srm,禁用
                setSrm();
            }
            else
            {
                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
                ////如果是srm,禁用
                setSrm();
            }
            //2025/07/12加上修改状态下不能修改供应商和组织srm,禁用
            setSrm();
            txt_receiveOrgId.IsReadly = true;
            txt_suppId.IsReadly = true;
        }
        /// <summary>
@@ -519,7 +522,6 @@
                    {
                        UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                }
                else
                {
@@ -689,8 +691,8 @@
                gvMx1quantity.OptionsColumn.ReadOnly = true;
                txt_paperBillNo.ReadOnly = true;
                txt_isSrm.Checked = true;
                txt_receiveOrgId.Enabled = false;
                txt_suppId.Enabled = false;
                txt_receiveOrgId.IsReadly = true;
                txt_suppId.IsReadly = true;
                btnSelect.Enabled = false;
            }
            else
@@ -698,8 +700,8 @@
                gvMx1quantity.OptionsColumn.ReadOnly = false;
                txt_paperBillNo.ReadOnly = false;
                txt_isSrm.Checked = false;
                txt_receiveOrgId.Enabled = true;
                txt_suppId.Enabled = true;
                txt_receiveOrgId.IsReadly = false;
                txt_suppId.IsReadly = false;
                btnSelect.Enabled = true;
            }
        }
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx
@@ -120,4 +120,7 @@
  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>33</value>
  </metadata>
</root>
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
@@ -230,9 +230,9 @@
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(rowGuid);
                txt_fabm.ReadOnly = true;
                txt_fSubsidiary.Enabled = false;
            }
            //2025/07/12加上修改状态下不能修改
            txt_fSubsidiary.IsReadly = true;
        }
        /// <summary>
        /// æ–°å¢žäº‹ä»¶
@@ -480,7 +480,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fabm, gridView1, "fabm");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("确定把所选择的物料【"+ strMsg + "】方案【" + rowName + "】吗?"))
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
@@ -29,18 +29,18 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -80,12 +80,7 @@
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -120,6 +115,11 @@
            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -155,12 +155,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -171,6 +166,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -450,7 +450,7 @@
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 74);
            this.btnSelect.Location = new System.Drawing.Point(12, 69);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(116, 27);
            this.btnSelect.StyleController = this.layoutMx1;
@@ -469,14 +469,14 @@
            // txt_kcOrgId
            // 
            this.txt_kcOrgId.IsReadly = false;
            this.txt_kcOrgId.Location = new System.Drawing.Point(114, 43);
            this.txt_kcOrgId.Location = new System.Drawing.Point(114, 38);
            this.txt_kcOrgId.Name = "txt_kcOrgId";
            this.txt_kcOrgId.Size = new System.Drawing.Size(165, 24);
            this.txt_kcOrgId.TabIndex = 526;
            // 
            // txt_billNo
            // 
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Location = new System.Drawing.Point(114, 7);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(165, 24);
@@ -487,7 +487,7 @@
            // txt_billType
            // 
            this.txt_billType.EditValue = "-请选择-";
            this.txt_billType.Location = new System.Drawing.Point(385, 43);
            this.txt_billType.Location = new System.Drawing.Point(385, 7);
            this.txt_billType.Name = "txt_billType";
            this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -506,7 +506,7 @@
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(927, 43);
            this.txt_checkDate.Location = new System.Drawing.Point(927, 38);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
@@ -516,7 +516,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(385, 74);
            this.txt_remark.Location = new System.Drawing.Point(385, 38);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(165, 24);
@@ -525,7 +525,7 @@
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(927, 12);
            this.txt_checkUser.Location = new System.Drawing.Point(927, 7);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
@@ -535,17 +535,17 @@
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(554, 43);
            this.txt_status.Location = new System.Drawing.Point(825, 69);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "审核标识";
            this.txt_status.Size = new System.Drawing.Size(267, 24);
            this.txt_status.Size = new System.Drawing.Size(268, 24);
            this.txt_status.StyleController = this.layoutMx1;
            this.txt_status.TabIndex = 528;
            this.txt_status.Tag = "readonly";
            // 
            // lastUpdateUser
            // 
            this.lastUpdateUser.Location = new System.Drawing.Point(385, 12);
            this.lastUpdateUser.Location = new System.Drawing.Point(656, 7);
            this.lastUpdateUser.Name = "lastUpdateUser";
            this.lastUpdateUser.Size = new System.Drawing.Size(165, 24);
            this.lastUpdateUser.StyleController = this.layoutMx1;
@@ -554,7 +554,7 @@
            // 
            // lastUpdateTime
            // 
            this.lastUpdateTime.Location = new System.Drawing.Point(656, 12);
            this.lastUpdateTime.Location = new System.Drawing.Point(656, 38);
            this.lastUpdateTime.Name = "lastUpdateTime";
            this.lastUpdateTime.Size = new System.Drawing.Size(165, 24);
            this.lastUpdateTime.StyleController = this.layoutMx1;
@@ -601,37 +601,37 @@
            this.layoutControlItem2,
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem7,
            this.layoutControlItem16,
            this.layoutControlItem5,
            this.layoutControlItem14,
            this.layoutControlItem11,
            this.layoutControlItem15,
            this.layoutControlItem11});
            this.layoutControlItem14,
            this.layoutControlItem5,
            this.layoutControlItem7});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            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;
            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;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1105, 113);
            this.Root.TextVisible = false;
            // 
@@ -676,17 +676,6 @@
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 62);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem7.Text = "申请备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.btnSelect;
@@ -700,49 +689,6 @@
            this.layoutControlItem16.Text = "退货明细";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem16.TextVisible = false;
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_billType;
            this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem5.Text = "申请类型";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.lastUpdateUser;
            this.layoutControlItem14.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem14.Text = "最后更新人";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.lastUpdateTime;
            this.layoutControlItem15.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem15.Text = "最后更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(542, 31);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // tabMx
            // 
@@ -948,10 +894,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1116,6 +1062,60 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.lastUpdateTime;
            this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem15.Text = "最后更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.lastUpdateUser;
            this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem14.Text = "最后更新人";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_billType;
            this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem5.Text = "申请类型";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem7.Text = "申请备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            //
            // Frm_Cqsq
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1161,12 +1161,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1177,6 +1172,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1223,7 +1223,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
        private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1242,10 +1241,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1260,5 +1255,10 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
    }
}
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
@@ -218,13 +218,14 @@
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                }
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                else
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -264,7 +265,7 @@
                lbGuid, txt_billNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -279,6 +280,8 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改
            txt_kcOrgId.IsReadly = true;
        }
        /// <summary>
        /// æ–°å¢žäº‹ä»¶
@@ -509,13 +512,14 @@
                case 0:
                    strMsg = "反审核";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -27,6 +27,8 @@
        protected override void OnCreateControl()
        {
            //列表,getmodel ä½¿ç”¨äº†RkqcManager,
            //保存,审核使,重新加载检验 ç”¨äº†MesQaItemsDetect01Manager
            base.OnCreateControl();
            if (Parent == null) return;
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
@@ -69,40 +71,48 @@
            else
                 if (strType == QcSeason.销售退货入库检.ToString())
                rptName = "rpt_Xsth";
            else
                 if (strType == QcSeason.超期检.ToString())
            {
                rptName = "";
                layoutControlItem25.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layoutControlItem27.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                tabMxPage3.PageVisible = false;
            }
            this.ucBtnPrint1.btnPrintClick += (s, e) =>
        {
            ucBtnPrint1.guidKey = "";
            string rowGuid = txt_aboutGuid.Text.Trim();
            ucBtnPrint1.guidKey = rowGuid;
            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
            {
                ucBtnPrint1.guidKey = "";
                string rowGuid = txt_aboutGuid.Text.Trim();
                ucBtnPrint1.guidKey = rowGuid;
                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请输入正确的条码数量!");
                    txt_iCount_1.Focus();
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量!");
                    txt_psnQty_1.Focus();
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                if (rowGuid.Length < 10)
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印的行!");
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请输入正确的条码数量!");
                txt_iCount_1.Focus();
                this.ucBtnPrint1.rptParameter = "return false";
                return;
            }
            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量!");
                txt_psnQty_1.Focus();
                this.ucBtnPrint1.rptParameter = "return false";
                return;
            }
            if (rowGuid.Length < 10)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印的行!");
                this.ucBtnPrint1.rptParameter = "return false";
                return;
            }
                this.ucBtnPrint1.rptParameter = rptName + "{" + rowGuid.Trim()
                       + "," + ""
                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
                       + "," + txt_iCount_1.Text.Trim()
                       + "," + txt_psnQty_1.Text.Trim()
                       + "}";
            };
            this.ucBtnPrint1.rptParameter = rptName + "{" + rowGuid.Trim()
                   + "," + ""
                   + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
                   + "," + txt_iCount_1.Text.Trim()
                   + "," + txt_psnQty_1.Text.Trim()
                   + "}";
        };
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {
                string rowGuid = txt_aboutGuid.Text.Trim();
@@ -193,7 +203,7 @@
            string strGuid = lbGuid.Text.Trim();
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -215,7 +225,7 @@
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
@@ -277,7 +287,7 @@
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            }
        }
@@ -388,7 +398,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -496,7 +506,7 @@
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -512,7 +522,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -648,7 +658,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
@@ -671,7 +681,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定操作吗?"))
@@ -686,9 +696,9 @@
                    "MesQaItemsDetect01Manager/" + _meth,
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnData.outMsg);
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnData.outMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim(), "0");
@@ -699,10 +709,12 @@
                    int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1);
                    UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, parentForm, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError("提示:" + _rtn.rtnData.outMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
DevApp/Gs.DevApp/DevFrm/RkQC/SelectCqsq.Designer.cs
@@ -39,12 +39,15 @@
            this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
            this.panelControl2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -89,10 +92,13 @@
            this.gv_supplierItemName,
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn2,
            this.gridColumn7,
            this.gridColumn1,
            this.gridColumn3,
            this.gridColumn4});
            this.gridColumn4,
            this.gridColumn2,
            this.gridColumn8,
            this.gridColumn9});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -203,15 +209,15 @@
            this.gridColumn6.VisibleIndex = 6;
            this.gridColumn6.Width = 92;
            // 
            // gridColumn2
            // gridColumn7
            // 
            this.gridColumn2.Caption = "库存组织";
            this.gridColumn2.FieldName = "orgName";
            this.gridColumn2.MinWidth = 10;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 10;
            this.gridColumn2.Width = 216;
            this.gridColumn7.Caption = "最后检验日期";
            this.gridColumn7.FieldName = "lastJy";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 7;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn1
            // 
@@ -220,7 +226,7 @@
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 7;
            this.gridColumn1.VisibleIndex = 10;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn3
@@ -230,8 +236,52 @@
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 8;
            this.gridColumn3.VisibleIndex = 9;
            this.gridColumn3.Width = 94;
            //
            // gridColumn4
            //
            this.gridColumn4.AppearanceCell.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical;
            this.gridColumn4.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn4.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical;
            this.gridColumn4.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn4.Caption = "开始预警日期";
            this.gridColumn4.FieldName = "begYjDate";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 12;
            this.gridColumn4.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "库存组织";
            this.gridColumn2.FieldName = "orgName";
            this.gridColumn2.MinWidth = 10;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 13;
            this.gridColumn2.Width = 216;
            //
            // gridColumn8
            //
            this.gridColumn8.Caption = "质保期";
            this.gridColumn8.FieldName = "zbq";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 8;
            this.gridColumn8.Width = 94;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "提前预警天";
            this.gridColumn9.FieldName = "tqyj";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 11;
            this.gridColumn9.Width = 94;
            // 
            // panelControl1
            // 
@@ -253,16 +303,6 @@
            this.btnIn.Size = new System.Drawing.Size(94, 39);
            this.btnIn.TabIndex = 4;
            this.btnIn.Text = "确定导入";
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "开始预警日期";
            this.gridColumn4.FieldName = "begYjDate";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 9;
            this.gridColumn4.Width = 94;
            // 
            // SelectCqsq
            // 
@@ -304,5 +344,8 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
    }
}
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1612,6 +1612,9 @@
    <EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
      <DependentUpon>MesQcExceptional.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_CqDetect01.resx">
      <DependentUpon>Frm_CqDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqfa.resx">
      <DependentUpon>Frm_Cqfa.cs</DependentUpon>
    </EmbeddedResource>
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -63,12 +63,14 @@
            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptSrm = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
            this.label1 = new System.Windows.Forms.Label();
            this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
            this.panelControl2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -413,8 +415,10 @@
            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_operationTime,
            this.gv_operationTable,
            this.gridColumn8,
            this.gv_userName,
            this.gv_Btn});
            this.gv_Btn,
            this.gridColumn11});
            this.gridView2.GridControl = this.gridControl2;
            this.gridView2.Name = "gridView2";
            this.gridView2.OptionsFind.ShowSearchNavButtons = false;
@@ -447,6 +451,16 @@
            this.gv_operationTable.VisibleIndex = 1;
            this.gv_operationTable.Width = 100;
            // 
            // gridColumn8
            //
            this.gridColumn8.Caption = "单据类型";
            this.gridColumn8.FieldName = "documentTypeTxt";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 3;
            this.gridColumn8.Width = 94;
            //
            // gv_userName
            // 
            this.gv_userName.AppearanceCell.Options.UseFont = true;
@@ -467,7 +481,7 @@
            this.gv_Btn.MinWidth = 25;
            this.gv_Btn.Name = "gv_Btn";
            this.gv_Btn.Visible = true;
            this.gv_Btn.VisibleIndex = 3;
            this.gv_Btn.VisibleIndex = 5;
            this.gv_Btn.Width = 94;
            // 
            // rptSrm
@@ -510,6 +524,16 @@
            new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(1)), "委外")});
            this.radioGroup1.Size = new System.Drawing.Size(197, 34);
            this.radioGroup1.TabIndex = 0;
            //
            // gridColumn11
            //
            this.gridColumn11.Caption = "建立时间";
            this.gridColumn11.FieldName = "createDate";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 4;
            this.gridColumn11.Width = 94;
            // 
            // SelectCgMx
            // 
@@ -580,5 +604,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptSrm;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
    }
}