lu
2025-02-08 a89f2c46d1f53a4d9e23dc76b949b40d2b2b18a6
采购退货
已修改6个文件
280 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs 198 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -463,7 +463,6 @@
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注 ";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.REMARK";
@@ -487,7 +486,6 @@
            this.gv_suppId.AppearanceCell.Options.UseFont = true;
            this.gv_suppId.Caption = "供应商";
            this.gv_suppId.FieldName = "supName";
            this.gv_suppId.MinWidth = 50;
            this.gv_suppId.Name = "gv_suppId";
            this.gv_suppId.OptionsColumn.AllowEdit = false;
            this.gv_suppId.Tag = "query_a.SUPP_ID";
@@ -511,7 +509,6 @@
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.Caption = "仓库";
            this.gv_depotId.FieldName = "dptName";
            this.gv_depotId.MinWidth = 50;
            this.gv_depotId.Name = "gv_depotId";
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
@@ -535,7 +532,6 @@
            this.gv_returnType.AppearanceCell.Options.UseFont = true;
            this.gv_returnType.Caption = "退料类型 ";
            this.gv_returnType.FieldName = "returnType";
            this.gv_returnType.MinWidth = 50;
            this.gv_returnType.Name = "gv_returnType";
            this.gv_returnType.OptionsColumn.AllowEdit = false;
            this.gv_returnType.Tag = "query_a.RETURN_TYPE";
@@ -559,7 +555,6 @@
            this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
            this.gv_returnMethod.Caption = "退料方式 ";
            this.gv_returnMethod.FieldName = "returnMethod";
            this.gv_returnMethod.MinWidth = 50;
            this.gv_returnMethod.Name = "gv_returnMethod";
            this.gv_returnMethod.OptionsColumn.AllowEdit = false;
            this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
@@ -596,7 +591,7 @@
            // 
            this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_status.Appearance.Options.UseFont = true;
            this.lb_status.Location = new System.Drawing.Point(606, 20);
            this.lb_status.Location = new System.Drawing.Point(595, 20);
            this.lb_status.Name = "lb_status";
            this.lb_status.Size = new System.Drawing.Size(68, 21);
            this.lb_status.TabIndex = 228;
@@ -643,7 +638,6 @@
            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
            this.gv_checkDate.Caption = "审核时间 ";
            this.gv_checkDate.FieldName = "checkDate";
            this.gv_checkDate.MinWidth = 50;
            this.gv_checkDate.Name = "gv_checkDate";
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
@@ -677,7 +671,6 @@
            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
            this.gv_checkUser.Caption = "审核人 ";
            this.gv_checkUser.FieldName = "checkUser";
            this.gv_checkUser.MinWidth = 50;
            this.gv_checkUser.Name = "gv_checkUser";
            this.gv_checkUser.OptionsColumn.AllowEdit = false;
            this.gv_checkUser.Tag = "query_a.CHECK_USER";
@@ -691,7 +684,6 @@
            this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateTime.Caption = "最后修改时间 ";
            this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
            this.gv_lastUpdateTime.MinWidth = 180;
            this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
            this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
@@ -705,7 +697,6 @@
            this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateUser.Caption = "最后跟新人 ";
            this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
            this.gv_lastUpdateUser.MinWidth = 50;
            this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";
            this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
@@ -739,7 +730,6 @@
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "单据编码";
            this.gv_billNo.FieldName = "billNo";
            this.gv_billNo.MinWidth = 120;
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.BILL_NO";
@@ -807,7 +797,6 @@
            // 
            this.gridColumn1.Caption = "退货组织";
            this.gridColumn1.FieldName = "receivingOrg";
            this.gridColumn1.MinWidth = 250;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "org.fnamber";
            this.gridColumn1.Visible = true;
@@ -941,7 +930,7 @@
            // txt_status
            // 
            this.txt_status.Enabled = false;
            this.txt_status.Location = new System.Drawing.Point(680, 18);
            this.txt_status.Location = new System.Drawing.Point(667, 18);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "";
            this.txt_status.Size = new System.Drawing.Size(28, 24);
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -56,7 +56,7 @@
            {
                if (string.IsNullOrEmpty(this.txt_suppId.GetId()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商,才能选择来料明细!");
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商!");
                    return;
                }
                var frm = new SelectMesCgthSq(this.txt_suppId.GetId(),this.txt_suppId.GetId(), (txt_isOut.Checked == true ? 2 : 1).ToString());
@@ -93,7 +93,7 @@
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            await Task.Delay(100);
            getPageList(1);
        }
@@ -236,17 +236,19 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            toolBarMenu1.currentAction = "edit";
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(lbGuid.Text.Trim());
                getModel(rowGuid);
            }
            else
            {
@@ -358,7 +360,8 @@
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    lbGuid.Text = _rtn.rtnData.outGuid;
                    txt_billNo.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
                }
@@ -501,19 +504,21 @@
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0)
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                    else
                        getPageList(this.pageBar1.CurrentPage);
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -39,8 +39,8 @@
            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_suppId = new DevExpress.XtraEditors.LabelControl();
@@ -128,8 +128,8 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -155,8 +155,8 @@
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
@@ -172,8 +172,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.xtraTabPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
@@ -189,7 +189,6 @@
            this.gvMx2itemId.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemId.Caption = "物料ID";
            this.gvMx2itemId.FieldName = "itemId";
            this.gvMx2itemId.MinWidth = 50;
            this.gvMx2itemId.Name = "gvMx2itemId";
            this.gvMx2itemId.Tag = "query_a.ITEM_ID";
            this.gvMx2itemId.Width = 94;
@@ -200,7 +199,6 @@
            this.gvMx2lineK3id.AppearanceCell.Options.UseFont = true;
            this.gvMx2lineK3id.Caption = "采购订单行ID";
            this.gvMx2lineK3id.FieldName = "lineK3id";
            this.gvMx2lineK3id.MinWidth = 50;
            this.gvMx2lineK3id.Name = "gvMx2lineK3id";
            this.gvMx2lineK3id.Tag = "query_a.LINE_K3ID";
            this.gvMx2lineK3id.Visible = true;
@@ -213,7 +211,6 @@
            this.gvMx2ebelnK3id.AppearanceCell.Options.UseFont = true;
            this.gvMx2ebelnK3id.Caption = "采购订单ID";
            this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
            this.gvMx2ebelnK3id.MinWidth = 50;
            this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
            this.gvMx2ebelnK3id.Tag = "query_a.EBELN_K3ID";
            this.gvMx2ebelnK3id.Visible = true;
@@ -226,7 +223,6 @@
            this.gvMx2workNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2workNo.Caption = "任务单行号";
            this.gvMx2workNo.FieldName = "workLine";
            this.gvMx2workNo.MinWidth = 50;
            this.gvMx2workNo.Name = "gvMx2workNo";
            this.gvMx2workNo.Tag = "query_a.WORK_NO";
            this.gvMx2workNo.Visible = true;
@@ -239,7 +235,6 @@
            this.gvMx2ebeln.AppearanceCell.Options.UseFont = true;
            this.gvMx2ebeln.Caption = "采购订单";
            this.gvMx2ebeln.FieldName = "ebeln";
            this.gvMx2ebeln.MinWidth = 50;
            this.gvMx2ebeln.Name = "gvMx2ebeln";
            this.gvMx2ebeln.Tag = "query_a.EBELN";
            this.gvMx2ebeln.Visible = true;
@@ -252,7 +247,6 @@
            this.gvMx2unit.AppearanceCell.Options.UseFont = true;
            this.gvMx2unit.Caption = "库存单位";
            this.gvMx2unit.FieldName = "kcUnit";
            this.gvMx2unit.MinWidth = 50;
            this.gvMx2unit.Name = "gvMx2unit";
            this.gvMx2unit.Tag = "query_a.UNIT";
            this.gvMx2unit.Visible = true;
@@ -265,7 +259,6 @@
            this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemSname.Caption = "物料名称";
            this.gvMx2itemSname.FieldName = "itemName";
            this.gvMx2itemSname.MinWidth = 50;
            this.gvMx2itemSname.Name = "gvMx2itemSname";
            this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
            this.gvMx2itemSname.Visible = true;
@@ -278,7 +271,6 @@
            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
            this.gvMx2quantity.Caption = "数量";
            this.gvMx2quantity.FieldName = "quantity";
            this.gvMx2quantity.MinWidth = 50;
            this.gvMx2quantity.Name = "gvMx2quantity";
            this.gvMx2quantity.Tag = "query_a.QUANTITY";
            this.gvMx2quantity.Visible = true;
@@ -298,25 +290,25 @@
            // 
            // tabMxPage2
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Controls.Add(this.gcMx1);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1344, 411);
            this.tabMxPage2.Text = "物料明细";
            // 
            // gcMx2
            // gcMx1
            // 
            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
            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(1344, 411);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1344, 411);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
            // 
            // gvMx2
            // gvMx1
            // 
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx2guid,
            this.gvMx2itemId,
            this.gridColumn2,
@@ -328,17 +320,16 @@
            this.gvMx2workNo,
            this.gvMx2ebelnK3id,
            this.gvMx2lineK3id});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx2.OptionsView.ShowGroupPanel = false;
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            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 = "itemNo";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 0;
@@ -348,7 +339,6 @@
            // 
            this.gridColumn1.Caption = "物料规格";
            this.gridColumn1.FieldName = "itemModel";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 2;
@@ -641,7 +631,6 @@
            this.gv_fstatus.AppearanceCell.Options.UseFont = true;
            this.gv_fstatus.Caption = "f状态 | 0-未审核 1-审核入库/结案 ";
            this.gv_fstatus.FieldName = "checkStatus";
            this.gv_fstatus.MinWidth = 50;
            this.gv_fstatus.Name = "gv_fstatus";
            this.gv_fstatus.OptionsColumn.AllowEdit = false;
            this.gv_fstatus.Tag = "query_a.FSTATUS";
@@ -666,7 +655,6 @@
            this.gv_reason.AppearanceCell.Options.UseFont = true;
            this.gv_reason.Caption = "原因 ";
            this.gv_reason.FieldName = "reason";
            this.gv_reason.MinWidth = 50;
            this.gv_reason.Name = "gv_reason";
            this.gv_reason.OptionsColumn.AllowEdit = false;
            this.gv_reason.Tag = "query_a.REASON";
@@ -678,7 +666,6 @@
            this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateBy.Caption = "最后更新人 ";
            this.gv_lastupdateBy.FieldName = "lastupdateBy";
            this.gv_lastupdateBy.MinWidth = 50;
            this.gv_lastupdateBy.Name = "gv_lastupdateBy";
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
@@ -690,7 +677,6 @@
            this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
            this.gv_lastupdateDate.Caption = "最后更新时间 ";
            this.gv_lastupdateDate.FieldName = "lastupdateDate";
            this.gv_lastupdateDate.MinWidth = 50;
            this.gv_lastupdateDate.Name = "gv_lastupdateDate";
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
@@ -702,7 +688,6 @@
            this.gv_userNoBack.AppearanceCell.Options.UseFont = true;
            this.gv_userNoBack.Caption = "退料人工号 ";
            this.gv_userNoBack.FieldName = "userNoBack";
            this.gv_userNoBack.MinWidth = 50;
            this.gv_userNoBack.Name = "gv_userNoBack";
            this.gv_userNoBack.OptionsColumn.AllowEdit = false;
            this.gv_userNoBack.Tag = "query_a.USER_NO_BACK";
@@ -714,7 +699,6 @@
            this.gv_taskNo.AppearanceCell.Options.UseFont = true;
            this.gv_taskNo.Caption = "TASK_NO ";
            this.gv_taskNo.FieldName = "taskNo";
            this.gv_taskNo.MinWidth = 50;
            this.gv_taskNo.Name = "gv_taskNo";
            this.gv_taskNo.OptionsColumn.AllowEdit = false;
            this.gv_taskNo.Tag = "query_a.TASK_NO";
@@ -726,7 +710,6 @@
            this.gv_checkRes.AppearanceCell.Options.UseFont = true;
            this.gv_checkRes.Caption = "CHECK_RES ";
            this.gv_checkRes.FieldName = "checkRes";
            this.gv_checkRes.MinWidth = 50;
            this.gv_checkRes.Name = "gv_checkRes";
            this.gv_checkRes.OptionsColumn.AllowEdit = false;
            this.gv_checkRes.Tag = "query_a.CHECK_RES";
@@ -738,7 +721,6 @@
            this.gv_checkQty.AppearanceCell.Options.UseFont = true;
            this.gv_checkQty.Caption = "CHECK_QTY ";
            this.gv_checkQty.FieldName = "checkQty";
            this.gv_checkQty.MinWidth = 50;
            this.gv_checkQty.Name = "gv_checkQty";
            this.gv_checkQty.OptionsColumn.AllowEdit = false;
            this.gv_checkQty.Tag = "query_a.CHECK_QTY";
@@ -750,7 +732,6 @@
            this.gv_mmlist.AppearanceCell.Options.UseFont = true;
            this.gv_mmlist.Caption = "MMLIST ";
            this.gv_mmlist.FieldName = "mmlist";
            this.gv_mmlist.MinWidth = 50;
            this.gv_mmlist.Name = "gv_mmlist";
            this.gv_mmlist.OptionsColumn.AllowEdit = false;
            this.gv_mmlist.Tag = "query_a.MMLIST";
@@ -762,7 +743,6 @@
            this.gv_ebeln.AppearanceCell.Options.UseFont = true;
            this.gv_ebeln.Caption = "EBELN ";
            this.gv_ebeln.FieldName = "ebeln";
            this.gv_ebeln.MinWidth = 50;
            this.gv_ebeln.Name = "gv_ebeln";
            this.gv_ebeln.OptionsColumn.AllowEdit = false;
            this.gv_ebeln.Tag = "query_a.EBELN";
@@ -774,7 +754,6 @@
            this.gv_transctionNo.AppearanceCell.Options.UseFont = true;
            this.gv_transctionNo.Caption = "TRANSCTION_NO ";
            this.gv_transctionNo.FieldName = "transctionNo";
            this.gv_transctionNo.MinWidth = 50;
            this.gv_transctionNo.Name = "gv_transctionNo";
            this.gv_transctionNo.OptionsColumn.AllowEdit = false;
            this.gv_transctionNo.Tag = "query_a.TRANSCTION_NO";
@@ -786,7 +765,6 @@
            this.gv_factory.AppearanceCell.Options.UseFont = true;
            this.gv_factory.Caption = "FACTORY ";
            this.gv_factory.FieldName = "factory";
            this.gv_factory.MinWidth = 50;
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.Tag = "query_a.FACTORY";
@@ -798,7 +776,6 @@
            this.gv_sapstatus.AppearanceCell.Options.UseFont = true;
            this.gv_sapstatus.Caption = "SAPSTATUS ";
            this.gv_sapstatus.FieldName = "sapstatus";
            this.gv_sapstatus.MinWidth = 50;
            this.gv_sapstatus.Name = "gv_sapstatus";
            this.gv_sapstatus.OptionsColumn.AllowEdit = false;
            this.gv_sapstatus.Tag = "query_a.SAPSTATUS";
@@ -810,7 +787,6 @@
            this.gv_ischeck.AppearanceCell.Options.UseFont = true;
            this.gv_ischeck.Caption = "ISCHECK ";
            this.gv_ischeck.FieldName = "ischeck";
            this.gv_ischeck.MinWidth = 50;
            this.gv_ischeck.Name = "gv_ischeck";
            this.gv_ischeck.OptionsColumn.AllowEdit = false;
            this.gv_ischeck.Tag = "query_a.ISCHECK";
@@ -822,7 +798,6 @@
            this.gv_insby.AppearanceCell.Options.UseFont = true;
            this.gv_insby.Caption = "INSBY ";
            this.gv_insby.FieldName = "insby";
            this.gv_insby.MinWidth = 50;
            this.gv_insby.Name = "gv_insby";
            this.gv_insby.OptionsColumn.AllowEdit = false;
            this.gv_insby.Tag = "query_a.INSBY";
@@ -834,7 +809,6 @@
            this.gv_isVisual.AppearanceCell.Options.UseFont = true;
            this.gv_isVisual.Caption = "IS_VISUAL ";
            this.gv_isVisual.FieldName = "isVisual";
            this.gv_isVisual.MinWidth = 50;
            this.gv_isVisual.Name = "gv_isVisual";
            this.gv_isVisual.OptionsColumn.AllowEdit = false;
            this.gv_isVisual.Tag = "query_a.IS_VISUAL";
@@ -846,7 +820,6 @@
            this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
            this.gv_urgentFlag.Caption = "URGENT_FLAG ";
            this.gv_urgentFlag.FieldName = "urgentFlag";
            this.gv_urgentFlag.MinWidth = 50;
            this.gv_urgentFlag.Name = "gv_urgentFlag";
            this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
            this.gv_urgentFlag.Tag = "query_a.URGENT_FLAG";
@@ -858,7 +831,6 @@
            this.gv_lineNo.AppearanceCell.Options.UseFont = true;
            this.gv_lineNo.Caption = "LINE_NO ";
            this.gv_lineNo.FieldName = "lineNo";
            this.gv_lineNo.MinWidth = 50;
            this.gv_lineNo.Name = "gv_lineNo";
            this.gv_lineNo.OptionsColumn.AllowEdit = false;
            this.gv_lineNo.Tag = "query_a.LINE_NO";
@@ -870,7 +842,6 @@
            this.gv_taskLino.AppearanceCell.Options.UseFont = true;
            this.gv_taskLino.Caption = "工单行号 ";
            this.gv_taskLino.FieldName = "taskLino";
            this.gv_taskLino.MinWidth = 50;
            this.gv_taskLino.Name = "gv_taskLino";
            this.gv_taskLino.OptionsColumn.AllowEdit = false;
            this.gv_taskLino.Tag = "query_a.TASK_LINO";
@@ -882,7 +853,6 @@
            this.gv_fbillno.AppearanceCell.Options.UseFont = true;
            this.gv_fbillno.Caption = "投料通知单单号 ";
            this.gv_fbillno.FieldName = "fbillno";
            this.gv_fbillno.MinWidth = 50;
            this.gv_fbillno.Name = "gv_fbillno";
            this.gv_fbillno.OptionsColumn.AllowEdit = false;
            this.gv_fbillno.Tag = "query_a.FBILLNO";
@@ -894,7 +864,6 @@
            this.gv_fbillLino.AppearanceCell.Options.UseFont = true;
            this.gv_fbillLino.Caption = "投料单行号 ";
            this.gv_fbillLino.FieldName = "fbillLino";
            this.gv_fbillLino.MinWidth = 50;
            this.gv_fbillLino.Name = "gv_fbillLino";
            this.gv_fbillLino.OptionsColumn.AllowEdit = false;
            this.gv_fbillLino.Tag = "query_a.FBILL_LINO";
@@ -906,7 +875,6 @@
            this.gv_custNo.AppearanceCell.Options.UseFont = true;
            this.gv_custNo.Caption = "客户编号 ";
            this.gv_custNo.FieldName = "custNo";
            this.gv_custNo.MinWidth = 50;
            this.gv_custNo.Name = "gv_custNo";
            this.gv_custNo.OptionsColumn.AllowEdit = false;
            this.gv_custNo.Tag = "query_a.CUST_NO";
@@ -918,7 +886,6 @@
            this.gv_custName.AppearanceCell.Options.UseFont = true;
            this.gv_custName.Caption = "客户名称 ";
            this.gv_custName.FieldName = "custName";
            this.gv_custName.MinWidth = 50;
            this.gv_custName.Name = "gv_custName";
            this.gv_custName.OptionsColumn.AllowEdit = false;
            this.gv_custName.Tag = "query_a.CUST_NAME";
@@ -930,7 +897,6 @@
            this.gv_iqcReleaseNo.AppearanceCell.Options.UseFont = true;
            this.gv_iqcReleaseNo.Caption = "IQC检验单号 ";
            this.gv_iqcReleaseNo.FieldName = "iqcReleaseNo";
            this.gv_iqcReleaseNo.MinWidth = 50;
            this.gv_iqcReleaseNo.Name = "gv_iqcReleaseNo";
            this.gv_iqcReleaseNo.OptionsColumn.AllowEdit = false;
            this.gv_iqcReleaseNo.Tag = "query_a.IQC_RELEASE_NO";
@@ -942,7 +908,6 @@
            this.gv_pickIns.AppearanceCell.Options.UseFont = true;
            this.gv_pickIns.Caption = "0 申请单,1入库单标识 ";
            this.gv_pickIns.FieldName = "pickIns";
            this.gv_pickIns.MinWidth = 50;
            this.gv_pickIns.Name = "gv_pickIns";
            this.gv_pickIns.OptionsColumn.AllowEdit = false;
            this.gv_pickIns.Tag = "query_a.PICK_INS";
@@ -954,7 +919,6 @@
            this.gv_fcheckUser.AppearanceCell.Options.UseFont = true;
            this.gv_fcheckUser.Caption = "入库审核人 ";
            this.gv_fcheckUser.FieldName = "fcheckUser";
            this.gv_fcheckUser.MinWidth = 50;
            this.gv_fcheckUser.Name = "gv_fcheckUser";
            this.gv_fcheckUser.OptionsColumn.AllowEdit = false;
            this.gv_fcheckUser.Tag = "query_a.FCHECK_USER";
@@ -966,7 +930,6 @@
            this.gv_rbillNo.AppearanceCell.Options.UseFont = true;
            this.gv_rbillNo.Caption = "任务汇报单/工单号(成品入库、退料) ";
            this.gv_rbillNo.FieldName = "rbillNo";
            this.gv_rbillNo.MinWidth = 50;
            this.gv_rbillNo.Name = "gv_rbillNo";
            this.gv_rbillNo.OptionsColumn.AllowEdit = false;
            this.gv_rbillNo.Tag = "query_a.RBILL_NO";
@@ -978,7 +941,6 @@
            this.gv_bgr.AppearanceCell.Options.UseFont = true;
            this.gv_bgr.Caption = "报工人 ";
            this.gv_bgr.FieldName = "bgr";
            this.gv_bgr.MinWidth = 50;
            this.gv_bgr.Name = "gv_bgr";
            this.gv_bgr.OptionsColumn.AllowEdit = false;
            this.gv_bgr.Tag = "query_a.BGR";
@@ -996,7 +958,6 @@
            // 
            this.bandedGridColumn2.Caption = "收料组织";
            this.bandedGridColumn2.FieldName = "receivingOrg";
            this.bandedGridColumn2.MinWidth = 250;
            this.bandedGridColumn2.Name = "bandedGridColumn2";
            this.bandedGridColumn2.Tag = "org.fnamber";
            this.bandedGridColumn2.Visible = true;
@@ -1006,7 +967,7 @@
            // 
            this.gridBand2.Caption = "入库单号";
            this.gridBand2.Columns.Add(this.gv_billNo);
            this.gridBand2.MinWidth = 180;
            this.gridBand2.MinWidth = 20;
            this.gridBand2.Name = "gridBand2";
            this.gridBand2.VisibleIndex = 2;
            this.gridBand2.Width = 180;
@@ -1017,7 +978,6 @@
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "入库单号 ";
            this.gv_billNo.FieldName = "billNo";
            this.gv_billNo.MinWidth = 50;
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.BILL_NO";
@@ -1028,7 +988,7 @@
            // 
            this.gridBand3.Caption = "到货单号";
            this.gridBand3.Columns.Add(this.gv_cbillNo);
            this.gridBand3.MinWidth = 180;
            this.gridBand3.MinWidth = 20;
            this.gridBand3.Name = "gridBand3";
            this.gridBand3.VisibleIndex = 3;
            this.gridBand3.Width = 180;
@@ -1039,7 +999,6 @@
            this.gv_cbillNo.AppearanceCell.Options.UseFont = true;
            this.gv_cbillNo.Caption = "到货单号/其它入库单号 ";
            this.gv_cbillNo.FieldName = "cbillNo";
            this.gv_cbillNo.MinWidth = 50;
            this.gv_cbillNo.Name = "gv_cbillNo";
            this.gv_cbillNo.OptionsColumn.AllowEdit = false;
            this.gv_cbillNo.Tag = "query_a.CBILL_NO";
@@ -1050,7 +1009,7 @@
            // 
            this.gridBand5.Caption = "创建人";
            this.gridBand5.Columns.Add(this.gv_createBy);
            this.gridBand5.MinWidth = 80;
            this.gridBand5.MinWidth = 40;
            this.gridBand5.Name = "gridBand5";
            this.gridBand5.VisibleIndex = 4;
            this.gridBand5.Width = 80;
@@ -1061,7 +1020,6 @@
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "创建人 ";
            this.gv_createBy.FieldName = "createBy";
            this.gv_createBy.MinWidth = 50;
            this.gv_createBy.Name = "gv_createBy";
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.CREATE_BY";
@@ -1072,7 +1030,7 @@
            // 
            this.gridBand4.Caption = "创建时间";
            this.gridBand4.Columns.Add(this.gv_createDate);
            this.gridBand4.MinWidth = 180;
            this.gridBand4.MinWidth = 20;
            this.gridBand4.Name = "gridBand4";
            this.gridBand4.VisibleIndex = 5;
            this.gridBand4.Width = 180;
@@ -1083,7 +1041,6 @@
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "创建时间 ";
            this.gv_createDate.FieldName = "createDate";
            this.gv_createDate.MinWidth = 50;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.CREATE_DATE";
@@ -1104,7 +1061,6 @@
            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
            this.gv_checkUser.Caption = "审核人 ";
            this.gv_checkUser.FieldName = "checkUser";
            this.gv_checkUser.MinWidth = 60;
            this.gv_checkUser.Name = "gv_checkUser";
            this.gv_checkUser.OptionsColumn.AllowEdit = false;
            this.gv_checkUser.Tag = "query_a.CHECK_USER";
@@ -1117,7 +1073,7 @@
            this.gridBand6.Columns.Add(this.gv_checkDate);
            this.gridBand6.Columns.Add(this.gv_insDate);
            this.gridBand6.Columns.Add(this.gv_fcheckDate);
            this.gridBand6.MinWidth = 180;
            this.gridBand6.MinWidth = 20;
            this.gridBand6.Name = "gridBand6";
            this.gridBand6.VisibleIndex = 7;
            this.gridBand6.Width = 180;
@@ -1128,7 +1084,6 @@
            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
            this.gv_checkDate.Caption = "CHECK_DATE ";
            this.gv_checkDate.FieldName = "checkDate";
            this.gv_checkDate.MinWidth = 50;
            this.gv_checkDate.Name = "gv_checkDate";
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
@@ -1141,7 +1096,6 @@
            this.gv_insDate.AppearanceCell.Options.UseFont = true;
            this.gv_insDate.Caption = "insDate审核日期";
            this.gv_insDate.FieldName = "insDate";
            this.gv_insDate.MinWidth = 50;
            this.gv_insDate.Name = "gv_insDate";
            this.gv_insDate.OptionsColumn.AllowEdit = false;
            this.gv_insDate.RowIndex = 1;
@@ -1154,7 +1108,6 @@
            this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
            this.gv_fcheckDate.Caption = "入库审核日期 ";
            this.gv_fcheckDate.FieldName = "fcheckDate";
            this.gv_fcheckDate.MinWidth = 50;
            this.gv_fcheckDate.Name = "gv_fcheckDate";
            this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
            this.gv_fcheckDate.RowIndex = 1;
@@ -1177,7 +1130,7 @@
            // 
            this.gridBand10.Caption = "仓库编号";
            this.gridBand10.Columns.Add(this.bandedGridColumn1);
            this.gridBand10.MinWidth = 50;
            this.gridBand10.MinWidth = 20;
            this.gridBand10.Name = "gridBand10";
            this.gridBand10.VisibleIndex = 0;
            this.gridBand10.Width = 100;
@@ -1186,7 +1139,6 @@
            // 
            this.bandedGridColumn1.Caption = "仓库编号";
            this.bandedGridColumn1.FieldName = "depotCode";
            this.bandedGridColumn1.MinWidth = 100;
            this.bandedGridColumn1.Name = "bandedGridColumn1";
            this.bandedGridColumn1.Visible = true;
            this.bandedGridColumn1.Width = 100;
@@ -1196,7 +1148,7 @@
            this.gridBand9.Caption = "仓库名称";
            this.gridBand9.Columns.Add(this.gv_depotsId);
            this.gridBand9.Columns.Add(this.gv_depotsCode);
            this.gridBand9.MinWidth = 80;
            this.gridBand9.MinWidth = 20;
            this.gridBand9.Name = "gridBand9";
            this.gridBand9.VisibleIndex = 1;
            this.gridBand9.Width = 100;
@@ -1207,7 +1159,6 @@
            this.gv_depotsId.AppearanceCell.Options.UseFont = true;
            this.gv_depotsId.Caption = "仓库名称";
            this.gv_depotsId.FieldName = "depotName";
            this.gv_depotsId.MinWidth = 100;
            this.gv_depotsId.Name = "gv_depotsId";
            this.gv_depotsId.OptionsColumn.AllowEdit = false;
            this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
@@ -1220,7 +1171,6 @@
            this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotsCode.Caption = "DEPOTS_CODE ";
            this.gv_depotsCode.FieldName = "depotsCode";
            this.gv_depotsCode.MinWidth = 50;
            this.gv_depotsCode.Name = "gv_depotsCode";
            this.gv_depotsCode.OptionsColumn.AllowEdit = false;
            this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE";
@@ -1242,7 +1192,7 @@
            // 
            this.gridBand11.Caption = "供应商编号";
            this.gridBand11.Columns.Add(this.gv_suppNo);
            this.gridBand11.MinWidth = 50;
            this.gridBand11.MinWidth = 20;
            this.gridBand11.Name = "gridBand11";
            this.gridBand11.VisibleIndex = 0;
            this.gridBand11.Width = 100;
@@ -1253,7 +1203,6 @@
            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
            this.gv_suppNo.Caption = "供应商编号";
            this.gv_suppNo.FieldName = "supNo";
            this.gv_suppNo.MinWidth = 100;
            this.gv_suppNo.Name = "gv_suppNo";
            this.gv_suppNo.OptionsColumn.AllowEdit = false;
            this.gv_suppNo.Tag = "query_a.SUPP_NO";
@@ -1264,7 +1213,7 @@
            // 
            this.gridBand12.Caption = "供应商名称";
            this.gridBand12.Columns.Add(this.gv_suppId);
            this.gridBand12.MinWidth = 100;
            this.gridBand12.MinWidth = 20;
            this.gridBand12.Name = "gridBand12";
            this.gridBand12.VisibleIndex = 1;
            this.gridBand12.Width = 150;
@@ -1275,7 +1224,6 @@
            this.gv_suppId.AppearanceCell.Options.UseFont = true;
            this.gv_suppId.Caption = "供应商名称";
            this.gv_suppId.FieldName = "supName";
            this.gv_suppId.MinWidth = 150;
            this.gv_suppId.Name = "gv_suppId";
            this.gv_suppId.OptionsColumn.AllowEdit = false;
            this.gv_suppId.Tag = "query_a.SUPP_ID";
@@ -1286,7 +1234,7 @@
            // 
            this.gridBand13.Caption = "送货单号";
            this.gridBand13.Columns.Add(this.gv_paperBillNo);
            this.gridBand13.MinWidth = 120;
            this.gridBand13.MinWidth = 50;
            this.gridBand13.Name = "gridBand13";
            this.gridBand13.VisibleIndex = 10;
            this.gridBand13.Width = 120;
@@ -1297,7 +1245,6 @@
            this.gv_paperBillNo.AppearanceCell.Options.UseFont = true;
            this.gv_paperBillNo.Caption = "送货单号 ";
            this.gv_paperBillNo.FieldName = "paperBillNo";
            this.gv_paperBillNo.MinWidth = 50;
            this.gv_paperBillNo.Name = "gv_paperBillNo";
            this.gv_paperBillNo.OptionsColumn.AllowEdit = false;
            this.gv_paperBillNo.Tag = "query_a.PAPER_BILL_NO";
@@ -1308,7 +1255,7 @@
            // 
            this.gridBand14.Caption = "备注信息";
            this.gridBand14.Columns.Add(this.gv_remark);
            this.gridBand14.MinWidth = 120;
            this.gridBand14.MinWidth = 50;
            this.gridBand14.Name = "gridBand14";
            this.gridBand14.VisibleIndex = 11;
            this.gridBand14.Width = 120;
@@ -1319,7 +1266,6 @@
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注 ";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.REMARK";
@@ -1380,25 +1326,25 @@
            // 
            // xtraTabPage3
            // 
            this.xtraTabPage3.Controls.Add(this.gcMx1);
            this.xtraTabPage3.Controls.Add(this.gcMx2);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1344, 411);
            this.xtraTabPage3.Text = "入库条码";
            // 
            // gcMx1
            // gcMx2
            // 
            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1344, 411);
            this.gcMx1.TabIndex = 1;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
            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(1344, 411);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
            // 
            // gvMx1
            // gvMx2
            // 
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx1guid,
            this.gvMx1urgentFlag,
            this.gvMx1itemBarcode,
@@ -1413,11 +1359,11 @@
            this.gvMx1depotCode,
            this.gvMx1ebelnK3id,
            this.gvMx1lineK3id});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx2.OptionsView.ShowGroupPanel = false;
            // 
            // gvMx1guid
            // 
@@ -1449,7 +1395,6 @@
            this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gvMx1itemBarcode.Caption = "物料条码";
            this.gvMx1itemBarcode.FieldName = "itemBarcode";
            this.gvMx1itemBarcode.MinWidth = 250;
            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gvMx1itemBarcode.Visible = true;
@@ -1462,7 +1407,6 @@
            this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1workNo.Caption = "采购单号";
            this.gvMx1workNo.FieldName = "workNo";
            this.gvMx1workNo.MinWidth = 100;
            this.gvMx1workNo.Name = "gvMx1workNo";
            this.gvMx1workNo.Tag = "query_a.WORK_NO";
            this.gvMx1workNo.Visible = true;
@@ -1475,7 +1419,6 @@
            this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
            this.gvMx1cItemCode.Caption = "物料编码";
            this.gvMx1cItemCode.FieldName = "itemNo";
            this.gvMx1cItemCode.MinWidth = 100;
            this.gvMx1cItemCode.Name = "gvMx1cItemCode";
            this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
            this.gvMx1cItemCode.Visible = true;
@@ -1488,7 +1431,6 @@
            this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
            this.gvMx1itemSname.Caption = "物料名称";
            this.gvMx1itemSname.FieldName = "itemName";
            this.gvMx1itemSname.MinWidth = 250;
            this.gvMx1itemSname.Name = "gvMx1itemSname";
            this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
            this.gvMx1itemSname.Visible = true;
@@ -1501,7 +1443,6 @@
            this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1itemNo.Caption = "规格型号";
            this.gvMx1itemNo.FieldName = "itemModel";
            this.gvMx1itemNo.MinWidth = 250;
            this.gvMx1itemNo.Name = "gvMx1itemNo";
            this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
            this.gvMx1itemNo.Visible = true;
@@ -1514,7 +1455,6 @@
            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
            this.gvMx1quantity.Caption = "数量";
            this.gvMx1quantity.FieldName = "quantity";
            this.gvMx1quantity.MinWidth = 50;
            this.gvMx1quantity.Name = "gvMx1quantity";
            this.gvMx1quantity.Tag = "query_a.QUANTITY";
            this.gvMx1quantity.Visible = true;
@@ -1527,7 +1467,6 @@
            this.gvMx1unit.AppearanceCell.Options.UseFont = true;
            this.gvMx1unit.Caption = "库存单位";
            this.gvMx1unit.FieldName = "kcUnit";
            this.gvMx1unit.MinWidth = 50;
            this.gvMx1unit.Name = "gvMx1unit";
            this.gvMx1unit.Tag = "query_a.UNIT";
            this.gvMx1unit.Visible = true;
@@ -1540,7 +1479,6 @@
            this.gvMx1rbillNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1rbillNo.Caption = "到货单号";
            this.gvMx1rbillNo.FieldName = "cbillNo";
            this.gvMx1rbillNo.MinWidth = 50;
            this.gvMx1rbillNo.Name = "gvMx1rbillNo";
            this.gvMx1rbillNo.Tag = "query_a.RBILL_NO";
            this.gvMx1rbillNo.Visible = true;
@@ -1553,7 +1491,6 @@
            this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
            this.gvMx1depotSectionCode.Caption = "货位编码";
            this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
            this.gvMx1depotSectionCode.MinWidth = 50;
            this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
            this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
            this.gvMx1depotSectionCode.Visible = true;
@@ -1566,7 +1503,6 @@
            this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
            this.gvMx1depotCode.Caption = "仓库编码";
            this.gvMx1depotCode.FieldName = "depotCode";
            this.gvMx1depotCode.MinWidth = 50;
            this.gvMx1depotCode.Name = "gvMx1depotCode";
            this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
            this.gvMx1depotCode.Visible = true;
@@ -1579,7 +1515,6 @@
            this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebelnK3id.Caption = "采购订单ID";
            this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
            this.gvMx1ebelnK3id.MinWidth = 50;
            this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
            this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
            this.gvMx1ebelnK3id.Visible = true;
@@ -1592,7 +1527,6 @@
            this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
            this.gvMx1lineK3id.Caption = "采购订单行ID";
            this.gvMx1lineK3id.FieldName = "lineK3id";
            this.gvMx1lineK3id.MinWidth = 50;
            this.gvMx1lineK3id.Name = "gvMx1lineK3id";
            this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
            this.gvMx1lineK3id.Visible = true;
@@ -1696,7 +1630,7 @@
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(68, 21);
            this.labelControl1.TabIndex = 586;
            this.labelControl1.Text = "审核日期";
            this.labelControl1.Text = "审核时间";
            // 
            // lbGuid
            // 
@@ -1729,8 +1663,8 @@
            this.Name = "Frm_MesInvItemIns";
            this.Text = "采购入库单";
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
@@ -1746,8 +1680,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.xtraTabPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).EndInit();
@@ -1779,8 +1713,8 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraEditors.LabelControl lb_suppId;
        private DevExpress.XtraEditors.LabelControl lb_cbillNo;
@@ -1856,8 +1790,8 @@
        private DevExpress.XtraEditors.TextEdit txt_suppName;
        private DevExpress.XtraEditors.TextEdit txt_dptName;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
@@ -1873,6 +1807,10 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.TextEdit txt_fcheckUser;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
@@ -1889,9 +1827,5 @@
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.TextEdit txt_fcheckUser;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -23,6 +23,7 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
            {
@@ -177,7 +178,6 @@
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        private   void getModel(string strGuid)
        {
@@ -202,8 +202,8 @@
                    dynamic dy = _rtn.rtnData;
                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    gvList.Add(gvMx2);
                    gvList.Add(gvMx1);
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
@@ -214,14 +214,14 @@
                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                    if (dt.Rows.Count > 0)
                    {
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                    }
                    JArray array2 = new JArray();
@@ -232,14 +232,14 @@
                    DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
                    if (dt.Rows.Count > 0)
                    {
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt2;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt2;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                }
                else
@@ -280,12 +280,15 @@
                var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0)
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                    else
                        getPageList(this.pageBar1.CurrentPage);
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "ischeck", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
            }
            catch (Exception ex)
DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
@@ -143,7 +143,7 @@
            this.gv_salesOrderId.FieldName = "itemNo";
            this.gv_salesOrderId.Name = "gv_salesOrderId";
            this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
            this.gv_salesOrderId.Tag = "query_a.itemNo";
            this.gv_salesOrderId.Tag = "query_a.item_no";
            this.gv_salesOrderId.Visible = true;
            this.gv_salesOrderId.VisibleIndex = 3;
            this.gv_salesOrderId.Width = 100;
@@ -156,7 +156,7 @@
            this.gv_orderLineId.FieldName = "itemName";
            this.gv_orderLineId.Name = "gv_orderLineId";
            this.gv_orderLineId.OptionsColumn.AllowEdit = false;
            this.gv_orderLineId.Tag = "query_a.itemName";
            this.gv_orderLineId.Tag = "query_a.item_name";
            this.gv_orderLineId.Visible = true;
            this.gv_orderLineId.VisibleIndex = 4;
            this.gv_orderLineId.Width = 200;
@@ -169,7 +169,7 @@
            this.gv_itemId.FieldName = "itemModel";
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.itemModel";
            this.gv_itemId.Tag = "query_a.item_model";
            this.gv_itemId.Visible = true;
            this.gv_itemId.VisibleIndex = 5;
            this.gv_itemId.Width = 200;
@@ -239,7 +239,6 @@
            this.pageBar1.Size = new System.Drawing.Size(984, 37);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            this.pageBar1.Visible = false;
            // 
            // SelectCheckDt
            // 
DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
@@ -47,7 +47,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }