From 7c9cdbe1f9196d3115f2e6cf8a340e9b5fafae6f Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 22 五月 2025 18:23:14 +0800 Subject: [PATCH] 销售 --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 20 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs | 383 +++++----- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 1 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs | 392 +++++----- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 1236 +++++++++++++++++----------------- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.resx | 3 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 20 7 files changed, 1,024 insertions(+), 1,031 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs index 935dab3..f6bebc1 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs @@ -1157,7 +1157,6 @@ // this.gridColumn4.Caption = "閿�鍞崟浣�"; this.gridColumn4.FieldName = "xxdw"; - this.gridColumn4.MaxWidth = 50; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 2; @@ -1167,7 +1166,6 @@ // this.gridColumn5.Caption = "閿�鍞暟閲�"; this.gridColumn5.FieldName = "qty"; - this.gridColumn5.MaxWidth = 50; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 3; @@ -1178,16 +1176,12 @@ 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 // @@ -1197,10 +1191,9 @@ this.gridColumn9.AppearanceHeader.Options.UseForeColor = true; this.gridColumn9.Caption = "鏈彂璐ф暟閲�"; this.gridColumn9.FieldName = "syQty"; - this.gridColumn9.MaxWidth = 50; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 6; + this.gridColumn9.VisibleIndex = 4; this.gridColumn9.Width = 50; // // gridColumn6 @@ -1208,8 +1201,6 @@ this.gridColumn6.Caption = "閿�鍞粍缁�"; this.gridColumn6.FieldName = "salesOrgName"; this.gridColumn6.Name = "gridColumn6"; - this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 7; // // gridColumn30 // @@ -1217,7 +1208,7 @@ this.gridColumn30.FieldName = "itemName"; this.gridColumn30.Name = "gridColumn30"; this.gridColumn30.Visible = true; - this.gridColumn30.VisibleIndex = 8; + this.gridColumn30.VisibleIndex = 5; // // gridColumn31 // @@ -1225,16 +1216,15 @@ this.gridColumn31.FieldName = "itemModel"; this.gridColumn31.Name = "gridColumn31"; this.gridColumn31.Visible = true; - this.gridColumn31.VisibleIndex = 9; + this.gridColumn31.VisibleIndex = 6; // // gridColumn32 // this.gridColumn32.Caption = "璁′环鍗曚綅"; this.gridColumn32.FieldName = "jjdw"; - this.gridColumn32.MaxWidth = 50; this.gridColumn32.Name = "gridColumn32"; this.gridColumn32.Visible = true; - this.gridColumn32.VisibleIndex = 10; + this.gridColumn32.VisibleIndex = 7; this.gridColumn32.Width = 50; // // gvMx1fMustQty @@ -1297,7 +1287,7 @@ // gvMx1fRealQty // this.gvMx1fRealQty.AppearanceCell.Options.UseFont = true; - this.gvMx1fRealQty.Caption = "瀹炲彂鏁伴噺 "; + this.gvMx1fRealQty.Caption = "鏈瀹炲彂鏁伴噺 "; this.gvMx1fRealQty.FieldName = "fRealQty"; this.gvMx1fRealQty.MinWidth = 50; this.gvMx1fRealQty.Name = "gvMx1fRealQty"; diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs index a1f8750..8d6cd74 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs @@ -67,6 +67,7 @@ var rtn = UtilityHelper.ReturnToTablePage(strReturn); var dt = rtn.rtnData.list; this.repositoryItemSearchLookUpEdit1.DataSource = dt; + repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup; } catch (Exception ex) { diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs index fbd8f54..c15e364 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs @@ -30,19 +30,19 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); + 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.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -372,7 +372,7 @@ // this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1254, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(1568, 570); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -393,7 +393,7 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1254, 570); + this.split1.Size = new System.Drawing.Size(1568, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // @@ -403,7 +403,7 @@ this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; - this.gcMain1.Size = new System.Drawing.Size(1254, 519); + this.gcMain1.Size = new System.Drawing.Size(1568, 519); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -972,7 +972,7 @@ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(1254, 39); + this.pageBar1.Size = new System.Drawing.Size(1568, 39); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // @@ -1001,7 +1001,7 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1568, 570); - this.splitMx1.SplitterPosition = 307; + this.splitMx1.SplitterPosition = 267; this.splitMx1.TabIndex = 4; // // layoutMx1 @@ -1060,7 +1060,7 @@ this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(667, 301, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1568, 307); + this.layoutMx1.Size = new System.Drawing.Size(1568, 267); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -1074,19 +1074,19 @@ // // txt_receiveContact // - this.txt_receiveContact.Location = new System.Drawing.Point(1260, 171); + this.txt_receiveContact.Location = new System.Drawing.Point(1244, 152); this.txt_receiveContact.Name = "txt_receiveContact"; this.txt_receiveContact.Properties.Appearance.Options.UseFont = true; - this.txt_receiveContact.Size = new System.Drawing.Size(296, 24); + this.txt_receiveContact.Size = new System.Drawing.Size(291, 24); this.txt_receiveContact.StyleController = this.layoutMx1; this.txt_receiveContact.TabIndex = 427; // // txt_receiveId // - this.txt_receiveId.Location = new System.Drawing.Point(1260, 75); + this.txt_receiveId.Location = new System.Drawing.Point(1244, 68); this.txt_receiveId.Name = "txt_receiveId"; this.txt_receiveId.Properties.Appearance.Options.UseFont = true; - this.txt_receiveId.Size = new System.Drawing.Size(296, 24); + this.txt_receiveId.Size = new System.Drawing.Size(291, 24); this.txt_receiveId.StyleController = this.layoutMx1; this.txt_receiveId.TabIndex = 425; // @@ -1110,172 +1110,172 @@ // // txt_changerId // - this.txt_changerId.Location = new System.Drawing.Point(1260, 203); + this.txt_changerId.Location = new System.Drawing.Point(1244, 180); this.txt_changerId.Name = "txt_changerId"; this.txt_changerId.Properties.Appearance.Options.UseFont = true; - this.txt_changerId.Size = new System.Drawing.Size(296, 24); + this.txt_changerId.Size = new System.Drawing.Size(291, 24); this.txt_changerId.StyleController = this.layoutMx1; this.txt_changerId.TabIndex = 378; // // txt_versionNo // - this.txt_versionNo.Location = new System.Drawing.Point(99, 203); + this.txt_versionNo.Location = new System.Drawing.Point(99, 180); this.txt_versionNo.Name = "txt_versionNo"; this.txt_versionNo.Properties.Appearance.Options.UseFont = true; - this.txt_versionNo.Size = new System.Drawing.Size(296, 24); + this.txt_versionNo.Size = new System.Drawing.Size(290, 24); this.txt_versionNo.StyleController = this.layoutMx1; this.txt_versionNo.TabIndex = 376; // // txt_cancellerId // - this.txt_cancellerId.Location = new System.Drawing.Point(486, 203); + this.txt_cancellerId.Location = new System.Drawing.Point(480, 180); this.txt_cancellerId.Name = "txt_cancellerId"; this.txt_cancellerId.Properties.Appearance.Options.UseFont = true; - this.txt_cancellerId.Size = new System.Drawing.Size(296, 24); + this.txt_cancellerId.Size = new System.Drawing.Size(291, 24); this.txt_cancellerId.StyleController = this.layoutMx1; this.txt_cancellerId.TabIndex = 374; // // txt_cancelStatusTxt // - this.txt_cancelStatusTxt.Location = new System.Drawing.Point(486, 235); + this.txt_cancelStatusTxt.Location = new System.Drawing.Point(480, 208); this.txt_cancelStatusTxt.Name = "txt_cancelStatusTxt"; this.txt_cancelStatusTxt.Properties.Appearance.Options.UseFont = true; - this.txt_cancelStatusTxt.Size = new System.Drawing.Size(296, 24); + this.txt_cancelStatusTxt.Size = new System.Drawing.Size(291, 24); this.txt_cancelStatusTxt.StyleController = this.layoutMx1; this.txt_cancelStatusTxt.TabIndex = 372; // // txt_changeDate // - this.txt_changeDate.Location = new System.Drawing.Point(1260, 235); + this.txt_changeDate.Location = new System.Drawing.Point(1244, 208); this.txt_changeDate.Name = "txt_changeDate"; this.txt_changeDate.Properties.Appearance.Options.UseFont = true; - this.txt_changeDate.Size = new System.Drawing.Size(296, 24); + this.txt_changeDate.Size = new System.Drawing.Size(291, 24); this.txt_changeDate.StyleController = this.layoutMx1; this.txt_changeDate.TabIndex = 344; // // txt_closeDate // - this.txt_closeDate.Location = new System.Drawing.Point(873, 267); + this.txt_closeDate.Location = new System.Drawing.Point(862, 236); this.txt_closeDate.Name = "txt_closeDate"; this.txt_closeDate.Properties.Appearance.Options.UseFont = true; - this.txt_closeDate.Size = new System.Drawing.Size(296, 24); + this.txt_closeDate.Size = new System.Drawing.Size(291, 24); this.txt_closeDate.StyleController = this.layoutMx1; this.txt_closeDate.TabIndex = 342; // // txt_closerId // - this.txt_closerId.Location = new System.Drawing.Point(873, 235); + this.txt_closerId.Location = new System.Drawing.Point(862, 208); this.txt_closerId.Name = "txt_closerId"; this.txt_closerId.Properties.Appearance.Options.UseFont = true; - this.txt_closerId.Size = new System.Drawing.Size(296, 24); + this.txt_closerId.Size = new System.Drawing.Size(291, 24); this.txt_closerId.StyleController = this.layoutMx1; this.txt_closerId.TabIndex = 340; // // txt_approveDate // - this.txt_approveDate.Location = new System.Drawing.Point(486, 107); + this.txt_approveDate.Location = new System.Drawing.Point(480, 96); this.txt_approveDate.Name = "txt_approveDate"; this.txt_approveDate.Properties.Appearance.Options.UseFont = true; - this.txt_approveDate.Size = new System.Drawing.Size(296, 24); + this.txt_approveDate.Size = new System.Drawing.Size(291, 24); this.txt_approveDate.StyleController = this.layoutMx1; this.txt_approveDate.TabIndex = 338; // // txt_modifyDate // - this.txt_modifyDate.Location = new System.Drawing.Point(873, 171); + this.txt_modifyDate.Location = new System.Drawing.Point(862, 152); this.txt_modifyDate.Name = "txt_modifyDate"; this.txt_modifyDate.Properties.Appearance.Options.UseFont = true; - this.txt_modifyDate.Size = new System.Drawing.Size(296, 24); + this.txt_modifyDate.Size = new System.Drawing.Size(291, 24); this.txt_modifyDate.StyleController = this.layoutMx1; this.txt_modifyDate.TabIndex = 314; // // txt_modifierId // - this.txt_modifierId.Location = new System.Drawing.Point(873, 139); + this.txt_modifierId.Location = new System.Drawing.Point(862, 124); this.txt_modifierId.Name = "txt_modifierId"; this.txt_modifierId.Properties.Appearance.Options.UseFont = true; - this.txt_modifierId.Size = new System.Drawing.Size(296, 24); + this.txt_modifierId.Size = new System.Drawing.Size(291, 24); this.txt_modifierId.StyleController = this.layoutMx1; this.txt_modifierId.TabIndex = 312; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(486, 171); + this.txt_createDate.Location = new System.Drawing.Point(480, 152); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(296, 24); + this.txt_createDate.Size = new System.Drawing.Size(291, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 310; // // txt_creatorId // - this.txt_creatorId.Location = new System.Drawing.Point(486, 139); + this.txt_creatorId.Location = new System.Drawing.Point(480, 124); this.txt_creatorId.Name = "txt_creatorId"; this.txt_creatorId.Properties.Appearance.Options.UseFont = true; - this.txt_creatorId.Size = new System.Drawing.Size(296, 24); + this.txt_creatorId.Size = new System.Drawing.Size(291, 24); this.txt_creatorId.StyleController = this.layoutMx1; this.txt_creatorId.TabIndex = 308; // // txt_linkPhone // - this.txt_linkPhone.Location = new System.Drawing.Point(1260, 139); + this.txt_linkPhone.Location = new System.Drawing.Point(1244, 124); this.txt_linkPhone.Name = "txt_linkPhone"; this.txt_linkPhone.Properties.Appearance.Options.UseFont = true; - this.txt_linkPhone.Size = new System.Drawing.Size(296, 24); + this.txt_linkPhone.Size = new System.Drawing.Size(291, 24); this.txt_linkPhone.StyleController = this.layoutMx1; this.txt_linkPhone.TabIndex = 288; // // txt_chargeId // - this.txt_chargeId.Location = new System.Drawing.Point(873, 75); + this.txt_chargeId.Location = new System.Drawing.Point(862, 68); this.txt_chargeId.Name = "txt_chargeId"; this.txt_chargeId.Properties.Appearance.Options.UseFont = true; - this.txt_chargeId.Size = new System.Drawing.Size(296, 24); + this.txt_chargeId.Size = new System.Drawing.Size(291, 24); this.txt_chargeId.StyleController = this.layoutMx1; this.txt_chargeId.TabIndex = 286; // // txt_linkMan // - this.txt_linkMan.Location = new System.Drawing.Point(1260, 107); + this.txt_linkMan.Location = new System.Drawing.Point(1244, 96); this.txt_linkMan.Name = "txt_linkMan"; this.txt_linkMan.Properties.Appearance.Options.UseFont = true; - this.txt_linkMan.Size = new System.Drawing.Size(296, 24); + this.txt_linkMan.Size = new System.Drawing.Size(291, 24); this.txt_linkMan.StyleController = this.layoutMx1; this.txt_linkMan.TabIndex = 284; // // txt_approverId // - this.txt_approverId.Location = new System.Drawing.Point(486, 75); + this.txt_approverId.Location = new System.Drawing.Point(480, 68); this.txt_approverId.Name = "txt_approverId"; this.txt_approverId.Properties.Appearance.Options.UseFont = true; - this.txt_approverId.Size = new System.Drawing.Size(296, 24); + this.txt_approverId.Size = new System.Drawing.Size(291, 24); this.txt_approverId.StyleController = this.layoutMx1; this.txt_approverId.TabIndex = 282; // // txt_settleId // - this.txt_settleId.Location = new System.Drawing.Point(873, 107); + this.txt_settleId.Location = new System.Drawing.Point(862, 96); this.txt_settleId.Name = "txt_settleId"; this.txt_settleId.Properties.Appearance.Options.UseFont = true; - this.txt_settleId.Size = new System.Drawing.Size(296, 24); + this.txt_settleId.Size = new System.Drawing.Size(291, 24); this.txt_settleId.StyleController = this.layoutMx1; this.txt_settleId.TabIndex = 265; // // txt_note // - this.txt_note.Location = new System.Drawing.Point(99, 235); + this.txt_note.Location = new System.Drawing.Point(99, 208); this.txt_note.Name = "txt_note"; this.txt_note.Properties.Appearance.Options.UseFont = true; - this.txt_note.Size = new System.Drawing.Size(296, 24); + this.txt_note.Size = new System.Drawing.Size(290, 24); this.txt_note.StyleController = this.layoutMx1; this.txt_note.TabIndex = 263; // // txt_changeReason // - this.txt_changeReason.Location = new System.Drawing.Point(1260, 267); + this.txt_changeReason.Location = new System.Drawing.Point(1244, 236); this.txt_changeReason.Name = "txt_changeReason"; this.txt_changeReason.Properties.Appearance.Options.UseFont = true; - this.txt_changeReason.Size = new System.Drawing.Size(296, 24); + this.txt_changeReason.Size = new System.Drawing.Size(291, 24); this.txt_changeReason.StyleController = this.layoutMx1; this.txt_changeReason.TabIndex = 261; // @@ -1299,10 +1299,10 @@ // // txt_closeStatusTxt // - this.txt_closeStatusTxt.Location = new System.Drawing.Point(873, 203); + this.txt_closeStatusTxt.Location = new System.Drawing.Point(862, 180); this.txt_closeStatusTxt.Name = "txt_closeStatusTxt"; this.txt_closeStatusTxt.Properties.Appearance.Options.UseFont = true; - this.txt_closeStatusTxt.Size = new System.Drawing.Size(296, 24); + this.txt_closeStatusTxt.Size = new System.Drawing.Size(291, 24); this.txt_closeStatusTxt.StyleController = this.layoutMx1; this.txt_closeStatusTxt.TabIndex = 247; // @@ -1317,64 +1317,64 @@ // // txt_headLocId // - this.txt_headLocId.Location = new System.Drawing.Point(1260, 43); + this.txt_headLocId.Location = new System.Drawing.Point(1244, 40); this.txt_headLocId.Name = "txt_headLocId"; this.txt_headLocId.Properties.Appearance.Options.UseFont = true; - this.txt_headLocId.Size = new System.Drawing.Size(296, 24); + this.txt_headLocId.Size = new System.Drawing.Size(291, 24); this.txt_headLocId.StyleController = this.layoutMx1; this.txt_headLocId.TabIndex = 243; // // txt_headDeliveryWay // - this.txt_headDeliveryWay.Location = new System.Drawing.Point(1260, 12); + this.txt_headDeliveryWay.Location = new System.Drawing.Point(1244, 12); this.txt_headDeliveryWay.Name = "txt_headDeliveryWay"; this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true; - this.txt_headDeliveryWay.Size = new System.Drawing.Size(296, 24); + this.txt_headDeliveryWay.Size = new System.Drawing.Size(291, 24); this.txt_headDeliveryWay.StyleController = this.layoutMx1; this.txt_headDeliveryWay.TabIndex = 235; // // txt_businessTypeTxt // - this.txt_businessTypeTxt.Location = new System.Drawing.Point(873, 43); + this.txt_businessTypeTxt.Location = new System.Drawing.Point(862, 40); this.txt_businessTypeTxt.Name = "txt_businessTypeTxt"; this.txt_businessTypeTxt.Properties.Appearance.Options.UseFont = true; - this.txt_businessTypeTxt.Size = new System.Drawing.Size(296, 24); + this.txt_businessTypeTxt.Size = new System.Drawing.Size(291, 24); this.txt_businessTypeTxt.StyleController = this.layoutMx1; this.txt_businessTypeTxt.TabIndex = 233; // // txt_fDate // - this.txt_fDate.Location = new System.Drawing.Point(486, 43); + this.txt_fDate.Location = new System.Drawing.Point(480, 40); this.txt_fDate.Name = "txt_fDate"; this.txt_fDate.Properties.Appearance.Options.UseFont = true; - this.txt_fDate.Size = new System.Drawing.Size(296, 24); + this.txt_fDate.Size = new System.Drawing.Size(291, 24); this.txt_fDate.StyleController = this.layoutMx1; this.txt_fDate.TabIndex = 231; // // txt_billTypeId // - this.txt_billTypeId.Location = new System.Drawing.Point(873, 12); + this.txt_billTypeId.Location = new System.Drawing.Point(862, 12); this.txt_billTypeId.Name = "txt_billTypeId"; this.txt_billTypeId.Properties.Appearance.Options.UseFont = true; - this.txt_billTypeId.Size = new System.Drawing.Size(296, 24); + this.txt_billTypeId.Size = new System.Drawing.Size(291, 24); this.txt_billTypeId.StyleController = this.layoutMx1; this.txt_billTypeId.TabIndex = 219; // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(486, 12); + this.txt_billNo.Location = new System.Drawing.Point(480, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(296, 24); + this.txt_billNo.Size = new System.Drawing.Size(291, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 216; // // txt_documentStatusTxt // - this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 43); + this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 40); this.txt_documentStatusTxt.Name = "txt_documentStatusTxt"; this.txt_documentStatusTxt.Properties.Appearance.Options.UseFont = true; - this.txt_documentStatusTxt.Size = new System.Drawing.Size(296, 24); + this.txt_documentStatusTxt.Size = new System.Drawing.Size(290, 24); this.txt_documentStatusTxt.StyleController = this.layoutMx1; this.txt_documentStatusTxt.TabIndex = 229; // @@ -1383,7 +1383,7 @@ this.txt_erpId.Location = new System.Drawing.Point(99, 12); this.txt_erpId.Name = "txt_erpId"; this.txt_erpId.Properties.Appearance.Options.UseFont = true; - this.txt_erpId.Size = new System.Drawing.Size(296, 24); + this.txt_erpId.Size = new System.Drawing.Size(290, 24); this.txt_erpId.StyleController = this.layoutMx1; this.txt_erpId.TabIndex = 214; // @@ -1399,33 +1399,33 @@ // // txt_xsOrgName // - this.txt_xsOrgName.Location = new System.Drawing.Point(99, 107); + this.txt_xsOrgName.Location = new System.Drawing.Point(99, 96); this.txt_xsOrgName.Name = "txt_xsOrgName"; - this.txt_xsOrgName.Size = new System.Drawing.Size(296, 24); + this.txt_xsOrgName.Size = new System.Drawing.Size(290, 24); this.txt_xsOrgName.StyleController = this.layoutMx1; this.txt_xsOrgName.TabIndex = 429; // // txt_salerName // - this.txt_salerName.Location = new System.Drawing.Point(99, 171); + this.txt_salerName.Location = new System.Drawing.Point(99, 152); this.txt_salerName.Name = "txt_salerName"; - this.txt_salerName.Size = new System.Drawing.Size(296, 24); + this.txt_salerName.Size = new System.Drawing.Size(290, 24); this.txt_salerName.StyleController = this.layoutMx1; this.txt_salerName.TabIndex = 430; // // txt_custName // - this.txt_custName.Location = new System.Drawing.Point(99, 139); + this.txt_custName.Location = new System.Drawing.Point(99, 124); this.txt_custName.Name = "txt_custName"; - this.txt_custName.Size = new System.Drawing.Size(296, 24); + this.txt_custName.Size = new System.Drawing.Size(290, 24); this.txt_custName.StyleController = this.layoutMx1; this.txt_custName.TabIndex = 431; // // txt_saleDeptName // - this.txt_saleDeptName.Location = new System.Drawing.Point(99, 75); + this.txt_saleDeptName.Location = new System.Drawing.Point(99, 68); this.txt_saleDeptName.Name = "txt_saleDeptName"; - this.txt_saleDeptName.Size = new System.Drawing.Size(296, 24); + this.txt_saleDeptName.Size = new System.Drawing.Size(290, 24); this.txt_saleDeptName.StyleController = this.layoutMx1; this.txt_saleDeptName.TabIndex = 432; // @@ -1545,90 +1545,90 @@ this.layoutControlItem29}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition5.Width = 100D; - columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition6.Width = 100D; - columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition7.Width = 100D; - columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition8.Width = 100D; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; + columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition2.Width = 100D; + columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition3.Width = 100D; + columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6, - columnDefinition7, - columnDefinition8}); - rowDefinition10.Height = 100D; - rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition11.Height = 100D; - rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition12.Height = 100D; - rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition13.Height = 100D; - rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition14.Height = 100D; - rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition15.Height = 100D; - rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition16.Height = 100D; - rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition17.Height = 100D; - rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition18.Height = 100D; - rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1, + columnDefinition2, + columnDefinition3, + columnDefinition4}); + rowDefinition1.Height = 100D; + rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition2.Height = 100D; + rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition3.Height = 100D; + 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; + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition7.Height = 100D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition8.Height = 100D; + rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition9.Height = 100D; + rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition10, - rowDefinition11, - rowDefinition12, - rowDefinition13, - rowDefinition14, - rowDefinition15, - rowDefinition16, - rowDefinition17, - rowDefinition18}); - this.Root.Size = new System.Drawing.Size(1568, 307); + rowDefinition1, + rowDefinition2, + rowDefinition3, + rowDefinition4, + rowDefinition5, + rowDefinition6, + rowDefinition7, + rowDefinition8, + rowDefinition9}); + this.Root.Size = new System.Drawing.Size(1547, 272); this.Root.TextVisible = false; // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_documentStatusTxt; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 31); + this.layoutControlItem3.Location = new System.Drawing.Point(0, 28); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem3.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem3.Size = new System.Drawing.Size(381, 28); this.layoutControlItem3.Text = "鍗曟嵁鐘舵��"; this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_fDate; - this.layoutControlItem6.Location = new System.Drawing.Point(387, 31); + this.layoutControlItem6.Location = new System.Drawing.Point(381, 28); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem6.Size = new System.Drawing.Size(382, 28); this.layoutControlItem6.Text = "鍗曟嵁鏃ユ湡"; this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_businessTypeTxt; - this.layoutControlItem7.Location = new System.Drawing.Point(774, 31); + this.layoutControlItem7.Location = new System.Drawing.Point(763, 28); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem7.Size = new System.Drawing.Size(382, 28); this.layoutControlItem7.Text = "涓氬姟绫诲瀷"; this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem20 // this.layoutControlItem20.Control = this.txt_linkPhone; - this.layoutControlItem20.Location = new System.Drawing.Point(1161, 127); + this.layoutControlItem20.Location = new System.Drawing.Point(1145, 112); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem20.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem20.Size = new System.Drawing.Size(382, 28); this.layoutControlItem20.Text = "鑱旂郴鐢佃瘽"; this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18); // @@ -1637,317 +1637,317 @@ this.layoutControlItem2.Control = this.txt_erpId; this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(387, 31); + this.layoutControlItem2.Size = new System.Drawing.Size(381, 28); this.layoutControlItem2.Text = "ERPID"; this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_billNo; - this.layoutControlItem4.Location = new System.Drawing.Point(387, 0); + this.layoutControlItem4.Location = new System.Drawing.Point(381, 0); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(387, 31); + this.layoutControlItem4.Size = new System.Drawing.Size(382, 28); this.layoutControlItem4.Text = "鍗曟嵁缂栧彿"; this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_billTypeId; - this.layoutControlItem5.Location = new System.Drawing.Point(774, 0); + this.layoutControlItem5.Location = new System.Drawing.Point(763, 0); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem5.Size = new System.Drawing.Size(387, 31); + this.layoutControlItem5.Size = new System.Drawing.Size(382, 28); this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷"; this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_headDeliveryWay; - this.layoutControlItem8.Location = new System.Drawing.Point(1161, 0); + this.layoutControlItem8.Location = new System.Drawing.Point(1145, 0); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem8.Size = new System.Drawing.Size(387, 31); + this.layoutControlItem8.Size = new System.Drawing.Size(382, 28); this.layoutControlItem8.Text = "浜よ揣鏂瑰紡"; this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem37 // this.layoutControlItem37.Control = this.txt_receiveContact; - this.layoutControlItem37.Location = new System.Drawing.Point(1161, 159); + this.layoutControlItem37.Location = new System.Drawing.Point(1145, 140); this.layoutControlItem37.Name = "layoutControlItem37"; this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem37.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem37.Size = new System.Drawing.Size(382, 28); this.layoutControlItem37.Text = "鏀惰揣鑱旂郴浜�"; this.layoutControlItem37.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem41 // this.layoutControlItem41.Control = this.txt_custName; - this.layoutControlItem41.Location = new System.Drawing.Point(0, 127); + this.layoutControlItem41.Location = new System.Drawing.Point(0, 112); this.layoutControlItem41.Name = "layoutControlItem41"; this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem41.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem41.Size = new System.Drawing.Size(381, 28); this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О"; this.layoutControlItem41.TextSize = new System.Drawing.Size(75, 18); // // lab_saleDeptName // this.lab_saleDeptName.Control = this.txt_saleDeptName; - this.lab_saleDeptName.Location = new System.Drawing.Point(0, 63); + this.lab_saleDeptName.Location = new System.Drawing.Point(0, 56); this.lab_saleDeptName.Name = "lab_saleDeptName"; this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 2; - this.lab_saleDeptName.Size = new System.Drawing.Size(387, 32); + this.lab_saleDeptName.Size = new System.Drawing.Size(381, 28); this.lab_saleDeptName.Text = "閿�鍞儴闂�"; this.lab_saleDeptName.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem39 // this.layoutControlItem39.Control = this.txt_xsOrgName; - this.layoutControlItem39.Location = new System.Drawing.Point(0, 95); + this.layoutControlItem39.Location = new System.Drawing.Point(0, 84); this.layoutControlItem39.Name = "layoutControlItem39"; this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem39.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem39.Size = new System.Drawing.Size(381, 28); this.layoutControlItem39.Text = "閿�鍞粍缁�"; this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem40 // this.layoutControlItem40.Control = this.txt_salerName; - this.layoutControlItem40.Location = new System.Drawing.Point(0, 159); + this.layoutControlItem40.Location = new System.Drawing.Point(0, 140); this.layoutControlItem40.Name = "layoutControlItem40"; this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem40.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem40.Size = new System.Drawing.Size(381, 28); this.layoutControlItem40.Text = "閿�鍞憳鍚�"; this.layoutControlItem40.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_headLocId; - this.layoutControlItem9.Location = new System.Drawing.Point(1161, 31); + this.layoutControlItem9.Location = new System.Drawing.Point(1145, 28); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem9.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem9.Size = new System.Drawing.Size(382, 28); this.layoutControlItem9.Text = "浜よ揣鍦扮偣"; this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem36 // this.layoutControlItem36.Control = this.txt_receiveId; - this.layoutControlItem36.Location = new System.Drawing.Point(1161, 63); + this.layoutControlItem36.Location = new System.Drawing.Point(1145, 56); this.layoutControlItem36.Name = "layoutControlItem36"; this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem36.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem36.Size = new System.Drawing.Size(382, 28); this.layoutControlItem36.Text = "鏀惰揣鏂�"; this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_linkMan; - this.layoutControlItem18.Location = new System.Drawing.Point(1161, 95); + this.layoutControlItem18.Location = new System.Drawing.Point(1145, 84); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem18.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem18.Size = new System.Drawing.Size(382, 28); this.layoutControlItem18.Text = "鏀惰揣浜哄鍚�"; this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem19 // this.layoutControlItem19.Control = this.txt_chargeId; - this.layoutControlItem19.Location = new System.Drawing.Point(774, 63); + this.layoutControlItem19.Location = new System.Drawing.Point(763, 56); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem19.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem19.Size = new System.Drawing.Size(382, 28); this.layoutControlItem19.Text = "浠樻鏂�"; this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_settleId; - this.layoutControlItem16.Location = new System.Drawing.Point(774, 95); + this.layoutControlItem16.Location = new System.Drawing.Point(763, 84); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem16.Size = new System.Drawing.Size(382, 28); this.layoutControlItem16.Text = "缁撶畻鏂�"; this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem23 // this.layoutControlItem23.Control = this.txt_modifierId; - this.layoutControlItem23.Location = new System.Drawing.Point(774, 127); + this.layoutControlItem23.Location = new System.Drawing.Point(763, 112); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem23.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem23.Size = new System.Drawing.Size(382, 28); this.layoutControlItem23.Text = "淇敼浜哄憳"; this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem24 // this.layoutControlItem24.Control = this.txt_modifyDate; - this.layoutControlItem24.Location = new System.Drawing.Point(774, 159); + this.layoutControlItem24.Location = new System.Drawing.Point(763, 140); this.layoutControlItem24.Name = "layoutControlItem24"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem24.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem24.Size = new System.Drawing.Size(382, 28); this.layoutControlItem24.Text = "淇敼鏃ユ湡"; this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem27 // this.layoutControlItem27.Control = this.txt_closeDate; - this.layoutControlItem27.Location = new System.Drawing.Point(774, 255); + this.layoutControlItem27.Location = new System.Drawing.Point(763, 224); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 8; - this.layoutControlItem27.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem27.Size = new System.Drawing.Size(382, 28); this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡"; this.layoutControlItem27.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_closerId; - this.layoutControlItem26.Location = new System.Drawing.Point(774, 223); + this.layoutControlItem26.Location = new System.Drawing.Point(763, 196); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7; - this.layoutControlItem26.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem26.Size = new System.Drawing.Size(382, 28); this.layoutControlItem26.Text = "鍏抽棴浜哄憳"; this.layoutControlItem26.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_closeStatusTxt; - this.layoutControlItem11.Location = new System.Drawing.Point(774, 191); + this.layoutControlItem11.Location = new System.Drawing.Point(763, 168); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem11.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem11.Size = new System.Drawing.Size(382, 28); this.layoutControlItem11.Text = "鍏抽棴鐘舵��"; this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem31 // this.layoutControlItem31.Control = this.txt_versionNo; - this.layoutControlItem31.Location = new System.Drawing.Point(0, 191); + this.layoutControlItem31.Location = new System.Drawing.Point(0, 168); this.layoutControlItem31.Name = "layoutControlItem31"; this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem31.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem31.Size = new System.Drawing.Size(381, 28); this.layoutControlItem31.Text = "鐗堟湰鍙�"; this.layoutControlItem31.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem32 // this.layoutControlItem32.Control = this.txt_changerId; - this.layoutControlItem32.Location = new System.Drawing.Point(1161, 191); + this.layoutControlItem32.Location = new System.Drawing.Point(1145, 168); this.layoutControlItem32.Name = "layoutControlItem32"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem32.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem32.Size = new System.Drawing.Size(382, 28); this.layoutControlItem32.Text = "鍙樻洿浜哄憳"; this.layoutControlItem32.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem28 // this.layoutControlItem28.Control = this.txt_changeDate; - this.layoutControlItem28.Location = new System.Drawing.Point(1161, 223); + this.layoutControlItem28.Location = new System.Drawing.Point(1145, 196); this.layoutControlItem28.Name = "layoutControlItem28"; this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7; - this.layoutControlItem28.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem28.Size = new System.Drawing.Size(382, 28); this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡"; this.layoutControlItem28.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_changeReason; - this.layoutControlItem14.Location = new System.Drawing.Point(1161, 255); + this.layoutControlItem14.Location = new System.Drawing.Point(1145, 224); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8; - this.layoutControlItem14.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem14.Size = new System.Drawing.Size(382, 28); this.layoutControlItem14.Text = "鍙樻洿鍘熷洜"; this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_note; - this.layoutControlItem15.Location = new System.Drawing.Point(0, 223); + this.layoutControlItem15.Location = new System.Drawing.Point(0, 196); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7; - this.layoutControlItem15.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem15.Size = new System.Drawing.Size(381, 28); this.layoutControlItem15.Text = "鍗曟嵁澶囨敞"; this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem17 // this.layoutControlItem17.Control = this.txt_approverId; - this.layoutControlItem17.Location = new System.Drawing.Point(387, 63); + this.layoutControlItem17.Location = new System.Drawing.Point(381, 56); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem17.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem17.Size = new System.Drawing.Size(382, 28); this.layoutControlItem17.Text = "瀹℃牳浜哄憳"; this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_approveDate; - this.layoutControlItem25.Location = new System.Drawing.Point(387, 95); + this.layoutControlItem25.Location = new System.Drawing.Point(381, 84); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem25.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem25.Size = new System.Drawing.Size(382, 28); this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡"; this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem21 // this.layoutControlItem21.Control = this.txt_creatorId; - this.layoutControlItem21.Location = new System.Drawing.Point(387, 127); + this.layoutControlItem21.Location = new System.Drawing.Point(381, 112); this.layoutControlItem21.Name = "layoutControlItem21"; this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem21.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem21.Size = new System.Drawing.Size(382, 28); this.layoutControlItem21.Text = "鍒涘缓浜哄憳"; this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem22 // this.layoutControlItem22.Control = this.txt_createDate; - this.layoutControlItem22.Location = new System.Drawing.Point(387, 159); + this.layoutControlItem22.Location = new System.Drawing.Point(381, 140); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem22.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem22.Size = new System.Drawing.Size(382, 28); this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡"; this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem30 // this.layoutControlItem30.Control = this.txt_cancellerId; - this.layoutControlItem30.Location = new System.Drawing.Point(387, 191); + this.layoutControlItem30.Location = new System.Drawing.Point(381, 168); this.layoutControlItem30.Name = "layoutControlItem30"; this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem30.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem30.Size = new System.Drawing.Size(382, 28); this.layoutControlItem30.Text = "浣滃簾浜哄憳"; this.layoutControlItem30.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem29 // this.layoutControlItem29.Control = this.txt_cancelStatusTxt; - this.layoutControlItem29.Location = new System.Drawing.Point(387, 223); + this.layoutControlItem29.Location = new System.Drawing.Point(381, 196); this.layoutControlItem29.Name = "layoutControlItem29"; this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7; - this.layoutControlItem29.Size = new System.Drawing.Size(387, 32); + this.layoutControlItem29.Size = new System.Drawing.Size(382, 28); this.layoutControlItem29.Text = "浣滃簾鐘舵��"; this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18); // @@ -1957,7 +1957,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(1568, 251); + this.tabMx.Size = new System.Drawing.Size(1568, 291); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -1966,7 +1966,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1566, 219); + this.tabMxPage1.Size = new System.Drawing.Size(1566, 259); this.tabMxPage1.Text = "閿�鍞槑缁�"; // // gcMx1 @@ -1975,7 +1975,7 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; - this.gcMx1.Size = new System.Drawing.Size(1566, 219); + this.gcMx1.Size = new System.Drawing.Size(1566, 259); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs index 55848c3..d3612b5 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs @@ -39,6 +39,16 @@ 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.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition9 = 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(); @@ -49,16 +59,6 @@ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -135,6 +135,36 @@ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); + this.layout99 = new DevExpress.XtraLayout.LayoutControl(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); + this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); + this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); + this.radOut = new DevExpress.XtraEditors.RadioGroup(); + this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); + this.txtWlid = new DevExpress.XtraEditors.TextEdit(); + this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); + this.txtWlmc = new DevExpress.XtraEditors.TextEdit(); + this.txtWlgg = new DevExpress.XtraEditors.TextEdit(); + this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); + this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); + this.txt_yQty = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -164,23 +194,11 @@ this.gvMx1isFree = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1returnType = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); - this.gvMx1inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); - this.radOut = new DevExpress.XtraEditors.RadioGroup(); - this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); - this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); - this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); - this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); - this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); - this.txt_yQty = new DevExpress.XtraEditors.TextEdit(); - this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); - this.txtWlgg = new DevExpress.XtraEditors.TextEdit(); - this.txtWlmc = new DevExpress.XtraEditors.TextEdit(); - this.txtWlid = new DevExpress.XtraEditors.TextEdit(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -198,28 +216,9 @@ this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); - this.layout99 = new DevExpress.XtraLayout.LayoutControl(); - this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); - this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -282,28 +281,6 @@ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); 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.gridView2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit(); - this.tabMxPage2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit(); this.split99.Panel1.SuspendLayout(); @@ -312,6 +289,22 @@ this.split99.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit(); this.layout99.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); @@ -320,16 +313,22 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); - this.layoutControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); + this.tabMxPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -343,7 +342,7 @@ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; - this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(1276, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; @@ -354,7 +353,7 @@ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602); + this.xtraTabControl1.Size = new System.Drawing.Size(1276, 602); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, @@ -364,7 +363,7 @@ // this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(1274, 570); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -385,7 +384,7 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1126, 570); + this.split1.Size = new System.Drawing.Size(1274, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; // @@ -395,7 +394,7 @@ this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; - this.gcMain1.Size = new System.Drawing.Size(1126, 519); + this.gcMain1.Size = new System.Drawing.Size(1274, 519); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -688,7 +687,7 @@ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(1126, 39); + this.pageBar1.Size = new System.Drawing.Size(1274, 39); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // @@ -696,7 +695,7 @@ // this.xtraTabPage2.Controls.Add(this.splitMx1); this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage2.Size = new System.Drawing.Size(1274, 570); this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; // // splitMx1 @@ -716,8 +715,8 @@ this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 188; + this.splitMx1.Size = new System.Drawing.Size(1274, 570); + this.splitMx1.SplitterPosition = 184; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -749,33 +748,33 @@ this.layoutControlItem1}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(834, 92, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(703, 289, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 188); + this.layoutMx1.Size = new System.Drawing.Size(1274, 184); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_fIsLink // this.txt_fIsLink.EditValue = "1"; - this.txt_fIsLink.Location = new System.Drawing.Point(84, 48); + this.txt_fIsLink.Location = new System.Drawing.Point(84, 42); this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0); this.txt_fIsLink.Name = "txt_fIsLink"; this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"), new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)}); this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0); - this.txt_fIsLink.Size = new System.Drawing.Size(195, 32); + this.txt_fIsLink.Size = new System.Drawing.Size(237, 33); this.txt_fIsLink.StyleController = this.layoutMx1; this.txt_fIsLink.TabIndex = 534; // // txt_fstockid // this.txt_fstockid.IsReadly = false; - this.txt_fstockid.Location = new System.Drawing.Point(84, 120); + this.txt_fstockid.Location = new System.Drawing.Point(84, 110); this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0); this.txt_fstockid.Name = "txt_fstockid"; - this.txt_fstockid.Size = new System.Drawing.Size(195, 24); + this.txt_fstockid.Size = new System.Drawing.Size(237, 24); this.txt_fstockid.TabIndex = 454; // // lbGuid @@ -788,20 +787,20 @@ // // txt_wjStatus // - this.txt_wjStatus.Location = new System.Drawing.Point(554, 156); + this.txt_wjStatus.Location = new System.Drawing.Point(638, 143); this.txt_wjStatus.Name = "txt_wjStatus"; this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑"; - this.txt_wjStatus.Size = new System.Drawing.Size(267, 24); + this.txt_wjStatus.Size = new System.Drawing.Size(309, 24); this.txt_wjStatus.StyleController = this.layoutMx1; this.txt_wjStatus.TabIndex = 453; this.txt_wjStatus.Tag = "readonly"; // // txt_chkStatus // - this.txt_chkStatus.Location = new System.Drawing.Point(825, 156); + this.txt_chkStatus.Location = new System.Drawing.Point(951, 143); this.txt_chkStatus.Name = "txt_chkStatus"; this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_chkStatus.Size = new System.Drawing.Size(268, 24); + this.txt_chkStatus.Size = new System.Drawing.Size(311, 24); this.txt_chkStatus.StyleController = this.layoutMx1; this.txt_chkStatus.TabIndex = 452; this.txt_chkStatus.Tag = "readonly"; @@ -809,31 +808,31 @@ // txt_billType // this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"; - this.txt_billType.Location = new System.Drawing.Point(355, 120); + this.txt_billType.Location = new System.Drawing.Point(397, 110); this.txt_billType.Name = "txt_billType"; this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_billType.Properties.Items.AddRange(new object[] { "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"}); this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_billType.Size = new System.Drawing.Size(195, 24); + this.txt_billType.Size = new System.Drawing.Size(237, 24); this.txt_billType.StyleController = this.layoutMx1; this.txt_billType.TabIndex = 451; // // txt_salesOrderId // this.txt_salesOrderId.IsReadly = false; - this.txt_salesOrderId.Location = new System.Drawing.Point(84, 84); + this.txt_salesOrderId.Location = new System.Drawing.Point(84, 77); this.txt_salesOrderId.Name = "txt_salesOrderId"; - this.txt_salesOrderId.Size = new System.Drawing.Size(195, 24); + this.txt_salesOrderId.Size = new System.Drawing.Size(237, 24); this.txt_salesOrderId.TabIndex = 0; // // txt_approvedDate // - this.txt_approvedDate.Location = new System.Drawing.Point(897, 120); + this.txt_approvedDate.Location = new System.Drawing.Point(1023, 110); this.txt_approvedDate.Name = "txt_approvedDate"; this.txt_approvedDate.Properties.Appearance.Options.UseFont = true; - this.txt_approvedDate.Size = new System.Drawing.Size(196, 24); + this.txt_approvedDate.Size = new System.Drawing.Size(239, 24); this.txt_approvedDate.StyleController = this.layoutMx1; this.txt_approvedDate.TabIndex = 378; this.txt_approvedDate.Tag = "readonly"; @@ -850,40 +849,40 @@ // // txt_approvedBy // - this.txt_approvedBy.Location = new System.Drawing.Point(897, 84); + this.txt_approvedBy.Location = new System.Drawing.Point(1023, 77); this.txt_approvedBy.Name = "txt_approvedBy"; this.txt_approvedBy.Properties.Appearance.Options.UseFont = true; - this.txt_approvedBy.Size = new System.Drawing.Size(196, 24); + this.txt_approvedBy.Size = new System.Drawing.Size(239, 24); this.txt_approvedBy.StyleController = this.layoutMx1; this.txt_approvedBy.TabIndex = 370; this.txt_approvedBy.Tag = "readonly"; // // txt_xsOrgName // - this.txt_xsOrgName.Location = new System.Drawing.Point(355, 12); + this.txt_xsOrgName.Location = new System.Drawing.Point(397, 12); this.txt_xsOrgName.Name = "txt_xsOrgName"; this.txt_xsOrgName.Properties.Appearance.Options.UseFont = true; - this.txt_xsOrgName.Size = new System.Drawing.Size(195, 24); + this.txt_xsOrgName.Size = new System.Drawing.Size(237, 24); this.txt_xsOrgName.StyleController = this.layoutMx1; this.txt_xsOrgName.TabIndex = 219; this.txt_xsOrgName.Tag = "readonly"; // // txt_inventoryOrg // - this.txt_inventoryOrg.Location = new System.Drawing.Point(626, 12); + this.txt_inventoryOrg.Location = new System.Drawing.Point(710, 12); this.txt_inventoryOrg.Name = "txt_inventoryOrg"; this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true; - this.txt_inventoryOrg.Size = new System.Drawing.Size(195, 24); + this.txt_inventoryOrg.Size = new System.Drawing.Size(237, 24); this.txt_inventoryOrg.StyleController = this.layoutMx1; this.txt_inventoryOrg.TabIndex = 243; this.txt_inventoryOrg.Tag = "readonly"; // // txt_modifiedDate // - this.txt_modifiedDate.Location = new System.Drawing.Point(897, 48); + this.txt_modifiedDate.Location = new System.Drawing.Point(1023, 44); this.txt_modifiedDate.Name = "txt_modifiedDate"; this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true; - this.txt_modifiedDate.Size = new System.Drawing.Size(196, 24); + this.txt_modifiedDate.Size = new System.Drawing.Size(239, 24); this.txt_modifiedDate.StyleController = this.layoutMx1; this.txt_modifiedDate.TabIndex = 336; this.txt_modifiedDate.Tag = "readonly"; @@ -893,76 +892,76 @@ this.txt_billNo.Location = new System.Drawing.Point(84, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(195, 24); + this.txt_billNo.Size = new System.Drawing.Size(237, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 213; this.txt_billNo.Tag = "readonly"; // // txt_salerName // - this.txt_salerName.Location = new System.Drawing.Point(355, 48); + this.txt_salerName.Location = new System.Drawing.Point(397, 44); this.txt_salerName.Name = "txt_salerName"; this.txt_salerName.Properties.Appearance.Options.UseFont = true; - this.txt_salerName.Size = new System.Drawing.Size(195, 24); + this.txt_salerName.Size = new System.Drawing.Size(237, 24); this.txt_salerName.StyleController = this.layoutMx1; this.txt_salerName.TabIndex = 267; this.txt_salerName.Tag = "readonly"; // // txt_modifiedBy // - this.txt_modifiedBy.Location = new System.Drawing.Point(897, 12); + this.txt_modifiedBy.Location = new System.Drawing.Point(1023, 12); this.txt_modifiedBy.Name = "txt_modifiedBy"; this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true; - this.txt_modifiedBy.Size = new System.Drawing.Size(196, 24); + this.txt_modifiedBy.Size = new System.Drawing.Size(239, 24); this.txt_modifiedBy.StyleController = this.layoutMx1; this.txt_modifiedBy.TabIndex = 327; this.txt_modifiedBy.Tag = "readonly"; // // txt_saleDeptName // - this.txt_saleDeptName.Location = new System.Drawing.Point(355, 84); + this.txt_saleDeptName.Location = new System.Drawing.Point(397, 77); this.txt_saleDeptName.Name = "txt_saleDeptName"; this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true; - this.txt_saleDeptName.Size = new System.Drawing.Size(195, 24); + this.txt_saleDeptName.Size = new System.Drawing.Size(237, 24); this.txt_saleDeptName.StyleController = this.layoutMx1; this.txt_saleDeptName.TabIndex = 222; this.txt_saleDeptName.Tag = "readonly"; // // txt_custName // - this.txt_custName.Location = new System.Drawing.Point(626, 48); + this.txt_custName.Location = new System.Drawing.Point(710, 44); this.txt_custName.Name = "txt_custName"; this.txt_custName.Properties.Appearance.Options.UseFont = true; - this.txt_custName.Size = new System.Drawing.Size(195, 24); + this.txt_custName.Size = new System.Drawing.Size(237, 24); this.txt_custName.StyleController = this.layoutMx1; this.txt_custName.TabIndex = 252; this.txt_custName.Tag = "readonly"; // // txt_createdDate // - this.txt_createdDate.Location = new System.Drawing.Point(626, 120); + this.txt_createdDate.Location = new System.Drawing.Point(710, 110); this.txt_createdDate.Name = "txt_createdDate"; this.txt_createdDate.Properties.Appearance.Options.UseFont = true; - this.txt_createdDate.Size = new System.Drawing.Size(195, 24); + this.txt_createdDate.Size = new System.Drawing.Size(237, 24); this.txt_createdDate.StyleController = this.layoutMx1; this.txt_createdDate.TabIndex = 319; this.txt_createdDate.Tag = "readonly"; // // txt_returnReason // - this.txt_returnReason.Location = new System.Drawing.Point(84, 156); + this.txt_returnReason.Location = new System.Drawing.Point(84, 143); this.txt_returnReason.Name = "txt_returnReason"; this.txt_returnReason.Properties.Appearance.Options.UseFont = true; - this.txt_returnReason.Size = new System.Drawing.Size(466, 24); + this.txt_returnReason.Size = new System.Drawing.Size(550, 24); this.txt_returnReason.StyleController = this.layoutMx1; this.txt_returnReason.TabIndex = 235; // // txt_createdBy // - this.txt_createdBy.Location = new System.Drawing.Point(626, 84); + this.txt_createdBy.Location = new System.Drawing.Point(710, 77); this.txt_createdBy.Name = "txt_createdBy"; this.txt_createdBy.Properties.Appearance.Options.UseFont = true; - this.txt_createdBy.Size = new System.Drawing.Size(195, 24); + this.txt_createdBy.Size = new System.Drawing.Size(237, 24); this.txt_createdBy.StyleController = this.layoutMx1; this.txt_createdBy.TabIndex = 312; this.txt_createdBy.Tag = "readonly"; @@ -1043,146 +1042,146 @@ rowDefinition3, rowDefinition4, rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1105, 200); + this.Root.Size = new System.Drawing.Size(1274, 184); this.Root.TextVisible = false; // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_xsOrgName; - this.layoutControlItem2.Location = new System.Drawing.Point(271, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(313, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem2.Size = new System.Drawing.Size(313, 32); this.layoutControlItem2.Text = "閿�鍞粍缁�"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_inventoryOrg; - this.layoutControlItem3.Location = new System.Drawing.Point(542, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(626, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem3.Size = new System.Drawing.Size(313, 32); this.layoutControlItem3.Text = "搴撳瓨缁勭粐"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_salerName; - this.layoutControlItem6.Location = new System.Drawing.Point(271, 36); + this.layoutControlItem6.Location = new System.Drawing.Point(313, 32); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(271, 36); - this.layoutControlItem6.Text = "閿�鍞憳"; + this.layoutControlItem6.Size = new System.Drawing.Size(313, 33); + this.layoutControlItem6.Text = "閿�鍞憳鍚�"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_saleDeptName; - this.layoutControlItem7.Location = new System.Drawing.Point(271, 72); + this.layoutControlItem7.Location = new System.Drawing.Point(313, 65); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem7.Size = new System.Drawing.Size(313, 33); this.layoutControlItem7.Text = "閿�鍞儴闂�"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_custName; - this.layoutControlItem8.Location = new System.Drawing.Point(542, 36); + this.layoutControlItem8.Location = new System.Drawing.Point(626, 32); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem8.Size = new System.Drawing.Size(313, 33); this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_billType; - this.layoutControlItem10.Location = new System.Drawing.Point(271, 108); + this.layoutControlItem10.Location = new System.Drawing.Point(313, 98); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem10.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem10.Size = new System.Drawing.Size(313, 33); this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷"; this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_createdBy; - this.layoutControlItem11.Location = new System.Drawing.Point(542, 72); + this.layoutControlItem11.Location = new System.Drawing.Point(626, 65); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(271, 36); - this.layoutControlItem11.Text = "鍒涘缓浜�"; + this.layoutControlItem11.Size = new System.Drawing.Size(313, 33); + this.layoutControlItem11.Text = "鍒涘缓浜哄憳"; this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_createdDate; - this.layoutControlItem12.Location = new System.Drawing.Point(542, 108); + this.layoutControlItem12.Location = new System.Drawing.Point(626, 98); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem12.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem12.Size = new System.Drawing.Size(313, 33); this.layoutControlItem12.Text = "鍒涘缓鏃堕棿"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_modifiedBy; - this.layoutControlItem13.Location = new System.Drawing.Point(813, 0); + this.layoutControlItem13.Location = new System.Drawing.Point(939, 0); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(272, 36); - this.layoutControlItem13.Text = "淇敼浜�"; + this.layoutControlItem13.Size = new System.Drawing.Size(315, 32); + this.layoutControlItem13.Text = "淇敼浜哄憳"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_modifiedDate; - this.layoutControlItem14.Location = new System.Drawing.Point(813, 36); + this.layoutControlItem14.Location = new System.Drawing.Point(939, 32); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem14.Size = new System.Drawing.Size(272, 36); + this.layoutControlItem14.Size = new System.Drawing.Size(315, 33); this.layoutControlItem14.Text = "淇敼鏃堕棿"; this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_approvedBy; - this.layoutControlItem15.Location = new System.Drawing.Point(813, 72); + this.layoutControlItem15.Location = new System.Drawing.Point(939, 65); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem15.Size = new System.Drawing.Size(272, 36); - this.layoutControlItem15.Text = "瀹℃牳浜�"; + this.layoutControlItem15.Size = new System.Drawing.Size(315, 33); + this.layoutControlItem15.Text = "瀹℃牳浜哄憳"; this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_approvedDate; - this.layoutControlItem16.Location = new System.Drawing.Point(813, 108); + this.layoutControlItem16.Location = new System.Drawing.Point(939, 98); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(272, 36); + this.layoutControlItem16.Size = new System.Drawing.Size(315, 33); this.layoutControlItem16.Text = "瀹℃牳鏃堕棿"; this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem17 // this.layoutControlItem17.Control = this.txt_chkStatus; - this.layoutControlItem17.Location = new System.Drawing.Point(813, 144); + this.layoutControlItem17.Location = new System.Drawing.Point(939, 131); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(272, 36); + this.layoutControlItem17.Size = new System.Drawing.Size(315, 33); this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem17.TextVisible = false; @@ -1190,11 +1189,11 @@ // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_wjStatus; - this.layoutControlItem18.Location = new System.Drawing.Point(542, 144); + this.layoutControlItem18.Location = new System.Drawing.Point(626, 131); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem18.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem18.Size = new System.Drawing.Size(313, 33); this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑"; this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem18.TextVisible = false; @@ -1204,7 +1203,7 @@ this.layoutControlItem4.Control = this.txt_billNo; this.layoutControlItem4.Location = new System.Drawing.Point(0, 0); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem4.Size = new System.Drawing.Size(313, 32); this.layoutControlItem4.Text = "鐢宠鍗曞彿"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // @@ -1212,41 +1211,42 @@ // this.layoutControlItem9.Control = this.txt_returnReason; this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜"; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 144); + this.layoutControlItem9.Location = new System.Drawing.Point(0, 131); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem9.Size = new System.Drawing.Size(542, 36); + this.layoutControlItem9.Size = new System.Drawing.Size(626, 33); this.layoutControlItem9.Text = "鐢宠鍘熷洜"; this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem20 // this.layoutControlItem20.Control = this.txt_fstockid; - this.layoutControlItem20.Location = new System.Drawing.Point(0, 108); + this.layoutControlItem20.Location = new System.Drawing.Point(0, 98); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem20.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem20.Size = new System.Drawing.Size(313, 33); this.layoutControlItem20.Text = "閫夋嫨浠撳簱"; this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_salesOrderId; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem5.Location = new System.Drawing.Point(0, 65); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem5.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem5.Size = new System.Drawing.Size(313, 33); this.layoutControlItem5.Text = "閿�鍞鍗�"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem21 // this.layoutControlItem21.Control = this.txt_fIsLink; - this.layoutControlItem21.Location = new System.Drawing.Point(0, 36); + this.layoutControlItem21.Location = new System.Drawing.Point(0, 32); this.layoutControlItem21.Name = "layoutControlItem21"; this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem21.Size = new System.Drawing.Size(271, 36); + this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0); + this.layoutControlItem21.Size = new System.Drawing.Size(313, 33); this.layoutControlItem21.Text = "鏈夋棤婧愬崟"; this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18); // @@ -1256,7 +1256,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, 370); + this.tabMx.Size = new System.Drawing.Size(1274, 374); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -1266,8 +1266,401 @@ // this.tabMxPage1.Controls.Add(this.split99); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 338); + this.tabMxPage1.Size = new System.Drawing.Size(1272, 342); this.tabMxPage1.Text = "鐢宠鏄庣粏"; + // + // split99 + // + this.split99.Dock = System.Windows.Forms.DockStyle.Fill; + this.split99.Horizontal = false; + this.split99.Location = new System.Drawing.Point(0, 0); + this.split99.Name = "split99"; + // + // split99.Panel1 + // + this.split99.Panel1.Controls.Add(this.layout99); + this.split99.Panel1.Text = "Panel1"; + // + // split99.Panel2 + // + this.split99.Panel2.Controls.Add(this.gcMx1); + this.split99.Panel2.Text = "Panel2"; + this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.split99.Size = new System.Drawing.Size(1272, 342); + this.split99.SplitterPosition = 137; + this.split99.TabIndex = 4; + // + // layout99 + // + this.layout99.Controls.Add(this.layoutControl1); + this.layout99.Controls.Add(this.ucBtnPrint1); + this.layout99.Controls.Add(this.radOut); + this.layout99.Controls.Add(this.lbMxGuid); + this.layout99.Controls.Add(this.txtWlid); + this.layout99.Controls.Add(this.txt_psnQty_1); + this.layout99.Controls.Add(this.txtWlmc); + this.layout99.Controls.Add(this.txtWlgg); + this.layout99.Controls.Add(this.txt_kQty); + this.layout99.Controls.Add(this.txtQuantity); + this.layout99.Controls.Add(this.txt_yQty); + this.layout99.Dock = System.Windows.Forms.DockStyle.Fill; + this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem29}); + this.layout99.Location = new System.Drawing.Point(0, 0); + this.layout99.Name = "layout99"; + this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(46, 297, 812, 500); + this.layout99.Root = this.layoutControlGroup1; + this.layout99.Size = new System.Drawing.Size(1272, 137); + this.layout99.TabIndex = 0; + this.layout99.Text = "layoutControl1"; + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.txt_iCount_1); + this.layoutControl1.Controls.Add(this.txt_yuliang_1); + this.layoutControl1.Location = new System.Drawing.Point(692, 76); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.layoutControlGroup2; + this.layoutControl1.Size = new System.Drawing.Size(336, 28); + this.layoutControl1.TabIndex = 477; + this.layoutControl1.Text = "layoutControl1"; + // + // txt_iCount_1 + // + this.txt_iCount_1.Location = new System.Drawing.Point(104, 2); + this.txt_iCount_1.Name = "txt_iCount_1"; + this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; + this.txt_iCount_1.Properties.ReadOnly = true; + this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); + this.txt_iCount_1.StyleController = this.layoutControl1; + this.txt_iCount_1.TabIndex = 228; + // + // txt_yuliang_1 + // + this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); + this.txt_yuliang_1.Name = "txt_yuliang_1"; + this.txt_yuliang_1.Properties.ReadOnly = true; + this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); + this.txt_yuliang_1.StyleController = this.layoutControl1; + this.txt_yuliang_1.TabIndex = 229; + // + // layoutControlGroup2 + // + this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup2.GroupBordersVisible = false; + this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem33, + this.layoutControlItem34}); + this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.layoutControlGroup2.Name = "layoutControlGroup2"; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition5, + columnDefinition6}); + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition6}); + this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28); + this.layoutControlGroup2.TextVisible = false; + // + // layoutControlItem33 + // + this.layoutControlItem33.Control = this.txt_iCount_1; + this.layoutControlItem33.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem33.Name = "layoutControlItem33"; + this.layoutControlItem33.Size = new System.Drawing.Size(168, 28); + this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��"; + this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem34 + // + this.layoutControlItem34.Control = this.txt_yuliang_1; + this.layoutControlItem34.Location = new System.Drawing.Point(168, 0); + this.layoutControlItem34.Name = "layoutControlItem34"; + this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem34.Size = new System.Drawing.Size(168, 28); + this.layoutControlItem34.Text = "鎵撳嵃浣欐暟"; + this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18); + // + // ucBtnPrint1 + // + this.ucBtnPrint1.guidKey = null; + this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42); + this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); + this.ucBtnPrint1.Name = "ucBtnPrint1"; + this.ucBtnPrint1.rptParameter = null; + this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32); + this.ucBtnPrint1.TabIndex = 230; + // + // radOut + // + this.radOut.Location = new System.Drawing.Point(1033, 10); + this.radOut.Margin = new System.Windows.Forms.Padding(0); + this.radOut.Name = "radOut"; + this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; + this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")}); + this.radOut.Size = new System.Drawing.Size(227, 28); + this.radOut.StyleController = this.layout99; + this.radOut.TabIndex = 476; + // + // lbMxGuid + // + this.lbMxGuid.Location = new System.Drawing.Point(755, 76); + this.lbMxGuid.Name = "lbMxGuid"; + this.lbMxGuid.Size = new System.Drawing.Size(58, 18); + this.lbMxGuid.StyleController = this.layout99; + this.lbMxGuid.TabIndex = 229; + this.lbMxGuid.Text = "lbMxGuid"; + this.lbMxGuid.Visible = false; + // + // txtWlid + // + this.txtWlid.Location = new System.Drawing.Point(114, 12); + this.txtWlid.Name = "txtWlid"; + this.txtWlid.Properties.Appearance.Options.UseFont = true; + this.txtWlid.Properties.ReadOnly = true; + this.txtWlid.Size = new System.Drawing.Size(234, 24); + this.txtWlid.StyleController = this.layout99; + this.txtWlid.TabIndex = 214; + // + // txt_psnQty_1 + // + this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44); + this.txt_psnQty_1.Name = "txt_psnQty_1"; + this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; + this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); + this.txt_psnQty_1.StyleController = this.layout99; + this.txt_psnQty_1.TabIndex = 226; + // + // txtWlmc + // + this.txtWlmc.Location = new System.Drawing.Point(114, 44); + this.txtWlmc.Name = "txtWlmc"; + this.txtWlmc.Properties.Appearance.Options.UseFont = true; + this.txtWlmc.Properties.ReadOnly = true; + this.txtWlmc.Size = new System.Drawing.Size(234, 24); + this.txtWlmc.StyleController = this.layout99; + this.txtWlmc.TabIndex = 216; + // + // txtWlgg + // + this.txtWlgg.Location = new System.Drawing.Point(114, 76); + this.txtWlgg.Name = "txtWlgg"; + this.txtWlgg.Properties.Appearance.Options.UseFont = true; + this.txtWlgg.Properties.ReadOnly = true; + this.txtWlgg.Size = new System.Drawing.Size(574, 24); + this.txtWlgg.StyleController = this.layout99; + this.txtWlgg.TabIndex = 218; + // + // txt_kQty + // + this.txt_kQty.Location = new System.Drawing.Point(794, 12); + this.txt_kQty.Name = "txt_kQty"; + this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; + this.txt_kQty.Properties.Appearance.Options.UseFont = true; + this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; + this.txt_kQty.Properties.ReadOnly = true; + this.txt_kQty.Size = new System.Drawing.Size(234, 24); + this.txt_kQty.StyleController = this.layout99; + this.txt_kQty.TabIndex = 224; + // + // txtQuantity + // + this.txtQuantity.Location = new System.Drawing.Point(454, 12); + this.txtQuantity.Name = "txtQuantity"; + this.txtQuantity.Properties.Appearance.Options.UseFont = true; + this.txtQuantity.Properties.ReadOnly = true; + this.txtQuantity.Size = new System.Drawing.Size(234, 24); + this.txtQuantity.StyleController = this.layout99; + this.txtQuantity.TabIndex = 220; + // + // txt_yQty + // + this.txt_yQty.Location = new System.Drawing.Point(454, 44); + this.txt_yQty.Name = "txt_yQty"; + this.txt_yQty.Properties.Appearance.Options.UseFont = true; + this.txt_yQty.Properties.ReadOnly = true; + this.txt_yQty.Size = new System.Drawing.Size(234, 24); + this.txt_yQty.StyleController = this.layout99; + this.txt_yQty.TabIndex = 222; + // + // layoutControlItem29 + // + this.layoutControlItem29.Control = this.lbMxGuid; + this.layoutControlItem29.Location = new System.Drawing.Point(1020, 64); + this.layoutControlItem29.Name = "layoutControlItem29"; + this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem29.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem29.Text = "lbMxGuid"; + this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem29.TextVisible = false; + // + // layoutControlGroup1 + // + this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup1.GroupBordersVisible = false; + this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem22, + this.layoutControlItem23, + this.layoutControlItem24, + this.layoutControlItem25, + this.layoutControlItem26, + this.layoutControlItem27, + this.layoutControlItem28, + this.layoutControlItem30, + this.layoutControlItem31, + this.layoutControlItem32}); + this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.layoutControlGroup1.Name = "Root"; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; + columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition9.Width = 100D; + columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition10.Width = 100D; + this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition7, + columnDefinition8, + columnDefinition9, + columnDefinition10}); + rowDefinition7.Height = 100D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition8.Height = 100D; + rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition9.Height = 100D; + rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition7, + rowDefinition8, + rowDefinition9}); + this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116); + this.layoutControlGroup1.TextVisible = false; + // + // layoutControlItem22 + // + this.layoutControlItem22.Control = this.txtWlid; + this.layoutControlItem22.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem22.Name = "layoutControlItem22"; + this.layoutControlItem22.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem22.Text = "鐗╂枡缂栫爜"; + this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem23 + // + this.layoutControlItem23.Control = this.txtWlmc; + this.layoutControlItem23.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem23.Name = "layoutControlItem23"; + this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem23.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem23.Text = "鐗╂枡鍚嶇О"; + this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem24 + // + this.layoutControlItem24.Control = this.txtWlgg; + this.layoutControlItem24.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem24.Name = "layoutControlItem24"; + this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem24.Size = new System.Drawing.Size(680, 32); + this.layoutControlItem24.Text = "鐗╂枡瑙勬牸"; + this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem25 + // + this.layoutControlItem25.Control = this.txtQuantity; + this.layoutControlItem25.Location = new System.Drawing.Point(340, 0); + this.layoutControlItem25.Name = "layoutControlItem25"; + this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem25.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺"; + this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem26 + // + this.layoutControlItem26.Control = this.txt_yQty; + this.layoutControlItem26.Location = new System.Drawing.Point(340, 32); + this.layoutControlItem26.Name = "layoutControlItem26"; + this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem26.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺"; + this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem27 + // + this.layoutControlItem27.Control = this.txt_kQty; + this.layoutControlItem27.Location = new System.Drawing.Point(680, 0); + this.layoutControlItem27.Name = "layoutControlItem27"; + this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem27.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem27.Text = "鍙墦鍗版�绘暟"; + this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem28 + // + this.layoutControlItem28.Control = this.txt_psnQty_1; + this.layoutControlItem28.Location = new System.Drawing.Point(680, 32); + this.layoutControlItem28.Name = "layoutControlItem28"; + this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem28.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem28.Text = "姣忓紶鏉$爜鏁伴噺"; + this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem30 + // + this.layoutControlItem30.Control = this.radOut; + this.layoutControlItem30.Location = new System.Drawing.Point(1020, 0); + this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28); + this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28); + this.layoutControlItem30.Name = "layoutControlItem30"; + this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); + this.layoutControlItem30.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem30.Text = "鑷姩璁$畻"; + this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem30.TextVisible = false; + // + // layoutControlItem31 + // + this.layoutControlItem31.Control = this.ucBtnPrint1; + this.layoutControlItem31.Location = new System.Drawing.Point(1020, 32); + this.layoutControlItem31.MaxSize = new System.Drawing.Size(338, 32); + this.layoutControlItem31.MinSize = new System.Drawing.Size(338, 32); + this.layoutControlItem31.Name = "layoutControlItem31"; + this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem31.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); + this.layoutControlItem31.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳"; + this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem31.TextVisible = false; + // + // layoutControlItem32 + // + this.layoutControlItem32.Control = this.layoutControl1; + this.layoutControlItem32.Location = new System.Drawing.Point(680, 64); + this.layoutControlItem32.Name = "layoutControlItem32"; + this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem32.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem32.Text = "鎵撳嵃鏁伴噺"; + this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem32.TextVisible = false; // // gcMx1 // @@ -1280,7 +1673,7 @@ this.repositoryItemButtonEdit1, this.repositoryItemComboBox1, this.repositoryItemDateEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 220); + this.gcMx1.Size = new System.Drawing.Size(1272, 193); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1303,7 +1696,6 @@ this.gvMx1returnDate, this.gvMx1isFree, this.gvMx1returnType, - this.gvMx1inventoryUnit, this.gridColumn12, this.gridColumn21, this.gridColumn22, @@ -1483,7 +1875,7 @@ // this.gvMx1salesUnitId.AppearanceCell.Options.UseFont = true; this.gvMx1salesUnitId.Caption = "閿�鍞崟浣� "; - this.gvMx1salesUnitId.FieldName = "salesUnitId"; + this.gvMx1salesUnitId.FieldName = "xxDw"; this.gvMx1salesUnitId.MinWidth = 50; this.gvMx1salesUnitId.Name = "gvMx1salesUnitId"; this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID"; @@ -1510,7 +1902,7 @@ this.gridColumn32.MinWidth = 25; this.gridColumn32.Name = "gridColumn32"; this.gridColumn32.Visible = true; - this.gridColumn32.VisibleIndex = 15; + this.gridColumn32.VisibleIndex = 13; this.gridColumn32.Width = 94; // // gvMx1note @@ -1526,7 +1918,7 @@ this.gvMx1note.Name = "gvMx1note"; this.gvMx1note.Tag = "edit"; this.gvMx1note.Visible = true; - this.gvMx1note.VisibleIndex = 6; + this.gvMx1note.VisibleIndex = 7; this.gvMx1note.Width = 94; // // gridColumn13 @@ -1541,7 +1933,7 @@ this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Tag = "yz_quantity_0_edit"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 7; + this.gridColumn13.VisibleIndex = 6; this.gridColumn13.Width = 94; // // gvMx1returnDate @@ -1558,7 +1950,7 @@ this.gvMx1returnDate.Name = "gvMx1returnDate"; this.gvMx1returnDate.Tag = "edit"; this.gvMx1returnDate.Visible = true; - this.gvMx1returnDate.VisibleIndex = 9; + this.gvMx1returnDate.VisibleIndex = 8; this.gvMx1returnDate.Width = 94; // // repositoryItemDateEdit1 @@ -1574,12 +1966,12 @@ // this.gvMx1isFree.AppearanceCell.Options.UseFont = true; this.gvMx1isFree.Caption = "鏄惁璧犲搧 "; - this.gvMx1isFree.FieldName = "isFree"; + this.gvMx1isFree.FieldName = "isFreeChk"; this.gvMx1isFree.MinWidth = 50; this.gvMx1isFree.Name = "gvMx1isFree"; this.gvMx1isFree.Tag = "query_a.IS_FREE"; this.gvMx1isFree.Visible = true; - this.gvMx1isFree.VisibleIndex = 8; + this.gvMx1isFree.VisibleIndex = 10; this.gvMx1isFree.Width = 94; // // gvMx1returnType @@ -1596,7 +1988,7 @@ this.gvMx1returnType.Name = "gvMx1returnType"; this.gvMx1returnType.Tag = "edit"; this.gvMx1returnType.Visible = true; - this.gvMx1returnType.VisibleIndex = 11; + this.gvMx1returnType.VisibleIndex = 9; this.gvMx1returnType.Width = 94; // // repositoryItemComboBox1 @@ -1611,18 +2003,6 @@ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1"; this.repositoryItemComboBox1.NullText = "璇烽�夋嫨"; this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - // - // gvMx1inventoryUnit - // - this.gvMx1inventoryUnit.AppearanceCell.Options.UseFont = true; - this.gvMx1inventoryUnit.Caption = "搴撳瓨鍗曚綅 "; - this.gvMx1inventoryUnit.FieldName = "inventoryUnit"; - this.gvMx1inventoryUnit.MinWidth = 50; - this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit"; - this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT"; - this.gvMx1inventoryUnit.Visible = true; - this.gvMx1inventoryUnit.VisibleIndex = 10; - this.gvMx1inventoryUnit.Width = 94; // // gridColumn12 // @@ -1639,7 +2019,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; - this.gridColumn21.VisibleIndex = 12; + this.gridColumn21.VisibleIndex = 11; this.gridColumn21.Width = 94; // // gridColumn22 @@ -1649,7 +2029,7 @@ this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; - this.gridColumn22.VisibleIndex = 13; + this.gridColumn22.VisibleIndex = 12; this.gridColumn22.Width = 94; // // gvMxDel @@ -1673,126 +2053,11 @@ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // - // radOut - // - this.radOut.Location = new System.Drawing.Point(756, -10); - this.radOut.Margin = new System.Windows.Forms.Padding(0); - this.radOut.Name = "radOut"; - this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; - this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"), - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"), - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")}); - this.radOut.Size = new System.Drawing.Size(227, 28); - this.radOut.StyleController = this.layout99; - this.radOut.TabIndex = 476; - // - // ucBtnPrint1 - // - this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(754, 22); - this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); - this.ucBtnPrint1.Name = "ucBtnPrint1"; - this.ucBtnPrint1.rptParameter = null; - this.ucBtnPrint1.Size = new System.Drawing.Size(180, 31); - this.ucBtnPrint1.TabIndex = 230; - // - // lbMxGuid - // - this.lbMxGuid.Location = new System.Drawing.Point(755, 76); - this.lbMxGuid.Name = "lbMxGuid"; - this.lbMxGuid.Size = new System.Drawing.Size(58, 18); - this.lbMxGuid.StyleController = this.layout99; - this.lbMxGuid.TabIndex = 229; - this.lbMxGuid.Text = "lbMxGuid"; - this.lbMxGuid.Visible = false; - // - // txt_iCount_1 - // - this.txt_iCount_1.Location = new System.Drawing.Point(104, 2); - this.txt_iCount_1.Name = "txt_iCount_1"; - this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; - this.txt_iCount_1.Properties.ReadOnly = true; - this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); - this.txt_iCount_1.StyleController = this.layoutControl1; - this.txt_iCount_1.TabIndex = 228; - // - // txt_psnQty_1 - // - this.txt_psnQty_1.Location = new System.Drawing.Point(517, 24); - this.txt_psnQty_1.Name = "txt_psnQty_1"; - this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; - this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); - this.txt_psnQty_1.StyleController = this.layout99; - this.txt_psnQty_1.TabIndex = 226; - // - // txt_kQty - // - this.txt_kQty.Location = new System.Drawing.Point(517, -8); - this.txt_kQty.Name = "txt_kQty"; - this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; - this.txt_kQty.Properties.Appearance.Options.UseFont = true; - this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; - this.txt_kQty.Properties.ReadOnly = true; - this.txt_kQty.Size = new System.Drawing.Size(234, 24); - this.txt_kQty.StyleController = this.layout99; - this.txt_kQty.TabIndex = 224; - // - // txt_yQty - // - this.txt_yQty.Location = new System.Drawing.Point(177, 24); - this.txt_yQty.Name = "txt_yQty"; - this.txt_yQty.Properties.Appearance.Options.UseFont = true; - this.txt_yQty.Properties.ReadOnly = true; - this.txt_yQty.Size = new System.Drawing.Size(234, 24); - this.txt_yQty.StyleController = this.layout99; - this.txt_yQty.TabIndex = 222; - // - // txtQuantity - // - this.txtQuantity.Location = new System.Drawing.Point(177, -8); - this.txtQuantity.Name = "txtQuantity"; - this.txtQuantity.Properties.Appearance.Options.UseFont = true; - this.txtQuantity.Properties.ReadOnly = true; - this.txtQuantity.Size = new System.Drawing.Size(234, 24); - this.txtQuantity.StyleController = this.layout99; - this.txtQuantity.TabIndex = 220; - // - // txtWlgg - // - this.txtWlgg.Location = new System.Drawing.Point(-163, 56); - this.txtWlgg.Name = "txtWlgg"; - this.txtWlgg.Properties.Appearance.Options.UseFont = true; - this.txtWlgg.Properties.ReadOnly = true; - this.txtWlgg.Size = new System.Drawing.Size(574, 24); - this.txtWlgg.StyleController = this.layout99; - this.txtWlgg.TabIndex = 218; - // - // txtWlmc - // - this.txtWlmc.Location = new System.Drawing.Point(-163, 24); - this.txtWlmc.Name = "txtWlmc"; - this.txtWlmc.Properties.Appearance.Options.UseFont = true; - this.txtWlmc.Properties.ReadOnly = true; - this.txtWlmc.Size = new System.Drawing.Size(234, 24); - this.txtWlmc.StyleController = this.layout99; - this.txtWlmc.TabIndex = 216; - // - // txtWlid - // - this.txtWlid.Location = new System.Drawing.Point(-163, -8); - this.txtWlid.Name = "txtWlid"; - this.txtWlid.Properties.Appearance.Options.UseFont = true; - this.txtWlid.Properties.ReadOnly = true; - this.txtWlid.Size = new System.Drawing.Size(234, 24); - this.txtWlid.StyleController = this.layout99; - this.txtWlid.TabIndex = 214; - // // tabMxPage2 // this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1124, 338); + this.tabMxPage2.Size = new System.Drawing.Size(1272, 342); this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�"; // // gcMx2 @@ -1802,8 +2067,8 @@ this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { - this.repositoryItemButtonEdit2}); - this.gcMx2.Size = new System.Drawing.Size(1124, 338); + this.rptChongDa}); + this.gcMx2.Size = new System.Drawing.Size(1272, 342); this.gcMx2.TabIndex = 3; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1972,24 +2237,24 @@ // // gvBtnAlawys // - this.gvBtnAlawys.Caption = "绉诲嚭"; - this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2; + this.gvBtnAlawys.Caption = "閲嶆墦"; + this.gvBtnAlawys.ColumnEdit = this.rptChongDa; this.gvBtnAlawys.MinWidth = 25; this.gvBtnAlawys.Name = "gvBtnAlawys"; this.gvBtnAlawys.Visible = true; this.gvBtnAlawys.VisibleIndex = 12; this.gvBtnAlawys.Width = 94; // - // repositoryItemButtonEdit2 + // rptChongDa // - this.repositoryItemButtonEdit2.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + this.rptChongDa.AutoHeight = false; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16; editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; - this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); - this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2"; - this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; - this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); + this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.rptChongDa.Name = "rptChongDa"; + this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick); // // picCheckBox // @@ -2002,289 +2267,11 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // - // split99 - // - this.split99.Dock = System.Windows.Forms.DockStyle.Fill; - this.split99.Horizontal = false; - this.split99.Location = new System.Drawing.Point(0, 0); - this.split99.Name = "split99"; - // - // split99.split99_Panel1 - // - this.split99.Panel1.Controls.Add(this.layout99); - this.split99.Panel1.Text = "Panel1"; - // - // split99.split99_Panel2 - // - this.split99.Panel2.Controls.Add(this.gcMx1); - this.split99.Panel2.Text = "Panel2"; - this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split99.Size = new System.Drawing.Size(1124, 338); - this.split99.SplitterPosition = 106; - this.split99.TabIndex = 4; - // - // layout99 - // - this.layout99.Controls.Add(this.layoutControl1); - this.layout99.Controls.Add(this.ucBtnPrint1); - this.layout99.Controls.Add(this.radOut); - this.layout99.Controls.Add(this.lbMxGuid); - this.layout99.Controls.Add(this.txtWlid); - this.layout99.Controls.Add(this.txt_psnQty_1); - this.layout99.Controls.Add(this.txtWlmc); - this.layout99.Controls.Add(this.txtWlgg); - this.layout99.Controls.Add(this.txt_kQty); - this.layout99.Controls.Add(this.txtQuantity); - this.layout99.Controls.Add(this.txt_yQty); - this.layout99.Dock = System.Windows.Forms.DockStyle.Fill; - this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem29}); - this.layout99.Location = new System.Drawing.Point(0, 0); - this.layout99.Name = "layout99"; - this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(46, 297, 812, 500); - this.layout99.Root = this.layoutControlGroup1; - this.layout99.Size = new System.Drawing.Size(1124, 106); - this.layout99.TabIndex = 0; - this.layout99.Text = "layoutControl1"; - // - // layoutControlGroup1 - // - this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup1.GroupBordersVisible = false; - this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem22, - this.layoutControlItem23, - this.layoutControlItem24, - this.layoutControlItem25, - this.layoutControlItem26, - this.layoutControlItem27, - this.layoutControlItem28, - this.layoutControlItem30, - this.layoutControlItem31, - this.layoutControlItem32}); - this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; - this.layoutControlGroup1.Name = "Root"; - columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition7.Width = 100D; - columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition8.Width = 100D; - columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition9.Width = 100D; - columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition10.Width = 100D; - this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition7, - columnDefinition8, - columnDefinition9, - columnDefinition10}); - rowDefinition7.Height = 100D; - rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition8.Height = 100D; - rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition9.Height = 100D; - rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; - this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition7, - rowDefinition8, - rowDefinition9}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116); - this.layoutControlGroup1.TextVisible = false; - // - // layoutControlItem22 - // - this.layoutControlItem22.Control = this.txtWlid; - this.layoutControlItem22.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem22.Text = "鐗╂枡缂栫爜"; - this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem23 - // - this.layoutControlItem23.Control = this.txtWlmc; - this.layoutControlItem23.Location = new System.Drawing.Point(0, 32); - this.layoutControlItem23.Name = "layoutControlItem23"; - this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem23.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem23.Text = "鐗╂枡鍚嶇О"; - this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem24 - // - this.layoutControlItem24.Control = this.txtWlgg; - this.layoutControlItem24.Location = new System.Drawing.Point(0, 64); - this.layoutControlItem24.Name = "layoutControlItem24"; - this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem24.Size = new System.Drawing.Size(680, 32); - this.layoutControlItem24.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem25 - // - this.layoutControlItem25.Control = this.txtQuantity; - this.layoutControlItem25.Location = new System.Drawing.Point(340, 0); - this.layoutControlItem25.Name = "layoutControlItem25"; - this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem25.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺"; - this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem26 - // - this.layoutControlItem26.Control = this.txt_yQty; - this.layoutControlItem26.Location = new System.Drawing.Point(340, 32); - this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem26.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺"; - this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem27 - // - this.layoutControlItem27.Control = this.txt_kQty; - this.layoutControlItem27.Location = new System.Drawing.Point(680, 0); - this.layoutControlItem27.Name = "layoutControlItem27"; - this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem27.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem27.Text = "鍙墦鍗版�绘暟"; - this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem28 - // - this.layoutControlItem28.Control = this.txt_psnQty_1; - this.layoutControlItem28.Location = new System.Drawing.Point(680, 32); - this.layoutControlItem28.Name = "layoutControlItem28"; - this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem28.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem28.Text = "姣忓紶鏉$爜鏁伴噺"; - this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem29 - // - this.layoutControlItem29.Control = this.lbMxGuid; - this.layoutControlItem29.Location = new System.Drawing.Point(1020, 64); - this.layoutControlItem29.Name = "layoutControlItem29"; - this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem29.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem29.Text = "lbMxGuid"; - this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem29.TextVisible = false; - // - // layoutControlItem30 - // - this.layoutControlItem30.Control = this.radOut; - this.layoutControlItem30.Location = new System.Drawing.Point(1020, 0); - this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28); - this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28); - this.layoutControlItem30.Name = "layoutControlItem30"; - this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); - this.layoutControlItem30.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem30.Text = "鑷姩璁$畻"; - this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem30.TextVisible = false; - // - // layoutControlItem31 - // - this.layoutControlItem31.Control = this.ucBtnPrint1; - this.layoutControlItem31.Location = new System.Drawing.Point(1020, 32); - this.layoutControlItem31.MaxSize = new System.Drawing.Size(182, 31); - this.layoutControlItem31.MinSize = new System.Drawing.Size(182, 31); - this.layoutControlItem31.Name = "layoutControlItem31"; - this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem31.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); - this.layoutControlItem31.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳"; - this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem31.TextVisible = false; - // - // layoutControl1 - // - this.layoutControl1.Controls.Add(this.txt_iCount_1); - this.layoutControl1.Controls.Add(this.txt_yuliang_1); - this.layoutControl1.Location = new System.Drawing.Point(415, 56); - this.layoutControl1.Name = "layoutControl1"; - this.layoutControl1.Root = this.layoutControlGroup2; - this.layoutControl1.Size = new System.Drawing.Size(336, 28); - this.layoutControl1.TabIndex = 477; - this.layoutControl1.Text = "layoutControl1"; - // - // layoutControlItem32 - // - this.layoutControlItem32.Control = this.layoutControl1; - this.layoutControlItem32.Location = new System.Drawing.Point(680, 64); - this.layoutControlItem32.Name = "layoutControlItem32"; - this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem32.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem32.Text = "鎵撳嵃鏁伴噺"; - this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem32.TextVisible = false; - // - // layoutControlGroup2 - // - this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup2.GroupBordersVisible = false; - this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem33, - this.layoutControlItem34}); - this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; - this.layoutControlGroup2.Name = "layoutControlGroup2"; - columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition5.Width = 100D; - columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition6.Width = 100D; - this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6}); - rowDefinition6.Height = 100D; - rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition6}); - this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28); - this.layoutControlGroup2.TextVisible = false; - // - // layoutControlItem33 - // - this.layoutControlItem33.Control = this.txt_iCount_1; - this.layoutControlItem33.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem33.Name = "layoutControlItem33"; - this.layoutControlItem33.Size = new System.Drawing.Size(168, 28); - this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��"; - this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18); - // - // txt_yuliang_1 - // - this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); - this.txt_yuliang_1.Name = "txt_yuliang_1"; - this.txt_yuliang_1.Properties.ReadOnly = true; - this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); - this.txt_yuliang_1.StyleController = this.layoutControl1; - this.txt_yuliang_1.TabIndex = 229; - // - // layoutControlItem34 - // - this.layoutControlItem34.Control = this.txt_yuliang_1; - this.layoutControlItem34.Location = new System.Drawing.Point(168, 0); - this.layoutControlItem34.Name = "layoutControlItem34"; - this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem34.Size = new System.Drawing.Size(168, 28); - this.layoutControlItem34.Text = "鎵撳嵃浣欐暟"; - this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18); - // // Frm_SalesReturnNotice // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1128, 682); + this.ClientSize = new System.Drawing.Size(1276, 682); this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); @@ -2352,28 +2339,6 @@ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit(); - this.tabMxPage2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit(); this.split99.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit(); @@ -2382,6 +2347,22 @@ this.split99.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit(); this.layout99.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); @@ -2390,16 +2371,22 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); - this.layoutControl1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); + this.tabMxPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); } @@ -2494,7 +2481,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1isFree; private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnType; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; - private DevExpress.XtraGrid.Columns.GridColumn gvMx1inventoryUnit; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; @@ -2542,7 +2528,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn30; private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys; - private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn32; private DevExpress.XtraEditors.RadioGroup radOut; diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs index 5504ff3..c1e7960 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs @@ -68,6 +68,7 @@ var rtn = UtilityHelper.ReturnToTablePage(strReturn); var dt = rtn.rtnData.list; this.repositoryItemSearchLookUpEdit1.DataSource = dt; + repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup; } catch (Exception ex) { @@ -412,7 +413,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -446,8 +447,12 @@ { ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } - } + + /// <summary> + /// 璇诲彇瀹炰綋 + /// </summary> + /// <param name="strGuid"></param> private void getModel(string strGuid) { gcMx1.DataSource = null; @@ -615,7 +620,11 @@ gvMx1.PostEditor(); gvMx1.UpdateCurrentRow(); } - + /// <summary> + /// 绉诲嚭鏄庣粏 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { var rowhandle = gvMx1.FocusedRowHandle; @@ -656,7 +665,6 @@ } } - private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e) { if (e.FocusedRowHandle >= 0) @@ -687,12 +695,14 @@ } /// <summary> - /// 绉诲嚭鏉$爜 + /// 閲嶆墦 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { + MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�"); + return; var rowhandle = gvMx2.FocusedRowHandle; if (rowhandle < 0) return; diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.resx b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.resx index a4826a3..25d6b3c 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.resx +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.resx @@ -120,4 +120,7 @@ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> + <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>25</value> + </metadata> </root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs index e53cc08..4fd483d 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs @@ -100,6 +100,17 @@ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); + this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.gcMx1 = new DevExpress.XtraGrid.GridControl(); + this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -113,17 +124,6 @@ this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); - this.gcMx1 = new DevExpress.XtraGrid.GridControl(); - this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -181,12 +181,12 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); - this.tabMxPage2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + this.tabMxPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // @@ -228,6 +228,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; + this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -240,7 +241,8 @@ // // split1.Panel2 // - this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.split1.Panel2.Text = "Panel2"; + this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1346, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; @@ -502,7 +504,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); - this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 // @@ -513,6 +515,7 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; + this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1346, 570); this.splitMx1.SplitterPosition = 176; this.splitMx1.TabIndex = 0; @@ -557,91 +560,91 @@ // // txt_ckName // - this.txt_ckName.Location = new System.Drawing.Point(445, 43); + this.txt_ckName.Location = new System.Drawing.Point(430, 43); this.txt_ckName.Name = "txt_ckName"; this.txt_ckName.Properties.Appearance.Options.UseFont = true; - this.txt_ckName.Size = new System.Drawing.Size(225, 24); + this.txt_ckName.Size = new System.Drawing.Size(240, 24); this.txt_ckName.StyleController = this.layoutMx1; this.txt_ckName.TabIndex = 609; // // txt_sqRemark // - this.txt_sqRemark.Location = new System.Drawing.Point(114, 136); + this.txt_sqRemark.Location = new System.Drawing.Point(99, 136); this.txt_sqRemark.Name = "txt_sqRemark"; this.txt_sqRemark.Properties.Appearance.Options.UseFont = true; - this.txt_sqRemark.Size = new System.Drawing.Size(556, 24); + this.txt_sqRemark.Size = new System.Drawing.Size(571, 24); this.txt_sqRemark.StyleController = this.layoutMx1; this.txt_sqRemark.TabIndex = 240; // // txt_checkUser // - this.txt_checkUser.Location = new System.Drawing.Point(1107, 12); + this.txt_checkUser.Location = new System.Drawing.Point(1092, 12); this.txt_checkUser.Name = "txt_checkUser"; this.txt_checkUser.Properties.Appearance.Options.UseFont = true; - this.txt_checkUser.Size = new System.Drawing.Size(227, 24); + this.txt_checkUser.Size = new System.Drawing.Size(242, 24); this.txt_checkUser.StyleController = this.layoutMx1; this.txt_checkUser.TabIndex = 608; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(776, 43); + this.txt_createDate.Location = new System.Drawing.Point(761, 43); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(225, 24); + this.txt_createDate.Size = new System.Drawing.Size(240, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 222; // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(114, 12); + this.txt_billNo.Location = new System.Drawing.Point(99, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(225, 24); + this.txt_billNo.Size = new System.Drawing.Size(240, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; // // txt_abtNo // - this.txt_abtNo.Location = new System.Drawing.Point(445, 12); + this.txt_abtNo.Location = new System.Drawing.Point(430, 12); this.txt_abtNo.Name = "txt_abtNo"; this.txt_abtNo.Properties.Appearance.Options.UseFont = true; - this.txt_abtNo.Size = new System.Drawing.Size(225, 24); + this.txt_abtNo.Size = new System.Drawing.Size(240, 24); this.txt_abtNo.StyleController = this.layoutMx1; this.txt_abtNo.TabIndex = 507; // // txt_djlx // - this.txt_djlx.Location = new System.Drawing.Point(445, 105); + this.txt_djlx.Location = new System.Drawing.Point(430, 105); this.txt_djlx.Name = "txt_djlx"; this.txt_djlx.Properties.Appearance.Options.UseFont = true; - this.txt_djlx.Size = new System.Drawing.Size(225, 24); + this.txt_djlx.Size = new System.Drawing.Size(240, 24); this.txt_djlx.StyleController = this.layoutMx1; this.txt_djlx.TabIndex = 598; // // txt_createBy // - this.txt_createBy.Location = new System.Drawing.Point(776, 12); + this.txt_createBy.Location = new System.Drawing.Point(761, 12); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.Appearance.Options.UseFont = true; - this.txt_createBy.Size = new System.Drawing.Size(225, 24); + this.txt_createBy.Size = new System.Drawing.Size(240, 24); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 219; // // txt_kcOrg // - this.txt_kcOrg.Location = new System.Drawing.Point(114, 43); + this.txt_kcOrg.Location = new System.Drawing.Point(99, 43); this.txt_kcOrg.Name = "txt_kcOrg"; this.txt_kcOrg.Properties.Appearance.Options.UseFont = true; - this.txt_kcOrg.Size = new System.Drawing.Size(225, 24); + this.txt_kcOrg.Size = new System.Drawing.Size(240, 24); this.txt_kcOrg.StyleController = this.layoutMx1; this.txt_kcOrg.TabIndex = 593; // // txt_checkDate // - this.txt_checkDate.Location = new System.Drawing.Point(1107, 43); + this.txt_checkDate.Location = new System.Drawing.Point(1092, 43); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Options.UseFont = true; - this.txt_checkDate.Size = new System.Drawing.Size(227, 24); + this.txt_checkDate.Size = new System.Drawing.Size(242, 24); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 587; // @@ -656,43 +659,43 @@ // // txt_lastupdateBy // - this.txt_lastupdateBy.Location = new System.Drawing.Point(776, 74); + this.txt_lastupdateBy.Location = new System.Drawing.Point(761, 74); this.txt_lastupdateBy.Name = "txt_lastupdateBy"; this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true; - this.txt_lastupdateBy.Size = new System.Drawing.Size(225, 24); + this.txt_lastupdateBy.Size = new System.Drawing.Size(240, 24); this.txt_lastupdateBy.StyleController = this.layoutMx1; this.txt_lastupdateBy.TabIndex = 610; // // txt_lastupdateDate // - this.txt_lastupdateDate.Location = new System.Drawing.Point(776, 105); + this.txt_lastupdateDate.Location = new System.Drawing.Point(761, 105); this.txt_lastupdateDate.Name = "txt_lastupdateDate"; this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true; - this.txt_lastupdateDate.Size = new System.Drawing.Size(225, 24); + this.txt_lastupdateDate.Size = new System.Drawing.Size(240, 24); this.txt_lastupdateDate.StyleController = this.layoutMx1; this.txt_lastupdateDate.TabIndex = 611; // // txt_ckNo // - this.txt_ckNo.Location = new System.Drawing.Point(445, 74); + this.txt_ckNo.Location = new System.Drawing.Point(430, 74); this.txt_ckNo.Name = "txt_ckNo"; - this.txt_ckNo.Size = new System.Drawing.Size(225, 24); + this.txt_ckNo.Size = new System.Drawing.Size(240, 24); this.txt_ckNo.StyleController = this.layoutMx1; this.txt_ckNo.TabIndex = 613; // // txt_xsNo // - this.txt_xsNo.Location = new System.Drawing.Point(114, 105); + this.txt_xsNo.Location = new System.Drawing.Point(99, 105); this.txt_xsNo.Name = "txt_xsNo"; - this.txt_xsNo.Size = new System.Drawing.Size(225, 24); + this.txt_xsNo.Size = new System.Drawing.Size(240, 24); this.txt_xsNo.StyleController = this.layoutMx1; this.txt_xsNo.TabIndex = 614; // // txt_custName // - this.txt_custName.Location = new System.Drawing.Point(114, 74); + this.txt_custName.Location = new System.Drawing.Point(99, 74); this.txt_custName.Name = "txt_custName"; - this.txt_custName.Size = new System.Drawing.Size(225, 24); + this.txt_custName.Size = new System.Drawing.Size(240, 24); this.txt_custName.StyleController = this.layoutMx1; this.txt_custName.TabIndex = 615; // @@ -770,7 +773,7 @@ this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(331, 31); this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem2 // @@ -780,7 +783,7 @@ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(331, 31); this.layoutControlItem2.Text = "鐢宠鍗曞彿"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem4 // @@ -789,8 +792,8 @@ this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem4.Size = new System.Drawing.Size(333, 31); - this.layoutControlItem4.Text = "瀹℃牳浜�"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem4.Text = "瀹℃牳浜哄憳"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem5 // @@ -800,7 +803,7 @@ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem5.Size = new System.Drawing.Size(331, 31); this.layoutControlItem5.Text = "搴撳瓨缁勭粐"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem8 // @@ -811,7 +814,7 @@ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(333, 31); this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem12 // @@ -834,7 +837,7 @@ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem16.Size = new System.Drawing.Size(662, 32); this.layoutControlItem16.Text = "澶囨敞"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem14 // @@ -845,7 +848,7 @@ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem14.Size = new System.Drawing.Size(331, 31); this.layoutControlItem14.Text = "浠撳簱鍚嶇О"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem6 // @@ -856,7 +859,7 @@ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem6.Size = new System.Drawing.Size(331, 31); this.layoutControlItem6.Text = "浠撳簱缂栧彿"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem9 // @@ -866,7 +869,7 @@ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem9.Size = new System.Drawing.Size(331, 31); this.layoutControlItem9.Text = "瀹㈡埛鍚嶇О"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem7 // @@ -876,7 +879,7 @@ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem7.Size = new System.Drawing.Size(331, 31); this.layoutControlItem7.Text = "閿�鍞崟鍙�"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem3 // @@ -887,7 +890,7 @@ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem3.Size = new System.Drawing.Size(331, 31); this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem11 // @@ -896,8 +899,8 @@ this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.Size = new System.Drawing.Size(331, 31); - this.layoutControlItem11.Text = "鍒涘缓浜�"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem11.Text = "鍒涘缓浜哄憳"; + this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem15 // @@ -908,7 +911,7 @@ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem15.Size = new System.Drawing.Size(331, 31); this.layoutControlItem15.Text = "鍒涘缓鏃堕棿"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem17 // @@ -919,7 +922,7 @@ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem17.Size = new System.Drawing.Size(331, 31); this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem18 // @@ -929,8 +932,8 @@ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem18.Size = new System.Drawing.Size(331, 31); - this.layoutControlItem18.Text = "鏈�鍚庢洿鏂版椂闂�"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem18.Text = "鏇存柊鏃堕棿"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18); // // tabMx // @@ -943,6 +946,129 @@ this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, this.tabMxPage2}); + // + // tabMxPage1 + // + this.tabMxPage1.Controls.Add(this.gcMx1); + this.tabMxPage1.Name = "tabMxPage1"; + this.tabMxPage1.Size = new System.Drawing.Size(1344, 350); + this.tabMxPage1.Text = "鍏ュ簱鏄庣粏"; + // + // gcMx1 + // + this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx1.Location = new System.Drawing.Point(0, 0); + this.gcMx1.MainView = this.gvMx1; + this.gcMx1.Name = "gcMx1"; + this.gcMx1.Size = new System.Drawing.Size(1344, 350); + this.gcMx1.TabIndex = 0; + this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMx1}); + // + // gvMx1 + // + this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn3, + this.gridColumn4, + this.gvMx2itemSname, + this.gvMx2quantity, + this.gvMx2unit, + this.gridColumn5, + this.gridColumn6, + this.gridColumn7}); + this.gvMx1.GridControl = this.gcMx1; + this.gvMx1.Name = "gvMx1"; + this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; + this.gvMx1.OptionsFind.ShowSearchNavButtons = false; + this.gvMx1.OptionsView.ShowGroupPanel = false; + // + // gridColumn3 + // + this.gridColumn3.Caption = "鐗╂枡缂栫爜"; + this.gridColumn3.FieldName = "itemNo"; + this.gridColumn3.MinWidth = 25; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 0; + this.gridColumn3.Width = 94; + // + // gridColumn4 + // + this.gridColumn4.Caption = "鐗╂枡瑙勬牸"; + this.gridColumn4.FieldName = "itemModel"; + this.gridColumn4.MinWidth = 25; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 1; + this.gridColumn4.Width = 94; + // + // gvMx2itemSname + // + this.gvMx2itemSname.AppearanceCell.Options.UseFont = true; + this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О"; + this.gvMx2itemSname.FieldName = "itemName"; + this.gvMx2itemSname.MinWidth = 50; + this.gvMx2itemSname.Name = "gvMx2itemSname"; + this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME"; + this.gvMx2itemSname.Visible = true; + this.gvMx2itemSname.VisibleIndex = 2; + this.gvMx2itemSname.Width = 94; + // + // gvMx2quantity + // + this.gvMx2quantity.AppearanceCell.Options.UseFont = true; + this.gvMx2quantity.Caption = "鏁伴噺"; + this.gvMx2quantity.FieldName = "quantity"; + this.gvMx2quantity.MinWidth = 50; + this.gvMx2quantity.Name = "gvMx2quantity"; + this.gvMx2quantity.Tag = "query_a.QUANTITY"; + this.gvMx2quantity.Visible = true; + this.gvMx2quantity.VisibleIndex = 3; + this.gvMx2quantity.Width = 94; + // + // gvMx2unit + // + this.gvMx2unit.AppearanceCell.Options.UseFont = true; + this.gvMx2unit.Caption = "搴撳瓨鍗曚綅"; + this.gvMx2unit.FieldName = "kcUnit"; + this.gvMx2unit.MinWidth = 50; + this.gvMx2unit.Name = "gvMx2unit"; + this.gvMx2unit.Tag = "query_a.UNIT"; + this.gvMx2unit.Visible = true; + this.gvMx2unit.VisibleIndex = 4; + this.gvMx2unit.Width = 94; + // + // gridColumn5 + // + this.gridColumn5.AppearanceCell.Options.UseFont = true; + this.gridColumn5.Caption = "寤虹珛鑰�"; + this.gridColumn5.FieldName = "createBy"; + this.gridColumn5.MinWidth = 25; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 5; + this.gridColumn5.Width = 94; + // + // gridColumn6 + // + this.gridColumn6.AppearanceCell.Options.UseFont = true; + this.gridColumn6.Caption = "寤虹珛鏃堕棿"; + this.gridColumn6.FieldName = "createDate"; + this.gridColumn6.MinWidth = 25; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 6; + this.gridColumn6.Width = 94; + // + // gridColumn7 + // + this.gridColumn7.Caption = "澶囨敞淇℃伅"; + this.gridColumn7.FieldName = "sqRemark"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 7; + this.gridColumn7.Width = 94; // // tabMxPage2 // @@ -1099,129 +1225,6 @@ this.gridColumn2.VisibleIndex = 9; this.gridColumn2.Width = 94; // - // tabMxPage1 - // - this.tabMxPage1.Controls.Add(this.gcMx1); - this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1344, 350); - this.tabMxPage1.Text = "鍏ュ簱鏄庣粏"; - // - // gcMx1 - // - this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMx1.Location = new System.Drawing.Point(0, 0); - this.gcMx1.MainView = this.gvMx1; - this.gcMx1.Name = "gcMx1"; - this.gcMx1.Size = new System.Drawing.Size(1344, 350); - this.gcMx1.TabIndex = 0; - this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { - this.gvMx1}); - // - // gvMx1 - // - this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gridColumn3, - this.gridColumn4, - this.gvMx2itemSname, - this.gvMx2quantity, - this.gvMx2unit, - this.gridColumn5, - this.gridColumn6, - this.gridColumn7}); - this.gvMx1.GridControl = this.gcMx1; - this.gvMx1.Name = "gvMx1"; - this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; - this.gvMx1.OptionsFind.ShowSearchNavButtons = false; - this.gvMx1.OptionsView.ShowGroupPanel = false; - // - // gridColumn3 - // - this.gridColumn3.Caption = "鐗╂枡缂栫爜"; - this.gridColumn3.FieldName = "itemNo"; - this.gridColumn3.MinWidth = 25; - this.gridColumn3.Name = "gridColumn3"; - this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 0; - this.gridColumn3.Width = 94; - // - // gridColumn4 - // - this.gridColumn4.Caption = "鐗╂枡瑙勬牸"; - this.gridColumn4.FieldName = "itemModel"; - this.gridColumn4.MinWidth = 25; - this.gridColumn4.Name = "gridColumn4"; - this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 1; - this.gridColumn4.Width = 94; - // - // gvMx2itemSname - // - this.gvMx2itemSname.AppearanceCell.Options.UseFont = true; - this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О"; - this.gvMx2itemSname.FieldName = "itemName"; - this.gvMx2itemSname.MinWidth = 50; - this.gvMx2itemSname.Name = "gvMx2itemSname"; - this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME"; - this.gvMx2itemSname.Visible = true; - this.gvMx2itemSname.VisibleIndex = 2; - this.gvMx2itemSname.Width = 94; - // - // gvMx2quantity - // - this.gvMx2quantity.AppearanceCell.Options.UseFont = true; - this.gvMx2quantity.Caption = "鏁伴噺"; - this.gvMx2quantity.FieldName = "quantity"; - this.gvMx2quantity.MinWidth = 50; - this.gvMx2quantity.Name = "gvMx2quantity"; - this.gvMx2quantity.Tag = "query_a.QUANTITY"; - this.gvMx2quantity.Visible = true; - this.gvMx2quantity.VisibleIndex = 3; - this.gvMx2quantity.Width = 94; - // - // gvMx2unit - // - this.gvMx2unit.AppearanceCell.Options.UseFont = true; - this.gvMx2unit.Caption = "搴撳瓨鍗曚綅"; - this.gvMx2unit.FieldName = "kcUnit"; - this.gvMx2unit.MinWidth = 50; - this.gvMx2unit.Name = "gvMx2unit"; - this.gvMx2unit.Tag = "query_a.UNIT"; - this.gvMx2unit.Visible = true; - this.gvMx2unit.VisibleIndex = 4; - this.gvMx2unit.Width = 94; - // - // gridColumn5 - // - this.gridColumn5.AppearanceCell.Options.UseFont = true; - this.gridColumn5.Caption = "寤虹珛鑰�"; - this.gridColumn5.FieldName = "createBy"; - this.gridColumn5.MinWidth = 25; - this.gridColumn5.Name = "gridColumn5"; - this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 5; - this.gridColumn5.Width = 94; - // - // gridColumn6 - // - this.gridColumn6.AppearanceCell.Options.UseFont = true; - this.gridColumn6.Caption = "寤虹珛鏃堕棿"; - this.gridColumn6.FieldName = "createDate"; - this.gridColumn6.MinWidth = 25; - this.gridColumn6.Name = "gridColumn6"; - this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 6; - this.gridColumn6.Width = 94; - // - // gridColumn7 - // - this.gridColumn7.Caption = "澶囨敞淇℃伅"; - this.gridColumn7.FieldName = "sqRemark"; - this.gridColumn7.MinWidth = 25; - this.gridColumn7.Name = "gridColumn7"; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 7; - this.gridColumn7.Width = 94; - // // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; @@ -1298,12 +1301,12 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); - this.tabMxPage2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + this.tabMxPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); -- Gitblit v1.9.3