lu
2025-01-13 9d3b4f0525c5a0c9a4c1e521cec260226394842f
采购退料申请
已修改10个文件
853 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs 410 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs 311 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            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 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.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -405,10 +405,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);
@@ -885,9 +885,9 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_qt025.Properties.Items.AddRange(new object[] {
            "请选择",
            "1,组织(BD_OwnerOrg)",
            "2,供应商(BD_Supplier)",
            "3,客户(BD_Customer)"});
            "1,组织(BD_OwnerOrg)",
            "2,供应商(BD_Supplier)",
            "3,客户(BD_Customer)"});
            this.txt_qt025.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_qt025.Size = new System.Drawing.Size(210, 24);
            this.txt_qt025.TabIndex = 311;
@@ -964,11 +964,11 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_qt019.Properties.Items.AddRange(new object[] {
            "请选择",
            "1,标准其他出库单(QTCKDO1 SYS)",
            "2,资产出库(QTCKDO2 SYS)",
            "3,VMI出库(QTCKDO3 SYS)",
            "4,费用物料出库(QTCKDO4 SYS)",
            "5,库存调整(QTCKDO5 SYS)"});
            "1,标准其他出库单(QTCKDO1 SYS)",
            "2,资产出库(QTCKDO2 SYS)",
            "3,VMI出库(QTCKDO3 SYS)",
            "4,费用物料出库(QTCKDO4 SYS)",
            "5,库存调整(QTCKDO5 SYS)"});
            this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_qt019.Size = new System.Drawing.Size(188, 24);
            this.txt_qt019.TabIndex = 301;
@@ -982,8 +982,8 @@
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_qt020.Properties.Items.AddRange(new object[] {
            "请选择",
            "1,普通(GENERAL)",
            "2,退货(RETURN)"});
            "1,普通(GENERAL)",
            "2,退货(RETURN)"});
            this.txt_qt020.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_qt020.Size = new System.Drawing.Size(188, 24);
            this.txt_qt020.TabIndex = 300;
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -77,39 +77,20 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
            this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_fType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_urgentFlag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_fstatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_depotsCode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_suppNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_remark = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -135,6 +116,25 @@
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -682,34 +682,17 @@
            this.gridView1.OptionsView.ShowColumnHeaders = false;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // gridBand19
            //
            this.gridBand19.Caption = "收料组织";
            this.gridBand19.Columns.Add(this.bandedGridColumn1);
            this.gridBand19.Name = "gridBand19";
            this.gridBand19.VisibleIndex = 0;
            this.gridBand19.Width = 250;
            //
            // bandedGridColumn1
            // 
            this.bandedGridColumn1.Caption = "收料组织";
            this.bandedGridColumn1.FieldName = "receivingOrg";
            this.bandedGridColumn1.MinWidth = 250;
            this.bandedGridColumn1.MinWidth = 50;
            this.bandedGridColumn1.Name = "bandedGridColumn1";
            this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
            this.bandedGridColumn1.OptionsColumn.ReadOnly = true;
            this.bandedGridColumn1.Tag = "org.fnamber";
            this.bandedGridColumn1.Visible = true;
            this.bandedGridColumn1.Width = 250;
            //
            // gridBand1
            //
            this.gridBand1.Caption = "委外";
            this.gridBand1.Columns.Add(this.gv_fType);
            this.gridBand1.MinWidth = 50;
            this.gridBand1.Name = "gridBand1";
            this.gridBand1.VisibleIndex = 1;
            this.gridBand1.Width = 50;
            // 
            // gv_fType
            // 
@@ -726,15 +709,6 @@
            this.gv_fType.Visible = true;
            this.gv_fType.Width = 50;
            // 
            // gridBand2
            //
            this.gridBand2.Caption = "急料";
            this.gridBand2.Columns.Add(this.gv_urgentFlag);
            this.gridBand2.MinWidth = 50;
            this.gridBand2.Name = "gridBand2";
            this.gridBand2.VisibleIndex = 2;
            this.gridBand2.Width = 50;
            //
            // gv_urgentFlag
            // 
            this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -747,17 +721,6 @@
            this.gv_urgentFlag.UnboundDataType = typeof(bool);
            this.gv_urgentFlag.Visible = true;
            this.gv_urgentFlag.Width = 50;
            //
            // gridBand3
            //
            this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand3.Caption = "提交检验";
            this.gridBand3.Columns.Add(this.gv_fstatus);
            this.gridBand3.MinWidth = 50;
            this.gridBand3.Name = "gridBand3";
            this.gridBand3.VisibleIndex = 3;
            this.gridBand3.Width = 50;
            // 
            // gv_fstatus
            // 
@@ -772,15 +735,6 @@
            this.gv_fstatus.Visible = true;
            this.gv_fstatus.Width = 50;
            // 
            // gridBand4
            //
            this.gridBand4.Caption = "入库";
            this.gridBand4.Columns.Add(this.gridColumn2);
            this.gridBand4.MinWidth = 50;
            this.gridBand4.Name = "gridBand4";
            this.gridBand4.VisibleIndex = 4;
            this.gridBand4.Width = 50;
            //
            // gridColumn2
            // 
            this.gridColumn2.Caption = "入库";
@@ -791,15 +745,6 @@
            this.gridColumn2.UnboundDataType = typeof(bool);
            this.gridColumn2.Visible = true;
            this.gridColumn2.Width = 50;
            //
            // gridBand5
            //
            this.gridBand5.Caption = "到货单号";
            this.gridBand5.Columns.Add(this.gv_billNo);
            this.gridBand5.MinWidth = 150;
            this.gridBand5.Name = "gridBand5";
            this.gridBand5.VisibleIndex = 5;
            this.gridBand5.Width = 150;
            // 
            // gv_billNo
            // 
@@ -813,27 +758,6 @@
            this.gv_billNo.Visible = true;
            this.gv_billNo.Width = 20;
            // 
            // gridBand6
            //
            this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand6.Caption = "创建信息";
            this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
            this.gridBand7,
            this.gridBand8});
            this.gridBand6.Name = "gridBand6";
            this.gridBand6.VisibleIndex = 6;
            this.gridBand6.Width = 265;
            //
            // gridBand7
            //
            this.gridBand7.Caption = "创建人员";
            this.gridBand7.Columns.Add(this.gv_createBy);
            this.gridBand7.MinWidth = 60;
            this.gridBand7.Name = "gridBand7";
            this.gridBand7.VisibleIndex = 0;
            this.gridBand7.Width = 85;
            //
            // gv_createBy
            // 
            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -845,15 +769,6 @@
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.Width = 85;
            //
            // gridBand8
            //
            this.gridBand8.Caption = "创建日期";
            this.gridBand8.Columns.Add(this.gv_createDate);
            this.gridBand8.MinWidth = 180;
            this.gridBand8.Name = "gridBand8";
            this.gridBand8.VisibleIndex = 1;
            this.gridBand8.Width = 180;
            // 
            // gv_createDate
            // 
@@ -867,27 +782,6 @@
            this.gv_createDate.Visible = true;
            this.gv_createDate.Width = 180;
            // 
            // gridBand9
            //
            this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand9.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand9.Caption = "收货信息";
            this.gridBand9.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
            this.gridBand10,
            this.gridBand11});
            this.gridBand9.Name = "gridBand9";
            this.gridBand9.VisibleIndex = 7;
            this.gridBand9.Width = 233;
            //
            // gridBand10
            //
            this.gridBand10.Caption = "仓库编号";
            this.gridBand10.Columns.Add(this.gv_depotsCode);
            this.gridBand10.MinWidth = 80;
            this.gridBand10.Name = "gridBand10";
            this.gridBand10.VisibleIndex = 0;
            this.gridBand10.Width = 83;
            //
            // gv_depotsCode
            // 
            this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -900,15 +794,6 @@
            this.gv_depotsCode.Visible = true;
            this.gv_depotsCode.Width = 83;
            // 
            // gridBand11
            //
            this.gridBand11.Caption = "仓库名称";
            this.gridBand11.Columns.Add(this.gridColumn4);
            this.gridBand11.MinWidth = 150;
            this.gridBand11.Name = "gridBand11";
            this.gridBand11.VisibleIndex = 1;
            this.gridBand11.Width = 150;
            //
            // gridColumn4
            // 
            this.gridColumn4.Caption = "收货仓库名称";
@@ -917,27 +802,6 @@
            this.gridColumn4.OptionsColumn.AllowEdit = false;
            this.gridColumn4.Visible = true;
            this.gridColumn4.Width = 119;
            //
            // gridBand13
            //
            this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand13.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand13.Caption = "供应商信息";
            this.gridBand13.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
            this.gridBand12,
            this.gridBand14});
            this.gridBand13.Name = "gridBand13";
            this.gridBand13.VisibleIndex = 8;
            this.gridBand13.Width = 281;
            //
            // gridBand12
            //
            this.gridBand12.Caption = "供应商编号";
            this.gridBand12.Columns.Add(this.gv_suppNo);
            this.gridBand12.MinWidth = 80;
            this.gridBand12.Name = "gridBand12";
            this.gridBand12.VisibleIndex = 0;
            this.gridBand12.Width = 81;
            // 
            // gv_suppNo
            // 
@@ -951,15 +815,6 @@
            this.gv_suppNo.Visible = true;
            this.gv_suppNo.Width = 81;
            // 
            // gridBand14
            //
            this.gridBand14.Caption = "供应商名称";
            this.gridBand14.Columns.Add(this.gridColumn5);
            this.gridBand14.MinWidth = 200;
            this.gridBand14.Name = "gridBand14";
            this.gridBand14.VisibleIndex = 1;
            this.gridBand14.Width = 200;
            //
            // gridColumn5
            // 
            this.gridColumn5.Caption = "供应商名称";
@@ -968,15 +823,6 @@
            this.gridColumn5.OptionsColumn.AllowEdit = false;
            this.gridColumn5.Visible = true;
            this.gridColumn5.Width = 49;
            //
            // gridBand16
            //
            this.gridBand16.Caption = "备注";
            this.gridBand16.Columns.Add(this.gv_remark);
            this.gridBand16.MinWidth = 180;
            this.gridBand16.Name = "gridBand16";
            this.gridBand16.VisibleIndex = 9;
            this.gridBand16.Width = 180;
            // 
            // gv_remark
            // 
@@ -990,27 +836,6 @@
            this.gv_remark.Visible = true;
            this.gv_remark.Width = 85;
            // 
            // gridBand18
            //
            this.gridBand18.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand18.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand18.Caption = "检验信息";
            this.gridBand18.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
            this.gridBand15,
            this.gridBand17});
            this.gridBand18.Name = "gridBand18";
            this.gridBand18.VisibleIndex = 10;
            this.gridBand18.Width = 479;
            //
            // gridBand15
            //
            this.gridBand15.Caption = "提交人";
            this.gridBand15.Columns.Add(this.gv_checkUser);
            this.gridBand15.MinWidth = 60;
            this.gridBand15.Name = "gridBand15";
            this.gridBand15.VisibleIndex = 0;
            this.gridBand15.Width = 106;
            //
            // gv_checkUser
            // 
            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1022,15 +847,6 @@
            this.gv_checkUser.Tag = "query_a.check_user";
            this.gv_checkUser.Visible = true;
            this.gv_checkUser.Width = 106;
            //
            // gridBand17
            //
            this.gridBand17.Caption = "提交日期";
            this.gridBand17.Columns.Add(this.gv_checkDate);
            this.gridBand17.MinWidth = 180;
            this.gridBand17.Name = "gridBand17";
            this.gridBand17.VisibleIndex = 1;
            this.gridBand17.Width = 373;
            // 
            // gv_checkDate
            // 
@@ -1301,6 +1117,190 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridBand19
            //
            this.gridBand19.Caption = "收料组织";
            this.gridBand19.Columns.Add(this.bandedGridColumn1);
            this.gridBand19.Name = "gridBand19";
            this.gridBand19.VisibleIndex = 0;
            this.gridBand19.Width = 250;
            //
            // gridBand1
            //
            this.gridBand1.Caption = "委外";
            this.gridBand1.Columns.Add(this.gv_fType);
            this.gridBand1.MinWidth = 50;
            this.gridBand1.Name = "gridBand1";
            this.gridBand1.VisibleIndex = 1;
            this.gridBand1.Width = 50;
            //
            // gridBand2
            //
            this.gridBand2.Caption = "急料";
            this.gridBand2.Columns.Add(this.gv_urgentFlag);
            this.gridBand2.MinWidth = 50;
            this.gridBand2.Name = "gridBand2";
            this.gridBand2.VisibleIndex = 2;
            this.gridBand2.Width = 50;
            //
            // gridBand3
            //
            this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridBand3.Caption = "提交检验";
            this.gridBand3.Columns.Add(this.gv_fstatus);
            this.gridBand3.MinWidth = 50;
            this.gridBand3.Name = "gridBand3";
            this.gridBand3.VisibleIndex = 3;
            this.gridBand3.Width = 50;
            //
            // gridBand4
            //
            this.gridBand4.Caption = "入库";
            this.gridBand4.Columns.Add(this.gridColumn2);
            this.gridBand4.MinWidth = 50;
            this.gridBand4.Name = "gridBand4";
            this.gridBand4.VisibleIndex = 4;
            this.gridBand4.Width = 50;
            //
            // gridBand5
            //
            this.gridBand5.Caption = "到货单号";
            this.gridBand5.Columns.Add(this.gv_billNo);
            this.gridBand5.MinWidth = 50;
            this.gridBand5.Name = "gridBand5";
            this.gridBand5.VisibleIndex = 5;
            this.gridBand5.Width = 50;
            //
            // gridBand6
            //
            this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand6.Caption = "创建信息";
            this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
            this.gridBand7,
            this.gridBand8});
            this.gridBand6.Name = "gridBand6";
            this.gridBand6.VisibleIndex = 6;
            this.gridBand6.Width = 265;
            //
            // gridBand7
            //
            this.gridBand7.Caption = "创建人员";
            this.gridBand7.Columns.Add(this.gv_createBy);
            this.gridBand7.MinWidth = 60;
            this.gridBand7.Name = "gridBand7";
            this.gridBand7.VisibleIndex = 0;
            this.gridBand7.Width = 85;
            //
            // gridBand8
            //
            this.gridBand8.Caption = "创建日期";
            this.gridBand8.Columns.Add(this.gv_createDate);
            this.gridBand8.MinWidth = 50;
            this.gridBand8.Name = "gridBand8";
            this.gridBand8.VisibleIndex = 1;
            this.gridBand8.Width = 180;
            //
            // gridBand9
            //
            this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand9.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand9.Caption = "收货信息";
            this.gridBand9.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
            this.gridBand10,
            this.gridBand11});
            this.gridBand9.Name = "gridBand9";
            this.gridBand9.VisibleIndex = 7;
            this.gridBand9.Width = 202;
            //
            // gridBand10
            //
            this.gridBand10.Caption = "仓库编号";
            this.gridBand10.Columns.Add(this.gv_depotsCode);
            this.gridBand10.MinWidth = 50;
            this.gridBand10.Name = "gridBand10";
            this.gridBand10.VisibleIndex = 0;
            this.gridBand10.Width = 83;
            //
            // gridBand11
            //
            this.gridBand11.Caption = "仓库名称";
            this.gridBand11.Columns.Add(this.gridColumn4);
            this.gridBand11.MinWidth = 50;
            this.gridBand11.Name = "gridBand11";
            this.gridBand11.VisibleIndex = 1;
            this.gridBand11.Width = 119;
            //
            // gridBand13
            //
            this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand13.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand13.Caption = "供应商信息";
            this.gridBand13.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
            this.gridBand12,
            this.gridBand14});
            this.gridBand13.Name = "gridBand13";
            this.gridBand13.VisibleIndex = 8;
            this.gridBand13.Width = 131;
            //
            // gridBand12
            //
            this.gridBand12.Caption = "供应商编号";
            this.gridBand12.Columns.Add(this.gv_suppNo);
            this.gridBand12.MinWidth = 50;
            this.gridBand12.Name = "gridBand12";
            this.gridBand12.VisibleIndex = 0;
            this.gridBand12.Width = 81;
            //
            // gridBand14
            //
            this.gridBand14.Caption = "供应商名称";
            this.gridBand14.Columns.Add(this.gridColumn5);
            this.gridBand14.MinWidth = 50;
            this.gridBand14.Name = "gridBand14";
            this.gridBand14.VisibleIndex = 1;
            this.gridBand14.Width = 50;
            //
            // gridBand16
            //
            this.gridBand16.Caption = "备注";
            this.gridBand16.Columns.Add(this.gv_remark);
            this.gridBand16.MinWidth = 50;
            this.gridBand16.Name = "gridBand16";
            this.gridBand16.VisibleIndex = 9;
            this.gridBand16.Width = 85;
            //
            // gridBand18
            //
            this.gridBand18.AppearanceHeader.Options.UseTextOptions = true;
            this.gridBand18.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.gridBand18.Caption = "检验信息";
            this.gridBand18.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
            this.gridBand15,
            this.gridBand17});
            this.gridBand18.Name = "gridBand18";
            this.gridBand18.VisibleIndex = 10;
            this.gridBand18.Width = 479;
            //
            // gridBand15
            //
            this.gridBand15.Caption = "提交人";
            this.gridBand15.Columns.Add(this.gv_checkUser);
            this.gridBand15.MinWidth = 60;
            this.gridBand15.Name = "gridBand15";
            this.gridBand15.VisibleIndex = 0;
            this.gridBand15.Width = 106;
            //
            // gridBand17
            //
            this.gridBand17.Caption = "提交日期";
            this.gridBand17.Columns.Add(this.gv_checkDate);
            this.gridBand17.MinWidth = 50;
            this.gridBand17.Name = "gridBand17";
            this.gridBand17.VisibleIndex = 1;
            this.gridBand17.Width = 373;
            //
            // Frm_MesInvItemArn
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1418,6 +1418,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand19;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
@@ -1437,6 +1438,5 @@
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand17;
        private System.Windows.Forms.PictureBox picCheckBox;
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -3,7 +3,6 @@
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.RichEdit.Export;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -104,7 +103,6 @@
                        MessageBox.Show(ex.Message);
                    }
                };
                frm.ShowDialog();
            };
@@ -415,6 +413,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -472,6 +471,7 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
@@ -578,7 +578,6 @@
            }
        }
        /// <summary>
        /// 检验和反检验
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -158,6 +158,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -215,6 +216,7 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
@@ -232,6 +234,7 @@
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt2;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                    }
                    else
                    {
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -73,7 +73,7 @@
            this.gv_tbl022 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_tbl021 = new DevExpress.XtraEditors.LabelControl();
            this.txt_tbl021 = new DevExpress.XtraEditors.TextEdit();
            this.txt_workName = new DevExpress.XtraEditors.TextEdit();
            this.gv_tbl021 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_tbl020 = new DevExpress.XtraEditors.LabelControl();
            this.gv_tbl020 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -101,15 +101,15 @@
            this.lb_tbl005 = new DevExpress.XtraEditors.LabelControl();
            this.gv_tbl005 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_tbl004 = new DevExpress.XtraEditors.LabelControl();
            this.txt_tbl004 = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
            this.gv_tbl004 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_tbl003 = new DevExpress.XtraEditors.LabelControl();
            this.txt_tbl003 = new DevExpress.XtraEditors.TextEdit();
            this.txt_rwd = new DevExpress.XtraEditors.TextEdit();
            this.gv_tbl003 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_tbl002 = new DevExpress.XtraEditors.LabelControl();
            this.gv_tbl002 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_tbl001 = new DevExpress.XtraEditors.LabelControl();
            this.txt_tbl001 = new DevExpress.XtraEditors.TextEdit();
            this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
            this.gv_tbl001 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
@@ -128,9 +128,15 @@
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.txt_tbl023 = new Gs.DevApp.UserControl.UcLookOrg();
            this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
            this.txt_tbl013 = new DevExpress.XtraEditors.CheckEdit();
            this.txt_tbl005 = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -139,10 +145,6 @@
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -157,13 +159,13 @@
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl021.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_workName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl004.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl003.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl001.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_rwd.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -307,7 +309,7 @@
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Controls.Add(this.panelMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 370);
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 351);
            this.tabMxPage1.Text = "退料明细";
            // 
            // gcMx1
@@ -318,7 +320,7 @@
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 272);
            this.gcMx1.Size = new System.Drawing.Size(1124, 253);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -611,21 +613,21 @@
            // 
            this.lb_tbl021.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl021.Appearance.Options.UseFont = true;
            this.lb_tbl021.Location = new System.Drawing.Point(256, 54);
            this.lb_tbl021.Location = new System.Drawing.Point(255, 52);
            this.lb_tbl021.Name = "lb_tbl021";
            this.lb_tbl021.Size = new System.Drawing.Size(73, 21);
            this.lb_tbl021.Size = new System.Drawing.Size(68, 21);
            this.lb_tbl021.TabIndex = 298;
            this.lb_tbl021.Text = "生产车间 ";
            this.lb_tbl021.Text = "生产车间";
            // 
            // txt_tbl021
            // txt_workName
            // 
            this.txt_tbl021.Enabled = false;
            this.txt_tbl021.Location = new System.Drawing.Point(331, 50);
            this.txt_tbl021.Name = "txt_tbl021";
            this.txt_tbl021.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_tbl021.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl021.Size = new System.Drawing.Size(150, 28);
            this.txt_tbl021.TabIndex = 298;
            this.txt_workName.Location = new System.Drawing.Point(326, 48);
            this.txt_workName.Name = "txt_workName";
            this.txt_workName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_workName.Properties.Appearance.Options.UseFont = true;
            this.txt_workName.Size = new System.Drawing.Size(201, 28);
            this.txt_workName.TabIndex = 298;
            this.txt_workName.Tag = "readonly";
            // 
            // gv_tbl021
            // 
@@ -645,7 +647,7 @@
            // 
            this.lb_tbl020.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl020.Appearance.Options.UseFont = true;
            this.lb_tbl020.Location = new System.Drawing.Point(745, 120);
            this.lb_tbl020.Location = new System.Drawing.Point(662, 81);
            this.lb_tbl020.Name = "lb_tbl020";
            this.lb_tbl020.Size = new System.Drawing.Size(73, 21);
            this.lb_tbl020.TabIndex = 291;
@@ -753,7 +755,7 @@
            // 
            this.lb_tbl013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl013.Appearance.Options.UseFont = true;
            this.lb_tbl013.Location = new System.Drawing.Point(745, 88);
            this.lb_tbl013.Location = new System.Drawing.Point(536, 82);
            this.lb_tbl013.Name = "lb_tbl013";
            this.lb_tbl013.Size = new System.Drawing.Size(73, 21);
            this.lb_tbl013.TabIndex = 252;
@@ -777,7 +779,7 @@
            // 
            this.lb_tbl012.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl012.Appearance.Options.UseFont = true;
            this.lb_tbl012.Location = new System.Drawing.Point(745, 54);
            this.lb_tbl012.Location = new System.Drawing.Point(536, 52);
            this.lb_tbl012.Name = "lb_tbl012";
            this.lb_tbl012.Size = new System.Drawing.Size(73, 21);
            this.lb_tbl012.TabIndex = 247;
@@ -785,13 +787,13 @@
            // 
            // txt_tbl012
            // 
            this.txt_tbl012.Enabled = false;
            this.txt_tbl012.Location = new System.Drawing.Point(822, 50);
            this.txt_tbl012.Location = new System.Drawing.Point(613, 48);
            this.txt_tbl012.Name = "txt_tbl012";
            this.txt_tbl012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl012.Size = new System.Drawing.Size(150, 28);
            this.txt_tbl012.TabIndex = 247;
            this.txt_tbl012.Tag = "readonly";
            // 
            // gv_tbl012
            // 
@@ -811,7 +813,7 @@
            // 
            this.lb_tbl011.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl011.Appearance.Options.UseFont = true;
            this.lb_tbl011.Location = new System.Drawing.Point(762, 20);
            this.lb_tbl011.Location = new System.Drawing.Point(553, 20);
            this.lb_tbl011.Name = "lb_tbl011";
            this.lb_tbl011.Size = new System.Drawing.Size(56, 21);
            this.lb_tbl011.TabIndex = 243;
@@ -819,13 +821,13 @@
            // 
            // txt_tbl011
            // 
            this.txt_tbl011.Enabled = false;
            this.txt_tbl011.Location = new System.Drawing.Point(822, 16);
            this.txt_tbl011.Location = new System.Drawing.Point(613, 16);
            this.txt_tbl011.Name = "txt_tbl011";
            this.txt_tbl011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl011.Size = new System.Drawing.Size(150, 28);
            this.txt_tbl011.TabIndex = 243;
            this.txt_tbl011.Tag = "readonly";
            // 
            // gv_tbl011
            // 
@@ -901,7 +903,7 @@
            // 
            this.lb_tbl006.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl006.Appearance.Options.UseFont = true;
            this.lb_tbl006.Location = new System.Drawing.Point(45, 120);
            this.lb_tbl006.Location = new System.Drawing.Point(42, 142);
            this.lb_tbl006.Name = "lb_tbl006";
            this.lb_tbl006.Size = new System.Drawing.Size(39, 21);
            this.lb_tbl006.TabIndex = 226;
@@ -909,11 +911,11 @@
            // 
            // txt_tbl006
            // 
            this.txt_tbl006.Location = new System.Drawing.Point(85, 116);
            this.txt_tbl006.Location = new System.Drawing.Point(85, 138);
            this.txt_tbl006.Name = "txt_tbl006";
            this.txt_tbl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl006.Size = new System.Drawing.Size(650, 28);
            this.txt_tbl006.Size = new System.Drawing.Size(678, 28);
            this.txt_tbl006.TabIndex = 226;
            // 
            // gv_tbl006
@@ -934,7 +936,7 @@
            // 
            this.lb_tbl005.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl005.Appearance.Options.UseFont = true;
            this.lb_tbl005.Location = new System.Drawing.Point(11, 88);
            this.lb_tbl005.Location = new System.Drawing.Point(8, 112);
            this.lb_tbl005.Name = "lb_tbl005";
            this.lb_tbl005.Size = new System.Drawing.Size(73, 21);
            this.lb_tbl005.TabIndex = 222;
@@ -958,21 +960,21 @@
            // 
            this.lb_tbl004.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl004.Appearance.Options.UseFont = true;
            this.lb_tbl004.Location = new System.Drawing.Point(508, 54);
            this.lb_tbl004.Location = new System.Drawing.Point(255, 112);
            this.lb_tbl004.Name = "lb_tbl004";
            this.lb_tbl004.Size = new System.Drawing.Size(73, 21);
            this.lb_tbl004.Size = new System.Drawing.Size(68, 21);
            this.lb_tbl004.TabIndex = 219;
            this.lb_tbl004.Text = "产品型号 ";
            this.lb_tbl004.Text = "产品名称";
            // 
            // txt_tbl004
            // txt_itemName
            // 
            this.txt_tbl004.Enabled = false;
            this.txt_tbl004.Location = new System.Drawing.Point(585, 50);
            this.txt_tbl004.Name = "txt_tbl004";
            this.txt_tbl004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_tbl004.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl004.Size = new System.Drawing.Size(150, 28);
            this.txt_tbl004.TabIndex = 219;
            this.txt_itemName.Location = new System.Drawing.Point(326, 108);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(437, 28);
            this.txt_itemName.TabIndex = 219;
            this.txt_itemName.Tag = "readonly";
            // 
            // gv_tbl004
            // 
@@ -992,21 +994,21 @@
            // 
            this.lb_tbl003.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl003.Appearance.Options.UseFont = true;
            this.lb_tbl003.Location = new System.Drawing.Point(256, 20);
            this.lb_tbl003.Location = new System.Drawing.Point(255, 20);
            this.lb_tbl003.Name = "lb_tbl003";
            this.lb_tbl003.Size = new System.Drawing.Size(73, 21);
            this.lb_tbl003.Size = new System.Drawing.Size(68, 21);
            this.lb_tbl003.TabIndex = 217;
            this.lb_tbl003.Text = "任务单号 ";
            this.lb_tbl003.Text = "任务单号";
            // 
            // txt_tbl003
            // txt_rwd
            // 
            this.txt_tbl003.Enabled = false;
            this.txt_tbl003.Location = new System.Drawing.Point(331, 16);
            this.txt_tbl003.Name = "txt_tbl003";
            this.txt_tbl003.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_tbl003.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl003.Size = new System.Drawing.Size(150, 28);
            this.txt_tbl003.TabIndex = 217;
            this.txt_rwd.Location = new System.Drawing.Point(326, 16);
            this.txt_rwd.Name = "txt_rwd";
            this.txt_rwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_rwd.Properties.Appearance.Options.UseFont = true;
            this.txt_rwd.Size = new System.Drawing.Size(201, 28);
            this.txt_rwd.TabIndex = 217;
            this.txt_rwd.Tag = "readonly";
            // 
            // gv_tbl003
            // 
@@ -1026,7 +1028,7 @@
            // 
            this.lb_tbl002.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl002.Appearance.Options.UseFont = true;
            this.lb_tbl002.Location = new System.Drawing.Point(11, 54);
            this.lb_tbl002.Location = new System.Drawing.Point(8, 82);
            this.lb_tbl002.Name = "lb_tbl002";
            this.lb_tbl002.Size = new System.Drawing.Size(73, 21);
            this.lb_tbl002.TabIndex = 216;
@@ -1050,21 +1052,21 @@
            // 
            this.lb_tbl001.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_tbl001.Appearance.Options.UseFont = true;
            this.lb_tbl001.Location = new System.Drawing.Point(508, 20);
            this.lb_tbl001.Location = new System.Drawing.Point(255, 82);
            this.lb_tbl001.Name = "lb_tbl001";
            this.lb_tbl001.Size = new System.Drawing.Size(73, 21);
            this.lb_tbl001.Size = new System.Drawing.Size(68, 21);
            this.lb_tbl001.TabIndex = 213;
            this.lb_tbl001.Text = "产线名称 ";
            this.lb_tbl001.Text = "产线名称";
            // 
            // txt_tbl001
            // txt_lineName
            // 
            this.txt_tbl001.Enabled = false;
            this.txt_tbl001.Location = new System.Drawing.Point(585, 16);
            this.txt_tbl001.Name = "txt_tbl001";
            this.txt_tbl001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_tbl001.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl001.Size = new System.Drawing.Size(150, 28);
            this.txt_tbl001.TabIndex = 213;
            this.txt_lineName.Location = new System.Drawing.Point(326, 78);
            this.txt_lineName.Name = "txt_lineName";
            this.txt_lineName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lineName.Properties.Appearance.Options.UseFont = true;
            this.txt_lineName.Size = new System.Drawing.Size(201, 28);
            this.txt_lineName.TabIndex = 213;
            this.txt_lineName.Tag = "readonly";
            // 
            // gv_tbl001
            // 
@@ -1084,21 +1086,21 @@
            // 
            this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_billNo.Appearance.Options.UseFont = true;
            this.lb_billNo.Location = new System.Drawing.Point(11, 20);
            this.lb_billNo.Location = new System.Drawing.Point(13, 20);
            this.lb_billNo.Name = "lb_billNo";
            this.lb_billNo.Size = new System.Drawing.Size(73, 21);
            this.lb_billNo.Size = new System.Drawing.Size(68, 21);
            this.lb_billNo.TabIndex = 211;
            this.lb_billNo.Text = "退料单号 ";
            this.lb_billNo.Text = "申请单号";
            // 
            // txt_billNo
            // 
            this.txt_billNo.Enabled = false;
            this.txt_billNo.Location = new System.Drawing.Point(85, 16);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(150, 28);
            this.txt_billNo.Size = new System.Drawing.Size(164, 28);
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
            // 
            // gv_billNo
            // 
@@ -1220,10 +1222,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 190);
            this.tabMx.Location = new System.Drawing.Point(0, 209);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 402);
            this.tabMx.Size = new System.Drawing.Size(1126, 383);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -1233,7 +1235,7 @@
            // 
            this.xtraTabPage3.Controls.Add(this.gcMx2);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 370);
            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 351);
            this.xtraTabPage3.Text = "条码明细";
            // 
            // gcMx2
@@ -1242,7 +1244,7 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1124, 370);
            this.gcMx2.Size = new System.Drawing.Size(1124, 351);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -1303,6 +1305,46 @@
            this.gvMx1quantity.VisibleIndex = 1;
            this.gvMx1quantity.Width = 94;
            // 
            // gridColumn7
            //
            this.gridColumn7.Caption = "单位";
            this.gridColumn7.FieldName = "dwName";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 2;
            this.gridColumn7.Width = 94;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "物料编码";
            this.gridColumn4.FieldName = "wlbm";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 94;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "物料名称";
            this.gridColumn9.FieldName = "wlmc";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 4;
            this.gridColumn9.Width = 94;
            //
            // gridColumn8
            //
            this.gridColumn8.Caption = "规格型号";
            this.gridColumn8.FieldName = "wlgg";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 5;
            this.gridColumn8.Width = 94;
            //
            // gvMx1createBy
            // 
            this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1313,7 +1355,7 @@
            this.gvMx1createBy.Name = "gvMx1createBy";
            this.gvMx1createBy.Tag = "query_a.CREATE_BY";
            this.gvMx1createBy.Visible = true;
            this.gvMx1createBy.VisibleIndex = 5;
            this.gvMx1createBy.VisibleIndex = 6;
            this.gvMx1createBy.Width = 94;
            // 
            // gvMx1lotDate
@@ -1332,6 +1374,8 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.txt_tbl023);
            this.panel1.Controls.Add(this.txt_tbl020);
            this.panel1.Controls.Add(this.txt_tbl013);
            this.panel1.Controls.Add(this.txt_tbl005);
@@ -1340,7 +1384,7 @@
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_tbl021);
            this.panel1.Controls.Add(this.txt_tbl021);
            this.panel1.Controls.Add(this.txt_workName);
            this.panel1.Controls.Add(this.lb_tbl020);
            this.panel1.Controls.Add(this.lb_tbl013);
            this.panel1.Controls.Add(this.lb_tbl012);
@@ -1351,42 +1395,60 @@
            this.panel1.Controls.Add(this.txt_tbl006);
            this.panel1.Controls.Add(this.lb_tbl005);
            this.panel1.Controls.Add(this.lb_tbl004);
            this.panel1.Controls.Add(this.txt_tbl004);
            this.panel1.Controls.Add(this.txt_itemName);
            this.panel1.Controls.Add(this.lb_tbl003);
            this.panel1.Controls.Add(this.txt_tbl003);
            this.panel1.Controls.Add(this.txt_rwd);
            this.panel1.Controls.Add(this.lb_tbl002);
            this.panel1.Controls.Add(this.lb_tbl001);
            this.panel1.Controls.Add(this.txt_tbl001);
            this.panel1.Controls.Add(this.txt_lineName);
            this.panel1.Controls.Add(this.lb_billNo);
            this.panel1.Controls.Add(this.txt_billNo);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1126, 190);
            this.panel1.Size = new System.Drawing.Size(1126, 209);
            this.panel1.TabIndex = 1;
            //
            // labelControl2
            //
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(13, 52);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(68, 21);
            this.labelControl2.TabIndex = 463;
            this.labelControl2.Text = "退料组织";
            //
            // txt_tbl023
            //
            this.txt_tbl023.IsReadly = false;
            this.txt_tbl023.Location = new System.Drawing.Point(85, 47);
            this.txt_tbl023.Name = "txt_tbl023";
            this.txt_tbl023.Size = new System.Drawing.Size(164, 30);
            this.txt_tbl023.TabIndex = 462;
            // 
            // txt_tbl020
            // 
            this.txt_tbl020.Enabled = false;
            this.txt_tbl020.Location = new System.Drawing.Point(822, 120);
            this.txt_tbl020.Location = new System.Drawing.Point(740, 79);
            this.txt_tbl020.Name = "txt_tbl020";
            this.txt_tbl020.Properties.Caption = "";
            this.txt_tbl020.Size = new System.Drawing.Size(94, 24);
            this.txt_tbl020.Size = new System.Drawing.Size(23, 24);
            this.txt_tbl020.TabIndex = 461;
            // 
            // txt_tbl013
            // 
            this.txt_tbl013.Enabled = false;
            this.txt_tbl013.Location = new System.Drawing.Point(822, 85);
            this.txt_tbl013.Location = new System.Drawing.Point(613, 80);
            this.txt_tbl013.Name = "txt_tbl013";
            this.txt_tbl013.Properties.Caption = "";
            this.txt_tbl013.Size = new System.Drawing.Size(94, 24);
            this.txt_tbl013.Size = new System.Drawing.Size(36, 24);
            this.txt_tbl013.TabIndex = 460;
            // 
            // txt_tbl005
            // 
            this.txt_tbl005.Location = new System.Drawing.Point(85, 86);
            this.txt_tbl005.Location = new System.Drawing.Point(85, 110);
            this.txt_tbl005.Name = "txt_tbl005";
            this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1394,21 +1456,22 @@
            "良品退料",
            "来料不良退料",
            "作业不良退料"});
            this.txt_tbl005.Size = new System.Drawing.Size(150, 24);
            this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_tbl005.Size = new System.Drawing.Size(164, 24);
            this.txt_tbl005.TabIndex = 459;
            // 
            // txt_tbl002
            // 
            this.txt_tbl002.IsReadly = false;
            this.txt_tbl002.Location = new System.Drawing.Point(85, 50);
            this.txt_tbl002.Location = new System.Drawing.Point(85, 78);
            this.txt_tbl002.Name = "txt_tbl002";
            this.txt_tbl002.Size = new System.Drawing.Size(150, 28);
            this.txt_tbl002.Size = new System.Drawing.Size(164, 30);
            this.txt_tbl002.TabIndex = 458;
            // 
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 150);
            this.btnSelect.Location = new System.Drawing.Point(13, 173);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(107, 29);
            this.btnSelect.TabIndex = 457;
@@ -1444,46 +1507,6 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn7
            //
            this.gridColumn7.Caption = "单位";
            this.gridColumn7.FieldName = "dwName";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 2;
            this.gridColumn7.Width = 94;
            //
            // gridColumn8
            //
            this.gridColumn8.Caption = "规格型号";
            this.gridColumn8.FieldName = "wlgg";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 5;
            this.gridColumn8.Width = 94;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "物料名称";
            this.gridColumn9.FieldName = "wlmc";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 4;
            this.gridColumn9.Width = 94;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "物料编码";
            this.gridColumn4.FieldName = "wlbm";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 94;
            //
            // Frm_MesItemTbl
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1509,13 +1532,13 @@
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl021.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_workName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl004.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl003.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl001.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_rwd.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -1565,7 +1588,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
        private DevExpress.XtraEditors.LabelControl lb_tbl021;
        private DevExpress.XtraEditors.TextEdit txt_tbl021;
        private DevExpress.XtraEditors.TextEdit txt_workName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl021;
        private DevExpress.XtraEditors.LabelControl lb_tbl020;
@@ -1600,18 +1623,18 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl005;
        private DevExpress.XtraEditors.LabelControl lb_tbl004;
        private DevExpress.XtraEditors.TextEdit txt_tbl004;
        private DevExpress.XtraEditors.TextEdit txt_itemName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl004;
        private DevExpress.XtraEditors.LabelControl lb_tbl003;
        private DevExpress.XtraEditors.TextEdit txt_tbl003;
        private DevExpress.XtraEditors.TextEdit txt_rwd;
        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl003;
        private DevExpress.XtraEditors.LabelControl lb_tbl002;
        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl002;
        private DevExpress.XtraEditors.LabelControl lb_tbl001;
        private DevExpress.XtraEditors.TextEdit txt_tbl001;
        private DevExpress.XtraEditors.TextEdit txt_lineName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl001;
        private DevExpress.XtraEditors.LabelControl lb_billNo;
@@ -1659,5 +1682,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private UserControl.UcLookOrg txt_tbl023;
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -28,8 +28,6 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            //toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
            //toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "tbl013", "", (value) =>
            {
@@ -44,6 +42,23 @@
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //设置组织
            txt_tbl023.EditChanged += (s, e) =>
            {
                string orgdId = txt_tbl023.GetId();
                if (string.IsNullOrEmpty(orgdId)) return;
                txt_tbl002.getSuppler(orgdId);
            };
            //设置工单子
            txt_tbl002.EditChanged += (s, e) =>
            {
                string daaId = txt_tbl002.GetId();
                if (string.IsNullOrEmpty(daaId)) return;
                txt_rwd.Text = txt_tbl002.GetRwd();
                txt_workName.Text = txt_tbl002.GetWorkName();
                txt_lineName.Text = txt_tbl002.GetPrdName();
                txt_itemName.Text = txt_tbl002.GetPrdModel();
            };
            //选择需要入库的明细
            btnSelect.Click += (s, e) =>
            {
@@ -122,14 +137,14 @@
                       + "}";
            };
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
            await Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        /// 分页事件
        /// </summary>
@@ -360,6 +375,13 @@
        {
            toolBarMenu1.isSetBtn = false;
            string workId = txt_tbl002.GetId();
            string orgId = txt_tbl023.GetId();
            if (string.IsNullOrEmpty(orgId.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择组织!");
                txt_tbl023.Focus();
                return;
            }
            if (string.IsNullOrEmpty(workId.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择工单!");
@@ -377,6 +399,8 @@
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                bz = txt_tbl006.Text.Trim(),//备注
                yy = txt_tbl005.Text.Trim(),//原因
                inDaaGuid = workId,//工单
                inOrgId = orgId,//组织
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
@@ -447,6 +471,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -504,6 +529,7 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
@@ -520,6 +546,7 @@
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt2;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                    }
                    else
                    {
@@ -641,12 +668,12 @@
                txtWlgg.Text = row["tld004"].ToString();
                txtWlmc.Text = row["tld003"].ToString();
                txtQuantity.Text = row["tld004"].ToString();//申请总量
                 //txtYdy.Text = row["YDYNUM"].ToString();//已打印总量
                 //kyPrtQty.Text = row["KDYNUM"].ToString();//可打印总量
                                                            //txtYdy.Text = row["YDYNUM"].ToString();//已打印总量
                                                            //kyPrtQty.Text = row["KDYNUM"].ToString();//可打印总量
                txtYdy.Text = "";//已打印总量
                kyPrtQty.Text = "";//可打印总量
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -336,6 +336,7 @@
            dataTable.Rows.Add("GDPC(工单排产)");//V
            dataTable.Rows.Add("WWPC(委外排产)");//V
            dataTable.Rows.Add("CKSQ(出库申请)");//V
            dataTable.Rows.Add("RKSQ(入库申请)");//V
            dataTable.Rows.Add("TL(退料单)");
            dataTable.Rows.Add("IN(入库单)");
            dataTable.Rows.Add("SC(生产工单)");
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -97,11 +97,11 @@
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
                gcMain.ForceInitialize();
                gridView1.BestFitColumns();
                var dddd = dd.rtnData.pages; //总页
                pageBar1.TotalPages = dddd;
                pageBar1.RecordCount = dd.rtnData.total; //记录总数
                pageBar1.CurrentPage = curPage; //当前页
                pageBar1.setTxt();
            }
            catch (Exception ex)
            {
DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs
@@ -41,6 +41,7 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -100,7 +101,8 @@
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn4,
            this.gridColumn3});
            this.gridColumn3,
            this.gridColumn2});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -112,11 +114,13 @@
            // 
            this.gv_chk.Caption = "选择";
            this.gv_chk.FieldName = "gvChk";
            this.gv_chk.MinWidth = 60;
            this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
            this.gv_chk.MaxWidth = 40;
            this.gv_chk.MinWidth = 40;
            this.gv_chk.Name = "gv_chk";
            this.gv_chk.Visible = true;
            this.gv_chk.VisibleIndex = 0;
            this.gv_chk.Width = 94;
            this.gv_chk.Width = 40;
            // 
            // gv_guid
            // 
@@ -186,23 +190,25 @@
            // gridColumn6
            // 
            this.gridColumn6.Caption = "单位";
            this.gridColumn6.FieldName = "fnumber";
            this.gridColumn6.MinWidth = 100;
            this.gridColumn6.FieldName = "fname";
            this.gridColumn6.MaxWidth = 60;
            this.gridColumn6.MinWidth = 60;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 100;
            this.gridColumn6.Width = 60;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "已发数量";
            this.gridColumn4.FieldName = "dab007";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.MaxWidth = 50;
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 6;
            this.gridColumn4.Width = 94;
            this.gridColumn4.Width = 50;
            // 
            // gridColumn3
            // 
@@ -213,6 +219,16 @@
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 7;
            this.gridColumn3.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "工单号";
            this.gridColumn2.FieldName = "dab001";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 8;
            this.gridColumn2.Width = 94;
            // 
            // panelControl1
            // 
@@ -285,5 +301,6 @@
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
    }
}
DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs
@@ -24,13 +24,11 @@
            InitializeComponent();
            this.daaGuid = _daaGuid;
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            getPageList(1, UtilityHelper.GetPageSize());
            gridView1.IndicatorWidth = 50;
            gridView1.CustomDrawRowIndicator += (s, e) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
            };
            });
            getPageList(1, UtilityHelper.GetPageSize());
            btnIn.Click += (s, e) =>
            {
                var list = new List<string>();
@@ -89,6 +87,7 @@
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
                gcMain.ForceInitialize();
                gridView1.BestFitColumns();
                var dddd = dd.rtnData.pages; //总页
                pageBar1.TotalPages = dddd;
                pageBar1.RecordCount = dd.rtnData.total; //记录总数