From db9189bc9225f858949c5ff098282cb136009303 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 21 二月 2025 09:53:48 +0800
Subject: [PATCH] 委外退料
---
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 2
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 47 +
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs | 583 ++++++++++++++++----------------
DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs | 187 ++++++++++
DevApp/Gs.DevApp/DevFrm/XtraForm1.cs | 100 +++++
DevApp/Gs.DevApp/DevFrm/XtraForm1.resx | 123 ++++++
7 files changed, 741 insertions(+), 310 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index ef87373..28de944 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -59,7 +59,7 @@
txt_noLength.ValueChanged += (s, e) => { DoPreviewCode(); };
txt_isIncludeDoc.CheckedChanged += (s, e) => { DoPreviewCode(); };
txt_isSpilit.CheckedChanged += (s, e) => { DoPreviewCode(); };
-
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index 6d80d33..1002d20 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -29,16 +29,16 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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 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();
this.gvMx1tld009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld007 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld006 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -63,7 +63,7 @@
this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
- this.kyPrtQty = new DevExpress.XtraEditors.TextEdit();
+ this.txtKdy = new DevExpress.XtraEditors.TextEdit();
this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
this.txtYdy = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -76,7 +76,7 @@
this.txtWlid = new DevExpress.XtraEditors.TextEdit();
this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
this.lb_tbl021 = new DevExpress.XtraEditors.LabelControl();
- this.txt_tbl021 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.lb_tbl020 = new DevExpress.XtraEditors.LabelControl();
this.lb_tbl013 = new DevExpress.XtraEditors.LabelControl();
this.lb_tbl012 = new DevExpress.XtraEditors.LabelControl();
@@ -87,13 +87,9 @@
this.txt_tbl006 = new DevExpress.XtraEditors.TextEdit();
this.lb_tbl005 = new DevExpress.XtraEditors.LabelControl();
this.lb_tbl004 = new DevExpress.XtraEditors.LabelControl();
- this.txt_tbl004 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.lb_tbl003 = new DevExpress.XtraEditors.LabelControl();
- this.txt_tbl003 = new DevExpress.XtraEditors.TextEdit();
- this.lb_tbl002 = new DevExpress.XtraEditors.LabelControl();
- this.lb_tbl001 = new DevExpress.XtraEditors.LabelControl();
- this.txt_tbl001 = new DevExpress.XtraEditors.TextEdit();
- this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
+ this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -118,7 +114,16 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_tbl002 = new Gs.DevApp.UserControl.UcLookWwgd();
+ this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_tbl013 = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_tbl005 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+ this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -130,16 +135,11 @@
this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.panel1 = new System.Windows.Forms.Panel();
- this.txt_tbl002 = new Gs.DevApp.UserControl.UcLookWwgd();
- this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
- this.txt_tbl013 = new DevExpress.XtraEditors.CheckEdit();
- this.txt_tbl005 = new DevExpress.XtraEditors.ComboBoxEdit();
- this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
- this.lbGuid = new System.Windows.Forms.Label();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -148,19 +148,18 @@
this.panelMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtYdy.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();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl021.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl004.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl003.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl001.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -171,14 +170,15 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.xtraTabPage3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl005.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx1tld009
@@ -305,7 +305,7 @@
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Controls.Add(this.panelMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 370);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 376);
this.tabMxPage1.Text = "閫�鏂欐槑缁�";
//
// gcMx1
@@ -316,7 +316,7 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 272);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 278);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -382,10 +382,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", 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);
@@ -398,7 +398,7 @@
this.panelMx1.Controls.Add(this.labelControl14);
this.panelMx1.Controls.Add(this.txt_psnQty_1);
this.panelMx1.Controls.Add(this.labelControl12);
- this.panelMx1.Controls.Add(this.kyPrtQty);
+ this.panelMx1.Controls.Add(this.txtKdy);
this.panelMx1.Controls.Add(this.labelControl13);
this.panelMx1.Controls.Add(this.txtYdy);
this.panelMx1.Controls.Add(this.labelControl1);
@@ -468,15 +468,15 @@
this.labelControl12.TabIndex = 225;
this.labelControl12.Text = "姣忓紶鏉＄爜鏁伴噺锛�";
//
- // kyPrtQty
+ // txtKdy
//
- this.kyPrtQty.Location = new System.Drawing.Point(430, 65);
- this.kyPrtQty.Name = "kyPrtQty";
- this.kyPrtQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.kyPrtQty.Properties.Appearance.Options.UseFont = true;
- this.kyPrtQty.Properties.ReadOnly = true;
- this.kyPrtQty.Size = new System.Drawing.Size(96, 28);
- this.kyPrtQty.TabIndex = 224;
+ this.txtKdy.Location = new System.Drawing.Point(430, 65);
+ this.txtKdy.Name = "txtKdy";
+ this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtKdy.Properties.Appearance.Options.UseFont = true;
+ this.txtKdy.Properties.ReadOnly = true;
+ this.txtKdy.Size = new System.Drawing.Size(96, 28);
+ this.txtKdy.TabIndex = 224;
//
// labelControl13
//
@@ -580,27 +580,27 @@
//
this.lb_tbl021.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl021.Appearance.Options.UseFont = true;
- this.lb_tbl021.Location = new System.Drawing.Point(256, 54);
+ this.lb_tbl021.Location = new System.Drawing.Point(540, 19);
this.lb_tbl021.Name = "lb_tbl021";
- this.lb_tbl021.Size = new System.Drawing.Size(73, 21);
+ this.lb_tbl021.Size = new System.Drawing.Size(68, 21);
this.lb_tbl021.TabIndex = 298;
- this.lb_tbl021.Text = "鐢熶骇杞﹂棿 ";
+ this.lb_tbl021.Text = "浜у搧缂栫爜";
//
- // txt_tbl021
+ // txt_itemNo
//
- this.txt_tbl021.Enabled = false;
- this.txt_tbl021.Location = new System.Drawing.Point(331, 50);
- this.txt_tbl021.Name = "txt_tbl021";
- this.txt_tbl021.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_tbl021.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl021.Size = new System.Drawing.Size(150, 28);
- this.txt_tbl021.TabIndex = 298;
+ this.txt_itemNo.Enabled = false;
+ this.txt_itemNo.Location = new System.Drawing.Point(615, 15);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(158, 28);
+ this.txt_itemNo.TabIndex = 298;
//
// lb_tbl020
//
this.lb_tbl020.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl020.Appearance.Options.UseFont = true;
- this.lb_tbl020.Location = new System.Drawing.Point(745, 120);
+ this.lb_tbl020.Location = new System.Drawing.Point(885, 87);
this.lb_tbl020.Name = "lb_tbl020";
this.lb_tbl020.Size = new System.Drawing.Size(73, 21);
this.lb_tbl020.TabIndex = 291;
@@ -610,26 +610,26 @@
//
this.lb_tbl013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl013.Appearance.Options.UseFont = true;
- this.lb_tbl013.Location = new System.Drawing.Point(745, 88);
+ this.lb_tbl013.Location = new System.Drawing.Point(779, 87);
this.lb_tbl013.Name = "lb_tbl013";
- this.lb_tbl013.Size = new System.Drawing.Size(73, 21);
+ this.lb_tbl013.Size = new System.Drawing.Size(68, 21);
this.lb_tbl013.TabIndex = 252;
- this.lb_tbl013.Text = "瀹℃牳鐘舵�� ";
+ this.lb_tbl013.Text = "瀹℃牳鐘舵��";
//
// lb_tbl012
//
this.lb_tbl012.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl012.Appearance.Options.UseFont = true;
- this.lb_tbl012.Location = new System.Drawing.Point(745, 54);
+ this.lb_tbl012.Location = new System.Drawing.Point(779, 54);
this.lb_tbl012.Name = "lb_tbl012";
- this.lb_tbl012.Size = new System.Drawing.Size(73, 21);
+ this.lb_tbl012.Size = new System.Drawing.Size(68, 21);
this.lb_tbl012.TabIndex = 247;
- this.lb_tbl012.Text = "瀹℃牳鏃堕棿 ";
+ this.lb_tbl012.Text = "瀹℃牳鏃堕棿";
//
// txt_tbl012
//
this.txt_tbl012.Enabled = false;
- this.txt_tbl012.Location = new System.Drawing.Point(822, 50);
+ this.txt_tbl012.Location = new System.Drawing.Point(852, 50);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
@@ -640,16 +640,16 @@
//
this.lb_tbl011.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl011.Appearance.Options.UseFont = true;
- this.lb_tbl011.Location = new System.Drawing.Point(762, 20);
+ this.lb_tbl011.Location = new System.Drawing.Point(796, 20);
this.lb_tbl011.Name = "lb_tbl011";
- this.lb_tbl011.Size = new System.Drawing.Size(56, 21);
+ this.lb_tbl011.Size = new System.Drawing.Size(51, 21);
this.lb_tbl011.TabIndex = 243;
- this.lb_tbl011.Text = "瀹℃牳浜� ";
+ this.lb_tbl011.Text = "瀹℃牳浜�";
//
// txt_tbl011
//
this.txt_tbl011.Enabled = false;
- this.txt_tbl011.Location = new System.Drawing.Point(822, 16);
+ this.txt_tbl011.Location = new System.Drawing.Point(852, 16);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
@@ -660,26 +660,26 @@
//
this.lb_tbl006.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl006.Appearance.Options.UseFont = true;
- this.lb_tbl006.Location = new System.Drawing.Point(45, 120);
+ this.lb_tbl006.Location = new System.Drawing.Point(337, 85);
this.lb_tbl006.Name = "lb_tbl006";
- this.lb_tbl006.Size = new System.Drawing.Size(39, 21);
+ this.lb_tbl006.Size = new System.Drawing.Size(34, 21);
this.lb_tbl006.TabIndex = 226;
- this.lb_tbl006.Text = "澶囨敞 ";
+ this.lb_tbl006.Text = "澶囨敞";
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(85, 116);
+ this.txt_tbl006.Location = new System.Drawing.Point(382, 81);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl006.Size = new System.Drawing.Size(650, 28);
+ this.txt_tbl006.Size = new System.Drawing.Size(391, 28);
this.txt_tbl006.TabIndex = 226;
//
// lb_tbl005
//
this.lb_tbl005.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl005.Appearance.Options.UseFont = true;
- this.lb_tbl005.Location = new System.Drawing.Point(11, 88);
+ this.lb_tbl005.Location = new System.Drawing.Point(11, 85);
this.lb_tbl005.Name = "lb_tbl005";
this.lb_tbl005.Size = new System.Drawing.Size(73, 21);
this.lb_tbl005.TabIndex = 222;
@@ -689,81 +689,41 @@
//
this.lb_tbl004.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl004.Appearance.Options.UseFont = true;
- this.lb_tbl004.Location = new System.Drawing.Point(508, 54);
+ this.lb_tbl004.Location = new System.Drawing.Point(540, 54);
this.lb_tbl004.Name = "lb_tbl004";
- this.lb_tbl004.Size = new System.Drawing.Size(73, 21);
+ this.lb_tbl004.Size = new System.Drawing.Size(68, 21);
this.lb_tbl004.TabIndex = 219;
- this.lb_tbl004.Text = "浜у搧鍨嬪彿 ";
+ this.lb_tbl004.Text = "浜у搧鍨嬪彿";
//
- // txt_tbl004
+ // txt_itemModel
//
- this.txt_tbl004.Enabled = false;
- this.txt_tbl004.Location = new System.Drawing.Point(585, 50);
- this.txt_tbl004.Name = "txt_tbl004";
- this.txt_tbl004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_tbl004.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl004.Size = new System.Drawing.Size(150, 28);
- this.txt_tbl004.TabIndex = 219;
+ this.txt_itemModel.Enabled = false;
+ this.txt_itemModel.Location = new System.Drawing.Point(615, 50);
+ this.txt_itemModel.Name = "txt_itemModel";
+ this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemModel.Size = new System.Drawing.Size(158, 28);
+ this.txt_itemModel.TabIndex = 219;
//
// lb_tbl003
//
this.lb_tbl003.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tbl003.Appearance.Options.UseFont = true;
- this.lb_tbl003.Location = new System.Drawing.Point(256, 20);
+ this.lb_tbl003.Location = new System.Drawing.Point(303, 20);
this.lb_tbl003.Name = "lb_tbl003";
- this.lb_tbl003.Size = new System.Drawing.Size(73, 21);
+ this.lb_tbl003.Size = new System.Drawing.Size(68, 21);
this.lb_tbl003.TabIndex = 217;
- this.lb_tbl003.Text = "浠诲姟鍗曞彿 ";
+ this.lb_tbl003.Text = "浠诲姟鍗曞彿";
//
- // txt_tbl003
+ // txt_daa014
//
- this.txt_tbl003.Enabled = false;
- this.txt_tbl003.Location = new System.Drawing.Point(331, 16);
- this.txt_tbl003.Name = "txt_tbl003";
- this.txt_tbl003.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_tbl003.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl003.Size = new System.Drawing.Size(150, 28);
- this.txt_tbl003.TabIndex = 217;
- //
- // lb_tbl002
- //
- this.lb_tbl002.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_tbl002.Appearance.Options.UseFont = true;
- this.lb_tbl002.Location = new System.Drawing.Point(11, 54);
- this.lb_tbl002.Name = "lb_tbl002";
- this.lb_tbl002.Size = new System.Drawing.Size(73, 21);
- this.lb_tbl002.TabIndex = 216;
- this.lb_tbl002.Text = "鐢熶骇宸ュ崟 ";
- //
- // lb_tbl001
- //
- this.lb_tbl001.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_tbl001.Appearance.Options.UseFont = true;
- this.lb_tbl001.Location = new System.Drawing.Point(508, 20);
- this.lb_tbl001.Name = "lb_tbl001";
- this.lb_tbl001.Size = new System.Drawing.Size(73, 21);
- this.lb_tbl001.TabIndex = 213;
- this.lb_tbl001.Text = "浜х嚎鍚嶇О ";
- //
- // txt_tbl001
- //
- this.txt_tbl001.Enabled = false;
- this.txt_tbl001.Location = new System.Drawing.Point(585, 16);
- this.txt_tbl001.Name = "txt_tbl001";
- this.txt_tbl001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_tbl001.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl001.Size = new System.Drawing.Size(150, 28);
- this.txt_tbl001.TabIndex = 213;
- //
- // lb_billNo
- //
- this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_billNo.Appearance.Options.UseFont = true;
- this.lb_billNo.Location = new System.Drawing.Point(11, 20);
- this.lb_billNo.Name = "lb_billNo";
- this.lb_billNo.Size = new System.Drawing.Size(73, 21);
- this.lb_billNo.TabIndex = 211;
- this.lb_billNo.Text = "閫�鏂欏崟鍙� ";
+ this.txt_daa014.Enabled = false;
+ this.txt_daa014.Location = new System.Drawing.Point(382, 16);
+ this.txt_daa014.Name = "txt_daa014";
+ this.txt_daa014.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_daa014.Properties.Appearance.Options.UseFont = true;
+ this.txt_daa014.Size = new System.Drawing.Size(150, 28);
+ this.txt_daa014.TabIndex = 217;
//
// txt_billNo
//
@@ -772,7 +732,7 @@
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(213, 28);
this.txt_billNo.TabIndex = 211;
//
// toolBarMenu1
@@ -924,7 +884,7 @@
//
this.gv_tbl002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_tbl002.AppearanceCell.Options.UseFont = true;
- this.gv_tbl002.Caption = "鐢熶骇宸ュ崟 ";
+ this.gv_tbl002.Caption = "濮斿宸ュ崟";
this.gv_tbl002.FieldName = "daa001";
this.gv_tbl002.MinWidth = 50;
this.gv_tbl002.Name = "gv_tbl002";
@@ -1061,10 +1021,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 190);
+ this.tabMx.Location = new System.Drawing.Point(0, 149);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 402);
+ this.tabMx.Size = new System.Drawing.Size(1126, 443);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1074,21 +1034,134 @@
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1124, 370);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1124, 411);
this.xtraTabPage3.Text = "鏉＄爜鏄庣粏";
//
- // gcMx2
+ // panel1
//
- this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.Location = new System.Drawing.Point(0, 0);
- 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, 370);
- this.gcMx2.TabIndex = 2;
- this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx2});
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.labelControl5);
+ this.panel1.Controls.Add(this.labelControl4);
+ this.panel1.Controls.Add(this.txt_itemName);
+ this.panel1.Controls.Add(this.labelControl2);
+ this.panel1.Controls.Add(this.txt_tbl002);
+ this.panel1.Controls.Add(this.txt_tbl020);
+ this.panel1.Controls.Add(this.txt_tbl013);
+ this.panel1.Controls.Add(this.txt_tbl005);
+ this.panel1.Controls.Add(this.btnSelect);
+ this.panel1.Controls.Add(this.labelControl11);
+ this.panel1.Controls.Add(this.lbGuid);
+ this.panel1.Controls.Add(this.lb_tbl021);
+ this.panel1.Controls.Add(this.txt_itemNo);
+ this.panel1.Controls.Add(this.lb_tbl020);
+ this.panel1.Controls.Add(this.lb_tbl013);
+ this.panel1.Controls.Add(this.lb_tbl012);
+ this.panel1.Controls.Add(this.txt_tbl012);
+ this.panel1.Controls.Add(this.lb_tbl011);
+ this.panel1.Controls.Add(this.txt_tbl011);
+ this.panel1.Controls.Add(this.lb_tbl006);
+ this.panel1.Controls.Add(this.txt_tbl006);
+ this.panel1.Controls.Add(this.lb_tbl005);
+ this.panel1.Controls.Add(this.lb_tbl004);
+ this.panel1.Controls.Add(this.txt_itemModel);
+ this.panel1.Controls.Add(this.lb_tbl003);
+ this.panel1.Controls.Add(this.txt_daa014);
+ this.panel1.Controls.Add(this.txt_billNo);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1126, 149);
+ this.panel1.TabIndex = 1;
+ //
+ // txt_tbl002
+ //
+ this.txt_tbl002.IsReadly = false;
+ this.txt_tbl002.Location = new System.Drawing.Point(85, 48);
+ this.txt_tbl002.Name = "txt_tbl002";
+ this.txt_tbl002.Size = new System.Drawing.Size(213, 32);
+ this.txt_tbl002.TabIndex = 462;
+ //
+ // txt_tbl020
+ //
+ this.txt_tbl020.Enabled = false;
+ this.txt_tbl020.Location = new System.Drawing.Point(961, 85);
+ this.txt_tbl020.Name = "txt_tbl020";
+ this.txt_tbl020.Properties.Caption = "";
+ this.txt_tbl020.Size = new System.Drawing.Size(94, 24);
+ this.txt_tbl020.TabIndex = 461;
+ //
+ // txt_tbl013
+ //
+ this.txt_tbl013.Enabled = false;
+ this.txt_tbl013.Location = new System.Drawing.Point(852, 85);
+ this.txt_tbl013.Name = "txt_tbl013";
+ this.txt_tbl013.Properties.Caption = "";
+ this.txt_tbl013.Size = new System.Drawing.Size(34, 24);
+ this.txt_tbl013.TabIndex = 460;
+ //
+ // txt_tbl005
+ //
+ this.txt_tbl005.Location = new System.Drawing.Point(85, 83);
+ this.txt_tbl005.Name = "txt_tbl005";
+ this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_tbl005.Properties.Items.AddRange(new object[] {
+ "鑹搧閫�鏂�",
+ "鏉ユ枡涓嶈壇閫�鏂�",
+ "浣滀笟涓嶈壇閫�鏂�"});
+ this.txt_tbl005.Size = new System.Drawing.Size(213, 24);
+ this.txt_tbl005.TabIndex = 459;
+ //
+ // btnSelect
+ //
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(11, 113);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(107, 29);
+ this.btnSelect.TabIndex = 457;
+ this.btnSelect.Text = "閫夊彇鐗╂枡";
+ //
+ // labelControl11
+ //
+ this.labelControl11.Location = new System.Drawing.Point(1010, 119);
+ this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl11.Name = "labelControl11";
+ this.labelControl11.Size = new System.Drawing.Size(45, 18);
+ this.labelControl11.TabIndex = 130;
+ this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(1061, 119);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(1016, 45);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 5;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions8.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, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", 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);
//
// gvMx2
//
@@ -1222,131 +1295,58 @@
this.gvBtnAlawys.VisibleIndex = 8;
this.gvBtnAlawys.Width = 94;
//
- // repositoryItemButtonEdit2
+ // gcMx2
//
- this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_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.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.Location = new System.Drawing.Point(0, 0);
+ 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, 411);
+ this.gcMx2.TabIndex = 2;
+ this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx2});
//
- // panel1
+ // labelControl2
//
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_tbl002);
- this.panel1.Controls.Add(this.txt_tbl020);
- this.panel1.Controls.Add(this.txt_tbl013);
- this.panel1.Controls.Add(this.txt_tbl005);
- this.panel1.Controls.Add(this.btnSelect);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_tbl021);
- this.panel1.Controls.Add(this.txt_tbl021);
- this.panel1.Controls.Add(this.lb_tbl020);
- this.panel1.Controls.Add(this.lb_tbl013);
- this.panel1.Controls.Add(this.lb_tbl012);
- this.panel1.Controls.Add(this.txt_tbl012);
- this.panel1.Controls.Add(this.lb_tbl011);
- this.panel1.Controls.Add(this.txt_tbl011);
- this.panel1.Controls.Add(this.lb_tbl006);
- this.panel1.Controls.Add(this.txt_tbl006);
- this.panel1.Controls.Add(this.lb_tbl005);
- this.panel1.Controls.Add(this.lb_tbl004);
- this.panel1.Controls.Add(this.txt_tbl004);
- this.panel1.Controls.Add(this.lb_tbl003);
- this.panel1.Controls.Add(this.txt_tbl003);
- this.panel1.Controls.Add(this.lb_tbl002);
- this.panel1.Controls.Add(this.lb_tbl001);
- this.panel1.Controls.Add(this.txt_tbl001);
- this.panel1.Controls.Add(this.lb_billNo);
- this.panel1.Controls.Add(this.txt_billNo);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 190);
- this.panel1.TabIndex = 1;
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Location = new System.Drawing.Point(303, 53);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(68, 21);
+ this.labelControl2.TabIndex = 463;
+ this.labelControl2.Text = "浜у搧鍚嶇О";
//
- // txt_tbl002
+ // txt_itemName
//
- this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(85, 48);
- this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(165, 28);
- this.txt_tbl002.TabIndex = 462;
+ this.txt_itemName.Enabled = false;
+ this.txt_itemName.Location = new System.Drawing.Point(382, 49);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemName.TabIndex = 464;
//
- // txt_tbl020
+ // labelControl4
//
- this.txt_tbl020.Enabled = false;
- this.txt_tbl020.Location = new System.Drawing.Point(822, 120);
- this.txt_tbl020.Name = "txt_tbl020";
- this.txt_tbl020.Properties.Caption = "";
- this.txt_tbl020.Size = new System.Drawing.Size(94, 24);
- this.txt_tbl020.TabIndex = 461;
+ this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl4.Appearance.Options.UseFont = true;
+ this.labelControl4.Location = new System.Drawing.Point(11, 19);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(68, 21);
+ this.labelControl4.TabIndex = 467;
+ this.labelControl4.Text = "鐢宠鍗曞彿";
//
- // txt_tbl013
+ // labelControl5
//
- this.txt_tbl013.Enabled = false;
- this.txt_tbl013.Location = new System.Drawing.Point(822, 85);
- this.txt_tbl013.Name = "txt_tbl013";
- this.txt_tbl013.Properties.Caption = "";
- this.txt_tbl013.Size = new System.Drawing.Size(94, 24);
- this.txt_tbl013.TabIndex = 460;
- //
- // txt_tbl005
- //
- this.txt_tbl005.Location = new System.Drawing.Point(85, 86);
- this.txt_tbl005.Name = "txt_tbl005";
- this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_tbl005.Properties.Items.AddRange(new object[] {
- "鑹搧閫�鏂�",
- "鏉ユ枡涓嶈壇閫�鏂�",
- "浣滀笟涓嶈壇閫�鏂�"});
- this.txt_tbl005.Size = new System.Drawing.Size(150, 24);
- this.txt_tbl005.TabIndex = 459;
- //
- // btnSelect
- //
- this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 150);
- this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(107, 29);
- this.btnSelect.TabIndex = 457;
- this.btnSelect.Text = "閫夊彇鐗╂枡";
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(993, 119);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(45, 18);
- this.labelControl11.TabIndex = 130;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(1044, 119);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Visible = false;
- //
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1016, 45);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 5;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(11, 53);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(68, 21);
+ this.labelControl5.TabIndex = 468;
+ this.labelControl5.Text = "濮斿宸ュ崟";
//
// Frm_WwTbl
//
@@ -1367,19 +1367,18 @@
this.panelMx1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtYdy.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();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl021.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl004.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl003.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl001.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
@@ -1390,15 +1389,16 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.xtraTabPage3.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl005.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1426,7 +1426,7 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraEditors.LabelControl lb_tbl021;
- private DevExpress.XtraEditors.TextEdit txt_tbl021;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.LabelControl lb_tbl020;
@@ -1444,17 +1444,10 @@
private DevExpress.XtraEditors.LabelControl lb_tbl005;
private DevExpress.XtraEditors.LabelControl lb_tbl004;
- private DevExpress.XtraEditors.TextEdit txt_tbl004;
+ private DevExpress.XtraEditors.TextEdit txt_itemModel;
private DevExpress.XtraEditors.LabelControl lb_tbl003;
- private DevExpress.XtraEditors.TextEdit txt_tbl003;
-
- private DevExpress.XtraEditors.LabelControl lb_tbl002;
-
- private DevExpress.XtraEditors.LabelControl lb_tbl001;
- private DevExpress.XtraEditors.TextEdit txt_tbl001;
-
- private DevExpress.XtraEditors.LabelControl lb_billNo;
+ private DevExpress.XtraEditors.TextEdit txt_daa014;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
@@ -1466,7 +1459,7 @@
private DevExpress.XtraEditors.LabelControl labelControl14;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private DevExpress.XtraEditors.LabelControl labelControl12;
- private DevExpress.XtraEditors.TextEdit kyPrtQty;
+ private DevExpress.XtraEditors.TextEdit txtKdy;
private DevExpress.XtraEditors.LabelControl labelControl13;
private DevExpress.XtraEditors.TextEdit txtYdy;
private DevExpress.XtraEditors.LabelControl labelControl1;
@@ -1516,5 +1509,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraEditors.LabelControl labelControl4;
+ private DevExpress.XtraEditors.LabelControl labelControl5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index d22c35b..ae1ef21 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -28,9 +28,10 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "tbl013", "", (value) =>
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "tbl013", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -113,7 +114,7 @@
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim()
+ this.ucBtnPrint1.rptParameter = "rpt_wwtl{" + lbMxGuid.Text.Trim()
+ "," + ""
+ "," + ""
+ "," + txt_iCount_1.Text.Trim()
@@ -121,14 +122,26 @@
+ "}";
};
}
-
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
await Task.Delay(100);
getPageList(1);
}
-
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -170,7 +183,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_billNo, gridView1);
toolBarMenu1.guidKey = rowGuid;
- toolBarMenu1.rptParameter = "rpt_SCTL{}";
+ toolBarMenu1.rptParameter = "rpt_wwtl{}";
}
private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
{
@@ -205,7 +218,7 @@
this.toolBarMenu1.rptParameter = "return false";
return;
}
- this.toolBarMenu1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim()
+ this.toolBarMenu1.rptParameter = "rpt_wwtl{" + lbMxGuid.Text.Trim()
+ "," + ""
+ "," + ""
+ "," + txt_iCount_1.Text.Trim()
@@ -418,9 +431,14 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
- lbGuid.Text = _rtn.rtnData;
+ lbGuid.Text = _rtn.rtnData.outGuid;
+ txt_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+ toolBarMenu1.currentAction = "";
}
}
catch (Exception ex)
@@ -680,7 +698,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
@@ -694,13 +711,11 @@
txtWlgg.Text = row["tld004"].ToString();
txtWlmc.Text = row["tld003"].ToString();
txtQuantity.Text = row["tld004"].ToString();//鐢宠鎬婚噺
- //txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
- //kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
+ //txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
+ //kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
txtYdy.Text = "";//宸叉墦鍗版�婚噺
- kyPrtQty.Text = "";//鍙墦鍗版�婚噺
+ txtKdy.Text = "";//鍙墦鍗版�婚噺
}
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
new file mode 100644
index 0000000..7f7335c
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
@@ -0,0 +1,187 @@
+锘縩amespace Gs.DevApp.DevFrm
+{
+ partial class XtraForm1
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.dockManager1 = new DevExpress.XtraBars.Docking.DockManager(this.components);
+ this.dockPanel6 = new DevExpress.XtraBars.Docking.DockPanel();
+ this.dockPanel6_Container = new DevExpress.XtraBars.Docking.ControlContainer();
+ this.panTuo = new DevExpress.XtraEditors.PanelControl();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.lbMsg = new DevExpress.XtraEditors.LabelControl();
+ this.dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
+ this.dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
+ ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).BeginInit();
+ this.dockPanel6.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.panTuo)).BeginInit();
+ this.panTuo.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ this.dockPanel1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // dockManager1
+ //
+ this.dockManager1.Form = this;
+ this.dockManager1.HiddenPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] {
+ this.dockPanel6});
+ this.dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] {
+ this.dockPanel1});
+ this.dockManager1.TopZIndexControls.AddRange(new string[] {
+ "DevExpress.XtraBars.BarDockControl",
+ "DevExpress.XtraBars.StandaloneBarDockControl",
+ "System.Windows.Forms.MenuStrip",
+ "System.Windows.Forms.StatusStrip",
+ "System.Windows.Forms.StatusBar",
+ "DevExpress.XtraBars.Ribbon.RibbonStatusBar",
+ "DevExpress.XtraBars.Ribbon.RibbonControl",
+ "DevExpress.XtraBars.Navigation.OfficeNavigationBar",
+ "DevExpress.XtraBars.Navigation.TileNavPane",
+ "DevExpress.XtraBars.TabFormControl",
+ "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl",
+ "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"});
+ //
+ // dockPanel6
+ //
+ this.dockPanel6.Controls.Add(this.dockPanel6_Container);
+ this.dockPanel6.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float;
+ this.dockPanel6.ID = new System.Guid("d1ecdb58-0d2a-4534-939d-21df5f7ede56");
+ this.dockPanel6.Location = new System.Drawing.Point(-32768, -32768);
+ this.dockPanel6.Name = "dockPanel6";
+ this.dockPanel6.OriginalSize = new System.Drawing.Size(200, 200);
+ this.dockPanel6.SavedIndex = 5;
+ this.dockPanel6.Size = new System.Drawing.Size(200, 200);
+ this.dockPanel6.Text = "dockPanel6";
+ this.dockPanel6.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
+ //
+ // dockPanel6_Container
+ //
+ this.dockPanel6_Container.Location = new System.Drawing.Point(5, 32);
+ this.dockPanel6_Container.Name = "dockPanel6_Container";
+ this.dockPanel6_Container.Size = new System.Drawing.Size(190, 164);
+ this.dockPanel6_Container.TabIndex = 0;
+ //
+ // panTuo
+ //
+ this.panTuo.Controls.Add(this.textEdit1);
+ this.panTuo.Controls.Add(this.labelControl1);
+ this.panTuo.Location = new System.Drawing.Point(74, 52);
+ this.panTuo.Name = "panTuo";
+ this.panTuo.Size = new System.Drawing.Size(276, 100);
+ this.panTuo.TabIndex = 0;
+ //
+ // textEdit1
+ //
+ this.textEdit1.Location = new System.Drawing.Point(108, 26);
+ this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Size = new System.Drawing.Size(125, 24);
+ this.textEdit1.TabIndex = 1;
+ //
+ // labelControl1
+ //
+ this.labelControl1.Location = new System.Drawing.Point(20, 34);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(81, 18);
+ this.labelControl1.TabIndex = 0;
+ this.labelControl1.Text = "labelControl1";
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.panTuo);
+ this.panelControl1.Location = new System.Drawing.Point(46, 69);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(482, 310);
+ this.panelControl1.TabIndex = 4;
+ //
+ // lbMsg
+ //
+ this.lbMsg.Location = new System.Drawing.Point(46, 28);
+ this.lbMsg.Name = "lbMsg";
+ this.lbMsg.Size = new System.Drawing.Size(81, 18);
+ this.lbMsg.TabIndex = 5;
+ this.lbMsg.Text = "labelControl2";
+ //
+ // dockPanel1
+ //
+ this.dockPanel1.Controls.Add(this.dockPanel1_Container);
+ this.dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+ this.dockPanel1.ID = new System.Guid("8abce80a-c8c2-4696-95f4-0ce4b3b63096");
+ this.dockPanel1.Location = new System.Drawing.Point(714, 0);
+ this.dockPanel1.Name = "dockPanel1";
+ this.dockPanel1.OriginalSize = new System.Drawing.Size(200, 200);
+ this.dockPanel1.Size = new System.Drawing.Size(200, 553);
+ this.dockPanel1.Text = "dockPanel1";
+ //
+ // dockPanel1_Container
+ //
+ this.dockPanel1_Container.Location = new System.Drawing.Point(6, 32);
+ this.dockPanel1_Container.Name = "dockPanel1_Container";
+ this.dockPanel1_Container.Size = new System.Drawing.Size(190, 517);
+ this.dockPanel1_Container.TabIndex = 0;
+ //
+ // XtraForm1
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(914, 553);
+ this.Controls.Add(this.lbMsg);
+ this.Controls.Add(this.panelControl1);
+ this.Controls.Add(this.dockPanel1);
+ this.Name = "XtraForm1";
+ this.Text = "XtraForm1";
+ ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).EndInit();
+ this.dockPanel6.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.panTuo)).EndInit();
+ this.panTuo.ResumeLayout(false);
+ this.panTuo.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ this.dockPanel1.ResumeLayout(false);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+ private DevExpress.XtraBars.Docking.DockManager dockManager1;
+ private DevExpress.XtraBars.Docking.DockPanel dockPanel6;
+ private DevExpress.XtraBars.Docking.ControlContainer dockPanel6_Container;
+ private DevExpress.XtraEditors.PanelControl panTuo;
+ private DevExpress.XtraEditors.TextEdit textEdit1;
+ private DevExpress.XtraEditors.LabelControl labelControl1;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.LabelControl lbMsg;
+ private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
+ private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
new file mode 100644
index 0000000..5157073
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
@@ -0,0 +1,100 @@
+锘縰sing DevExpress.XtraBars.Docking;
+using DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm
+{
+ public partial class XtraForm1 : DevExpress.XtraEditors.XtraForm
+ {
+
+ private bool isDragging = false;
+ private Point dragCursorPoint;
+ private Point dragPanelPoint;
+
+ public XtraForm1()
+ {
+ InitializeComponent();
+ // 鍒濆鍖栬〃鍗�
+ this.Text = "Draggable Panel Example";
+ this.Size = new Size(800, 600);
+
+ // 娣诲姞榧犳爣浜嬩欢澶勭悊绋嬪簭
+ panTuo.MouseDown += new MouseEventHandler(DraggablePanel_MouseDown);
+ panTuo.MouseMove += new MouseEventHandler(DraggablePanel_MouseMove);
+ panTuo.MouseUp += new MouseEventHandler(DraggablePanel_MouseUp);
+ }
+ private void DraggablePanel_MouseDown(object sender, MouseEventArgs e)
+ {
+ if (e.Button == MouseButtons.Left)
+ {
+ isDragging = true;
+ dragCursorPoint = Cursor.Position;
+ dragPanelPoint = panTuo.Location;
+ panTuo.Cursor = Cursors.SizeAll;
+
+ }
+ }
+
+ private void DraggablePanel_MouseMove(object sender, MouseEventArgs e)
+ {
+ if (isDragging)
+ {
+
+ panTuo.Location = new Point(
+ dragPanelPoint.X + Cursor.Position.X - dragCursorPoint.X,
+ dragPanelPoint.Y + Cursor.Position.Y - dragCursorPoint.Y);
+ Point newLocation = panTuo.Location;
+ Rectangle bounds = panelControl1.Bounds;
+ lbMsg.Text = panTuo.Location.ToString() + "-" + bounds.ToString();
+
+ if (IsOutsideBounds(panTuo, panelControl1))
+ {
+ lbMsg.Text = "瓒呬簡";
+ panelControl1.Controls.Remove(panTuo);
+ dockPanel1.Controls.Add(panTuo);
+
+ panTuo.Location = new Point(
+ Math.Max(0, Math.Min(dockPanel1.Width - panTuo.Width, newLocation.X - dockPanel1.Location.X)),
+ Math.Max(0, Math.Min(dockPanel1.Height - panTuo.Height, newLocation.Y - dockPanel1.Location.Y)));
+ }
+ else
+ {
+ lbMsg.Text = panTuo.Location.ToString() + "-" + bounds.ToString();
+ }
+ }
+
+
+ }
+ public static bool IsOutsideBounds(Control child, Control parent)
+ {
+ // 鑾峰彇鎺т欢鐩稿浜庡叾鐖跺鍣ㄧ殑浣嶇疆鍜屽ぇ灏�
+ Rectangle childBounds = new Rectangle(child.Location, child.Size);
+ Rectangle parentBounds = new Rectangle(Point.Empty, parent.ClientSize); // 浣跨敤ClientSize鑾峰彇瀹瑰櫒鐨勫伐浣滃尯澶у皬
+
+ // 娉ㄦ剰锛氳繖閲屾垜浠亣璁綾hild鏄痯arent鐨勭洿鎺ュ瓙鎺т欢锛屽洜姝hild.Location鏄浉瀵逛簬parent鐨勩��
+ // 濡傛灉child涓嶆槸parent鐨勭洿鎺ュ瓙鎺т欢锛屼綘闇�瑕佸厛鎵惧埌child鐩稿浜巔arent鐨勭浉瀵逛綅缃��
+
+ // 妫�鏌hildBounds鏄惁瓒呭嚭浜唒arentBounds鐨勪换浣曚竴涓竟鐣�
+ return !parentBounds.Contains(childBounds);
+ }
+
+ private void DraggablePanel_MouseUp(object sender, MouseEventArgs e)
+ {
+ if (e.Button == MouseButtons.Left)
+ {
+ isDragging = false;
+ }
+ }
+
+
+ }
+
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx b/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
new file mode 100644
index 0000000..8eb0253
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 7a0f365..76d869b 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -681,6 +681,12 @@
<Compile Include="DevFrm\WW\WwBlclDj.Designer.cs">
<DependentUpon>WwBlclDj.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\XtraForm1.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\XtraForm1.Designer.cs">
+ <DependentUpon>XtraForm1.cs</DependentUpon>
+ </Compile>
<Compile Include="Entity\LoginInfoModel.cs" />
<Compile Include="Entity\PageQueryModel.cs" />
<Compile Include="Entity\ReturnModel.cs" />
@@ -1150,6 +1156,9 @@
<EmbeddedResource Include="DevFrm\WW\WwBlclDj.resx">
<DependentUpon>WwBlclDj.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\XtraForm1.resx">
+ <DependentUpon>XtraForm1.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
--
Gitblit v1.9.3