bug
lu
5 天以前 734425617f9829718d3c42e87cf4b2523d2f09b0
bug
已修改3个文件
482 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs 421 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -38,6 +38,7 @@
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -89,7 +90,6 @@
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -97,13 +97,11 @@
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -154,6 +152,16 @@
            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_qt031 = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_qt030 = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_qt029 = new DevExpress.XtraEditors.CheckEdit();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -191,7 +199,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
@@ -199,13 +206,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -217,6 +222,15 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -306,7 +320,8 @@
            this.gridColumn33,
            this.gridColumn34,
            this.gridColumn35,
            this.gridColumn36});
            this.gridColumn36,
            this.gridColumn38});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -317,7 +332,7 @@
            // gv_fApproverStaus
            // 
            this.gv_fApproverStaus.AppearanceCell.Options.UseFont = true;
            this.gv_fApproverStaus.Caption = "审核标识";
            this.gv_fApproverStaus.Caption = "制单审核";
            this.gv_fApproverStaus.FieldName = "chkStatus";
            this.gv_fApproverStaus.MinWidth = 50;
            this.gv_fApproverStaus.Name = "gv_fApproverStaus";
@@ -334,7 +349,7 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.VisibleIndex = 2;
            this.gridColumn2.Width = 94;
            // 
            // gv_billNo
@@ -347,7 +362,7 @@
            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.VisibleIndex = 3;
            this.gv_billNo.Width = 94;
            // 
            // gv_fBillTypeID
@@ -360,7 +375,7 @@
            this.gv_fBillTypeID.OptionsColumn.AllowEdit = false;
            this.gv_fBillTypeID.Tag = "query_a.FBillTypeID";
            this.gv_fBillTypeID.Visible = true;
            this.gv_fBillTypeID.VisibleIndex = 3;
            this.gv_fBillTypeID.VisibleIndex = 4;
            this.gv_fBillTypeID.Width = 94;
            // 
            // gv_fSaleOrgId
@@ -373,7 +388,7 @@
            this.gv_fSaleOrgId.OptionsColumn.AllowEdit = false;
            this.gv_fSaleOrgId.Tag = "query_a.FSaleOrgId";
            this.gv_fSaleOrgId.Visible = true;
            this.gv_fSaleOrgId.VisibleIndex = 4;
            this.gv_fSaleOrgId.VisibleIndex = 5;
            this.gv_fSaleOrgId.Width = 94;
            // 
            // gv_fCreatorId
@@ -386,7 +401,7 @@
            this.gv_fCreatorId.OptionsColumn.AllowEdit = false;
            this.gv_fCreatorId.Tag = "query_a.FCreatorId";
            this.gv_fCreatorId.Visible = true;
            this.gv_fCreatorId.VisibleIndex = 5;
            this.gv_fCreatorId.VisibleIndex = 6;
            this.gv_fCreatorId.Width = 94;
            // 
            // gv_fApproverID
@@ -399,7 +414,7 @@
            this.gv_fApproverID.OptionsColumn.AllowEdit = false;
            this.gv_fApproverID.Tag = "query_a.FApproverID";
            this.gv_fApproverID.Visible = true;
            this.gv_fApproverID.VisibleIndex = 6;
            this.gv_fApproverID.VisibleIndex = 7;
            this.gv_fApproverID.Width = 94;
            // 
            // gv_fCreateDate
@@ -412,7 +427,7 @@
            this.gv_fCreateDate.OptionsColumn.AllowEdit = false;
            this.gv_fCreateDate.Tag = "query_a.FCreateDate";
            this.gv_fCreateDate.Visible = true;
            this.gv_fCreateDate.VisibleIndex = 7;
            this.gv_fCreateDate.VisibleIndex = 8;
            this.gv_fCreateDate.Width = 94;
            // 
            // gv_fApproveDate
@@ -425,7 +440,7 @@
            this.gv_fApproveDate.OptionsColumn.AllowEdit = false;
            this.gv_fApproveDate.Tag = "query_a.FApproveDate";
            this.gv_fApproveDate.Visible = true;
            this.gv_fApproveDate.VisibleIndex = 8;
            this.gv_fApproveDate.VisibleIndex = 9;
            this.gv_fApproveDate.Width = 94;
            // 
            // gv_fSalesManID
@@ -460,7 +475,7 @@
            this.gv_fNote.OptionsColumn.AllowEdit = false;
            this.gv_fNote.Tag = "query_a.FNote";
            this.gv_fNote.Visible = true;
            this.gv_fNote.VisibleIndex = 9;
            this.gv_fNote.VisibleIndex = 10;
            this.gv_fNote.Width = 94;
            // 
            // gridColumn33
@@ -470,7 +485,7 @@
            this.gridColumn33.MinWidth = 25;
            this.gridColumn33.Name = "gridColumn33";
            this.gridColumn33.Visible = true;
            this.gridColumn33.VisibleIndex = 10;
            this.gridColumn33.VisibleIndex = 11;
            this.gridColumn33.Width = 94;
            // 
            // gridColumn34
@@ -480,7 +495,7 @@
            this.gridColumn34.MinWidth = 25;
            this.gridColumn34.Name = "gridColumn34";
            this.gridColumn34.Visible = true;
            this.gridColumn34.VisibleIndex = 11;
            this.gridColumn34.VisibleIndex = 12;
            this.gridColumn34.Width = 94;
            // 
            // gridColumn35
@@ -490,7 +505,7 @@
            this.gridColumn35.MinWidth = 25;
            this.gridColumn35.Name = "gridColumn35";
            this.gridColumn35.Visible = true;
            this.gridColumn35.VisibleIndex = 12;
            this.gridColumn35.VisibleIndex = 13;
            this.gridColumn35.Width = 94;
            // 
            // gridColumn36
@@ -537,7 +552,7 @@
            this.splitContainerControl1.Panel2.Controls.Add(this.tabMx);
            this.splitContainerControl1.Panel2.Text = "Panel2";
            this.splitContainerControl1.Size = new System.Drawing.Size(1126, 570);
            this.splitContainerControl1.SplitterPosition = 141;
            this.splitContainerControl1.SplitterPosition = 167;
            this.splitContainerControl1.TabIndex = 0;
            // 
            // layoutMx1
@@ -559,6 +574,9 @@
            this.layoutMx1.Controls.Add(this.txt_shf);
            this.layoutMx1.Controls.Add(this.txt_shName);
            this.layoutMx1.Controls.Add(this.txt_wjStatus);
            this.layoutMx1.Controls.Add(this.txt_qt031);
            this.layoutMx1.Controls.Add(this.txt_qt030);
            this.layoutMx1.Controls.Add(this.txt_qt029);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem1,
@@ -567,7 +585,7 @@
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(552, 472, 812, 500);
            this.layoutMx1.Root = this.layoutControlGroup1;
            this.layoutMx1.Size = new System.Drawing.Size(1126, 141);
            this.layoutMx1.Size = new System.Drawing.Size(1126, 167);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
@@ -581,7 +599,7 @@
            // 
            // txt_chkStatus
            // 
            this.txt_chkStatus.Location = new System.Drawing.Point(840, 72);
            this.txt_chkStatus.Location = new System.Drawing.Point(840, 70);
            this.txt_chkStatus.Name = "txt_chkStatus";
            this.txt_chkStatus.Properties.Caption = "审核状态";
            this.txt_chkStatus.Size = new System.Drawing.Size(274, 24);
@@ -601,10 +619,10 @@
            // 
            // txt_billNo
            // 
            this.txt_billNo.Location = new System.Drawing.Point(99, 12);
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(185, 24);
            this.txt_billNo.Size = new System.Drawing.Size(170, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
@@ -612,23 +630,23 @@
            // txt_fBillTypeID
            // 
            this.txt_fBillTypeID.EditValue = "标准销售出库单(XSCKD01_SYS)";
            this.txt_fBillTypeID.Location = new System.Drawing.Point(99, 42);
            this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 41);
            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(185, 24);
            this.txt_fBillTypeID.Size = new System.Drawing.Size(170, 24);
            this.txt_fBillTypeID.StyleController = this.layoutMx1;
            this.txt_fBillTypeID.TabIndex = 362;
            // 
            // txt_fApproverID
            // 
            this.txt_fApproverID.Location = new System.Drawing.Point(927, 12);
            this.txt_fApproverID.Location = new System.Drawing.Point(942, 12);
            this.txt_fApproverID.Name = "txt_fApproverID";
            this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
            this.txt_fApproverID.Size = new System.Drawing.Size(187, 24);
            this.txt_fApproverID.Size = new System.Drawing.Size(172, 24);
            this.txt_fApproverID.StyleController = this.layoutMx1;
            this.txt_fApproverID.TabIndex = 222;
            this.txt_fApproverID.Tag = "readonly";
@@ -636,101 +654,101 @@
            // txt_salesId
            // 
            this.txt_salesId.IsReadly = false;
            this.txt_salesId.Location = new System.Drawing.Point(99, 72);
            this.txt_salesId.Location = new System.Drawing.Point(114, 70);
            this.txt_salesId.Name = "txt_salesId";
            this.txt_salesId.Size = new System.Drawing.Size(185, 24);
            this.txt_salesId.Size = new System.Drawing.Size(170, 24);
            this.txt_salesId.TabIndex = 367;
            // 
            // txt_fSaleOrgIdTxt
            // 
            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(375, 12);
            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(390, 12);
            this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
            this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(185, 24);
            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(170, 24);
            this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
            this.txt_fSaleOrgIdTxt.TabIndex = 365;
            this.txt_fSaleOrgIdTxt.Tag = "readonly";
            // 
            // txt_fCreatorId
            // 
            this.txt_fCreatorId.Location = new System.Drawing.Point(651, 12);
            this.txt_fCreatorId.Location = new System.Drawing.Point(666, 12);
            this.txt_fCreatorId.Name = "txt_fCreatorId";
            this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
            this.txt_fCreatorId.Size = new System.Drawing.Size(185, 24);
            this.txt_fCreatorId.Size = new System.Drawing.Size(170, 24);
            this.txt_fCreatorId.StyleController = this.layoutMx1;
            this.txt_fCreatorId.TabIndex = 219;
            this.txt_fCreatorId.Tag = "readonly";
            // 
            // txt_fApproveDate
            // 
            this.txt_fApproveDate.Location = new System.Drawing.Point(927, 42);
            this.txt_fApproveDate.Location = new System.Drawing.Point(942, 41);
            this.txt_fApproveDate.Name = "txt_fApproveDate";
            this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
            this.txt_fApproveDate.Size = new System.Drawing.Size(187, 24);
            this.txt_fApproveDate.Size = new System.Drawing.Size(172, 24);
            this.txt_fApproveDate.StyleController = this.layoutMx1;
            this.txt_fApproveDate.TabIndex = 228;
            this.txt_fApproveDate.Tag = "readonly";
            // 
            // txt_fNote
            // 
            this.txt_fNote.Location = new System.Drawing.Point(99, 102);
            this.txt_fNote.Location = new System.Drawing.Point(114, 99);
            this.txt_fNote.Name = "txt_fNote";
            this.txt_fNote.Properties.Appearance.Options.UseFont = true;
            this.txt_fNote.Size = new System.Drawing.Size(461, 24);
            this.txt_fNote.Size = new System.Drawing.Size(446, 24);
            this.txt_fNote.StyleController = this.layoutMx1;
            this.txt_fNote.TabIndex = 243;
            // 
            // txt_fSalesManIDTxt
            // 
            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(651, 72);
            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(114, 128);
            this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
            this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(185, 24);
            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(170, 24);
            this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;
            this.txt_fSalesManIDTxt.TabIndex = 231;
            this.txt_fSalesManIDTxt.Tag = "readonly";
            // 
            // txt_fCreateDate
            // 
            this.txt_fCreateDate.Location = new System.Drawing.Point(651, 42);
            this.txt_fCreateDate.Location = new System.Drawing.Point(666, 41);
            this.txt_fCreateDate.Name = "txt_fCreateDate";
            this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_fCreateDate.Size = new System.Drawing.Size(185, 24);
            this.txt_fCreateDate.Size = new System.Drawing.Size(170, 24);
            this.txt_fCreateDate.StyleController = this.layoutMx1;
            this.txt_fCreateDate.TabIndex = 226;
            this.txt_fCreateDate.Tag = "readonly";
            // 
            // txt_fCustomerIDTxt
            // 
            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(375, 42);
            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(390, 41);
            this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
            this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(185, 24);
            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(170, 24);
            this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;
            this.txt_fCustomerIDTxt.TabIndex = 368;
            this.txt_fCustomerIDTxt.Tag = "readonly";
            // 
            // txt_shf
            // 
            this.txt_shf.Location = new System.Drawing.Point(375, 72);
            this.txt_shf.Location = new System.Drawing.Point(390, 70);
            this.txt_shf.Name = "txt_shf";
            this.txt_shf.Size = new System.Drawing.Size(185, 24);
            this.txt_shf.Size = new System.Drawing.Size(170, 24);
            this.txt_shf.StyleController = this.layoutMx1;
            this.txt_shf.TabIndex = 373;
            this.txt_shf.Tag = "readonly";
            // 
            // txt_shName
            // 
            this.txt_shName.Location = new System.Drawing.Point(651, 102);
            this.txt_shName.Location = new System.Drawing.Point(390, 128);
            this.txt_shName.Name = "txt_shName";
            this.txt_shName.Size = new System.Drawing.Size(185, 24);
            this.txt_shName.Size = new System.Drawing.Size(170, 24);
            this.txt_shName.StyleController = this.layoutMx1;
            this.txt_shName.TabIndex = 374;
            this.txt_shName.Tag = "readonly";
            // 
            // txt_wjStatus
            // 
            this.txt_wjStatus.Location = new System.Drawing.Point(840, 102);
            this.txt_wjStatus.Location = new System.Drawing.Point(840, 99);
            this.txt_wjStatus.Name = "txt_wjStatus";
            this.txt_wjStatus.Properties.Caption = "完结状态";
            this.txt_wjStatus.Size = new System.Drawing.Size(274, 24);
@@ -768,7 +786,6 @@
            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.layoutControlGroup1.GroupBordersVisible = false;
            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem17,
            this.layoutControlItem2,
            this.layoutControlItem10,
            this.layoutControlItem11,
@@ -776,13 +793,17 @@
            this.layoutControlItem6,
            this.layoutControlItem7,
            this.layoutControlItem13,
            this.layoutControlItem9,
            this.layoutControlItem5,
            this.layoutControlItem14,
            this.layoutControlItem8,
            this.layoutControlItem4,
            this.layoutControlItem3,
            this.layoutControlItem12});
            this.layoutControlItem12,
            this.layoutControlItem9,
            this.layoutControlItem17,
            this.layoutControlItem18,
            this.layoutControlItem19,
            this.layoutControlItem20});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -806,26 +827,16 @@
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1126, 141);
            rowDefinition4,
            rowDefinition5});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1126, 167);
            this.layoutControlGroup1.TextVisible = false;
            //
            // layoutControlItem17
            //
            this.layoutControlItem17.Control = this.txt_shName;
            this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem17.CustomizationFormText = "收货人姓名";
            this.layoutControlItem17.Location = new System.Drawing.Point(552, 90);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem17.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem17.Text = "收货人姓名";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem2
            // 
@@ -834,9 +845,9 @@
            this.layoutControlItem2.CustomizationFormText = "申请编号";
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem2.Text = "申请编号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem10
            // 
@@ -846,31 +857,31 @@
            this.layoutControlItem10.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 30);
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem10.Text = "审核人员";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_fApproveDate;
            this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem11.CustomizationFormText = "审核日期";
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 30);
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 29);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 30);
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem11.Text = "审核日期";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_chkStatus;
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 60);
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 58);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem15.Text = "审核状态";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem15.TextVisible = false;
@@ -883,48 +894,35 @@
            this.layoutControlItem6.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem6.Text = "创建人员";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_fCreateDate;
            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem7.CustomizationFormText = "创建日期";
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 30);
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 29);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem7.Text = "创建日期";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_fCustomerIDTxt;
            this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem13.CustomizationFormText = "客户名称";
            this.layoutControlItem13.Location = new System.Drawing.Point(276, 30);
            this.layoutControlItem13.Location = new System.Drawing.Point(276, 29);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem13.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem13.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem13.Text = "客户名称";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem9
            //
            this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
            this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem9.CustomizationFormText = "销售员";
            this.layoutControlItem9.Location = new System.Drawing.Point(552, 60);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem9.Text = "销售人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem5
            // 
@@ -934,73 +932,59 @@
            this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem5.Text = "销售组织";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_shf;
            this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem14.CustomizationFormText = "收货方";
            this.layoutControlItem14.Location = new System.Drawing.Point(276, 60);
            this.layoutControlItem14.Location = new System.Drawing.Point(276, 58);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem14.Text = "收货方";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_fNote;
            this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem8.CustomizationFormText = "申请备注";
            this.layoutControlItem8.Location = new System.Drawing.Point(0, 90);
            this.layoutControlItem8.Location = new System.Drawing.Point(0, 87);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(552, 31);
            this.layoutControlItem8.Size = new System.Drawing.Size(552, 29);
            this.layoutControlItem8.Text = "申请备注";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_salesId;
            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem4.CustomizationFormText = "销售订单";
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 60);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 58);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem4.Text = "销售订单";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_fBillTypeID;
            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem3.CustomizationFormText = "单据类型";
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 30);
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 29);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 30);
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem3.Text = "单据类型";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_wjStatus;
            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem12.CustomizationFormText = "完结标识";
            this.layoutControlItem12.Location = new System.Drawing.Point(828, 90);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem12.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem12.Text = "完结标识";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // tabMx
            // 
@@ -1008,7 +992,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 417);
            this.tabMx.Size = new System.Drawing.Size(1126, 391);
            this.tabMx.TabIndex = 4;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -1017,7 +1001,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 385);
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 359);
            this.tabMxPage1.Text = "申请明细";
            // 
            // gcMx1
@@ -1030,7 +1014,7 @@
            this.repositoryItemSearchLookUpEdit1,
            this.repositoryItemButtonEdit1,
            this.repositoryItemDateEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 385);
            this.gcMx1.Size = new System.Drawing.Size(1124, 359);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1227,7 +1211,7 @@
            this.gvMx1fMustQty.Name = "gvMx1fMustQty";
            this.gvMx1fMustQty.Tag = "yz_quantity_0_edit";
            this.gvMx1fMustQty.Visible = true;
            this.gvMx1fMustQty.VisibleIndex = 1;
            this.gvMx1fMustQty.VisibleIndex = 3;
            this.gvMx1fMustQty.Width = 94;
            // 
            // gridColumn11
@@ -1243,7 +1227,7 @@
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Tag = "edit";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 2;
            this.gridColumn11.VisibleIndex = 4;
            this.gridColumn11.Width = 94;
            // 
            // repositoryItemDateEdit1
@@ -1268,7 +1252,7 @@
            this.gvMx1fEntrynote.Name = "gvMx1fEntrynote";
            this.gvMx1fEntrynote.Tag = "edit";
            this.gvMx1fEntrynote.Visible = true;
            this.gvMx1fEntrynote.VisibleIndex = 3;
            this.gvMx1fEntrynote.VisibleIndex = 5;
            this.gvMx1fEntrynote.Width = 94;
            // 
            // gvMx1fRealQty
@@ -1280,7 +1264,7 @@
            this.gvMx1fRealQty.Name = "gvMx1fRealQty";
            this.gvMx1fRealQty.Tag = "query_a.FRealQty";
            this.gvMx1fRealQty.Visible = true;
            this.gvMx1fRealQty.VisibleIndex = 4;
            this.gvMx1fRealQty.VisibleIndex = 6;
            this.gvMx1fRealQty.Width = 94;
            // 
            // gridColumn12
@@ -1290,7 +1274,7 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 5;
            this.gridColumn12.VisibleIndex = 7;
            this.gridColumn12.Width = 94;
            // 
            // gridColumn13
@@ -1300,7 +1284,7 @@
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 6;
            this.gridColumn13.VisibleIndex = 1;
            this.gridColumn13.Width = 94;
            // 
            // gridColumn14
@@ -1310,7 +1294,7 @@
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 7;
            this.gridColumn14.VisibleIndex = 2;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn15
@@ -1349,8 +1333,6 @@
            this.gridColumn18.FieldName = "dwJj";
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 11;
            this.gridColumn18.Width = 94;
            // 
            // gridColumn19
@@ -1360,7 +1342,7 @@
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 12;
            this.gridColumn19.VisibleIndex = 11;
            this.gridColumn19.Width = 94;
            // 
            // gridColumn20
@@ -1370,7 +1352,7 @@
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 13;
            this.gridColumn20.VisibleIndex = 12;
            this.gridColumn20.Width = 94;
            // 
            // gridColumn21
@@ -1380,7 +1362,7 @@
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 14;
            this.gridColumn21.VisibleIndex = 13;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn22
@@ -1389,8 +1371,6 @@
            this.gridColumn22.FieldName = "hzlx";
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 15;
            this.gridColumn22.Width = 94;
            // 
            // gridColumn23
@@ -1399,8 +1379,6 @@
            this.gridColumn23.FieldName = "hz";
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 16;
            this.gridColumn23.Width = 94;
            // 
            // gridColumn24
@@ -1410,7 +1388,7 @@
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 17;
            this.gridColumn24.VisibleIndex = 14;
            this.gridColumn24.Width = 94;
            // 
            // gridColumn25
@@ -1420,7 +1398,7 @@
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 18;
            this.gridColumn25.VisibleIndex = 15;
            this.gridColumn25.Width = 94;
            // 
            // gridColumn26
@@ -1430,7 +1408,7 @@
            this.gridColumn26.MinWidth = 25;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 19;
            this.gridColumn26.VisibleIndex = 16;
            this.gridColumn26.Width = 94;
            // 
            // gridColumn27
@@ -1439,8 +1417,6 @@
            this.gridColumn27.FieldName = "gyOrg";
            this.gridColumn27.MinWidth = 25;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 20;
            this.gridColumn27.Width = 94;
            // 
            // gridColumn28
@@ -1449,8 +1425,6 @@
            this.gridColumn28.FieldName = "kcOrg";
            this.gridColumn28.MinWidth = 25;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.Visible = true;
            this.gridColumn28.VisibleIndex = 21;
            this.gridColumn28.Width = 94;
            // 
            // gridColumn29
@@ -1459,8 +1433,6 @@
            this.gridColumn29.FieldName = "jsOrg";
            this.gridColumn29.MinWidth = 25;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 22;
            this.gridColumn29.Width = 94;
            // 
            // gvMx1id
@@ -1510,7 +1482,7 @@
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 23;
            this.gvMxDel.VisibleIndex = 17;
            this.gvMxDel.Width = 94;
            // 
            // repositoryItemButtonEdit1
@@ -1542,6 +1514,120 @@
            this.picCheckBox.TabIndex = 9;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn38
            //
            this.gridColumn38.Caption = "财务审核";
            this.gridColumn38.FieldName = "isCwChk";
            this.gridColumn38.MinWidth = 25;
            this.gridColumn38.Name = "gridColumn38";
            this.gridColumn38.Visible = true;
            this.gridColumn38.VisibleIndex = 1;
            this.gridColumn38.Width = 94;
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_wjStatus;
            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem12.CustomizationFormText = "完结标识";
            this.layoutControlItem12.Location = new System.Drawing.Point(828, 87);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem12.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem12.Text = "完结标识";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
            //
            // layoutControlItem9
            //
            this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
            this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem9.CustomizationFormText = "销售员";
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 116);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem9.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem9.Text = "销售人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem17
            //
            this.layoutControlItem17.Control = this.txt_shName;
            this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem17.CustomizationFormText = "收货人姓名";
            this.layoutControlItem17.Location = new System.Drawing.Point(276, 116);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem17.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem17.Text = "收货人姓名";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
            //
            // txt_qt031
            //
            this.txt_qt031.Location = new System.Drawing.Point(666, 70);
            this.txt_qt031.Name = "txt_qt031";
            this.txt_qt031.Properties.ReadOnly = true;
            this.txt_qt031.Size = new System.Drawing.Size(170, 24);
            this.txt_qt031.StyleController = this.layoutMx1;
            this.txt_qt031.TabIndex = 378;
            this.txt_qt031.Tag = "readonly";
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_qt031;
            this.layoutControlItem18.Location = new System.Drawing.Point(552, 58);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem18.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem18.Text = "财务审核人员";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
            //
            // txt_qt030
            //
            this.txt_qt030.Location = new System.Drawing.Point(666, 99);
            this.txt_qt030.Name = "txt_qt030";
            this.txt_qt030.Properties.ReadOnly = true;
            this.txt_qt030.Size = new System.Drawing.Size(170, 24);
            this.txt_qt030.StyleController = this.layoutMx1;
            this.txt_qt030.TabIndex = 379;
            this.txt_qt030.Tag = "readonly";
            //
            // layoutControlItem19
            //
            this.layoutControlItem19.Control = this.txt_qt030;
            this.layoutControlItem19.Location = new System.Drawing.Point(552, 87);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem19.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem19.Text = "财务审核日期";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
            //
            // txt_qt029
            //
            this.txt_qt029.Location = new System.Drawing.Point(564, 128);
            this.txt_qt029.Name = "txt_qt029";
            this.txt_qt029.Properties.Caption = "财务审核状态";
            this.txt_qt029.Properties.ReadOnly = true;
            this.txt_qt029.Size = new System.Drawing.Size(272, 24);
            this.txt_qt029.StyleController = this.layoutMx1;
            this.txt_qt029.TabIndex = 380;
            this.txt_qt029.Tag = "readonly";
            //
            // layoutControlItem20
            //
            this.layoutControlItem20.Control = this.txt_qt029;
            this.layoutControlItem20.Location = new System.Drawing.Point(552, 116);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem20.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem20.Text = "财务审核状态";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem20.TextVisible = false;
            // 
            // Frm_SalesDeliver
            // 
@@ -1590,7 +1676,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
@@ -1598,13 +1683,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1616,6 +1699,15 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1709,7 +1801,6 @@
        private DevExpress.XtraEditors.TextEdit txt_shf;
        private DevExpress.XtraEditors.CheckEdit txt_chkStatus;
        private DevExpress.XtraEditors.TextEdit txt_shName;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraEditors.CheckEdit txt_wjStatus;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
@@ -1719,7 +1810,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
@@ -1727,9 +1817,18 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
        private DevExpress.XtraEditors.TextEdit txt_qt031;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraEditors.TextEdit txt_qt030;
        private DevExpress.XtraEditors.CheckEdit txt_qt029;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
    }
}
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -220,6 +220,8 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改
            txt_salesId.IsReadly = true;
        }
        /// <summary>
        /// 新增事件
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
@@ -44,7 +44,7 @@
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
@@ -188,7 +188,7 @@
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -203,7 +203,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -261,50 +261,14 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            gvMx2.CloseEditor();
            gvMx2.UpdateCurrentRow();
            var rowhandle = gvMx2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx2.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据,确定删除吗?"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx2.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
                var lst = new List<string>();
                lst.Add(mxGuid);
                try
                {
                    strJson = UtilityHelper.HttpPost("",
                        _webServiceName + "DeleteModelMx2",
                        JsonConvert.SerializeObject(lst));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                }
            }
        }
        /// <summary>
        /// 工具条事件
        /// </summary>
@@ -326,7 +290,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
@@ -342,22 +306,23 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    Form parentForm = this.FindForm();
                    UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, parentForm, _inFieldValue.ToString());
                    UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
    }