From 342b5740dded9d8bdb4a6bc5917d79b724b59aec Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期五, 12 十二月 2025 17:05:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 285 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 172 insertions(+), 113 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index e9506b7..aec7bcf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -31,61 +31,61 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesDbck));
- DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition23 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition24 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions28 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject109 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject110 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject111 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject112 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions29 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject113 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject114 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject115 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject116 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions30 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject117 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject118 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject119 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject120 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions31 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject121 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject122 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject123 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject124 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions32 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject125 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject126 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject127 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject128 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions33 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject129 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject130 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject131 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject132 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions34 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject133 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject134 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject135 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject136 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions35 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject137 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject138 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject139 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject140 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions36 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject141 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject142 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject143 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject144 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -125,10 +125,13 @@
this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_productCode = new DevExpress.XtraEditors.TextEdit();
this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
this.txt_djtype = new DevExpress.XtraEditors.ComboBoxEdit();
this.lbGuid = new System.Windows.Forms.Label();
@@ -186,6 +189,7 @@
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -263,6 +267,7 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_productCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djtype.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeInIdHead.Properties)).BeginInit();
@@ -315,6 +320,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -450,7 +456,9 @@
this.gv_id,
this.gridColumn51,
this.gridColumn52,
- this.gridColumn53});
+ this.gridColumn53,
+ this.gridColumn57,
+ this.gridColumn58});
this.gridView1.DetailHeight = 427;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 61;
@@ -776,6 +784,26 @@
this.gridColumn53.Name = "gridColumn53";
this.gridColumn53.Width = 117;
//
+ // gridColumn57
+ //
+ this.gridColumn57.Caption = "宸ュ崟鍗曞彿";
+ this.gridColumn57.FieldName = "workOrderNumber";
+ this.gridColumn57.MinWidth = 30;
+ this.gridColumn57.Name = "gridColumn57";
+ this.gridColumn57.Visible = true;
+ this.gridColumn57.VisibleIndex = 22;
+ this.gridColumn57.Width = 112;
+ //
+ // gridColumn58
+ //
+ this.gridColumn58.Caption = "浜у搧缂栫爜";
+ this.gridColumn58.FieldName = "productCode";
+ this.gridColumn58.MinWidth = 30;
+ this.gridColumn58.Name = "gridColumn58";
+ this.gridColumn58.Visible = true;
+ this.gridColumn58.VisibleIndex = 23;
+ this.gridColumn58.Width = 112;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -820,6 +848,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_productCode);
this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.txt_djtype);
this.layoutMx1.Controls.Add(this.lbGuid);
@@ -864,6 +893,15 @@
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // txt_productCode
+ //
+ this.txt_productCode.Location = new System.Drawing.Point(1209, 252);
+ this.txt_productCode.Name = "txt_productCode";
+ this.txt_productCode.Size = new System.Drawing.Size(237, 28);
+ this.txt_productCode.StyleController = this.layoutMx1;
+ this.txt_productCode.TabIndex = 446;
+ this.txt_productCode.Tag = "readonly";
+ //
// btnCopyXls
//
this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
@@ -885,7 +923,8 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_djtype.Properties.Items.AddRange(new object[] {
"鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)",
- "濮斿鐩存帴璋冩嫧鍗�(WWDB01_SYS)"});
+ "濮斿鐩存帴璋冩嫧鍗�(WWDB01_SYS)",
+ "鐢熶骇鐩存帴璋冩嫧鍗�(SCDB01_SYS)"});
this.txt_djtype.Properties.ReadOnly = true;
this.txt_djtype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_djtype.Size = new System.Drawing.Size(235, 28);
@@ -967,7 +1006,8 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBusinessType.Properties.Items.AddRange(new object[] {
"鏍囧噯(NORMAL)",
- "濮斿(WW)"});
+ "濮斿(WW)",
+ "鐢熶骇(SC)"});
this.txt_fBusinessType.Properties.ReadOnly = true;
this.txt_fBusinessType.Properties.Tag = "readonly";
this.txt_fBusinessType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
@@ -1049,7 +1089,8 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)",
- "濮斿璋冩嫧鐢宠鍗�(DBSQD02_WW)"});
+ "濮斿璋冩嫧鐢宠鍗�(DBSQD02_WW)",
+ "鐢熶骇璋冩嫧鐢宠鍗�(DBSQD03_SC)"});
this.txt_fBillTypeID.Properties.SuppressMouseEventOnOuterMouseClick = true;
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_fBillTypeID.Properties.EditValueChanged += new System.EventHandler(this.txt_fBillTypeID_EditValueChanged);
@@ -1295,41 +1336,42 @@
this.layoutControlItem11,
this.layoutControlItem27,
this.layoutControlItem30,
- this.layoutControlItem1});
+ this.layoutControlItem1,
+ this.layoutControlItem31});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition13.Width = 100D;
- columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition14.Width = 100D;
- columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition15.Width = 100D;
- columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition16.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[] {
- columnDefinition13,
- columnDefinition14,
- columnDefinition15,
- columnDefinition16});
- rowDefinition19.Height = 100D;
- rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition20.Height = 100D;
- rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition21.Height = 100D;
- rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition22.Height = 100D;
- rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition23.Height = 100D;
- rowDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition24.Height = 100D;
- rowDefinition24.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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition19,
- rowDefinition20,
- rowDefinition21,
- rowDefinition22,
- rowDefinition23,
- rowDefinition24});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1458, 310);
this.Root.TextVisible = false;
//
@@ -1591,6 +1633,17 @@
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
//
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_productCode;
+ this.layoutControlItem31.Location = new System.Drawing.Point(1077, 240);
+ this.layoutControlItem31.Name = "layoutControlItem31";
+ this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem31.Size = new System.Drawing.Size(361, 50);
+ this.layoutControlItem31.Text = "浜у搧缂栫爜";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(108, 22);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1670,7 +1723,7 @@
this.gridColumn54,
this.gridColumn55,
this.gridColumn56});
- this.gvMx1.CustomizationFormBounds = new System.Drawing.Rectangle(1141, 791, 389, 299);
+ this.gvMx1.CustomizationFormBounds = new System.Drawing.Rectangle(1141, 492, 389, 299);
this.gvMx1.DetailHeight = 427;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -1916,9 +1969,9 @@
// rptDcOrg
//
this.rptDcOrg.AutoHeight = false;
- editorButtonImageOptions28.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
this.rptDcOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions28, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject109, serializableAppearanceObject110, serializableAppearanceObject111, serializableAppearanceObject112, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcOrg.Name = "rptDcOrg";
this.rptDcOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcOrg_ButtonClick);
//
@@ -1940,9 +1993,9 @@
// rptDcCk
//
this.rptDcCk.AutoHeight = false;
- editorButtonImageOptions29.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions29, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject113, serializableAppearanceObject114, serializableAppearanceObject115, serializableAppearanceObject116, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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.rptDcCk.Name = "rptDcCk";
this.rptDcCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCk_ButtonClick);
//
@@ -1960,9 +2013,9 @@
// rptDcCw
//
this.rptDcCw.AutoHeight = false;
- editorButtonImageOptions30.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions30, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject117, serializableAppearanceObject118, serializableAppearanceObject119, serializableAppearanceObject120, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcCw.Name = "rptDcCw";
this.rptDcCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCw_ButtonClick);
//
@@ -1984,9 +2037,9 @@
// rptDrOrg
//
this.rptDrOrg.AutoHeight = false;
- editorButtonImageOptions31.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions31, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject121, serializableAppearanceObject122, serializableAppearanceObject123, serializableAppearanceObject124, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrOrg.Name = "rptDrOrg";
this.rptDrOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrOrg_ButtonClick);
//
@@ -2008,9 +2061,9 @@
// rptDrCk
//
this.rptDrCk.AutoHeight = false;
- editorButtonImageOptions32.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions32, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject125, serializableAppearanceObject126, serializableAppearanceObject127, serializableAppearanceObject128, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrCk.Name = "rptDrCk";
this.rptDrCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCk_ButtonClick);
//
@@ -2026,9 +2079,9 @@
// rptDrCw
//
this.rptDrCw.AutoHeight = false;
- editorButtonImageOptions33.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions33, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject129, serializableAppearanceObject130, serializableAppearanceObject131, serializableAppearanceObject132, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrCw.Name = "rptDrCw";
this.rptDrCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCw_ButtonClick);
//
@@ -2050,9 +2103,9 @@
// rptDcHz
//
this.rptDcHz.AutoHeight = false;
- editorButtonImageOptions34.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions34, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject133, serializableAppearanceObject134, serializableAppearanceObject135, serializableAppearanceObject136, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcHz.Name = "rptDcHz";
this.rptDcHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcHz_ButtonClick);
//
@@ -2074,9 +2127,9 @@
// rptDrHz
//
this.rptDrHz.AutoHeight = false;
- editorButtonImageOptions35.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions35, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject137, serializableAppearanceObject138, serializableAppearanceObject139, serializableAppearanceObject140, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrHz.Name = "rptDrHz";
this.rptDrHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrHz_ButtonClick);
//
@@ -2093,10 +2146,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions36.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions36.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions9.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions36, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject141, serializableAppearanceObject142, serializableAppearanceObject143, serializableAppearanceObject144, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2182,7 +2235,7 @@
this.gridColumn54.Name = "gridColumn54";
this.gridColumn54.Visible = true;
this.gridColumn54.VisibleIndex = 15;
- this.gridColumn54.Width = 112;
+ this.gridColumn54.Width = 111;
//
// gridColumn55
//
@@ -2190,7 +2243,7 @@
this.gridColumn55.FieldName = "dabErpId";
this.gridColumn55.MinWidth = 30;
this.gridColumn55.Name = "gridColumn55";
- this.gridColumn55.Width = 112;
+ this.gridColumn55.Width = 111;
//
// gridColumn56
//
@@ -2200,7 +2253,7 @@
this.gridColumn56.Name = "gridColumn56";
this.gridColumn56.Visible = true;
this.gridColumn56.VisibleIndex = 16;
- this.gridColumn56.Width = 112;
+ this.gridColumn56.Width = 111;
//
// btnTest1
//
@@ -2285,6 +2338,7 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_productCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djtype.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeInIdHead.Properties)).EndInit();
@@ -2337,6 +2391,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2519,5 +2574,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn57;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
+ private DevExpress.XtraEditors.TextEdit txt_productCode;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
}
}
\ No newline at end of file
--
Gitblit v1.9.3