lu
2025-02-27 be53dc839f3698dd196ecbb002ea190d5bb7dabb
销售
已修改12个文件
5402 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs 249 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs 4078 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs 899 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/XtraForm1.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/XtraForm1.resx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/licenses.licx 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookSales.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx1fseq = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1fEntrynote = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1fRealQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -50,7 +50,6 @@
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.lb_fApproverStaus = new DevExpress.XtraEditors.LabelControl();
            this.txt_fApproverStaus = new DevExpress.XtraEditors.TextEdit();
            this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_fNote = new DevExpress.XtraEditors.LabelControl();
            this.txt_fNote = new DevExpress.XtraEditors.TextEdit();
@@ -97,6 +96,7 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_fApproverStaus = new DevExpress.XtraEditors.CheckEdit();
            this.txt_fStockOrgId = new Gs.DevApp.UserControl.UcLookOrg();
            this.txt_fCustomerID = new DevExpress.XtraEditors.TextEdit();
            this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales();
@@ -106,13 +106,20 @@
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.gridColumn3 = 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.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManID.Properties)).BeginInit();
@@ -131,6 +138,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
@@ -240,8 +248,8 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 354);
            this.tabMxPage1.Text = "明细1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 389);
            this.tabMxPage1.Text = "申请明细";
            // 
            // gcMx1
            // 
@@ -252,7 +260,7 @@
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemSearchLookUpEdit1,
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 354);
            this.gcMx1.Size = new System.Drawing.Size(1124, 389);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -303,6 +311,15 @@
            // 
            // repositoryItemSearchLookUpEdit1View
            // 
            this.repositoryItemSearchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn10,
            this.gridColumn3,
            this.gridColumn4,
            this.gridColumn5,
            this.gridColumn7,
            this.gridColumn8,
            this.gridColumn9,
            this.gridColumn6});
            this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
            this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
            this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -321,10 +338,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions8.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -333,20 +350,11 @@
            // 
            this.lb_fApproverStaus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fApproverStaus.Appearance.Options.UseFont = true;
            this.lb_fApproverStaus.Location = new System.Drawing.Point(270, 116);
            this.lb_fApproverStaus.Location = new System.Drawing.Point(815, 85);
            this.lb_fApproverStaus.Name = "lb_fApproverStaus";
            this.lb_fApproverStaus.Size = new System.Drawing.Size(68, 21);
            this.lb_fApproverStaus.TabIndex = 247;
            this.lb_fApproverStaus.Text = "审核状态";
            //
            // txt_fApproverStaus
            //
            this.txt_fApproverStaus.Location = new System.Drawing.Point(330, 116);
            this.txt_fApproverStaus.Name = "txt_fApproverStaus";
            this.txt_fApproverStaus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fApproverStaus.Properties.Appearance.Options.UseFont = true;
            this.txt_fApproverStaus.Size = new System.Drawing.Size(150, 28);
            this.txt_fApproverStaus.TabIndex = 247;
            // 
            // gv_fApproverStaus
            // 
@@ -366,7 +374,7 @@
            // 
            this.lb_fNote.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fNote.Appearance.Options.UseFont = true;
            this.lb_fNote.Location = new System.Drawing.Point(20, 116);
            this.lb_fNote.Location = new System.Drawing.Point(40, 118);
            this.lb_fNote.Name = "lb_fNote";
            this.lb_fNote.Size = new System.Drawing.Size(39, 21);
            this.lb_fNote.TabIndex = 243;
@@ -374,11 +382,11 @@
            // 
            // txt_fNote
            // 
            this.txt_fNote.Location = new System.Drawing.Point(80, 116);
            this.txt_fNote.Location = new System.Drawing.Point(84, 114);
            this.txt_fNote.Name = "txt_fNote";
            this.txt_fNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fNote.Properties.Appearance.Options.UseFont = true;
            this.txt_fNote.Size = new System.Drawing.Size(150, 28);
            this.txt_fNote.Size = new System.Drawing.Size(179, 28);
            this.txt_fNote.TabIndex = 243;
            // 
            // gv_fNote
@@ -399,7 +407,7 @@
            // 
            this.lb_fDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fDate.Appearance.Options.UseFont = true;
            this.lb_fDate.Location = new System.Drawing.Point(770, 84);
            this.lb_fDate.Location = new System.Drawing.Point(580, 117);
            this.lb_fDate.Name = "lb_fDate";
            this.lb_fDate.Size = new System.Drawing.Size(39, 21);
            this.lb_fDate.TabIndex = 240;
@@ -407,12 +415,13 @@
            // 
            // txt_fDate
            // 
            this.txt_fDate.Location = new System.Drawing.Point(849, 84);
            this.txt_fDate.Location = new System.Drawing.Point(622, 113);
            this.txt_fDate.Name = "txt_fDate";
            this.txt_fDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fDate.Properties.Appearance.Options.UseFont = true;
            this.txt_fDate.Size = new System.Drawing.Size(150, 28);
            this.txt_fDate.Size = new System.Drawing.Size(173, 28);
            this.txt_fDate.TabIndex = 240;
            this.txt_fDate.Tag = "readonly";
            // 
            // gv_fDate
            // 
@@ -432,7 +441,7 @@
            // 
            this.lb_fCustomerID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fCustomerID.Appearance.Options.UseFont = true;
            this.lb_fCustomerID.Location = new System.Drawing.Point(520, 84);
            this.lb_fCustomerID.Location = new System.Drawing.Point(304, 115);
            this.lb_fCustomerID.Name = "lb_fCustomerID";
            this.lb_fCustomerID.Size = new System.Drawing.Size(39, 21);
            this.lb_fCustomerID.TabIndex = 235;
@@ -456,7 +465,7 @@
            // 
            this.lb_fSalesManID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fSalesManID.Appearance.Options.UseFont = true;
            this.lb_fSalesManID.Location = new System.Drawing.Point(270, 84);
            this.lb_fSalesManID.Location = new System.Drawing.Point(287, 84);
            this.lb_fSalesManID.Name = "lb_fSalesManID";
            this.lb_fSalesManID.Size = new System.Drawing.Size(56, 21);
            this.lb_fSalesManID.TabIndex = 231;
@@ -464,12 +473,13 @@
            // 
            // txt_fSalesManID
            // 
            this.txt_fSalesManID.Location = new System.Drawing.Point(330, 84);
            this.txt_fSalesManID.Location = new System.Drawing.Point(350, 80);
            this.txt_fSalesManID.Name = "txt_fSalesManID";
            this.txt_fSalesManID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fSalesManID.Properties.Appearance.Options.UseFont = true;
            this.txt_fSalesManID.Size = new System.Drawing.Size(150, 28);
            this.txt_fSalesManID.Size = new System.Drawing.Size(195, 28);
            this.txt_fSalesManID.TabIndex = 231;
            this.txt_fSalesManID.Tag = "readonly";
            // 
            // gv_fSalesManID
            // 
@@ -489,7 +499,7 @@
            // 
            this.lb_fApproveDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fApproveDate.Appearance.Options.UseFont = true;
            this.lb_fApproveDate.Location = new System.Drawing.Point(20, 84);
            this.lb_fApproveDate.Location = new System.Drawing.Point(810, 50);
            this.lb_fApproveDate.Name = "lb_fApproveDate";
            this.lb_fApproveDate.Size = new System.Drawing.Size(73, 21);
            this.lb_fApproveDate.TabIndex = 228;
@@ -497,12 +507,13 @@
            // 
            // txt_fApproveDate
            // 
            this.txt_fApproveDate.Location = new System.Drawing.Point(80, 84);
            this.txt_fApproveDate.Location = new System.Drawing.Point(886, 46);
            this.txt_fApproveDate.Name = "txt_fApproveDate";
            this.txt_fApproveDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
            this.txt_fApproveDate.Size = new System.Drawing.Size(150, 28);
            this.txt_fApproveDate.Size = new System.Drawing.Size(173, 28);
            this.txt_fApproveDate.TabIndex = 228;
            this.txt_fApproveDate.Tag = "readonly";
            // 
            // gv_fApproveDate
            // 
@@ -522,7 +533,7 @@
            // 
            this.lb_fCreateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fCreateDate.Appearance.Options.UseFont = true;
            this.lb_fCreateDate.Location = new System.Drawing.Point(770, 52);
            this.lb_fCreateDate.Location = new System.Drawing.Point(546, 83);
            this.lb_fCreateDate.Name = "lb_fCreateDate";
            this.lb_fCreateDate.Size = new System.Drawing.Size(73, 21);
            this.lb_fCreateDate.TabIndex = 226;
@@ -530,12 +541,13 @@
            // 
            // txt_fCreateDate
            // 
            this.txt_fCreateDate.Location = new System.Drawing.Point(849, 52);
            this.txt_fCreateDate.Location = new System.Drawing.Point(622, 79);
            this.txt_fCreateDate.Name = "txt_fCreateDate";
            this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_fCreateDate.Size = new System.Drawing.Size(150, 28);
            this.txt_fCreateDate.Size = new System.Drawing.Size(173, 28);
            this.txt_fCreateDate.TabIndex = 226;
            this.txt_fCreateDate.Tag = "readonly";
            // 
            // gv_fCreateDate
            // 
@@ -555,7 +567,7 @@
            // 
            this.lb_fApproverID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fApproverID.Appearance.Options.UseFont = true;
            this.lb_fApproverID.Location = new System.Drawing.Point(520, 52);
            this.lb_fApproverID.Location = new System.Drawing.Point(832, 17);
            this.lb_fApproverID.Name = "lb_fApproverID";
            this.lb_fApproverID.Size = new System.Drawing.Size(51, 21);
            this.lb_fApproverID.TabIndex = 222;
@@ -563,12 +575,13 @@
            // 
            // txt_fApproverID
            // 
            this.txt_fApproverID.Location = new System.Drawing.Point(592, 52);
            this.txt_fApproverID.Location = new System.Drawing.Point(886, 13);
            this.txt_fApproverID.Name = "txt_fApproverID";
            this.txt_fApproverID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
            this.txt_fApproverID.Size = new System.Drawing.Size(150, 28);
            this.txt_fApproverID.Size = new System.Drawing.Size(173, 28);
            this.txt_fApproverID.TabIndex = 222;
            this.txt_fApproverID.Tag = "readonly";
            // 
            // gv_fApproverID
            // 
@@ -588,7 +601,7 @@
            // 
            this.lb_fCreatorId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fCreatorId.Appearance.Options.UseFont = true;
            this.lb_fCreatorId.Location = new System.Drawing.Point(270, 52);
            this.lb_fCreatorId.Location = new System.Drawing.Point(563, 50);
            this.lb_fCreatorId.Name = "lb_fCreatorId";
            this.lb_fCreatorId.Size = new System.Drawing.Size(56, 21);
            this.lb_fCreatorId.TabIndex = 219;
@@ -596,12 +609,13 @@
            // 
            // txt_fCreatorId
            // 
            this.txt_fCreatorId.Location = new System.Drawing.Point(330, 52);
            this.txt_fCreatorId.Location = new System.Drawing.Point(622, 46);
            this.txt_fCreatorId.Name = "txt_fCreatorId";
            this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
            this.txt_fCreatorId.Size = new System.Drawing.Size(150, 28);
            this.txt_fCreatorId.Size = new System.Drawing.Size(173, 28);
            this.txt_fCreatorId.TabIndex = 219;
            this.txt_fCreatorId.Tag = "readonly";
            // 
            // gv_fCreatorId
            // 
@@ -621,7 +635,7 @@
            // 
            this.lb_fStockOrgId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fStockOrgId.Appearance.Options.UseFont = true;
            this.lb_fStockOrgId.Location = new System.Drawing.Point(20, 52);
            this.lb_fStockOrgId.Location = new System.Drawing.Point(6, 86);
            this.lb_fStockOrgId.Name = "lb_fStockOrgId";
            this.lb_fStockOrgId.Size = new System.Drawing.Size(73, 21);
            this.lb_fStockOrgId.TabIndex = 217;
@@ -645,7 +659,7 @@
            // 
            this.lb_fSaleOrgId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fSaleOrgId.Appearance.Options.UseFont = true;
            this.lb_fSaleOrgId.Location = new System.Drawing.Point(770, 20);
            this.lb_fSaleOrgId.Location = new System.Drawing.Point(270, 50);
            this.lb_fSaleOrgId.Name = "lb_fSaleOrgId";
            this.lb_fSaleOrgId.Size = new System.Drawing.Size(73, 21);
            this.lb_fSaleOrgId.TabIndex = 216;
@@ -669,7 +683,7 @@
            // 
            this.lb_fBillTypeID.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fBillTypeID.Appearance.Options.UseFont = true;
            this.lb_fBillTypeID.Location = new System.Drawing.Point(520, 20);
            this.lb_fBillTypeID.Location = new System.Drawing.Point(546, 17);
            this.lb_fBillTypeID.Name = "lb_fBillTypeID";
            this.lb_fBillTypeID.Size = new System.Drawing.Size(73, 21);
            this.lb_fBillTypeID.TabIndex = 213;
@@ -693,7 +707,7 @@
            // 
            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(270, 20);
            this.lb_billNo.Location = new System.Drawing.Point(270, 17);
            this.lb_billNo.Name = "lb_billNo";
            this.lb_billNo.Size = new System.Drawing.Size(73, 21);
            this.lb_billNo.TabIndex = 211;
@@ -701,12 +715,13 @@
            // 
            // txt_billNo
            // 
            this.txt_billNo.Location = new System.Drawing.Point(330, 20);
            this.txt_billNo.Location = new System.Drawing.Point(350, 13);
            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(195, 28);
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
            // 
            // gv_billNo
            // 
@@ -726,20 +741,21 @@
            // 
            this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_id.Appearance.Options.UseFont = true;
            this.lb_id.Location = new System.Drawing.Point(20, 20);
            this.lb_id.Location = new System.Drawing.Point(5, 17);
            this.lb_id.Name = "lb_id";
            this.lb_id.Size = new System.Drawing.Size(18, 21);
            this.lb_id.Size = new System.Drawing.Size(74, 21);
            this.lb_id.TabIndex = 210;
            this.lb_id.Text = "id ";
            this.lb_id.Text = "主键GUID";
            // 
            // txt_id
            // 
            this.txt_id.Location = new System.Drawing.Point(80, 20);
            this.txt_id.Location = new System.Drawing.Point(84, 13);
            this.txt_id.Name = "txt_id";
            this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_id.Properties.Appearance.Options.UseFont = true;
            this.txt_id.Size = new System.Drawing.Size(150, 28);
            this.txt_id.Size = new System.Drawing.Size(179, 28);
            this.txt_id.TabIndex = 210;
            this.txt_id.Tag = "readonly";
            // 
            // gv_id
            // 
@@ -863,10 +879,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 184);
            this.tabMx.Location = new System.Drawing.Point(0, 149);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 386);
            this.tabMx.Size = new System.Drawing.Size(1126, 421);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -874,6 +890,7 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_fApproverStaus);
            this.panel1.Controls.Add(this.txt_fStockOrgId);
            this.panel1.Controls.Add(this.txt_fCustomerID);
            this.panel1.Controls.Add(this.txt_salesId);
@@ -883,7 +900,6 @@
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
            this.panel1.Controls.Add(this.lb_fApproverStaus);
            this.panel1.Controls.Add(this.txt_fApproverStaus);
            this.panel1.Controls.Add(this.lb_fNote);
            this.panel1.Controls.Add(this.txt_fNote);
            this.panel1.Controls.Add(this.lb_fDate);
@@ -910,39 +926,49 @@
            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, 184);
            this.panel1.Size = new System.Drawing.Size(1126, 149);
            this.panel1.TabIndex = 1;
            //
            // txt_fApproverStaus
            //
            this.txt_fApproverStaus.Enabled = false;
            this.txt_fApproverStaus.Location = new System.Drawing.Point(886, 85);
            this.txt_fApproverStaus.Name = "txt_fApproverStaus";
            this.txt_fApproverStaus.Properties.Caption = "";
            this.txt_fApproverStaus.Size = new System.Drawing.Size(59, 24);
            this.txt_fApproverStaus.TabIndex = 370;
            // 
            // txt_fStockOrgId
            // 
            this.txt_fStockOrgId.IsReadly = false;
            this.txt_fStockOrgId.Location = new System.Drawing.Point(80, 48);
            this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 81);
            this.txt_fStockOrgId.Name = "txt_fStockOrgId";
            this.txt_fStockOrgId.Size = new System.Drawing.Size(138, 30);
            this.txt_fStockOrgId.Size = new System.Drawing.Size(179, 30);
            this.txt_fStockOrgId.TabIndex = 369;
            // 
            // txt_fCustomerID
            // 
            this.txt_fCustomerID.Location = new System.Drawing.Point(592, 86);
            this.txt_fCustomerID.Location = new System.Drawing.Point(350, 111);
            this.txt_fCustomerID.Name = "txt_fCustomerID";
            this.txt_fCustomerID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fCustomerID.Properties.Appearance.Options.UseFont = true;
            this.txt_fCustomerID.Size = new System.Drawing.Size(150, 28);
            this.txt_fCustomerID.Size = new System.Drawing.Size(195, 28);
            this.txt_fCustomerID.TabIndex = 368;
            this.txt_fCustomerID.Tag = "readonly";
            // 
            // txt_salesId
            // 
            this.txt_salesId.IsReadly = false;
            this.txt_salesId.Location = new System.Drawing.Point(80, 150);
            this.txt_salesId.Location = new System.Drawing.Point(84, 48);
            this.txt_salesId.Name = "txt_salesId";
            this.txt_salesId.Size = new System.Drawing.Size(234, 29);
            this.txt_salesId.Size = new System.Drawing.Size(179, 30);
            this.txt_salesId.TabIndex = 367;
            // 
            // lb_salesId
            // 
            this.lb_salesId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_salesId.Appearance.Options.UseFont = true;
            this.lb_salesId.Location = new System.Drawing.Point(20, 150);
            this.lb_salesId.Location = new System.Drawing.Point(11, 53);
            this.lb_salesId.Name = "lb_salesId";
            this.lb_salesId.Size = new System.Drawing.Size(68, 21);
            this.lb_salesId.TabIndex = 366;
@@ -950,29 +976,30 @@
            // 
            // txt_fSaleOrgId
            // 
            this.txt_fSaleOrgId.Location = new System.Drawing.Point(849, 13);
            this.txt_fSaleOrgId.Location = new System.Drawing.Point(350, 46);
            this.txt_fSaleOrgId.Name = "txt_fSaleOrgId";
            this.txt_fSaleOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fSaleOrgId.Properties.Appearance.Options.UseFont = true;
            this.txt_fSaleOrgId.Size = new System.Drawing.Size(150, 28);
            this.txt_fSaleOrgId.Size = new System.Drawing.Size(195, 28);
            this.txt_fSaleOrgId.TabIndex = 365;
            this.txt_fSaleOrgId.Tag = "readonly";
            // 
            // txt_fBillTypeID
            // 
            this.txt_fBillTypeID.EditValue = "标准销售出库单(XSCKD01_SYS)";
            this.txt_fBillTypeID.Location = new System.Drawing.Point(592, 17);
            this.txt_fBillTypeID.Location = new System.Drawing.Point(622, 15);
            this.txt_fBillTypeID.Name = "txt_fBillTypeID";
            this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
            "标准销售出库单(XSCKD01_SYS)"});
            this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_fBillTypeID.Size = new System.Drawing.Size(146, 24);
            this.txt_fBillTypeID.Size = new System.Drawing.Size(173, 24);
            this.txt_fBillTypeID.TabIndex = 362;
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(529, 126);
            this.labelControl11.Location = new System.Drawing.Point(983, 104);
            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -982,7 +1009,7 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(580, 126);
            this.lbGuid.Location = new System.Drawing.Point(1034, 104);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
@@ -997,6 +1024,70 @@
            this.picCheckBox.TabIndex = 9;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "物料编码";
            this.gridColumn3.FieldName = "itemNo";
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 1;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "销售单位";
            this.gridColumn4.FieldName = "dwName";
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 2;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "销售数量";
            this.gridColumn5.FieldName = "qty";
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 3;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "供应组织";
            this.gridColumn7.FieldName = "gyOrg";
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 4;
            //
            // gridColumn8
            //
            this.gridColumn8.Caption = "库存组织";
            this.gridColumn8.FieldName = "kcOrg";
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 5;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "剩余未出数量";
            this.gridColumn9.FieldName = "syQty";
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 6;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "销售单号";
            this.gridColumn10.FieldName = "billNo";
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 0;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "销售组织";
            this.gridColumn6.FieldName = "salesOrgName";
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 7;
            // 
            // Frm_SalesDeliver
            // 
@@ -1013,7 +1104,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManID.Properties)).EndInit();
@@ -1033,6 +1123,7 @@
            this.tabMx.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
@@ -1065,7 +1156,6 @@
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraEditors.LabelControl lb_fApproverStaus;
        private DevExpress.XtraEditors.TextEdit txt_fApproverStaus;
        private DevExpress.XtraGrid.Columns.GridColumn gv_fApproverStaus;
        private DevExpress.XtraEditors.LabelControl lb_fNote;
@@ -1128,5 +1218,14 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private UserControl.UcLookOrg txt_fStockOrgId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraEditors.CheckEdit txt_fApproverStaus;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
    }
}
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -45,8 +45,14 @@
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //设置销售单
            txt_salesId.getSuppler("", "");
            this.txt_salesId.EditChanged += (s, e) =>
            {
                //有没有发货组织
                string _fhOrg = txt_fStockOrgId.GetId();//目前过滤供应组织
                if (string.IsNullOrEmpty(_fhOrg))
                    return;
                //有没有销售订单
                string _sqGuid = txt_salesId.GetId();
                if (string.IsNullOrEmpty(_sqGuid))
                    return;
@@ -54,8 +60,7 @@
                txt_fCustomerID.Text = txt_salesId.GetSalesCusName();
                txt_fSaleOrgId.Text = txt_salesId.GetSalesOrgName();
                System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
                sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
                var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
                var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _fhOrg);
                var json = JsonConvert.SerializeObject(_obj);
                try
                {
@@ -558,7 +563,5 @@
                }
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
ÎļþÌ«´ó
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
@@ -11,6 +11,7 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -24,7 +25,7 @@
        public Frm_SalesOrder()
        {
            InitializeComponent();
            _drapHelp = new DragResizeHelp(this, splitContainerControl1.Panel1);
            _drapHelp = new DragResizeHelp(this,panel1);
            this.xtraTabControl1.CustomHeaderButtonClick += (s, e) => { _drapHelp.Show(); };
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -201,5 +202,7 @@
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
@@ -28,902 +28,63 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_erpId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_billTypeId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_documentStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_fDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_businessType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_headDeliveryWay = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_headLocId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_custId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_saleDeptId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_salerId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_changeReason = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_note = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_settleId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_approverId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_linkMan = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_chargeId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_linkPhone = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_creatorId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_modifierId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_modifyDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_approveDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_closerId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_closeDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_changeDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_cancelStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_cancellerId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_versionNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_changerId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_entryNote = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_fbilltype = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_saleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_receiveId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_receiveContact = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.textEdit4 = new DevExpress.XtraEditors.TextEdit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            this.xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
            this.splitContainerControl1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
            this.splitContainerControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
            this.panelControl2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
            this.panelControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            this.SuspendLayout();
            //
            // xtraTabControl1
            //
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
            this.xtraTabControl1.CustomHeaderButtons.AddRange(new DevExpress.XtraTab.Buttons.CustomHeaderButton[] {
            new DevExpress.XtraTab.Buttons.CustomHeaderButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, editorButtonImageOptions1, serializableAppearanceObject1, "", null, null)});
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1057, 660);
            this.xtraTabControl1.TabIndex = 1;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
            this.xtraTabPage2});
            //
            // xtraTabPage1
            //
            this.xtraTabPage1.Controls.Add(this.toolStrip1);
            this.xtraTabPage1.Controls.Add(this.gcMain);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1055, 628);
            this.xtraTabPage1.Text = "xtraTabPage1";
            //
            // toolStrip1
            //
            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
            this.toolStrip1.Name = "toolStrip1";
            this.toolStrip1.Size = new System.Drawing.Size(1055, 25);
            this.toolStrip1.TabIndex = 7;
            this.toolStrip1.Text = "toolStrip1";
            //
            // gcMain
            //
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
            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(1055, 628);
            this.gcMain.TabIndex = 6;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            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_id,
            this.gv_erpId,
            this.gv_billNo,
            this.gv_billTypeId,
            this.gv_documentStatus,
            this.gv_fDate,
            this.gv_businessType,
            this.gv_headDeliveryWay,
            this.gv_headLocId,
            this.gv_custId,
            this.gv_closeStatus,
            this.gv_saleDeptId,
            this.gv_salerId,
            this.gv_changeReason,
            this.gv_note,
            this.gv_settleId,
            this.gv_approverId,
            this.gv_linkMan,
            this.gv_chargeId,
            this.gv_linkPhone,
            this.gv_creatorId,
            this.gv_createDate,
            this.gv_modifierId,
            this.gv_modifyDate,
            this.gv_approveDate,
            this.gv_closerId,
            this.gv_closeDate,
            this.gv_changeDate,
            this.gv_cancelStatus,
            this.gv_cancellerId,
            this.gv_versionNo,
            this.gv_changerId,
            this.gv_entryNote,
            this.gv_fbilltype,
            this.gv_saleOrgId,
            this.gv_receiveId,
            this.gv_receiveContact});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_id
            //
            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "id ";
            this.gv_id.FieldName = "id";
            this.gv_id.MinWidth = 50;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.Tag = "query_a.id";
            this.gv_id.Visible = true;
            this.gv_id.VisibleIndex = 0;
            this.gv_id.Width = 94;
            //
            // gv_erpId
            //
            this.gv_erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_erpId.AppearanceCell.Options.UseFont = true;
            this.gv_erpId.Caption = "erp_id ";
            this.gv_erpId.FieldName = "erpId";
            this.gv_erpId.MinWidth = 50;
            this.gv_erpId.Name = "gv_erpId";
            this.gv_erpId.OptionsColumn.AllowEdit = false;
            this.gv_erpId.Tag = "query_a.erp_id";
            this.gv_erpId.Visible = true;
            this.gv_erpId.VisibleIndex = 1;
            this.gv_erpId.Width = 94;
            //
            // gv_billNo
            //
            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.FieldName = "billNo";
            this.gv_billNo.MinWidth = 50;
            this.gv_billNo.Name = "gv_billNo";
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.bill_no";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 2;
            this.gv_billNo.Width = 94;
            //
            // gv_billTypeId
            //
            this.gv_billTypeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_billTypeId.AppearanceCell.Options.UseFont = true;
            this.gv_billTypeId.Caption = "单据类型 ";
            this.gv_billTypeId.FieldName = "billTypeId";
            this.gv_billTypeId.MinWidth = 50;
            this.gv_billTypeId.Name = "gv_billTypeId";
            this.gv_billTypeId.OptionsColumn.AllowEdit = false;
            this.gv_billTypeId.Tag = "query_a.bill_type_id";
            this.gv_billTypeId.Visible = true;
            this.gv_billTypeId.VisibleIndex = 3;
            this.gv_billTypeId.Width = 94;
            //
            // gv_documentStatus
            //
            this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_documentStatus.AppearanceCell.Options.UseFont = true;
            this.gv_documentStatus.Caption = "单据状态 ";
            this.gv_documentStatus.FieldName = "documentStatus";
            this.gv_documentStatus.MinWidth = 50;
            this.gv_documentStatus.Name = "gv_documentStatus";
            this.gv_documentStatus.OptionsColumn.AllowEdit = false;
            this.gv_documentStatus.Tag = "query_a.document_status";
            this.gv_documentStatus.Visible = true;
            this.gv_documentStatus.VisibleIndex = 4;
            this.gv_documentStatus.Width = 94;
            //
            // gv_fDate
            //
            this.gv_fDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_fDate.AppearanceCell.Options.UseFont = true;
            this.gv_fDate.Caption = "日期 ";
            this.gv_fDate.FieldName = "fDate";
            this.gv_fDate.MinWidth = 50;
            this.gv_fDate.Name = "gv_fDate";
            this.gv_fDate.OptionsColumn.AllowEdit = false;
            this.gv_fDate.Tag = "query_a.f_date";
            this.gv_fDate.Visible = true;
            this.gv_fDate.VisibleIndex = 5;
            this.gv_fDate.Width = 94;
            //
            // gv_businessType
            //
            this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_businessType.AppearanceCell.Options.UseFont = true;
            this.gv_businessType.Caption = "业务类型 ";
            this.gv_businessType.FieldName = "businessType";
            this.gv_businessType.MinWidth = 50;
            this.gv_businessType.Name = "gv_businessType";
            this.gv_businessType.OptionsColumn.AllowEdit = false;
            this.gv_businessType.Tag = "query_a.business_type";
            this.gv_businessType.Visible = true;
            this.gv_businessType.VisibleIndex = 6;
            this.gv_businessType.Width = 94;
            //
            // gv_headDeliveryWay
            //
            this.gv_headDeliveryWay.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_headDeliveryWay.AppearanceCell.Options.UseFont = true;
            this.gv_headDeliveryWay.Caption = "交货方式 ";
            this.gv_headDeliveryWay.FieldName = "headDeliveryWay";
            this.gv_headDeliveryWay.MinWidth = 50;
            this.gv_headDeliveryWay.Name = "gv_headDeliveryWay";
            this.gv_headDeliveryWay.OptionsColumn.AllowEdit = false;
            this.gv_headDeliveryWay.Tag = "query_a.head_delivery_way";
            this.gv_headDeliveryWay.Visible = true;
            this.gv_headDeliveryWay.VisibleIndex = 7;
            this.gv_headDeliveryWay.Width = 94;
            //
            // gv_headLocId
            //
            this.gv_headLocId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_headLocId.AppearanceCell.Options.UseFont = true;
            this.gv_headLocId.Caption = "交货地点 ";
            this.gv_headLocId.FieldName = "headLocId";
            this.gv_headLocId.MinWidth = 50;
            this.gv_headLocId.Name = "gv_headLocId";
            this.gv_headLocId.OptionsColumn.AllowEdit = false;
            this.gv_headLocId.Tag = "query_a.head_loc_id";
            this.gv_headLocId.Visible = true;
            this.gv_headLocId.VisibleIndex = 8;
            this.gv_headLocId.Width = 94;
            //
            // gv_custId
            //
            this.gv_custId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_custId.AppearanceCell.Options.UseFont = true;
            this.gv_custId.Caption = "客户 ";
            this.gv_custId.FieldName = "custId";
            this.gv_custId.MinWidth = 50;
            this.gv_custId.Name = "gv_custId";
            this.gv_custId.OptionsColumn.AllowEdit = false;
            this.gv_custId.Tag = "query_a.cust_id";
            this.gv_custId.Visible = true;
            this.gv_custId.VisibleIndex = 9;
            this.gv_custId.Width = 94;
            //
            // gv_closeStatus
            //
            this.gv_closeStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_closeStatus.AppearanceCell.Options.UseFont = true;
            this.gv_closeStatus.Caption = "关闭状态 ";
            this.gv_closeStatus.FieldName = "closeStatus";
            this.gv_closeStatus.MinWidth = 50;
            this.gv_closeStatus.Name = "gv_closeStatus";
            this.gv_closeStatus.OptionsColumn.AllowEdit = false;
            this.gv_closeStatus.Tag = "query_a.close_status";
            this.gv_closeStatus.Visible = true;
            this.gv_closeStatus.VisibleIndex = 10;
            this.gv_closeStatus.Width = 94;
            //
            // gv_saleDeptId
            //
            this.gv_saleDeptId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_saleDeptId.AppearanceCell.Options.UseFont = true;
            this.gv_saleDeptId.Caption = "销售部门 ";
            this.gv_saleDeptId.FieldName = "saleDeptId";
            this.gv_saleDeptId.MinWidth = 50;
            this.gv_saleDeptId.Name = "gv_saleDeptId";
            this.gv_saleDeptId.OptionsColumn.AllowEdit = false;
            this.gv_saleDeptId.Tag = "query_a.sale_dept_id";
            this.gv_saleDeptId.Visible = true;
            this.gv_saleDeptId.VisibleIndex = 11;
            this.gv_saleDeptId.Width = 94;
            //
            // gv_salerId
            //
            this.gv_salerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_salerId.AppearanceCell.Options.UseFont = true;
            this.gv_salerId.Caption = "销售员 ";
            this.gv_salerId.FieldName = "salerId";
            this.gv_salerId.MinWidth = 50;
            this.gv_salerId.Name = "gv_salerId";
            this.gv_salerId.OptionsColumn.AllowEdit = false;
            this.gv_salerId.Tag = "query_a.saler_id";
            this.gv_salerId.Visible = true;
            this.gv_salerId.VisibleIndex = 12;
            this.gv_salerId.Width = 94;
            //
            // gv_changeReason
            //
            this.gv_changeReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_changeReason.AppearanceCell.Options.UseFont = true;
            this.gv_changeReason.Caption = "变更原因 ";
            this.gv_changeReason.FieldName = "changeReason";
            this.gv_changeReason.MinWidth = 50;
            this.gv_changeReason.Name = "gv_changeReason";
            this.gv_changeReason.OptionsColumn.AllowEdit = false;
            this.gv_changeReason.Tag = "query_a.change_reason";
            this.gv_changeReason.Visible = true;
            this.gv_changeReason.VisibleIndex = 13;
            this.gv_changeReason.Width = 94;
            //
            // gv_note
            //
            this.gv_note.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_note.AppearanceCell.Options.UseFont = true;
            this.gv_note.Caption = "备注 ";
            this.gv_note.FieldName = "note";
            this.gv_note.MinWidth = 50;
            this.gv_note.Name = "gv_note";
            this.gv_note.OptionsColumn.AllowEdit = false;
            this.gv_note.Tag = "query_a.note";
            this.gv_note.Visible = true;
            this.gv_note.VisibleIndex = 14;
            this.gv_note.Width = 94;
            //
            // gv_settleId
            //
            this.gv_settleId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_settleId.AppearanceCell.Options.UseFont = true;
            this.gv_settleId.Caption = "结算方 ";
            this.gv_settleId.FieldName = "settleId";
            this.gv_settleId.MinWidth = 50;
            this.gv_settleId.Name = "gv_settleId";
            this.gv_settleId.OptionsColumn.AllowEdit = false;
            this.gv_settleId.Tag = "query_a.settle_id";
            this.gv_settleId.Visible = true;
            this.gv_settleId.VisibleIndex = 15;
            this.gv_settleId.Width = 94;
            //
            // gv_approverId
            //
            this.gv_approverId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_approverId.AppearanceCell.Options.UseFont = true;
            this.gv_approverId.Caption = "审核人 ";
            this.gv_approverId.FieldName = "approverId";
            this.gv_approverId.MinWidth = 50;
            this.gv_approverId.Name = "gv_approverId";
            this.gv_approverId.OptionsColumn.AllowEdit = false;
            this.gv_approverId.Tag = "query_a.approver_id";
            this.gv_approverId.Visible = true;
            this.gv_approverId.VisibleIndex = 16;
            this.gv_approverId.Width = 94;
            //
            // gv_linkMan
            //
            this.gv_linkMan.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_linkMan.AppearanceCell.Options.UseFont = true;
            this.gv_linkMan.Caption = "收货人姓名 ";
            this.gv_linkMan.FieldName = "linkMan";
            this.gv_linkMan.MinWidth = 50;
            this.gv_linkMan.Name = "gv_linkMan";
            this.gv_linkMan.OptionsColumn.AllowEdit = false;
            this.gv_linkMan.Tag = "query_a.link_man";
            this.gv_linkMan.Visible = true;
            this.gv_linkMan.VisibleIndex = 17;
            this.gv_linkMan.Width = 94;
            //
            // gv_chargeId
            //
            this.gv_chargeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_chargeId.AppearanceCell.Options.UseFont = true;
            this.gv_chargeId.Caption = "付款方 ";
            this.gv_chargeId.FieldName = "chargeId";
            this.gv_chargeId.MinWidth = 50;
            this.gv_chargeId.Name = "gv_chargeId";
            this.gv_chargeId.OptionsColumn.AllowEdit = false;
            this.gv_chargeId.Tag = "query_a.charge_id";
            this.gv_chargeId.Visible = true;
            this.gv_chargeId.VisibleIndex = 18;
            this.gv_chargeId.Width = 94;
            //
            // gv_linkPhone
            //
            this.gv_linkPhone.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_linkPhone.AppearanceCell.Options.UseFont = true;
            this.gv_linkPhone.Caption = "联系电话 ";
            this.gv_linkPhone.FieldName = "linkPhone";
            this.gv_linkPhone.MinWidth = 50;
            this.gv_linkPhone.Name = "gv_linkPhone";
            this.gv_linkPhone.OptionsColumn.AllowEdit = false;
            this.gv_linkPhone.Tag = "query_a.link_phone";
            this.gv_linkPhone.Visible = true;
            this.gv_linkPhone.VisibleIndex = 19;
            this.gv_linkPhone.Width = 94;
            //
            // gv_creatorId
            //
            this.gv_creatorId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_creatorId.AppearanceCell.Options.UseFont = true;
            this.gv_creatorId.Caption = "创建人 ";
            this.gv_creatorId.FieldName = "creatorId";
            this.gv_creatorId.MinWidth = 50;
            this.gv_creatorId.Name = "gv_creatorId";
            this.gv_creatorId.OptionsColumn.AllowEdit = false;
            this.gv_creatorId.Tag = "query_a.creator_id";
            this.gv_creatorId.Visible = true;
            this.gv_creatorId.VisibleIndex = 20;
            this.gv_creatorId.Width = 94;
            //
            // gv_createDate
            //
            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_createDate.AppearanceCell.Options.UseFont = true;
            this.gv_createDate.Caption = "创建日期 ";
            this.gv_createDate.FieldName = "createDate";
            this.gv_createDate.MinWidth = 50;
            this.gv_createDate.Name = "gv_createDate";
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 21;
            this.gv_createDate.Width = 94;
            //
            // gv_modifierId
            //
            this.gv_modifierId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_modifierId.AppearanceCell.Options.UseFont = true;
            this.gv_modifierId.Caption = "最后修改人 ";
            this.gv_modifierId.FieldName = "modifierId";
            this.gv_modifierId.MinWidth = 50;
            this.gv_modifierId.Name = "gv_modifierId";
            this.gv_modifierId.OptionsColumn.AllowEdit = false;
            this.gv_modifierId.Tag = "query_a.modifier_id";
            this.gv_modifierId.Visible = true;
            this.gv_modifierId.VisibleIndex = 22;
            this.gv_modifierId.Width = 94;
            //
            // gv_modifyDate
            //
            this.gv_modifyDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_modifyDate.AppearanceCell.Options.UseFont = true;
            this.gv_modifyDate.Caption = "最后修改日期 ";
            this.gv_modifyDate.FieldName = "modifyDate";
            this.gv_modifyDate.MinWidth = 50;
            this.gv_modifyDate.Name = "gv_modifyDate";
            this.gv_modifyDate.OptionsColumn.AllowEdit = false;
            this.gv_modifyDate.Tag = "query_a.modify_date";
            this.gv_modifyDate.Visible = true;
            this.gv_modifyDate.VisibleIndex = 23;
            this.gv_modifyDate.Width = 94;
            //
            // gv_approveDate
            //
            this.gv_approveDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_approveDate.AppearanceCell.Options.UseFont = true;
            this.gv_approveDate.Caption = "审核日期 ";
            this.gv_approveDate.FieldName = "approveDate";
            this.gv_approveDate.MinWidth = 50;
            this.gv_approveDate.Name = "gv_approveDate";
            this.gv_approveDate.OptionsColumn.AllowEdit = false;
            this.gv_approveDate.Tag = "query_a.approve_date";
            this.gv_approveDate.Visible = true;
            this.gv_approveDate.VisibleIndex = 24;
            this.gv_approveDate.Width = 94;
            //
            // gv_closerId
            //
            this.gv_closerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_closerId.AppearanceCell.Options.UseFont = true;
            this.gv_closerId.Caption = "关闭人 ";
            this.gv_closerId.FieldName = "closerId";
            this.gv_closerId.MinWidth = 50;
            this.gv_closerId.Name = "gv_closerId";
            this.gv_closerId.OptionsColumn.AllowEdit = false;
            this.gv_closerId.Tag = "query_a.closer_id";
            this.gv_closerId.Visible = true;
            this.gv_closerId.VisibleIndex = 25;
            this.gv_closerId.Width = 94;
            //
            // gv_closeDate
            //
            this.gv_closeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_closeDate.AppearanceCell.Options.UseFont = true;
            this.gv_closeDate.Caption = "关闭日期 ";
            this.gv_closeDate.FieldName = "closeDate";
            this.gv_closeDate.MinWidth = 50;
            this.gv_closeDate.Name = "gv_closeDate";
            this.gv_closeDate.OptionsColumn.AllowEdit = false;
            this.gv_closeDate.Tag = "query_a.close_date";
            this.gv_closeDate.Visible = true;
            this.gv_closeDate.VisibleIndex = 26;
            this.gv_closeDate.Width = 94;
            //
            // gv_changeDate
            //
            this.gv_changeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_changeDate.AppearanceCell.Options.UseFont = true;
            this.gv_changeDate.Caption = "变更日期 ";
            this.gv_changeDate.FieldName = "changeDate";
            this.gv_changeDate.MinWidth = 50;
            this.gv_changeDate.Name = "gv_changeDate";
            this.gv_changeDate.OptionsColumn.AllowEdit = false;
            this.gv_changeDate.Tag = "query_a.change_date";
            this.gv_changeDate.Visible = true;
            this.gv_changeDate.VisibleIndex = 27;
            this.gv_changeDate.Width = 94;
            //
            // gv_cancelStatus
            //
            this.gv_cancelStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_cancelStatus.AppearanceCell.Options.UseFont = true;
            this.gv_cancelStatus.Caption = "作废状态 ";
            this.gv_cancelStatus.FieldName = "cancelStatus";
            this.gv_cancelStatus.MinWidth = 50;
            this.gv_cancelStatus.Name = "gv_cancelStatus";
            this.gv_cancelStatus.OptionsColumn.AllowEdit = false;
            this.gv_cancelStatus.Tag = "query_a.cancel_status";
            this.gv_cancelStatus.Visible = true;
            this.gv_cancelStatus.VisibleIndex = 28;
            this.gv_cancelStatus.Width = 94;
            //
            // gv_cancellerId
            //
            this.gv_cancellerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_cancellerId.AppearanceCell.Options.UseFont = true;
            this.gv_cancellerId.Caption = "作废人 ";
            this.gv_cancellerId.FieldName = "cancellerId";
            this.gv_cancellerId.MinWidth = 50;
            this.gv_cancellerId.Name = "gv_cancellerId";
            this.gv_cancellerId.OptionsColumn.AllowEdit = false;
            this.gv_cancellerId.Tag = "query_a.canceller_id";
            this.gv_cancellerId.Visible = true;
            this.gv_cancellerId.VisibleIndex = 29;
            this.gv_cancellerId.Width = 94;
            //
            // gv_versionNo
            //
            this.gv_versionNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_versionNo.AppearanceCell.Options.UseFont = true;
            this.gv_versionNo.Caption = "版本号 ";
            this.gv_versionNo.FieldName = "versionNo";
            this.gv_versionNo.MinWidth = 50;
            this.gv_versionNo.Name = "gv_versionNo";
            this.gv_versionNo.OptionsColumn.AllowEdit = false;
            this.gv_versionNo.Tag = "query_a.version_no";
            this.gv_versionNo.Visible = true;
            this.gv_versionNo.VisibleIndex = 30;
            this.gv_versionNo.Width = 94;
            //
            // gv_changerId
            //
            this.gv_changerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_changerId.AppearanceCell.Options.UseFont = true;
            this.gv_changerId.Caption = "变更人 ";
            this.gv_changerId.FieldName = "changerId";
            this.gv_changerId.MinWidth = 50;
            this.gv_changerId.Name = "gv_changerId";
            this.gv_changerId.OptionsColumn.AllowEdit = false;
            this.gv_changerId.Tag = "query_a.changer_id";
            this.gv_changerId.Visible = true;
            this.gv_changerId.VisibleIndex = 31;
            this.gv_changerId.Width = 94;
            //
            // gv_entryNote
            //
            this.gv_entryNote.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_entryNote.AppearanceCell.Options.UseFont = true;
            this.gv_entryNote.Caption = "备注 ";
            this.gv_entryNote.FieldName = "entryNote";
            this.gv_entryNote.MinWidth = 50;
            this.gv_entryNote.Name = "gv_entryNote";
            this.gv_entryNote.OptionsColumn.AllowEdit = false;
            this.gv_entryNote.Tag = "query_a.entry_note";
            this.gv_entryNote.Visible = true;
            this.gv_entryNote.VisibleIndex = 32;
            this.gv_entryNote.Width = 94;
            //
            // gv_fbilltype
            //
            this.gv_fbilltype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_fbilltype.AppearanceCell.Options.UseFont = true;
            this.gv_fbilltype.Caption = "fbilltype ";
            this.gv_fbilltype.FieldName = "fbilltype";
            this.gv_fbilltype.MinWidth = 50;
            this.gv_fbilltype.Name = "gv_fbilltype";
            this.gv_fbilltype.OptionsColumn.AllowEdit = false;
            this.gv_fbilltype.Tag = "query_a.fbilltype";
            this.gv_fbilltype.Visible = true;
            this.gv_fbilltype.VisibleIndex = 33;
            this.gv_fbilltype.Width = 94;
            //
            // gv_saleOrgId
            //
            this.gv_saleOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_saleOrgId.AppearanceCell.Options.UseFont = true;
            this.gv_saleOrgId.Caption = "销售组织ID ";
            this.gv_saleOrgId.FieldName = "saleOrgId";
            this.gv_saleOrgId.MinWidth = 50;
            this.gv_saleOrgId.Name = "gv_saleOrgId";
            this.gv_saleOrgId.OptionsColumn.AllowEdit = false;
            this.gv_saleOrgId.Tag = "query_a.SALE_ORG_ID";
            this.gv_saleOrgId.Visible = true;
            this.gv_saleOrgId.VisibleIndex = 34;
            this.gv_saleOrgId.Width = 94;
            //
            // gv_receiveId
            //
            this.gv_receiveId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_receiveId.AppearanceCell.Options.UseFont = true;
            this.gv_receiveId.Caption = "收货方 ";
            this.gv_receiveId.FieldName = "receiveId";
            this.gv_receiveId.MinWidth = 50;
            this.gv_receiveId.Name = "gv_receiveId";
            this.gv_receiveId.OptionsColumn.AllowEdit = false;
            this.gv_receiveId.Tag = "query_a.RECEIVE_ID";
            this.gv_receiveId.Visible = true;
            this.gv_receiveId.VisibleIndex = 35;
            this.gv_receiveId.Width = 94;
            //
            // gv_receiveContact
            //
            this.gv_receiveContact.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_receiveContact.AppearanceCell.Options.UseFont = true;
            this.gv_receiveContact.Caption = "收货方联系人 ";
            this.gv_receiveContact.FieldName = "receiveContact";
            this.gv_receiveContact.MinWidth = 50;
            this.gv_receiveContact.Name = "gv_receiveContact";
            this.gv_receiveContact.OptionsColumn.AllowEdit = false;
            this.gv_receiveContact.Tag = "query_a.RECEIVE_CONTACT";
            this.gv_receiveContact.Visible = true;
            this.gv_receiveContact.VisibleIndex = 36;
            this.gv_receiveContact.Width = 94;
            //
            // xtraTabPage2
            //
            this.xtraTabPage2.Controls.Add(this.splitContainerControl1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(1055, 628);
            this.xtraTabPage2.Text = "xtraTabPage2";
            //
            // splitContainerControl1
            //
            this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitContainerControl1.Horizontal = false;
            this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
            this.splitContainerControl1.Name = "splitContainerControl1";
            //
            // splitContainerControl1.Panel1
            //
            this.splitContainerControl1.Panel1.Appearance.BackColor = System.Drawing.Color.White;
            this.splitContainerControl1.Panel1.Appearance.Options.UseBackColor = true;
            this.splitContainerControl1.Panel1.Controls.Add(this.panel1);
            this.splitContainerControl1.Panel1.Controls.Add(this.panelControl2);
            this.splitContainerControl1.Panel1.Controls.Add(this.panelControl1);
            this.splitContainerControl1.Panel1.Text = "Panel1";
            //
            // splitContainerControl1.Panel2
            //
            this.splitContainerControl1.Panel2.Text = "Panel2";
            this.splitContainerControl1.Size = new System.Drawing.Size(1055, 628);
            this.splitContainerControl1.SplitterPosition = 189;
            this.splitContainerControl1.TabIndex = 2;
            //
            // panelControl2
            //
            this.panelControl2.Appearance.BackColor = System.Drawing.Color.White;
            this.panelControl2.Appearance.Options.UseBackColor = true;
            this.panelControl2.Controls.Add(this.labelControl3);
            this.panelControl2.Controls.Add(this.textEdit2);
            this.panelControl2.Location = new System.Drawing.Point(189, 76);
            this.panelControl2.Name = "panelControl2";
            this.panelControl2.Size = new System.Drawing.Size(237, 39);
            this.panelControl2.TabIndex = 1;
            //
            // labelControl3
            //
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(4, 5);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(73, 21);
            this.labelControl3.TabIndex = 217;
            this.labelControl3.Text = "单据类型 ";
            //
            // textEdit2
            //
            this.textEdit2.Location = new System.Drawing.Point(78, 5);
            this.textEdit2.Name = "textEdit2";
            this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.textEdit2.Properties.Appearance.Options.UseFont = true;
            this.textEdit2.Size = new System.Drawing.Size(155, 28);
            this.textEdit2.TabIndex = 218;
            //
            // panelControl1
            //
            this.panelControl1.Controls.Add(this.labelControl1);
            this.panelControl1.Controls.Add(this.textEdit1);
            this.panelControl1.Location = new System.Drawing.Point(189, 31);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(237, 39);
            this.panelControl1.TabIndex = 0;
            //
            // labelControl1
            //
            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl1.Appearance.Options.UseFont = true;
            this.labelControl1.Location = new System.Drawing.Point(4, 8);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(68, 21);
            this.labelControl1.TabIndex = 214;
            this.labelControl1.Text = "单据编号";
            //
            // textEdit1
            //
            this.textEdit1.Location = new System.Drawing.Point(78, 5);
            this.textEdit1.Name = "textEdit1";
            this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.textEdit1.Properties.Appearance.Options.UseFont = true;
            this.textEdit1.Size = new System.Drawing.Size(155, 28);
            this.textEdit1.TabIndex = 215;
            // 
            // panel1
            // 
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.textEdit4);
            this.panel1.Location = new System.Drawing.Point(494, 31);
            this.panel1.Controls.Add(this.layoutControl1);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(271, 100);
            this.panel1.TabIndex = 2;
            this.panel1.Size = new System.Drawing.Size(1057, 392);
            this.panel1.TabIndex = 0;
            // 
            // labelControl2
            // layoutControl1
            // 
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(34, 40);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(73, 21);
            this.labelControl2.TabIndex = 219;
            this.labelControl2.Text = "单据类型 ";
            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
            this.layoutControl1.Name = "layoutControl1";
            this.layoutControl1.Root = this.Root;
            this.layoutControl1.Size = new System.Drawing.Size(1057, 392);
            this.layoutControl1.TabIndex = 0;
            this.layoutControl1.Text = "layoutControl1";
            // 
            // textEdit4
            // Root
            // 
            this.textEdit4.Location = new System.Drawing.Point(113, 33);
            this.textEdit4.Name = "textEdit4";
            this.textEdit4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.textEdit4.Properties.Appearance.Options.UseFont = true;
            this.textEdit4.Size = new System.Drawing.Size(155, 28);
            this.textEdit4.TabIndex = 220;
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.Root.GroupBordersVisible = false;
            this.Root.Name = "Root";
            this.Root.OptionsCustomization.AllowDrag = DevExpress.XtraLayout.ItemDragDropMode.Allow;
            this.Root.OptionsCustomization.AllowDrop = DevExpress.XtraLayout.ItemDragDropMode.Allow;
            this.Root.Size = new System.Drawing.Size(1057, 392);
            this.Root.TextVisible = false;
            // 
            // XtraForm1
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1057, 660);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.panel1);
            this.Name = "XtraForm1";
            this.Text = "XtraForm1";
            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
            this.xtraTabPage1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            this.xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
            this.splitContainerControl1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
            this.splitContainerControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
            this.panelControl2.ResumeLayout(false);
            this.panelControl2.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
            this.panelControl1.ResumeLayout(false);
            this.panelControl1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
        private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_billTypeId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_documentStatus;
        private DevExpress.XtraGrid.Columns.GridColumn gv_fDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_businessType;
        private DevExpress.XtraGrid.Columns.GridColumn gv_headDeliveryWay;
        private DevExpress.XtraGrid.Columns.GridColumn gv_headLocId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_custId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
        private DevExpress.XtraGrid.Columns.GridColumn gv_saleDeptId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_salerId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_changeReason;
        private DevExpress.XtraGrid.Columns.GridColumn gv_note;
        private DevExpress.XtraGrid.Columns.GridColumn gv_settleId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_approverId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_linkMan;
        private DevExpress.XtraGrid.Columns.GridColumn gv_chargeId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_linkPhone;
        private DevExpress.XtraGrid.Columns.GridColumn gv_creatorId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_modifierId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_modifyDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_approveDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_closerId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_closeDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_changeDate;
        private DevExpress.XtraGrid.Columns.GridColumn gv_cancelStatus;
        private DevExpress.XtraGrid.Columns.GridColumn gv_cancellerId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_versionNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_changerId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_entryNote;
        private DevExpress.XtraGrid.Columns.GridColumn gv_fbilltype;
        private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrgId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_receiveId;
        private DevExpress.XtraGrid.Columns.GridColumn gv_receiveContact;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
        private DevExpress.XtraEditors.PanelControl panelControl2;
        private DevExpress.XtraEditors.LabelControl labelControl3;
        private DevExpress.XtraEditors.TextEdit textEdit2;
        private DevExpress.XtraEditors.PanelControl panelControl1;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.TextEdit textEdit1;
        private System.Windows.Forms.ToolStrip toolStrip1;
        private System.Windows.Forms.ToolTip toolTip1;
        private System.Windows.Forms.Panel panel1;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.TextEdit textEdit4;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
    }
}
DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
@@ -1,4 +1,5 @@
using DevExpress.XtraEditors;
using DevExpress.XtraLayout;
using DevExpress.XtraRichEdit.Model;
using Gs.DevApp.ToolBox;
using System;
@@ -15,21 +16,14 @@
{
    public partial class XtraForm1 : DevExpress.XtraEditors.XtraForm
    {
        private Gs.DevApp.ToolBox.DragResizeHelp _drapHelp;
        public XtraForm1()
        {
            InitializeComponent();
            _drapHelp = new DragResizeHelp(this, splitContainerControl1.Panel1);
            this.xtraTabControl1.CustomHeaderButtonClick += XtraTabControl1_CustomHeaderButtonClick;
        }
        private void XtraTabControl1_CustomHeaderButtonClick(object sender, DevExpress.XtraTab.ViewInfo.CustomHeaderButtonEventArgs e)
        {
            _drapHelp.Show();
        }
    }
}
DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
@@ -117,10 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>139, 17</value>
  </metadata>
  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>
DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,31 +1,32 @@
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.GalleryControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.GalleryControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
@@ -21,7 +21,7 @@
        private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
        private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
        private System.ComponentModel.IContainer components = null;
        private ToolTip toolTip;
        //private ToolTip toolTip;
        #endregion
        #region Inner Object
        private enum EnumMousePointPosition
@@ -40,7 +40,7 @@
        #endregion
        public DragResizeHelp(DevExpress.XtraEditors.XtraForm frm, Control regBox)
        {
            toolTip = new ToolTip();
          //  toolTip = new ToolTip();
            this.components = new System.ComponentModel.Container();
            dragBox1 = regBox;
            this.components = new System.ComponentModel.Container();
@@ -180,7 +180,7 @@
                    //   isDragging = false;
                    dragBoxCurrentName = dockPanel1_Container.Name;
                }
                reloadLoaction(null);
              //  reloadLoaction(null);
            }
            else if (dockPanel1_Container.Name == dragBoxCurrentName)
            {
@@ -227,7 +227,7 @@
                });
                menu.Items.Add($"一键重排", null, (ss, ee) =>
                {
                    frm.ShowDialog();
                    reloadLoaction((sender as Control).Parent);
                });
                menu.Show(control, e.Location);
            }
@@ -366,7 +366,7 @@
                int height = control.Height;
                Point[] ps =  { new Point(0, 0),new Point(width - 1, 0),
                new Point(width - 1, height - 1),new Point(0, height - 1),new Point(0, 0) };
                g.DrawLines(new Pen(Color.LightCoral), ps);
                g.DrawLines(new Pen(Color.Pink), ps);
            }
            //  reloadLoaction();
            reloadMsg(lCtrl);
@@ -476,6 +476,7 @@
        private void reloadLoaction(Control cocccc)
        {
            int _top = 0;
            //如果是控件箱,不移Left
            if (dockPanel1_Container.Name == dragBoxCurrentName)
            {
                foreach (Control col in dockPanel1_Container.Controls)
@@ -487,19 +488,22 @@
                return;
            }
            if (cocccc == null) return;
            int x = 15;
            int y = 15;
            //这是容器
            int x = 2;
            int y = 2;
            foreach (Control btn in dragBox1.Controls)
            {
                if (cocccc.Name == btn.Name)
                    continue;
                //btn.Left = x;
                //btn.Top = y;
                x += btn.Width + 15;
                if (cocccc.Visible ==false)
                    continue;
                btn.Left = x;
                btn.Top = y;
                x += btn.Width + 2;
                if (btn.Width > dragBox1.Width - x)
                {
                    x = 15;
                    y += btn.Height + 15;
                    x = 2;
                    y += btn.Height +2;
                }
            }
            cocccc.Left = x;
@@ -515,7 +519,7 @@
            sb.Append(string.IsNullOrEmpty(dragBoxCurrentName) ? "表单中" : "组件箱中");
            sb.Append(",坐标:" + cocccc.Location.ToString());
            sb.Append(",大小:" + cocccc.Size.ToString());
            toolTip.SetToolTip(ctrlCurrentObj, sb.ToString());
           // toolTip.SetToolTip(ctrlCurrentObj, sb.ToString());
        }
    }
}
DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
@@ -54,7 +54,6 @@
            this.txtUrl.Name = "txtUrl";
            this.txtUrl.Size = new System.Drawing.Size(905, 24);
            this.txtUrl.TabIndex = 0;
            this.txtUrl.Visible = false;
            // 
            // ShowFile
            // 
DevApp/Gs.DevApp/UserControl/UcLookSales.cs
@@ -22,7 +22,7 @@
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
            getSuppler();
          //  getSuppler();
        }
        public bool IsReadly { get; set; }
@@ -37,10 +37,19 @@
        {
            if (EditChanged != null) EditChanged(this, e);
        }
        private void getSuppler()
        /// <summary>
        /// è¯»å–销售订单
        /// </summary>
        /// <param name="orgId"></param>
        /// <param name="_dftVale"></param>
        public void getSuppler(string orgId, string _dftVale = "")
        {
            var pgq = new PageQueryModel(1, 999999, "a.bill_no", "asc", "", " and 1=1");
            lookSearchSupplier.EditValue = null;
            string _keyWhere = "";
            if (!string.IsNullOrEmpty(orgId))
                _keyWhere = " and a.erp_sczz ='" + orgId + "'";
            var pgq = new PageQueryModel(1, 999999, "a.bill_no", "asc", "",
                " and 1=1" + _keyWhere);
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -52,7 +61,8 @@
                lookSearchSupplier.Properties.ValueMember = "id";
                lookSearchSupplier.ForceInitialize();
                lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                if (!string.IsNullOrEmpty(_dftVale))
                    SetIdOrCode(_dftVale);
            }
            catch (Exception ex)
            {
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -4,15 +4,21 @@
using System.Data;
using System.Linq;
using System.Net;
using System.Windows.Controls.Primitives;
using System.Windows.Forms;
using DevExpress.XtraBars;
using DevExpress.XtraBars.Commands;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Menu;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Gs.DevApp.UserControl
{
@@ -652,9 +658,25 @@
            Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtnJson.rtnMsg);
        }
        private void BtnLayout_ItemClick(object sender, ItemClickEventArgs e)
        private void BtnLayout_ItemClick(object sender, ItemClickEventArgs ee)
        {
            if (btnLayoutClick != null) btnLayoutClick(this, e);
            Form parentForm = this.Parent as Form;
            string _formNamespace = parentForm.GetType().FullName;
            if (parentForm != null)
            {
                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                GridControl gcMain = parentForm.Controls.Find("gcMain", true).OfType<GridControl>().FirstOrDefault();
                if (gcMain != null) {
                    GridView gv1 = gcMain.MainView as GridView;
                    if (gv1 != null)
                    {
                        gvList.Add(gv1);
                    }
                }
                Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList);
                DevFrm.ShowDialog();
            }
            if (btnLayoutClick != null) btnLayoutClick(this, ee);
        }
        private void _enabledBtn(List<string> lstBtn)
        {