lu
2024-11-14 1a8f404f8641d38b5a2746d9d6d14b1e40f3b5bf
打印
已修改5个文件
19487 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs 1108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs 274 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.Setup/Gs.Setup.vdproj 18062 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -270,18 +270,50 @@
            toolBarMenu1.guidKey = rowGuid;
        }
        /// <summary>
        ///检验事件
        ///提交检验事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
        private async void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_releaseNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定提交检验吗?"))
                return;
            UcLoading _loading = new UcLoading();
            var _obj = new
            {
                guid = rowGuid,
            };
            try
            {
                var strJson = await UtilityHelper.HttpPostAsync("",
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnData.outMsg);
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                        getModel(lbGuid.Text.Trim(), false, 999);
                    else
                        getPageList(1, UtilityHelper.GetPageSize());
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
            _loading.Stop();
        }
        /// <summary>
@@ -639,7 +671,7 @@
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
                }
            }
        }
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,6 +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();
            this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -41,24 +46,44 @@
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1parentGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ebelnLine = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
            this.kyPrtQty = new DevExpress.XtraEditors.TextEdit();
            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
            this.textEdit6 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
            this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
            this.txtWlid = new DevExpress.XtraEditors.TextEdit();
            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
            this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -69,54 +94,64 @@
            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
            this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
            this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
            this.txtDepotsId = new DevExpress.XtraEditors.TextEdit();
            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
            this.label1 = new System.Windows.Forms.Label();
            this.txtSupplierId = new DevExpress.XtraEditors.TextEdit();
            this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_percentage = new DevExpress.XtraEditors.TextEdit();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
            this.lbGuid = new System.Windows.Forms.Label();
            this.lb_urgentFlag = new DevExpress.XtraEditors.LabelControl();
            this.txt_urgentFlag = new DevExpress.XtraEditors.TextEdit();
            this.lb_fstatus = new DevExpress.XtraEditors.LabelControl();
            this.txt_fstatus = new DevExpress.XtraEditors.TextEdit();
            this.lb_suppNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_suppNo = new DevExpress.XtraEditors.TextEdit();
            this.lb_depotsCode = new DevExpress.XtraEditors.LabelControl();
            this.txt_depotsCode = new DevExpress.XtraEditors.TextEdit();
            this.lb_insDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_insDate = new DevExpress.XtraEditors.TextEdit();
            this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
            this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.lb_status = new DevExpress.XtraEditors.LabelControl();
            this.txt_status = new DevExpress.XtraEditors.TextEdit();
            this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
            this.panelMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
            ((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.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -126,19 +161,16 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
            this.SuspendLayout();
            // 
@@ -196,7 +228,7 @@
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 315);
            this.tabMxPage2.Size = new System.Drawing.Size(1342, 377);
            this.tabMxPage2.Text = "已打条码信息";
            // 
            // gcMx2
@@ -205,7 +237,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, 315);
            this.gcMx2.Size = new System.Drawing.Size(1342, 377);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -279,215 +311,431 @@
            this.gridColumn15.VisibleIndex = 7;
            this.gridColumn15.Width = 94;
            // 
            // gvMx1urgentFlag
            //
            this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
            this.gvMx1urgentFlag.Caption = "急料标识 ";
            this.gvMx1urgentFlag.FieldName = "urgentFlag";
            this.gvMx1urgentFlag.MinWidth = 50;
            this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
            this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
            this.gvMx1urgentFlag.Visible = true;
            this.gvMx1urgentFlag.VisibleIndex = 0;
            this.gvMx1urgentFlag.Width = 94;
            //
            // gvMx1itemNo
            //
            this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1itemNo.Caption = "物料编码 ";
            this.gvMx1itemNo.FieldName = "itemNo";
            this.gvMx1itemNo.MinWidth = 50;
            this.gvMx1itemNo.Name = "gvMx1itemNo";
            this.gvMx1itemNo.Tag = "query_a.item_no";
            this.gvMx1itemNo.Visible = true;
            this.gvMx1itemNo.VisibleIndex = 5;
            this.gvMx1itemNo.Width = 94;
            //
            // gvMx1ebeln
            //
            this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebeln.Caption = "采购单号 ";
            this.gvMx1ebeln.FieldName = "ebeln";
            this.gvMx1ebeln.MinWidth = 50;
            this.gvMx1ebeln.Name = "gvMx1ebeln";
            this.gvMx1ebeln.Tag = "query_a.ebeln";
            this.gvMx1ebeln.Visible = true;
            this.gvMx1ebeln.VisibleIndex = 10;
            this.gvMx1ebeln.Width = 94;
            //
            // gvMx1parentGuid
            //
            this.gvMx1parentGuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1parentGuid.AppearanceCell.Options.UseFont = true;
            this.gvMx1parentGuid.Caption = "parent_Guid ";
            this.gvMx1parentGuid.FieldName = "parentGuid";
            this.gvMx1parentGuid.MinWidth = 50;
            this.gvMx1parentGuid.Name = "gvMx1parentGuid";
            this.gvMx1parentGuid.Tag = "query_a.parent_Guid";
            this.gvMx1parentGuid.Width = 94;
            //
            // gvMx1guid
            //
            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
            this.gvMx1guid.Caption = "guid ";
            this.gvMx1guid.FieldName = "guid";
            this.gvMx1guid.MinWidth = 50;
            this.gvMx1guid.Name = "gvMx1guid";
            this.gvMx1guid.Tag = "query_a.guid";
            this.gvMx1guid.Width = 94;
            //
            // tabMxPage1
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Controls.Add(this.panelMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 315);
            this.tabMxPage1.Size = new System.Drawing.Size(1342, 377);
            this.tabMxPage1.Text = "来料信息明细";
            // 
            // gcMx1
            // 
            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.Location = new System.Drawing.Point(0, 98);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1124, 315);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1,
            this.repositoryItemCheckEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1342, 279);
            this.gcMx1.TabIndex = 1;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
            // 
            // gvMx1
            // 
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvAbtGuid,
            this.gvMx1guid,
            this.gvMx1parentGuid,
            this.gvMx1ebeln,
            this.gvMx1ebelnLine,
            this.gvMx1urgentFlag,
            this.gridColumn4,
            this.gvMx1itemNo,
            this.gridColumn5,
            this.gridColumn7,
            this.gridColumn13,
            this.gridColumn8,
            this.gridColumn10,
            this.gvMx1boardStyle,
            this.gridColumn6,
            this.gridColumn8,
            this.gvMx1ebelnQty,
            this.gvMx1okRkqty,
            this.gvMx1states,
            this.gridColumn5,
            this.gridColumn9,
            this.gvMx1ebeln,
            this.gridColumn11,
            this.gridColumn12});
            this.gridColumn7,
            this.gridColumn10});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            //
            // gvAbtGuid
            //
            this.gvAbtGuid.Caption = "abtGuid不能删除";
            this.gvAbtGuid.FieldName = "aboutGuid";
            this.gvAbtGuid.MinWidth = 50;
            this.gvAbtGuid.Name = "gvAbtGuid";
            this.gvAbtGuid.OptionsColumn.ReadOnly = true;
            this.gvAbtGuid.Width = 94;
            //
            // gvMx1guid
            //
            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
            this.gvMx1guid.Caption = "guid不能删除";
            this.gvMx1guid.FieldName = "guid";
            this.gvMx1guid.MinWidth = 70;
            this.gvMx1guid.Name = "gvMx1guid";
            this.gvMx1guid.OptionsColumn.ReadOnly = true;
            this.gvMx1guid.Tag = "query_a.guid";
            this.gvMx1guid.Width = 100;
            //
            // gvMx1ebeln
            //
            this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebeln.Caption = "ERP采购单号";
            this.gvMx1ebeln.FieldName = "ebeln";
            this.gvMx1ebeln.MinWidth = 120;
            this.gvMx1ebeln.Name = "gvMx1ebeln";
            this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
            this.gvMx1ebeln.Tag = "query_a.ebeln";
            this.gvMx1ebeln.Visible = true;
            this.gvMx1ebeln.VisibleIndex = 0;
            this.gvMx1ebeln.Width = 120;
            //
            // gvMx1ebelnLine
            //
            this.gvMx1ebelnLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebelnLine.Caption = "ERP行ID";
            this.gvMx1ebelnLine.FieldName = "ebelnK3id";
            this.gvMx1ebelnLine.MinWidth = 90;
            this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
            this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
            this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
            this.gvMx1ebelnLine.Visible = true;
            this.gvMx1ebelnLine.VisibleIndex = 1;
            this.gvMx1ebelnLine.Width = 100;
            //
            // gvMx1urgentFlag
            //
            this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
            this.gvMx1urgentFlag.Caption = "急料标识";
            this.gvMx1urgentFlag.FieldName = "urgentFlag";
            this.gvMx1urgentFlag.MinWidth = 60;
            this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
            this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
            this.gvMx1urgentFlag.Visible = true;
            this.gvMx1urgentFlag.VisibleIndex = 2;
            this.gvMx1urgentFlag.Width = 100;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "序号";
            this.gridColumn4.FieldName = "workLine";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Caption = "物料ID";
            this.gridColumn4.FieldName = "itemId";
            this.gridColumn4.MinWidth = 100;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.ReadOnly = true;
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 1;
            this.gridColumn4.Width = 94;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.Width = 100;
            // 
            // gridColumn5
            // gvMx1boardStyle
            // 
            this.gridColumn5.Caption = "物料名称";
            this.gridColumn5.FieldName = "itemName";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.Width = 94;
            this.gvMx1boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
            this.gvMx1boardStyle.Caption = "物料名称";
            this.gvMx1boardStyle.FieldName = "itemName";
            this.gvMx1boardStyle.MinWidth = 180;
            this.gvMx1boardStyle.Name = "gvMx1boardStyle";
            this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
            this.gvMx1boardStyle.Tag = "query_a.board_style";
            this.gvMx1boardStyle.Visible = true;
            this.gvMx1boardStyle.VisibleIndex = 4;
            this.gvMx1boardStyle.Width = 180;
            // 
            // gridColumn7
            // gridColumn6
            // 
            this.gridColumn7.Caption = "物料规格";
            this.gridColumn7.FieldName = "itemModel";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.Width = 94;
            //
            // gridColumn13
            //
            this.gridColumn13.Caption = "本次收货数量";
            this.gridColumn13.FieldName = "quantity";
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 4;
            this.gridColumn13.Width = 94;
            this.gridColumn6.Caption = "物料规格";
            this.gridColumn6.FieldName = "itemModel";
            this.gridColumn6.MinWidth = 125;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 125;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "已打印总数量";
            this.gridColumn8.FieldName = "prnQty";
            this.gridColumn8.Caption = "本次收货数量";
            this.gridColumn8.FieldName = "quantity";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 6;
            this.gridColumn8.Width = 94;
            // 
            // gridColumn10
            // gvMx1ebelnQty
            // 
            this.gridColumn10.Caption = "已入库数量";
            this.gridColumn10.FieldName = "okRkqty";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 7;
            this.gridColumn10.Width = 94;
            this.gvMx1ebelnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebelnQty.Caption = "已打印数量";
            this.gvMx1ebelnQty.FieldName = "prnQty";
            this.gvMx1ebelnQty.MinWidth = 90;
            this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
            this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
            this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
            this.gvMx1ebelnQty.Visible = true;
            this.gvMx1ebelnQty.VisibleIndex = 7;
            this.gvMx1ebelnQty.Width = 100;
            // 
            // gridColumn6
            // gvMx1okRkqty
            // 
            this.gridColumn6.Caption = "打印条码张数";
            this.gridColumn6.FieldName = "icount";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 8;
            this.gridColumn6.Width = 94;
            this.gvMx1okRkqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
            this.gvMx1okRkqty.Caption = "已入库数量";
            this.gvMx1okRkqty.FieldName = "okRkqty";
            this.gvMx1okRkqty.MinWidth = 90;
            this.gvMx1okRkqty.Name = "gvMx1okRkqty";
            this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
            this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
            this.gvMx1okRkqty.Visible = true;
            this.gvMx1okRkqty.VisibleIndex = 8;
            this.gvMx1okRkqty.Width = 100;
            //
            // gvMx1states
            //
            this.gvMx1states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1states.AppearanceCell.Options.UseFont = true;
            this.gvMx1states.Caption = "打印条码张数";
            this.gvMx1states.FieldName = "icount";
            this.gvMx1states.MinWidth = 90;
            this.gvMx1states.Name = "gvMx1states";
            this.gvMx1states.OptionsColumn.ReadOnly = true;
            this.gvMx1states.Tag = "query_a.states";
            this.gvMx1states.Visible = true;
            this.gvMx1states.VisibleIndex = 9;
            this.gvMx1states.Width = 100;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "物料单位";
            this.gridColumn5.FieldName = "wnDw";
            this.gridColumn5.MinWidth = 60;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 10;
            this.gridColumn5.Width = 180;
            // 
            // gridColumn9
            // 
            this.gridColumn9.Caption = "物料单位";
            this.gridColumn9.FieldName = "fname";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Caption = "采购单位";
            this.gridColumn9.FieldName = "cgUnit";
            this.gridColumn9.MinWidth = 60;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 9;
            this.gridColumn9.VisibleIndex = 11;
            this.gridColumn9.Width = 94;
            // 
            // gridColumn11
            // gridColumn7
            // 
            this.gridColumn11.Caption = "库存单位";
            this.gridColumn11.FieldName = "kcUnit";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 11;
            this.gridColumn11.Width = 94;
            this.gridColumn7.Caption = "库存单位";
            this.gridColumn7.FieldName = "kcUnit";
            this.gridColumn7.MinWidth = 60;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 12;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn12
            // repositoryItemButtonEdit1
            // 
            this.gridColumn12.Caption = "采购单位";
            this.gridColumn12.FieldName = "cgUnit";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 12;
            this.gridColumn12.Width = 94;
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.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)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            //
            // repositoryItemCheckEdit1
            //
            this.repositoryItemCheckEdit1.AutoHeight = false;
            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
            //
            // panelMx1
            //
            this.panelMx1.Controls.Add(this.lbMxGuid);
            this.panelMx1.Controls.Add(this.txt_iCount_1);
            this.panelMx1.Controls.Add(this.labelControl14);
            this.panelMx1.Controls.Add(this.txt_psnQty_1);
            this.panelMx1.Controls.Add(this.labelControl12);
            this.panelMx1.Controls.Add(this.kyPrtQty);
            this.panelMx1.Controls.Add(this.labelControl13);
            this.panelMx1.Controls.Add(this.textEdit6);
            this.panelMx1.Controls.Add(this.labelControl11);
            this.panelMx1.Controls.Add(this.txtQuantity);
            this.panelMx1.Controls.Add(this.labelControl10);
            this.panelMx1.Controls.Add(this.txtWlgg);
            this.panelMx1.Controls.Add(this.labelControl9);
            this.panelMx1.Controls.Add(this.txtWlmc);
            this.panelMx1.Controls.Add(this.labelControl8);
            this.panelMx1.Controls.Add(this.txtWlid);
            this.panelMx1.Controls.Add(this.labelControl7);
            this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
            this.panelMx1.Location = new System.Drawing.Point(0, 0);
            this.panelMx1.Name = "panelMx1";
            this.panelMx1.Size = new System.Drawing.Size(1342, 98);
            this.panelMx1.TabIndex = 0;
            //
            // lbMxGuid
            //
            this.lbMxGuid.Location = new System.Drawing.Point(552, 75);
            this.lbMxGuid.Name = "lbMxGuid";
            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
            this.lbMxGuid.TabIndex = 229;
            this.lbMxGuid.Text = "lbMxGuid";
            //
            // txt_iCount_1
            //
            this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
            this.txt_iCount_1.TabIndex = 228;
            //
            // labelControl14
            //
            this.labelControl14.Location = new System.Drawing.Point(543, 39);
            this.labelControl14.Name = "labelControl14";
            this.labelControl14.Size = new System.Drawing.Size(105, 18);
            this.labelControl14.TabIndex = 227;
            this.labelControl14.Text = "打印条码张数:";
            //
            // txt_psnQty_1
            //
            this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
            this.txt_psnQty_1.TabIndex = 226;
            //
            // labelControl12
            //
            this.labelControl12.Location = new System.Drawing.Point(543, 9);
            this.labelControl12.Name = "labelControl12";
            this.labelControl12.Size = new System.Drawing.Size(105, 18);
            this.labelControl12.TabIndex = 225;
            this.labelControl12.Text = "每张条码数量:";
            //
            // kyPrtQty
            //
            this.kyPrtQty.Location = new System.Drawing.Point(430, 65);
            this.kyPrtQty.Name = "kyPrtQty";
            this.kyPrtQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.kyPrtQty.Properties.Appearance.Options.UseFont = true;
            this.kyPrtQty.Properties.ReadOnly = true;
            this.kyPrtQty.Size = new System.Drawing.Size(96, 28);
            this.kyPrtQty.TabIndex = 224;
            //
            // labelControl13
            //
            this.labelControl13.Location = new System.Drawing.Point(332, 70);
            this.labelControl13.Name = "labelControl13";
            this.labelControl13.Size = new System.Drawing.Size(90, 18);
            this.labelControl13.TabIndex = 223;
            this.labelControl13.Text = "可打印总数:";
            //
            // textEdit6
            //
            this.textEdit6.Location = new System.Drawing.Point(430, 34);
            this.textEdit6.Name = "textEdit6";
            this.textEdit6.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.textEdit6.Properties.Appearance.Options.UseFont = true;
            this.textEdit6.Properties.ReadOnly = true;
            this.textEdit6.Size = new System.Drawing.Size(96, 28);
            this.textEdit6.TabIndex = 222;
            //
            // labelControl11
            //
            this.labelControl11.Location = new System.Drawing.Point(332, 39);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(90, 18);
            this.labelControl11.TabIndex = 221;
            this.labelControl11.Text = "已打印总量:";
            //
            // txtQuantity
            //
            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
            this.txtQuantity.Name = "txtQuantity";
            this.txtQuantity.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
            this.txtQuantity.Properties.ReadOnly = true;
            this.txtQuantity.Size = new System.Drawing.Size(96, 28);
            this.txtQuantity.TabIndex = 220;
            //
            // labelControl10
            //
            this.labelControl10.Location = new System.Drawing.Point(317, 9);
            this.labelControl10.Name = "labelControl10";
            this.labelControl10.Size = new System.Drawing.Size(105, 18);
            this.labelControl10.TabIndex = 219;
            this.labelControl10.Text = "本次收货总量:";
            //
            // txtWlgg
            //
            this.txtWlgg.Location = new System.Drawing.Point(77, 65);
            this.txtWlgg.Name = "txtWlgg";
            this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
            this.txtWlgg.Properties.ReadOnly = true;
            this.txtWlgg.Size = new System.Drawing.Size(215, 28);
            this.txtWlgg.TabIndex = 218;
            //
            // labelControl9
            //
            this.labelControl9.Location = new System.Drawing.Point(11, 70);
            this.labelControl9.Name = "labelControl9";
            this.labelControl9.Size = new System.Drawing.Size(60, 18);
            this.labelControl9.TabIndex = 217;
            this.labelControl9.Text = "物料规格";
            //
            // txtWlmc
            //
            this.txtWlmc.Location = new System.Drawing.Point(77, 34);
            this.txtWlmc.Name = "txtWlmc";
            this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
            this.txtWlmc.Properties.ReadOnly = true;
            this.txtWlmc.Size = new System.Drawing.Size(215, 28);
            this.txtWlmc.TabIndex = 216;
            //
            // labelControl8
            //
            this.labelControl8.Location = new System.Drawing.Point(11, 39);
            this.labelControl8.Name = "labelControl8";
            this.labelControl8.Size = new System.Drawing.Size(60, 18);
            this.labelControl8.TabIndex = 215;
            this.labelControl8.Text = "物料名称";
            //
            // txtWlid
            //
            this.txtWlid.Location = new System.Drawing.Point(77, 4);
            this.txtWlid.Name = "txtWlid";
            this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtWlid.Properties.Appearance.Options.UseFont = true;
            this.txtWlid.Properties.ReadOnly = true;
            this.txtWlid.Size = new System.Drawing.Size(215, 28);
            this.txtWlid.TabIndex = 214;
            //
            // labelControl7
            //
            this.labelControl7.Location = new System.Drawing.Point(25, 9);
            this.labelControl7.Name = "labelControl7";
            this.labelControl7.Size = new System.Drawing.Size(46, 18);
            this.labelControl7.TabIndex = 213;
            this.labelControl7.Text = "物料ID";
            // 
            // gv_urgentFlag
            // 
            this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
            this.gv_urgentFlag.Caption = "急料标识 ";
            this.gv_urgentFlag.Caption = "急料标识";
            this.gv_urgentFlag.FieldName = "urgentFlag";
            this.gv_urgentFlag.MinWidth = 50;
            this.gv_urgentFlag.Name = "gv_urgentFlag";
@@ -515,7 +763,7 @@
            // 
            this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_suppNo.AppearanceCell.Options.UseFont = true;
            this.gv_suppNo.Caption = "供应商编码 ";
            this.gv_suppNo.Caption = "供应商编码";
            this.gv_suppNo.FieldName = "suppNo";
            this.gv_suppNo.MinWidth = 50;
            this.gv_suppNo.Name = "gv_suppNo";
@@ -529,7 +777,7 @@
            // 
            this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotsCode.Caption = "收货仓库编码 ";
            this.gv_depotsCode.Caption = "收货仓库编码";
            this.gv_depotsCode.FieldName = "depotsCode";
            this.gv_depotsCode.MinWidth = 50;
            this.gv_depotsCode.Name = "gv_depotsCode";
@@ -557,7 +805,7 @@
            // 
            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
            this.gv_checkDate.Caption = "提交日期 ";
            this.gv_checkDate.Caption = "提交日期";
            this.gv_checkDate.FieldName = "checkDate";
            this.gv_checkDate.MinWidth = 50;
            this.gv_checkDate.Name = "gv_checkDate";
@@ -571,7 +819,7 @@
            // 
            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注 ";
            this.gv_remark.Caption = "备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.MinWidth = 50;
            this.gv_remark.Name = "gv_remark";
@@ -613,7 +861,7 @@
            // 
            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "到货单号 ";
            this.gv_billNo.Caption = "到货单号";
            this.gv_billNo.FieldName = "billNo";
            this.gv_billNo.MinWidth = 50;
            this.gv_billNo.Name = "gv_billNo";
@@ -622,18 +870,6 @@
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 3;
            this.gv_billNo.Width = 94;
            //
            // gv_guid
            //
            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键 ";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Width = 94;
            // 
            // toolBarMenu1
            // 
@@ -644,7 +880,7 @@
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.Size = new System.Drawing.Size(1346, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
@@ -656,7 +892,7 @@
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.Size = new System.Drawing.Size(1126, 531);
            this.gcMain.Size = new System.Drawing.Size(1344, 531);
            this.gcMain.TabIndex = 1;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -666,7 +902,6 @@
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_guid,
            this.gv_urgentFlag,
            this.gv_fstatus,
            this.gv_status,
@@ -693,19 +928,10 @@
            this.gridColumn1.FieldName = "percentage";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 94;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "收货仓库名称";
            this.gridColumn3.FieldName = "depotName";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 11;
            this.gridColumn3.Width = 94;
            // 
            // gridColumn2
            // 
@@ -713,9 +939,21 @@
            this.gridColumn2.FieldName = "suppName";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 9;
            this.gridColumn2.Width = 94;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "收货仓库名称";
            this.gridColumn3.FieldName = "depotName";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.AllowEdit = false;
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 11;
            this.gridColumn3.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -723,7 +961,7 @@
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
            this.xtraTabControl1.Size = new System.Drawing.Size(1346, 602);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
@@ -734,7 +972,7 @@
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Controls.Add(this.pageBar1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage1.Size = new System.Drawing.Size(1344, 570);
            this.xtraTabPage1.Text = "数据查询";
            // 
            // pageBar1
@@ -746,7 +984,7 @@
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.RowsCount = 50;
            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
            this.pageBar1.Size = new System.Drawing.Size(1344, 39);
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            // 
@@ -756,16 +994,16 @@
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.PageEnabled = false;
            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage2.Size = new System.Drawing.Size(1344, 570);
            this.xtraTabPage2.Text = "数据编辑";
            // 
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 223);
            this.tabMx.Location = new System.Drawing.Point(0, 161);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 347);
            this.tabMx.Size = new System.Drawing.Size(1344, 409);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -774,47 +1012,159 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_fstatus);
            this.panel1.Controls.Add(this.txt_urgentFlag);
            this.panel1.Controls.Add(this.labelControl5);
            this.panel1.Controls.Add(this.txt_paperBillNo);
            this.panel1.Controls.Add(this.txtDepotsId);
            this.panel1.Controls.Add(this.labelControl4);
            this.panel1.Controls.Add(this.label1);
            this.panel1.Controls.Add(this.txtSupplierId);
            this.panel1.Controls.Add(this.txt_depotsId);
            this.panel1.Controls.Add(this.labelControl1);
            this.panel1.Controls.Add(this.txt_suppId);
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.labelControl3);
            this.panel1.Controls.Add(this.txt_percentage);
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.txt_depotName);
            this.panel1.Controls.Add(this.labelControl1);
            this.panel1.Controls.Add(this.txt_suppName);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_urgentFlag);
            this.panel1.Controls.Add(this.txt_urgentFlag);
            this.panel1.Controls.Add(this.lb_fstatus);
            this.panel1.Controls.Add(this.txt_fstatus);
            this.panel1.Controls.Add(this.lb_suppNo);
            this.panel1.Controls.Add(this.txt_suppNo);
            this.panel1.Controls.Add(this.lb_depotsCode);
            this.panel1.Controls.Add(this.txt_depotsCode);
            this.panel1.Controls.Add(this.lb_insDate);
            this.panel1.Controls.Add(this.txt_insDate);
            this.panel1.Controls.Add(this.lb_checkDate);
            this.panel1.Controls.Add(this.txt_checkDate);
            this.panel1.Controls.Add(this.lb_remark);
            this.panel1.Controls.Add(this.txt_remark);
            this.panel1.Controls.Add(this.lb_createDate);
            this.panel1.Controls.Add(this.txt_createDate);
            this.panel1.Controls.Add(this.lb_createBy);
            this.panel1.Controls.Add(this.txt_createBy);
            this.panel1.Controls.Add(this.lb_status);
            this.panel1.Controls.Add(this.txt_status);
            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, 223);
            this.panel1.Size = new System.Drawing.Size(1344, 161);
            this.panel1.TabIndex = 1;
            //
            // txt_fstatus
            //
            this.txt_fstatus.Location = new System.Drawing.Point(993, 17);
            this.txt_fstatus.Name = "txt_fstatus";
            this.txt_fstatus.Properties.Caption = "";
            this.txt_fstatus.Size = new System.Drawing.Size(94, 24);
            this.txt_fstatus.TabIndex = 466;
            //
            // txt_urgentFlag
            //
            this.txt_urgentFlag.Location = new System.Drawing.Point(993, 53);
            this.txt_urgentFlag.Name = "txt_urgentFlag";
            this.txt_urgentFlag.Properties.Caption = "";
            this.txt_urgentFlag.Size = new System.Drawing.Size(94, 24);
            this.txt_urgentFlag.TabIndex = 465;
            //
            // labelControl5
            //
            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl5.Appearance.Options.UseFont = true;
            this.labelControl5.Location = new System.Drawing.Point(335, 19);
            this.labelControl5.Name = "labelControl5";
            this.labelControl5.Size = new System.Drawing.Size(68, 21);
            this.labelControl5.TabIndex = 464;
            this.labelControl5.Text = "送货单号";
            //
            // txt_paperBillNo
            //
            this.txt_paperBillNo.Location = new System.Drawing.Point(415, 15);
            this.txt_paperBillNo.Name = "txt_paperBillNo";
            this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
            this.txt_paperBillNo.Size = new System.Drawing.Size(215, 28);
            this.txt_paperBillNo.TabIndex = 463;
            //
            // txtDepotsId
            //
            this.txtDepotsId.Enabled = false;
            this.txtDepotsId.Location = new System.Drawing.Point(413, 90);
            this.txtDepotsId.Name = "txtDepotsId";
            this.txtDepotsId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtDepotsId.Properties.Appearance.Options.UseFont = true;
            this.txtDepotsId.Size = new System.Drawing.Size(215, 28);
            this.txtDepotsId.TabIndex = 462;
            //
            // labelControl4
            //
            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl4.Appearance.Options.UseFont = true;
            this.labelControl4.Location = new System.Drawing.Point(351, 94);
            this.labelControl4.Name = "labelControl4";
            this.labelControl4.Size = new System.Drawing.Size(52, 21);
            this.labelControl4.TabIndex = 461;
            this.labelControl4.Text = "仓库ID";
            //
            // label1
            //
            this.label1.AutoSize = true;
            this.label1.Location = new System.Drawing.Point(22, 94);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(79, 21);
            this.label1.TabIndex = 460;
            this.label1.Text = "供应商ID";
            //
            // txtSupplierId
            //
            this.txtSupplierId.Enabled = false;
            this.txtSupplierId.Location = new System.Drawing.Point(111, 90);
            this.txtSupplierId.Name = "txtSupplierId";
            this.txtSupplierId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtSupplierId.Properties.Appearance.Options.UseFont = true;
            this.txtSupplierId.Size = new System.Drawing.Size(215, 28);
            this.txtSupplierId.TabIndex = 459;
            //
            // txt_depotsId
            //
            this.txt_depotsId.IsReadly = true;
            this.txt_depotsId.KeyFile = "";
            this.txt_depotsId.Location = new System.Drawing.Point(413, 51);
            this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_depotsId.Name = "txt_depotsId";
            this.txt_depotsId.Size = new System.Drawing.Size(215, 28);
            this.txt_depotsId.TabIndex = 458;
            //
            // labelControl1
            //
            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl1.Appearance.Options.UseFont = true;
            this.labelControl1.Location = new System.Drawing.Point(335, 55);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(68, 21);
            this.labelControl1.TabIndex = 457;
            this.labelControl1.Text = "仓库名称";
            //
            // txt_suppId
            //
            this.txt_suppId.IsReadly = true;
            this.txt_suppId.KeyFile = "";
            this.txt_suppId.Location = new System.Drawing.Point(111, 51);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(215, 28);
            this.txt_suppId.TabIndex = 456;
            //
            // labelControl2
            //
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(16, 55);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(85, 21);
            this.labelControl2.TabIndex = 455;
            this.labelControl2.Text = "供应商名称";
            // 
            // labelControl3
            // 
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(354, 182);
            this.labelControl3.Location = new System.Drawing.Point(884, 94);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(102, 21);
            this.labelControl3.TabIndex = 341;
@@ -822,50 +1172,12 @@
            // 
            // txt_percentage
            // 
            this.txt_percentage.Location = new System.Drawing.Point(525, 179);
            this.txt_percentage.Location = new System.Drawing.Point(993, 90);
            this.txt_percentage.Name = "txt_percentage";
            this.txt_percentage.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_percentage.Properties.Appearance.Options.UseFont = true;
            this.txt_percentage.Size = new System.Drawing.Size(150, 28);
            this.txt_percentage.Size = new System.Drawing.Size(60, 28);
            this.txt_percentage.TabIndex = 342;
            //
            // labelControl2
            //
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(20, 182);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(68, 21);
            this.labelControl2.TabIndex = 339;
            this.labelControl2.Text = "仓库名称";
            //
            // txt_depotName
            //
            this.txt_depotName.Location = new System.Drawing.Point(111, 179);
            this.txt_depotName.Name = "txt_depotName";
            this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
            this.txt_depotName.Size = new System.Drawing.Size(150, 28);
            this.txt_depotName.TabIndex = 340;
            //
            // labelControl1
            //
            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl1.Appearance.Options.UseFont = true;
            this.labelControl1.Location = new System.Drawing.Point(15, 95);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(85, 21);
            this.labelControl1.TabIndex = 337;
            this.labelControl1.Text = "供应商名称";
            //
            // txt_suppName
            //
            this.txt_suppName.Location = new System.Drawing.Point(111, 92);
            this.txt_suppName.Name = "txt_suppName";
            this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
            this.txt_suppName.Size = new System.Drawing.Size(150, 28);
            this.txt_suppName.TabIndex = 338;
            // 
            // lbGuid
            // 
@@ -879,83 +1191,27 @@
            // 
            this.lb_urgentFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_urgentFlag.Appearance.Options.UseFont = true;
            this.lb_urgentFlag.Location = new System.Drawing.Point(354, 139);
            this.lb_urgentFlag.Location = new System.Drawing.Point(913, 55);
            this.lb_urgentFlag.Name = "lb_urgentFlag";
            this.lb_urgentFlag.Size = new System.Drawing.Size(73, 21);
            this.lb_urgentFlag.TabIndex = 336;
            this.lb_urgentFlag.Text = "急料标识 ";
            // 
            // txt_urgentFlag
            //
            this.txt_urgentFlag.Location = new System.Drawing.Point(525, 136);
            this.txt_urgentFlag.Name = "txt_urgentFlag";
            this.txt_urgentFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_urgentFlag.Properties.Appearance.Options.UseFont = true;
            this.txt_urgentFlag.Size = new System.Drawing.Size(150, 28);
            this.txt_urgentFlag.TabIndex = 336;
            //
            // lb_fstatus
            // 
            this.lb_fstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fstatus.Appearance.Options.UseFont = true;
            this.lb_fstatus.Location = new System.Drawing.Point(354, 95);
            this.lb_fstatus.Location = new System.Drawing.Point(913, 19);
            this.lb_fstatus.Name = "lb_fstatus";
            this.lb_fstatus.Size = new System.Drawing.Size(73, 21);
            this.lb_fstatus.TabIndex = 291;
            this.lb_fstatus.Text = "提交状态 ";
            // 
            // txt_fstatus
            //
            this.txt_fstatus.Location = new System.Drawing.Point(525, 92);
            this.txt_fstatus.Name = "txt_fstatus";
            this.txt_fstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fstatus.Properties.Appearance.Options.UseFont = true;
            this.txt_fstatus.Size = new System.Drawing.Size(150, 28);
            this.txt_fstatus.TabIndex = 291;
            //
            // lb_suppNo
            //
            this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_suppNo.Appearance.Options.UseFont = true;
            this.lb_suppNo.Location = new System.Drawing.Point(15, 60);
            this.lb_suppNo.Name = "lb_suppNo";
            this.lb_suppNo.Size = new System.Drawing.Size(90, 21);
            this.lb_suppNo.TabIndex = 285;
            this.lb_suppNo.Text = "供应商编码 ";
            //
            // txt_suppNo
            //
            this.txt_suppNo.Location = new System.Drawing.Point(111, 57);
            this.txt_suppNo.Name = "txt_suppNo";
            this.txt_suppNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_suppNo.Properties.Appearance.Options.UseFont = true;
            this.txt_suppNo.Size = new System.Drawing.Size(150, 28);
            this.txt_suppNo.TabIndex = 285;
            //
            // lb_depotsCode
            //
            this.lb_depotsCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_depotsCode.Appearance.Options.UseFont = true;
            this.lb_depotsCode.Location = new System.Drawing.Point(20, 139);
            this.lb_depotsCode.Name = "lb_depotsCode";
            this.lb_depotsCode.Size = new System.Drawing.Size(73, 21);
            this.lb_depotsCode.TabIndex = 273;
            this.lb_depotsCode.Text = "仓库编码 ";
            //
            // txt_depotsCode
            //
            this.txt_depotsCode.Location = new System.Drawing.Point(111, 136);
            this.txt_depotsCode.Name = "txt_depotsCode";
            this.txt_depotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
            this.txt_depotsCode.Size = new System.Drawing.Size(150, 28);
            this.txt_depotsCode.TabIndex = 273;
            //
            // lb_insDate
            // 
            this.lb_insDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_insDate.Appearance.Options.UseFont = true;
            this.lb_insDate.Location = new System.Drawing.Point(717, 23);
            this.lb_insDate.Location = new System.Drawing.Point(639, 94);
            this.lb_insDate.Name = "lb_insDate";
            this.lb_insDate.Size = new System.Drawing.Size(73, 21);
            this.lb_insDate.TabIndex = 258;
@@ -963,7 +1219,7 @@
            // 
            // txt_insDate
            // 
            this.txt_insDate.Location = new System.Drawing.Point(796, 20);
            this.txt_insDate.Location = new System.Drawing.Point(724, 90);
            this.txt_insDate.Name = "txt_insDate";
            this.txt_insDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_insDate.Properties.Appearance.Options.UseFont = true;
@@ -974,7 +1230,7 @@
            // 
            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkDate.Appearance.Options.UseFont = true;
            this.lb_checkDate.Location = new System.Drawing.Point(719, 139);
            this.lb_checkDate.Location = new System.Drawing.Point(639, 55);
            this.lb_checkDate.Name = "lb_checkDate";
            this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
            this.lb_checkDate.TabIndex = 252;
@@ -982,7 +1238,7 @@
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(796, 136);
            this.txt_checkDate.Location = new System.Drawing.Point(724, 51);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -993,7 +1249,7 @@
            // 
            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark.Appearance.Options.UseFont = true;
            this.lb_remark.Location = new System.Drawing.Point(729, 95);
            this.lb_remark.Location = new System.Drawing.Point(62, 128);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(39, 21);
            this.lb_remark.TabIndex = 235;
@@ -1001,37 +1257,18 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(796, 92);
            this.txt_remark.Location = new System.Drawing.Point(111, 124);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(150, 28);
            this.txt_remark.Size = new System.Drawing.Size(215, 28);
            this.txt_remark.TabIndex = 235;
            //
            // lb_createDate
            //
            this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createDate.Appearance.Options.UseFont = true;
            this.lb_createDate.Location = new System.Drawing.Point(354, 60);
            this.lb_createDate.Name = "lb_createDate";
            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
            this.lb_createDate.TabIndex = 219;
            this.lb_createDate.Text = "创建时间 ";
            //
            // txt_createDate
            //
            this.txt_createDate.Location = new System.Drawing.Point(525, 57);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
            this.txt_createDate.Size = new System.Drawing.Size(150, 28);
            this.txt_createDate.TabIndex = 219;
            // 
            // lb_createBy
            // 
            this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_createBy.Appearance.Options.UseFont = true;
            this.lb_createBy.Location = new System.Drawing.Point(717, 57);
            this.lb_createBy.Location = new System.Drawing.Point(644, 19);
            this.lb_createBy.Name = "lb_createBy";
            this.lb_createBy.Size = new System.Drawing.Size(68, 21);
            this.lb_createBy.TabIndex = 217;
@@ -1039,37 +1276,18 @@
            // 
            // txt_createBy
            // 
            this.txt_createBy.Location = new System.Drawing.Point(796, 54);
            this.txt_createBy.Location = new System.Drawing.Point(724, 15);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
            this.txt_createBy.Size = new System.Drawing.Size(150, 28);
            this.txt_createBy.TabIndex = 217;
            // 
            // lb_status
            //
            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(285, 23);
            this.lb_status.Name = "lb_status";
            this.lb_status.Size = new System.Drawing.Size(234, 21);
            this.lb_status.TabIndex = 213;
            this.lb_status.Text = "状态|0-未审核1-审核入库 ç»“案 ";
            //
            // txt_status
            //
            this.txt_status.Location = new System.Drawing.Point(525, 20);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_status.Properties.Appearance.Options.UseFont = true;
            this.txt_status.Size = new System.Drawing.Size(150, 28);
            this.txt_status.TabIndex = 213;
            //
            // lb_billNo
            // 
            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(20, 23);
            this.lb_billNo.Location = new System.Drawing.Point(28, 19);
            this.lb_billNo.Name = "lb_billNo";
            this.lb_billNo.Size = new System.Drawing.Size(73, 21);
            this.lb_billNo.TabIndex = 211;
@@ -1077,18 +1295,28 @@
            // 
            // txt_billNo
            // 
            this.txt_billNo.Location = new System.Drawing.Point(111, 20);
            this.txt_billNo.Location = new System.Drawing.Point(111, 15);
            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(215, 28);
            this.txt_billNo.TabIndex = 211;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "可打印总量";
            this.gridColumn10.FieldName = "kyPrtQty";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 13;
            this.gridColumn10.Width = 94;
            // 
            // Frm_ArrivalBarcode
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1128, 682);
            this.ClientSize = new System.Drawing.Size(1346, 682);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_ArrivalBarcode";
@@ -1098,6 +1326,19 @@
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
            this.panelMx1.ResumeLayout(false);
            this.panelMx1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
            ((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.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1108,19 +1349,16 @@
            this.tabMx.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
            this.ResumeLayout(false);
@@ -1141,14 +1379,7 @@
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1parentGuid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
        private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
        private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
@@ -1159,54 +1390,79 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private System.Windows.Forms.Panel panel1;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.TextEdit txt_depotName;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.TextEdit txt_suppName;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
        private DevExpress.XtraEditors.TextEdit txt_urgentFlag;
        private DevExpress.XtraEditors.LabelControl lb_fstatus;
        private DevExpress.XtraEditors.TextEdit txt_fstatus;
        private DevExpress.XtraEditors.LabelControl lb_suppNo;
        private DevExpress.XtraEditors.TextEdit txt_suppNo;
        private DevExpress.XtraEditors.LabelControl lb_depotsCode;
        private DevExpress.XtraEditors.TextEdit txt_depotsCode;
        private DevExpress.XtraEditors.LabelControl lb_insDate;
        private DevExpress.XtraEditors.TextEdit txt_insDate;
        private DevExpress.XtraEditors.LabelControl lb_checkDate;
        private DevExpress.XtraEditors.TextEdit txt_checkDate;
        private DevExpress.XtraEditors.LabelControl lb_remark;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraEditors.LabelControl lb_createDate;
        private DevExpress.XtraEditors.TextEdit txt_createDate;
        private DevExpress.XtraEditors.LabelControl lb_createBy;
        private DevExpress.XtraEditors.TextEdit txt_createBy;
        private DevExpress.XtraEditors.LabelControl lb_status;
        private DevExpress.XtraEditors.TextEdit txt_status;
        private DevExpress.XtraEditors.LabelControl lb_billNo;
        private DevExpress.XtraEditors.TextEdit txt_billNo;
        private DevExpress.XtraEditors.LabelControl labelControl3;
        private DevExpress.XtraEditors.TextEdit txt_percentage;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraEditors.TextEdit txtDepotsId;
        private DevExpress.XtraEditors.LabelControl labelControl4;
        private System.Windows.Forms.Label label1;
        private DevExpress.XtraEditors.TextEdit txtSupplierId;
        private UserControl.UcLookCk txt_depotsId;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private UserControl.UcLookSupplier txt_suppId;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.LabelControl labelControl5;
        private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
        private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
        private DevExpress.XtraEditors.CheckEdit txt_fstatus;
        private DevExpress.XtraEditors.PanelControl panelMx1;
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnLine;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraEditors.TextEdit txtWlmc;
        private DevExpress.XtraEditors.LabelControl labelControl8;
        private DevExpress.XtraEditors.TextEdit txtWlid;
        private DevExpress.XtraEditors.LabelControl labelControl7;
        private DevExpress.XtraEditors.TextEdit textEdit6;
        private DevExpress.XtraEditors.LabelControl labelControl11;
        private DevExpress.XtraEditors.TextEdit txtQuantity;
        private DevExpress.XtraEditors.LabelControl labelControl10;
        private DevExpress.XtraEditors.TextEdit txtWlgg;
        private DevExpress.XtraEditors.LabelControl labelControl9;
        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
        private DevExpress.XtraEditors.LabelControl labelControl14;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private DevExpress.XtraEditors.LabelControl labelControl12;
        private DevExpress.XtraEditors.TextEdit kyPrtQty;
        private DevExpress.XtraEditors.LabelControl labelControl13;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraEditors.LabelControl lbMxGuid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
    }
}
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -1,5 +1,3 @@
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -8,6 +6,7 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -19,13 +18,10 @@
        public Frm_ArrivalBarcode()
        {
            InitializeComponent();
            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
            toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            getPageList(1, UtilityHelper.GetPageSize());
            pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -43,8 +39,36 @@
                Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
                e.Graphics.DrawString(str, f, Brushes.Gray, r);
            };
            //设置仓库选择
            this.txt_depotsId.KeyFile = "depotId";
            this.txt_depotsId.EditChanged += (s, e) =>
            {
                txtDepotsId.Text = this.txt_depotsId.GetId();
            };
            //设置供应商选择
            this.txt_suppId.KeyFile = "id";
            this.txt_suppId.EditChanged += (s, e) =>
            {
                txtSupplierId.Text = this.txt_suppId.GetId();
            };
            gcMx1.MouseClick += GcMx1_MouseClick;
        }
        private void GcMx1_MouseClick(object sender, MouseEventArgs e)
        {
            string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
            if (string.IsNullOrEmpty(rowGuid))
                return;
            lbMxGuid.Text = rowGuid;
            toolBarMenu1.guidKey = rowGuid;
            var info = gvMx1.CalcHitInfo(e.Location);
            var view = info.View;
            var row = view.GetDataRow(info.RowHandle);
            txtWlid.Text = row["itemId"].ToString();
            txtWlgg.Text = row["itemModel"].ToString();
            txtWlmc.Text = row["itemName"].ToString();
            txtQuantity.Text = row["Quantity"].ToString();
            kyPrtQty.Text = row["kyPrtQty"].ToString();
        }
        /// <summary>
        /// åŒå‡»äº‹ä»¶
        /// </summary>
@@ -86,51 +110,54 @@
            _filterList = e.FilterList;
            getPageList(1, pageBar1.RowsCount);
        }
        /// <summary>
        /// å–消事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
        {
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            toolBarMenu1.rptParameter = "rpt_Arrival{}";
        }
        /// <summary>
        /// åˆ é™¤äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            if (xtraTabControl1.SelectedTabPageIndex == 0)
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                getModel(rowGuid, false, 999);
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
            if (lbMxGuid.Text.Trim().Length < 36)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择你要打印的行!");
                this.toolBarMenu1.rptParameter = "return false";
                return;
               List<dynamic> lst = new List<dynamic>();
          lst.Add(rowGuid);
          var _obj = lst;
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    UtilityHelper.JumpToTab(xtraTabControl1, 0);
                    getPageList(1, UtilityHelper.GetPageSize());
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码张数!");
                txt_iCount_1.Focus();
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量!");
                txt_psnQty_1.Focus();
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            this.toolBarMenu1.rptParameter = "rpt_Arrival{" + ""
                   + "," + ""
                   + "," + ""
                   + "," + txt_iCount_1.Text.Trim()
                   + "," + txt_psnQty_1.Text.Trim()
                   + "}";
        }
        /// <summary>
@@ -144,110 +171,38 @@
            getPageList(1, UtilityHelper.GetPageSize());
        }
        /// <summary>
        /// ä¿®æ”¹äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            getModel(rowGuid, true, 1);
        }
        /// <summary>
        /// æ–°å¢žäº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
        {
               UtilityHelper.JumpToTab(xtraTabControl1, 1);
     lbGuid.Text = "";
     List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
     gridViews.Add(gvMx1);
     UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
     Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("登录账号不能为空!");
                // txt_account.Focus();
                return;
            }
            var _obj = new
            {
                  guid =UtilityHelper.ToGuid( lbGuid.Text.Trim()), //主建
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        /// <summary>
        /// 
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage, int pageSize)
        {
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            foreach (FilterEntity itm in _filterList)
            {
                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
            }
            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            var _sbSqlWhere = new StringBuilder();
            foreach (var itm in _filterList)
                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
                                   itm.fileValue + "'");
            var pgq = new PageQueryModel(curPage, pageSize, "create_date",
                "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
     {
         DataTable dt = dd.rtnData.list;
         gcMain.BindingContext = new BindingContext();
         gcMain.DataSource = dt;
         gcMain.ForceInitialize();
         int dddd = dd.rtnData.pages;//总页
         pageBar1.TotalPages = dddd;
         pageBar1.RecordCount = dd.rtnData.total;//记录总数
         pageBar1.CurrentPage = curPage;//当前页
         pageBar1.RowsCount = pageSize;//每页显示
         pageBar1.setTxt();
     }
     else
     {
         ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
     }
                var strReturn = UtilityHelper.HttpPost("",
                    _webServiceName + "GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                gcMain.BindingContext = new BindingContext();
                gcMain.DataSource = dt;
                gcMain.ForceInitialize();
                var dddd = dd.rtnData.pages; //总页
                pageBar1.TotalPages = dddd;
                pageBar1.RecordCount = dd.rtnData.total; //记录总数
                pageBar1.CurrentPage = curPage; //当前页
                pageBar1.RowsCount = pageSize; //每页显示
                pageBar1.setTxt();
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        private void getModel(string strGuid, bool isEdit, int tabIdx)
@@ -264,7 +219,7 @@
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName +"GetModel", JsonConvert.SerializeObject(_obj));
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
@@ -273,41 +228,38 @@
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    JArray list3 = new JArray();
                    foreach (var a in _job["rtnData"]["list"])
                    JArray array1 = new JArray();
                    foreach (var a in dy["list1"])
                    {
                        array.Add(a);
                        array1.Add(a);
                    }
                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                    if (dt.Rows.Count > 0)
                    DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
                    if (dt1.Rows.Count > 0)
                    {
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.DataSource = dt1;
                        gcMx1.ForceInitialize();
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    //foreach (var a in _job["rtnData"]["list3"])
                    //{
                    //    list3.Add(a);
                    //}
                    foreach (var a in _job["rtnData"]["list3"])
                    {
                        list3.Add(a);
                    }
                    DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(list3.ToString());
                    if (dt1.Rows.Count > 0)
                    {
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt1;
                        gcMx2.ForceInitialize();
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                    }
                    //DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(list3.ToString());
                    //if (dt1.Rows.Count > 0)
                    //{
                    //    gcMx2.BindingContext = new BindingContext();
                    //    gcMx2.DataSource = dt1;
                    //    gcMx2.ForceInitialize();
                    //}
                    //else
                    //{
                    //    Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                    //}
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -1,3 +1,4 @@
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -6,7 +7,6 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Windows.Controls;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -45,8 +45,10 @@
            {
                txt_suppId.Text = this.txt_suppNo_1.GetId();
            };
        }
        /// <summary>
        /// åŒå‡»äº‹ä»¶
        /// </summary>
@@ -108,6 +110,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_itemName, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            toolBarMenu1.rptParameter = "rpt_ItemInv{}";
        }
        private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
        {
DevApp/Gs.Setup/Gs.Setup.vdproj
ÎļþÌ«´ó