From c4187f9a3321d9ff62579f87dedf66bf8151690d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 04 四月 2025 11:01:35 +0800
Subject: [PATCH] 加班
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs | 274 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 160 insertions(+), 114 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
index f1439f0..011df92 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
@@ -30,15 +30,15 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition27 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition28 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition29 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition30 = 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -61,6 +61,7 @@
this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -82,6 +83,8 @@
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_kcOrg = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -99,7 +102,7 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- 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();
@@ -163,6 +166,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -180,7 +185,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -196,6 +201,7 @@
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -243,17 +249,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.Size = new System.Drawing.Size(1126, 570);
- this.split1.SplitterPosition = 263;
+ this.split1.SplitterPosition = 558;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+
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, 224);
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -262,7 +268,7 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -281,7 +287,8 @@
this.gv_remark,
this.gv_reason,
this.gridColumn1,
- this.gridColumn6});
+ this.gridColumn6,
+ this.gridColumn7});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -291,7 +298,7 @@
//
// gv_status
//
- this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鏍囪瘑";
this.gv_status.FieldName = "statusChk";
@@ -305,7 +312,7 @@
//
// gv_itemOutNo
//
- this.gv_itemOutNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿";
this.gv_itemOutNo.FieldName = "itemOutNo";
@@ -319,7 +326,7 @@
//
// gv_workNo
//
- this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_workNo.AppearanceCell.Options.UseFont = true;
this.gv_workNo.Caption = "鐢宠鍗曞彿";
this.gv_workNo.FieldName = "taskNo";
@@ -333,7 +340,7 @@
//
// gv_pbillNo
//
- this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
this.gv_pbillNo.Caption = "閿�鍞崟鍙�";
this.gv_pbillNo.FieldName = "workNo";
@@ -347,7 +354,7 @@
//
// gv_outDate
//
- this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_outDate.AppearanceCell.Options.UseFont = true;
this.gv_outDate.Caption = "鍑哄簱鏃ユ湡 ";
this.gv_outDate.FieldName = "outDate";
@@ -361,7 +368,7 @@
//
// gv_outType
//
- this.gv_outType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_outType.AppearanceCell.Options.UseFont = true;
this.gv_outType.Caption = "鍑哄簱绫诲埆 ";
this.gv_outType.FieldName = "outType";
@@ -375,7 +382,7 @@
//
// gv_checkUser
//
- this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
this.gv_checkUser.FieldName = "checkUser";
@@ -389,7 +396,7 @@
//
// gv_checkDate
//
- this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_checkDate.FieldName = "checkDate";
@@ -403,9 +410,9 @@
//
// gv_receiver
//
- this.gv_receiver.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_receiver.AppearanceCell.Options.UseFont = true;
- this.gv_receiver.Caption = "鍑哄簱缂栧彿";
+ this.gv_receiver.Caption = "浠撳簱缂栧彿";
this.gv_receiver.FieldName = "ckNo";
this.gv_receiver.MinWidth = 25;
this.gv_receiver.Name = "gv_receiver";
@@ -417,9 +424,9 @@
//
// gv_outPart
//
- this.gv_outPart.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_outPart.AppearanceCell.Options.UseFont = true;
- this.gv_outPart.Caption = "鍑哄簱鍚嶇О";
+ this.gv_outPart.Caption = "浠撳簱鍚嶇О";
this.gv_outPart.FieldName = "ckName";
this.gv_outPart.MinWidth = 25;
this.gv_outPart.Name = "gv_outPart";
@@ -431,7 +438,7 @@
//
// gv_createBy
//
- this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
@@ -445,7 +452,7 @@
//
// gv_createDate
//
- this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
@@ -459,10 +466,10 @@
//
// gv_remark
//
- this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞淇℃伅 ";
- this.gv_remark.FieldName = "remark";
+ this.gv_remark.FieldName = "sqRemark";
this.gv_remark.MinWidth = 25;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
@@ -473,7 +480,7 @@
//
// gv_reason
//
- this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gv_reason.AppearanceCell.Options.UseFont = true;
this.gv_reason.Caption = "瀹㈡埛鍚嶇О";
this.gv_reason.FieldName = "cusName";
@@ -505,11 +512,19 @@
this.gridColumn6.VisibleIndex = 15;
this.gridColumn6.Width = 94;
//
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "涓婚敭Guid";
+ this.gridColumn7.FieldName = "guid";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 224);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
@@ -541,7 +556,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 161;
+ this.splitMx1.SplitterPosition = 171;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -563,20 +578,23 @@
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_kcOrg);
this.layoutMx1.Controls.Add(this.txt_status);
+ this.layoutMx1.Controls.Add(this.txt_sqRemark);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem17});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(764, 426, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 161);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 171);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 140);
+ this.lbGuid.Location = new System.Drawing.Point(840, 154);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 28);
+ this.lbGuid.Size = new System.Drawing.Size(274, 32);
this.lbGuid.TabIndex = 591;
this.lbGuid.Text = "lbGuid";
//
@@ -584,7 +602,7 @@
//
this.txt_ckName.Location = new System.Drawing.Point(636, 108);
this.txt_ckName.Name = "txt_ckName";
- this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_ckName.Properties.Appearance.Options.UseFont = true;
this.txt_ckName.Size = new System.Drawing.Size(200, 28);
this.txt_ckName.StyleController = this.layoutMx1;
@@ -594,7 +612,7 @@
//
this.txt_cusNo.Location = new System.Drawing.Point(360, 76);
this.txt_cusNo.Name = "txt_cusNo";
- this.txt_cusNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_cusNo.Properties.Appearance.Options.UseFont = true;
this.txt_cusNo.Size = new System.Drawing.Size(200, 28);
this.txt_cusNo.StyleController = this.layoutMx1;
@@ -604,7 +622,7 @@
//
this.txt_xxNo.Location = new System.Drawing.Point(84, 108);
this.txt_xxNo.Name = "txt_xxNo";
- this.txt_xxNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_xxNo.Properties.Appearance.Options.UseFont = true;
this.txt_xxNo.Size = new System.Drawing.Size(200, 28);
this.txt_xxNo.StyleController = this.layoutMx1;
@@ -614,7 +632,7 @@
//
this.txt_ckNo.Location = new System.Drawing.Point(360, 108);
this.txt_ckNo.Name = "txt_ckNo";
- this.txt_ckNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_ckNo.Properties.Appearance.Options.UseFont = true;
this.txt_ckNo.Size = new System.Drawing.Size(200, 28);
this.txt_ckNo.StyleController = this.layoutMx1;
@@ -624,7 +642,7 @@
//
this.txt_itemOutNo.Location = new System.Drawing.Point(84, 12);
this.txt_itemOutNo.Name = "txt_itemOutNo";
- this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemOutNo.Size = new System.Drawing.Size(200, 28);
this.txt_itemOutNo.StyleController = this.layoutMx1;
@@ -634,7 +652,7 @@
//
this.txt_xxzz.Location = new System.Drawing.Point(360, 12);
this.txt_xxzz.Name = "txt_xxzz";
- this.txt_xxzz.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_xxzz.Properties.Appearance.Options.UseFont = true;
this.txt_xxzz.Size = new System.Drawing.Size(200, 28);
this.txt_xxzz.StyleController = this.layoutMx1;
@@ -644,7 +662,7 @@
//
this.txt_createBy.Location = new System.Drawing.Point(636, 12);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
this.txt_createBy.Size = new System.Drawing.Size(200, 28);
this.txt_createBy.StyleController = this.layoutMx1;
@@ -654,7 +672,7 @@
//
this.txt_abtNo.Location = new System.Drawing.Point(912, 12);
this.txt_abtNo.Name = "txt_abtNo";
- this.txt_abtNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
this.txt_abtNo.Size = new System.Drawing.Size(202, 28);
this.txt_abtNo.StyleController = this.layoutMx1;
@@ -664,7 +682,7 @@
//
this.txt_outType.Location = new System.Drawing.Point(84, 44);
this.txt_outType.Name = "txt_outType";
- this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_outType.Properties.Appearance.Options.UseFont = true;
this.txt_outType.Size = new System.Drawing.Size(200, 28);
this.txt_outType.StyleController = this.layoutMx1;
@@ -674,7 +692,7 @@
//
this.txt_cusName.Location = new System.Drawing.Point(360, 44);
this.txt_cusName.Name = "txt_cusName";
- this.txt_cusName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_cusName.Properties.Appearance.Options.UseFont = true;
this.txt_cusName.Size = new System.Drawing.Size(200, 28);
this.txt_cusName.StyleController = this.layoutMx1;
@@ -684,7 +702,7 @@
//
this.txt_checkDate.Location = new System.Drawing.Point(912, 76);
this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
this.txt_checkDate.Size = new System.Drawing.Size(202, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
@@ -694,7 +712,7 @@
//
this.txt_createDate.Location = new System.Drawing.Point(636, 44);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
this.txt_createDate.Size = new System.Drawing.Size(200, 28);
this.txt_createDate.StyleController = this.layoutMx1;
@@ -704,7 +722,7 @@
//
this.txt_checkUser.Location = new System.Drawing.Point(912, 44);
this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
this.txt_checkUser.Size = new System.Drawing.Size(202, 28);
this.txt_checkUser.StyleController = this.layoutMx1;
@@ -714,7 +732,7 @@
//
this.txt_remark.Location = new System.Drawing.Point(636, 76);
this.txt_remark.Name = "txt_remark";
- this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Size = new System.Drawing.Size(200, 28);
this.txt_remark.StyleController = this.layoutMx1;
@@ -724,7 +742,7 @@
//
this.txt_kcOrg.Location = new System.Drawing.Point(84, 76);
this.txt_kcOrg.Name = "txt_kcOrg";
- this.txt_kcOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.txt_kcOrg.Properties.Appearance.Options.UseFont = true;
this.txt_kcOrg.Size = new System.Drawing.Size(200, 28);
this.txt_kcOrg.StyleController = this.layoutMx1;
@@ -738,6 +756,26 @@
this.txt_status.Size = new System.Drawing.Size(274, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 590;
+ //
+ // txt_sqRemark
+ //
+ this.txt_sqRemark.Location = new System.Drawing.Point(84, 140);
+ this.txt_sqRemark.Name = "txt_sqRemark";
+ this.txt_sqRemark.Size = new System.Drawing.Size(476, 24);
+ this.txt_sqRemark.StyleController = this.layoutMx1;
+ this.txt_sqRemark.TabIndex = 592;
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.lbGuid;
+ this.layoutControlItem17.Location = new System.Drawing.Point(828, 142);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem17.Size = new System.Drawing.Size(278, 36);
+ this.layoutControlItem17.Text = "lbGuid";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
//
// Root
//
@@ -760,38 +798,38 @@
this.layoutControlItem14,
this.layoutControlItem15,
this.layoutControlItem16,
- this.layoutControlItem17});
+ this.layoutControlItem18});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition21.Width = 100D;
- columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition22.Width = 100D;
- columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition23.Width = 100D;
- columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition24.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[] {
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24});
- rowDefinition26.Height = 100D;
- rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition27.Height = 100D;
- rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition28.Height = 100D;
- rowDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition29.Height = 100D;
- rowDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition30.Height = 100D;
- rowDefinition30.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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition26,
- rowDefinition27,
- rowDefinition28,
- rowDefinition29,
- rowDefinition30});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
this.Root.Size = new System.Drawing.Size(1126, 180);
this.Root.TextVisible = false;
//
@@ -964,17 +1002,16 @@
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
//
- // layoutControlItem17
+ // layoutControlItem18
//
- this.layoutControlItem17.Control = this.lbGuid;
- this.layoutControlItem17.Location = new System.Drawing.Point(828, 128);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(278, 32);
- this.layoutControlItem17.Text = "lbGuid";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem17.TextVisible = false;
+ this.layoutControlItem18.Control = this.txt_sqRemark;
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 128);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem18.Size = new System.Drawing.Size(552, 32);
+ this.layoutControlItem18.Text = "澶囨敞鍘熷洜";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -982,7 +1019,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, 397);
+ this.tabMx.Size = new System.Drawing.Size(1126, 387);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -992,7 +1029,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 365);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 355);
this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
//
// gcMx1
@@ -1001,13 +1038,15 @@
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(1124, 365);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 355);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
//
// gvMx1
//
+
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1workNo,
@@ -1028,7 +1067,7 @@
//
// gvMx1guid
//
- this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid ";
this.gvMx1guid.FieldName = "guid";
@@ -1039,7 +1078,7 @@
//
// gvMx1workNo
//
- this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
this.gvMx1workNo.Caption = "鐢宠鍗曞彿";
this.gvMx1workNo.FieldName = "workNo";
@@ -1052,7 +1091,7 @@
//
// gvMx1itemNo
//
- this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx1itemNo.Caption = "鐗╂枡缂栧彿 ";
this.gvMx1itemNo.FieldName = "itemNo";
@@ -1065,7 +1104,7 @@
//
// gvMx1itemId
//
- this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
this.gvMx1itemId.Caption = "鐗╂枡ID ";
this.gvMx1itemId.FieldName = "itemId";
@@ -1078,7 +1117,7 @@
//
// gvMx1createBy
//
- this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鐗╂枡鍚嶇О";
this.gvMx1createBy.FieldName = "itemName";
@@ -1091,7 +1130,7 @@
//
// gvMx1createDate
//
- this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
this.gvMx1createDate.Caption = "鐗╂枡瑙勬牸";
this.gvMx1createDate.FieldName = "itemModel";
@@ -1104,7 +1143,7 @@
//
// gvMx1quantity
//
- this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鐢宠鏁伴噺 ";
this.gvMx1quantity.FieldName = "quantitySq";
@@ -1117,7 +1156,7 @@
//
// gvMx1tlQty
//
- this.gvMx1tlQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1tlQty.AppearanceCell.Options.UseFont = true;
this.gvMx1tlQty.Caption = "宸叉壂鏁伴噺 ";
this.gvMx1tlQty.FieldName = "tlQty";
@@ -1130,10 +1169,10 @@
//
// gvMx1remark
//
- this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx1remark.AppearanceCell.Options.UseFont = true;
this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
- this.gvMx1remark.FieldName = "remark";
+ this.gvMx1remark.FieldName = "sqRemark";
this.gvMx1remark.MinWidth = 50;
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "query_a.remark";
@@ -1165,7 +1204,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 365);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 355);
this.tabMxPage2.Text = "鍑哄簱鏉＄爜";
//
// gcMx2
@@ -1174,13 +1213,15 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1124, 365);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 355);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
//
// gvMx2
//
+
+ this.gvMx2.Appearance.Row.Options.UseFont = true;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx2itemBarcode,
this.gvMx2itemNo,
@@ -1199,7 +1240,7 @@
//
// gvMx2itemBarcode
//
- this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx2itemBarcode.FieldName = "itemBarcode";
@@ -1212,7 +1253,7 @@
//
// gvMx2itemNo
//
- this.gvMx2itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
this.gvMx2itemNo.FieldName = "itemNo";
@@ -1225,7 +1266,7 @@
//
// gvMx2lotNo
//
- this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
this.gvMx2lotNo.FieldName = "itemName";
@@ -1238,7 +1279,7 @@
//
// gvMx2quantity
//
- this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
this.gvMx2quantity.Caption = "鏁伴噺";
this.gvMx2quantity.FieldName = "quantity";
@@ -1251,7 +1292,7 @@
//
// gvMx2depotCode
//
- this.gvMx2depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
this.gvMx2depotCode.Caption = "浠撳簱缂栫爜 ";
this.gvMx2depotCode.FieldName = "depotCode";
@@ -1264,7 +1305,7 @@
//
// gvMx2depotSectionCode
//
- this.gvMx2depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx2depotSectionCode.AppearanceCell.Options.UseFont = true;
this.gvMx2depotSectionCode.Caption = "璐т綅缂栫爜 ";
this.gvMx2depotSectionCode.FieldName = "depotSectionCode";
@@ -1297,7 +1338,7 @@
//
// gvMx2remark
//
- this.gvMx2remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+
this.gvMx2remark.AppearanceCell.Options.UseFont = true;
this.gvMx2remark.Caption = "澶囨敞 ";
this.gvMx2remark.FieldName = "remark";
@@ -1364,6 +1405,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1381,7 +1424,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1484,5 +1527,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraEditors.TextEdit txt_sqRemark;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
}
}
\ No newline at end of file
--
Gitblit v1.9.3