From 9e6ef4b357b46a8f91bf74500d06af1f48567cb7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 12 二月 2025 08:10:18 +0800
Subject: [PATCH] 其它出入库
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.resx | 120 +++++++++
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs | 98 +++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs | 8
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs | 215 ++++++++++++++++
DevApp/Gs.DevApp/Program.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs | 8
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 193 ++++++--------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 33 +-
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 92 ++++---
11 files changed, 609 insertions(+), 171 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 4c027d9..aa38953 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- 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 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();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -91,16 +91,15 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
- this.txt_qt018_1 = new Gs.DevApp.UserControl.UcLookDepartment();
- this.txt_qt008 = new Gs.DevApp.UserControl.UcLookCk();
- this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
- this.txt_qt025 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_qt009 = new Gs.DevApp.UserControl.UcLookDepartment();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.txt_qt024 = new Gs.DevApp.UserControl.UcLookOrg();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_qt023 = new Gs.DevApp.UserControl.UcLookOrg();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_qt018 = new Gs.DevApp.UserControl.UcLookCustomer();
+ this.txt_qt013 = new Gs.DevApp.UserControl.UcLookCustomer();
this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit();
this.txt_qt019 = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_qt020 = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -126,7 +125,6 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt025.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt020.Properties)).BeginInit();
@@ -137,7 +135,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 396);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 367);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
@@ -149,7 +147,7 @@
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemSearchLookUpEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 396);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 367);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -405,10 +403,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -417,7 +415,7 @@
//
this.lb_qt020.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt020.Appearance.Options.UseFont = true;
- this.lb_qt020.Location = new System.Drawing.Point(315, 51);
+ this.lb_qt020.Location = new System.Drawing.Point(688, 20);
this.lb_qt020.Name = "lb_qt020";
this.lb_qt020.Size = new System.Drawing.Size(68, 21);
this.lb_qt020.TabIndex = 285;
@@ -441,7 +439,7 @@
//
this.lb_qt019.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt019.Appearance.Options.UseFont = true;
- this.lb_qt019.Location = new System.Drawing.Point(315, 20);
+ this.lb_qt019.Location = new System.Drawing.Point(353, 20);
this.lb_qt019.Name = "lb_qt019";
this.lb_qt019.Size = new System.Drawing.Size(68, 21);
this.lb_qt019.TabIndex = 280;
@@ -451,17 +449,17 @@
//
this.lb_qt018.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt018.Appearance.Options.UseFont = true;
- this.lb_qt018.Location = new System.Drawing.Point(546, 83);
+ this.lb_qt018.Location = new System.Drawing.Point(387, 81);
this.lb_qt018.Name = "lb_qt018";
- this.lb_qt018.Size = new System.Drawing.Size(82, 21);
+ this.lb_qt018.Size = new System.Drawing.Size(34, 21);
this.lb_qt018.TabIndex = 273;
- this.lb_qt018.Text = "璐т富(瀹㈡埛)";
+ this.lb_qt018.Text = "瀹㈡埛";
//
// lb_qt016
//
this.lb_qt016.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt016.Appearance.Options.UseFont = true;
- this.lb_qt016.Location = new System.Drawing.Point(900, 83);
+ this.lb_qt016.Location = new System.Drawing.Point(705, 110);
this.lb_qt016.Name = "lb_qt016";
this.lb_qt016.Size = new System.Drawing.Size(51, 21);
this.lb_qt016.TabIndex = 262;
@@ -469,7 +467,7 @@
//
// txt_qt016
//
- this.txt_qt016.Location = new System.Drawing.Point(957, 79);
+ this.txt_qt016.Location = new System.Drawing.Point(760, 106);
this.txt_qt016.Name = "txt_qt016";
this.txt_qt016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_qt016.Properties.Appearance.Options.UseFont = true;
@@ -495,7 +493,7 @@
//
this.lb_qt015.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt015.Appearance.Options.UseFont = true;
- this.lb_qt015.Location = new System.Drawing.Point(883, 15);
+ this.lb_qt015.Location = new System.Drawing.Point(688, 51);
this.lb_qt015.Name = "lb_qt015";
this.lb_qt015.Size = new System.Drawing.Size(68, 21);
this.lb_qt015.TabIndex = 258;
@@ -537,7 +535,7 @@
//
this.lb_qt010.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt010.Appearance.Options.UseFont = true;
- this.lb_qt010.Location = new System.Drawing.Point(24, 112);
+ this.lb_qt010.Location = new System.Drawing.Point(18, 141);
this.lb_qt010.Name = "lb_qt010";
this.lb_qt010.Size = new System.Drawing.Size(68, 21);
this.lb_qt010.TabIndex = 235;
@@ -545,11 +543,11 @@
//
// txt_qt010
//
- this.txt_qt010.Location = new System.Drawing.Point(98, 108);
+ this.txt_qt010.Location = new System.Drawing.Point(92, 137);
this.txt_qt010.Name = "txt_qt010";
this.txt_qt010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_qt010.Properties.Appearance.Options.UseFont = true;
- this.txt_qt010.Size = new System.Drawing.Size(445, 28);
+ this.txt_qt010.Size = new System.Drawing.Size(591, 28);
this.txt_qt010.TabIndex = 235;
//
// gv_qt010
@@ -570,11 +568,11 @@
//
this.lb_qt009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt009.Appearance.Options.UseFont = true;
- this.lb_qt009.Location = new System.Drawing.Point(546, 116);
+ this.lb_qt009.Location = new System.Drawing.Point(353, 110);
this.lb_qt009.Name = "lb_qt009";
- this.lb_qt009.Size = new System.Drawing.Size(82, 21);
+ this.lb_qt009.Size = new System.Drawing.Size(68, 21);
this.lb_qt009.TabIndex = 231;
- this.lb_qt009.Text = "璐т富(閮ㄩ棬)";
+ this.lb_qt009.Text = "棰嗘枡閮ㄩ棬";
//
// gv_qt008
//
@@ -608,7 +606,7 @@
//
this.lb_qt002.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qt002.Appearance.Options.UseFont = true;
- this.lb_qt002.Location = new System.Drawing.Point(883, 51);
+ this.lb_qt002.Location = new System.Drawing.Point(688, 81);
this.lb_qt002.Name = "lb_qt002";
this.lb_qt002.Size = new System.Drawing.Size(68, 21);
this.lb_qt002.TabIndex = 216;
@@ -616,7 +614,7 @@
//
// txt_qt002
//
- this.txt_qt002.Location = new System.Drawing.Point(957, 47);
+ this.txt_qt002.Location = new System.Drawing.Point(760, 77);
this.txt_qt002.Name = "txt_qt002";
this.txt_qt002.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_qt002.Properties.Appearance.Options.UseFont = true;
@@ -656,19 +654,19 @@
//
this.lb_qtck.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_qtck.Appearance.Options.UseFont = true;
- this.lb_qtck.Location = new System.Drawing.Point(24, 20);
+ this.lb_qtck.Location = new System.Drawing.Point(18, 20);
this.lb_qtck.Name = "lb_qtck";
this.lb_qtck.Size = new System.Drawing.Size(68, 21);
this.lb_qtck.TabIndex = 211;
- this.lb_qtck.Text = "鐢宠鍗曞彿";
+ this.lb_qtck.Text = "鍗曟嵁缂栧彿";
//
// txt_qtck
//
- this.txt_qtck.Location = new System.Drawing.Point(98, 16);
+ this.txt_qtck.Location = new System.Drawing.Point(92, 16);
this.txt_qtck.Name = "txt_qtck";
this.txt_qtck.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_qtck.Properties.Appearance.Options.UseFont = true;
- this.txt_qtck.Size = new System.Drawing.Size(210, 28);
+ this.txt_qtck.Size = new System.Drawing.Size(255, 28);
this.txt_qtck.TabIndex = 211;
this.txt_qtck.Tag = "readonly";
//
@@ -803,10 +801,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 142);
+ this.tabMx.Location = new System.Drawing.Point(0, 171);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 428);
+ this.tabMx.Size = new System.Drawing.Size(1126, 399);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -814,16 +812,15 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_qt018_1);
- this.panel1.Controls.Add(this.txt_qt008);
- this.panel1.Controls.Add(this.labelControl5);
- this.panel1.Controls.Add(this.txt_qt025);
+ this.panel1.Controls.Add(this.ucLookHuoZhu1);
+ this.panel1.Controls.Add(this.labelControl4);
+ this.panel1.Controls.Add(this.txt_qt009);
this.panel1.Controls.Add(this.labelControl3);
this.panel1.Controls.Add(this.txt_qt024);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_qt023);
this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Controls.Add(this.txt_qt018);
+ this.panel1.Controls.Add(this.txt_qt013);
this.panel1.Controls.Add(this.txt_qt015);
this.panel1.Controls.Add(this.txt_qt019);
this.panel1.Controls.Add(this.txt_qt020);
@@ -846,57 +843,41 @@
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, 142);
+ this.panel1.Size = new System.Drawing.Size(1126, 171);
this.panel1.TabIndex = 1;
//
- // txt_qt018_1
+ // ucLookHuoZhu1
//
- this.txt_qt018_1.IsReadly = false;
- this.txt_qt018_1.Location = new System.Drawing.Point(633, 110);
- this.txt_qt018_1.Name = "txt_qt018_1";
- this.txt_qt018_1.Size = new System.Drawing.Size(247, 28);
- this.txt_qt018_1.TabIndex = 316;
+ this.ucLookHuoZhu1.IsReadly = false;
+ this.ucLookHuoZhu1.Location = new System.Drawing.Point(92, 76);
+ this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
+ this.ucLookHuoZhu1.OrgId = null;
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(255, 61);
+ this.ucLookHuoZhu1.TabIndex = 318;
//
- // txt_qt008
+ // labelControl4
//
- this.txt_qt008.IsReadly = false;
- this.txt_qt008.Location = new System.Drawing.Point(98, 77);
- this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
- this.txt_qt008.Name = "txt_qt008";
- this.txt_qt008.Size = new System.Drawing.Size(445, 30);
- this.txt_qt008.TabIndex = 315;
+ this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl4.Appearance.Options.UseFont = true;
+ this.labelControl4.Location = new System.Drawing.Point(52, 110);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(34, 21);
+ this.labelControl4.TabIndex = 317;
+ this.labelControl4.Text = "璐т富";
//
- // labelControl5
+ // txt_qt009
//
- this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(24, 77);
- this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(68, 21);
- this.labelControl5.TabIndex = 314;
- this.labelControl5.Text = "鍙戞枡浠撳簱";
- //
- // txt_qt025
- //
- this.txt_qt025.EditValue = "璇烽�夋嫨";
- this.txt_qt025.Location = new System.Drawing.Point(633, 49);
- this.txt_qt025.Name = "txt_qt025";
- this.txt_qt025.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_qt025.Properties.Items.AddRange(new object[] {
- "璇烽�夋嫨",
- "1,缁勭粐(BD_OwnerOrg)",
- "2,渚涘簲鍟�(BD_Supplier)",
- "3,瀹㈡埛(BD_Customer)"});
- this.txt_qt025.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt025.Size = new System.Drawing.Size(247, 24);
- this.txt_qt025.TabIndex = 311;
+ this.txt_qt009.IsReadly = false;
+ this.txt_qt009.Location = new System.Drawing.Point(425, 105);
+ this.txt_qt009.Name = "txt_qt009";
+ this.txt_qt009.Size = new System.Drawing.Size(258, 30);
+ this.txt_qt009.TabIndex = 316;
//
// labelControl3
//
this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(560, 51);
+ this.labelControl3.Location = new System.Drawing.Point(18, 81);
this.labelControl3.Name = "labelControl3";
this.labelControl3.Size = new System.Drawing.Size(68, 21);
this.labelControl3.TabIndex = 310;
@@ -905,16 +886,16 @@
// txt_qt024
//
this.txt_qt024.IsReadly = false;
- this.txt_qt024.Location = new System.Drawing.Point(632, 15);
+ this.txt_qt024.Location = new System.Drawing.Point(425, 46);
this.txt_qt024.Name = "txt_qt024";
- this.txt_qt024.Size = new System.Drawing.Size(248, 30);
+ this.txt_qt024.Size = new System.Drawing.Size(258, 30);
this.txt_qt024.TabIndex = 309;
//
// labelControl2
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(560, 20);
+ this.labelControl2.Location = new System.Drawing.Point(353, 51);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(68, 21);
this.labelControl2.TabIndex = 308;
@@ -923,33 +904,33 @@
// txt_qt023
//
this.txt_qt023.IsReadly = false;
- this.txt_qt023.Location = new System.Drawing.Point(98, 46);
+ this.txt_qt023.Location = new System.Drawing.Point(92, 46);
this.txt_qt023.Name = "txt_qt023";
- this.txt_qt023.Size = new System.Drawing.Size(211, 30);
+ this.txt_qt023.Size = new System.Drawing.Size(255, 30);
this.txt_qt023.TabIndex = 307;
//
// labelControl1
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(24, 51);
+ this.labelControl1.Location = new System.Drawing.Point(18, 51);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(68, 21);
this.labelControl1.TabIndex = 306;
- this.labelControl1.Text = "鍙戞枡缁勭粐";
+ this.labelControl1.Text = "搴撳瓨缁勭粐";
//
- // txt_qt018
+ // txt_qt013
//
- this.txt_qt018.IsReadly = false;
- this.txt_qt018.Location = new System.Drawing.Point(633, 79);
- this.txt_qt018.Name = "txt_qt018";
- this.txt_qt018.Size = new System.Drawing.Size(247, 28);
- this.txt_qt018.TabIndex = 304;
+ this.txt_qt013.IsReadly = false;
+ this.txt_qt013.Location = new System.Drawing.Point(425, 76);
+ this.txt_qt013.Name = "txt_qt013";
+ this.txt_qt013.Size = new System.Drawing.Size(258, 30);
+ this.txt_qt013.TabIndex = 304;
//
// txt_qt015
//
this.txt_qt015.Enabled = false;
- this.txt_qt015.Location = new System.Drawing.Point(957, 13);
+ this.txt_qt015.Location = new System.Drawing.Point(760, 49);
this.txt_qt015.Name = "txt_qt015";
this.txt_qt015.Properties.Caption = "";
this.txt_qt015.Size = new System.Drawing.Size(32, 24);
@@ -958,7 +939,7 @@
// txt_qt019
//
this.txt_qt019.EditValue = "璇烽�夋嫨";
- this.txt_qt019.Location = new System.Drawing.Point(386, 18);
+ this.txt_qt019.Location = new System.Drawing.Point(425, 18);
this.txt_qt019.Name = "txt_qt019";
this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -970,13 +951,13 @@
"4,璐圭敤鐗╂枡鍑哄簱(QTCKDO4 SYS)",
"5,搴撳瓨璋冩暣(QTCKDO5 SYS)"});
this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt019.Size = new System.Drawing.Size(157, 24);
+ this.txt_qt019.Size = new System.Drawing.Size(258, 24);
this.txt_qt019.TabIndex = 301;
//
// txt_qt020
//
this.txt_qt020.EditValue = "璇烽�夋嫨";
- this.txt_qt020.Location = new System.Drawing.Point(386, 49);
+ this.txt_qt020.Location = new System.Drawing.Point(760, 18);
this.txt_qt020.Name = "txt_qt020";
this.txt_qt020.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -985,12 +966,12 @@
"1,鏅��(GENERAL)",
"2,閫�璐�(RETURN)"});
this.txt_qt020.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt020.Size = new System.Drawing.Size(157, 24);
+ this.txt_qt020.Size = new System.Drawing.Size(162, 24);
this.txt_qt020.TabIndex = 300;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(906, 117);
+ this.labelControl11.Location = new System.Drawing.Point(722, 142);
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);
@@ -1048,7 +1029,6 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt025.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt020.Properties)).EndInit();
@@ -1126,18 +1106,17 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd008;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd009;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd010;
- private UserControl.UcLookCustomer txt_qt018;
+ private UserControl.UcLookCustomer txt_qt013;
private DevExpress.XtraEditors.LabelControl labelControl1;
private UserControl.UcLookOrg txt_qt023;
- private DevExpress.XtraEditors.ComboBoxEdit txt_qt025;
private DevExpress.XtraEditors.LabelControl labelControl3;
private UserControl.UcLookOrg txt_qt024;
private DevExpress.XtraEditors.LabelControl labelControl2;
- private UserControl.UcLookCk txt_qt008;
- private DevExpress.XtraEditors.LabelControl labelControl5;
- private UserControl.UcLookDepartment txt_qt018_1;
+ private UserControl.UcLookDepartment txt_qt009;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraEditors.LabelControl labelControl4;
+ private UserControl.UcLookHuoZhu ucLookHuoZhu1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index ff2580e..3dc4684 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -26,6 +26,7 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -42,16 +43,16 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //璁剧疆鍙戞枡缁勭粐
+ //閫夋嫨搴撳瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡锛�
txt_qt023.EditChanged += (s, e) =>
{
string _orgId = txt_qt023.GetId();
if (string.IsNullOrEmpty(_orgId))
return;
- txt_qt008.getSuppler(_orgId);
+ ucLookHuoZhu1.OrgId = _orgId;
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
- var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(),"");
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
var json = JsonConvert.SerializeObject(_obj);
try
{
@@ -66,29 +67,36 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
- //璁剧疆鍙戞枡浠撳簱
- //txt_qt008.getSuppler("");
- this.txt_qt008.EditChanged += (s, e) =>
- {
- string _ckId = txt_qt008.GetId();
- if (string.IsNullOrEmpty(_ckId))
- return;
- };
- //璁剧疆棰嗙敤
+ //閫夋嫨璐т富绫诲瀷锛堝彉璐т富锛�
+ //閫夋嫨棰嗙敤缁勭粐
txt_qt024.EditChanged += (s, e) =>
{
string _orgId = txt_qt024.GetId();
if (string.IsNullOrEmpty(_orgId))
return;
- //txt_qt018.getSuppler(_orgId);
- //txt_qt009.getSuppler(_orgId);
+ txt_qt013.getSuppler(_orgId);
+ txt_qt009.getSuppler(_orgId);
};
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
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_qtck, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
/// 鍒嗛〉浜嬩欢
@@ -242,21 +250,35 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string inOrgId = txt_qt023.GetId();//鍙戞枡缁勭粐
- string inCkId = txt_qt008.GetId();//鍙戞枡浠撳簱
+ string inOrgId = txt_qt023.GetId();//搴撳瓨缁勭粐
+ string inHzlx = ucLookHuoZhu1.GetHzLx();//璐т富绫诲瀷
+ string inHz = ucLookHuoZhu1.GetHzId();//璐т富
+ string inRkyy = txt_qt010.Text.Trim();//鍘熷洜
+ string inDjlx = txt_qt019.Text.Trim();//鍗曟嵁绫诲瀷
string inLyOrg = txt_qt024.GetId();//棰嗙敤缁勭粐
- string inLyCus = txt_qt018.GetId();//棰嗙敤瀹㈡埛
- string inLyDepart = txt_qt018_1.GetId();//棰嗙敤閮ㄩ棬
+ string inLyCus = txt_qt013.GetId();//棰嗙敤瀹㈡埛
+ string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
+ string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
if (string.IsNullOrEmpty(inOrgId))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡缁勭粐锛�");
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨缁勭粐锛�");
txt_qt023.Focus();
return;
}
- if (string.IsNullOrEmpty(inCkId))
+ if (string.IsNullOrEmpty(inHzlx))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡浠撳簱锛�");
- txt_qt008.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富绫诲瀷锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(inHz))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富锛�");
+ return;
+ }
+ if (txt_qt019.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ txt_qt019.Focus();
return;
}
if (string.IsNullOrEmpty(inLyOrg))
@@ -270,17 +292,6 @@
Gs.DevApp.ToolBox.MsgHelper.Warning("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
return;
}
- if (!string.IsNullOrEmpty(inLyCus) && !string.IsNullOrEmpty(inLyDepart))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("瀹㈡埛鎴栭儴闂ㄥ彧閫変竴涓紒");
- return;
- }
- if (txt_qt019.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- txt_qt019.Focus();
- return;
- }
if (txt_qt020.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨鏂瑰悜锛�");
@@ -290,14 +301,15 @@
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- inDjlx = txt_qt019.Text.Trim(),//鍗曟嵁绫诲瀷
- inKcfx = txt_qt020.Text.Trim(),//搴撳瓨鏂瑰悜
- inOrgId = inOrgId,//鍙戞枡缁勭粐
- inCkId = inCkId,//鍙戞枡浠撳簱
+ inOrgId = inOrgId,//搴撳瓨缁勭粐
+ inHzlx = inHzlx,//璐т富绫诲瀷
+ inHz = inHz,//璐т富
+ inRkyy = inRkyy,//鍘熷洜
+ inDjlx = inDjlx,//鍗曟嵁绫诲瀷
inLyOrg = inLyOrg,//棰嗙敤缁勭粐
- inHzlx = txt_qt025.Text.Trim(),//璐т富绫诲瀷
- inLyCusOrDpt = inLyCus,//璐т富瀹㈡埛鎴栭儴闂�
- inRkyy = txt_qt010.Text.Trim(),//鍘熷洜
+ inLyCus = inLyCus,//棰嗙敤瀹㈡埛
+ inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬
+ inKcfx = inKcfx,//搴撳瓨鏂瑰悜
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 3e20974..5804dc2 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -407,7 +407,7 @@
{
DialogResult = DialogResult.Cancel;
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return -1;
+ return 1;
}
}
private void GetOrg()
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 1837ea9..0fcf852 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,11 +29,11 @@
/// </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();
this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2createDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -235,7 +235,7 @@
this.gvMx2itemSname.Name = "gvMx2itemSname";
this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx2itemSname.Visible = true;
- this.gvMx2itemSname.VisibleIndex = 8;
+ this.gvMx2itemSname.VisibleIndex = 6;
this.gvMx2itemSname.Width = 94;
//
// gvMx2unit
@@ -248,7 +248,7 @@
this.gvMx2unit.Name = "gvMx2unit";
this.gvMx2unit.Tag = "query_a.UNIT";
this.gvMx2unit.Visible = true;
- this.gvMx2unit.VisibleIndex = 6;
+ this.gvMx2unit.VisibleIndex = 4;
this.gvMx2unit.Width = 94;
//
// gvMx2createDate
@@ -261,7 +261,7 @@
this.gvMx2createDate.Name = "gvMx2createDate";
this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
this.gvMx2createDate.Visible = true;
- this.gvMx2createDate.VisibleIndex = 5;
+ this.gvMx2createDate.VisibleIndex = 9;
this.gvMx2createDate.Width = 94;
//
// gvMx2createBy
@@ -274,7 +274,7 @@
this.gvMx2createBy.Name = "gvMx2createBy";
this.gvMx2createBy.Tag = "query_a.CREATE_BY";
this.gvMx2createBy.Visible = true;
- this.gvMx2createBy.VisibleIndex = 4;
+ this.gvMx2createBy.VisibleIndex = 8;
this.gvMx2createBy.Width = 94;
//
// gvMx2quantity
@@ -345,12 +345,12 @@
this.gridColumn19,
this.gvMx2itemBarcode,
this.gvMx2quantity,
- this.gvMx2createBy,
- this.gvMx2createDate,
this.gvMx2unit,
this.gridColumn18,
this.gvMx2itemSname,
this.gridColumn17,
+ this.gvMx2createBy,
+ this.gvMx2createDate,
this.gvBtnAlawys});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
@@ -372,6 +372,7 @@
// gridColumn19
//
this.gridColumn19.Caption = "鍏ュ簱鏍囪瘑";
+ this.gridColumn19.FieldName = "isRk";
this.gridColumn19.MaxWidth = 50;
this.gridColumn19.MinWidth = 50;
this.gridColumn19.Name = "gridColumn19";
@@ -386,7 +387,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 7;
+ this.gridColumn18.VisibleIndex = 5;
this.gridColumn18.Width = 94;
//
// gridColumn17
@@ -396,7 +397,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 9;
+ this.gridColumn17.VisibleIndex = 7;
this.gridColumn17.Width = 94;
//
// gvBtnAlawys
@@ -412,10 +413,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 64a9f49..f479d20 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -803,6 +803,12 @@
<Compile Include="UserControl\UcLookDepartment.Designer.cs">
<DependentUpon>UcLookDepartment.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcLookHuoZhu.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookHuoZhu.Designer.cs">
+ <DependentUpon>UcLookHuoZhu.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcLookItems.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -1185,6 +1191,9 @@
<EmbeddedResource Include="UserControl\UcLookDepartment.resx">
<DependentUpon>UcLookDepartment.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookHuoZhu.resx">
+ <DependentUpon>UcLookHuoZhu.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookItems.resx">
<DependentUpon>UcLookItems.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 040e7b3..4757468 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -38,7 +38,7 @@
/// </summary>
private static void _startLogin()
{
- //Application.Run(new ShowFile("dsfs"));
+ //Application.Run(new XtraForm1();
//return;
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs b/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs
index 731b077..f5b2960 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs
@@ -22,7 +22,6 @@
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
- getSuppler();
}
public bool IsReadly { get; set; }
@@ -38,9 +37,12 @@
if (EditChanged != null) EditChanged(this, e);
}
- private void getSuppler()
+ public void getSuppler(string orgId)
{
- var pgq = new PageQueryModel(1, 999999, "a.create_date", "asc", "", " and 1=1");
+ string _keyWhere = "";
+ if (!string.IsNullOrEmpty(orgId))
+ _keyWhere = " and a.FSubsidiary ='" + orgId + "'";
+ var pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.cust_no", "asc", "", "and 1=1" + _keyWhere);
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
index 5094542..85a4a7b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -17,7 +17,6 @@
searchLookUpEdit1View.OptionsView.ColumnAutoWidth = true;
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
- getSuppler();
}
public bool IsReadly { get; set; }
@@ -33,9 +32,12 @@
if (EditChanged != null) EditChanged(this, e);
}
- private void getSuppler()
+ public void getSuppler(string orgId)
{
- var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1");
+ string _keyWhere = "";
+ if (!string.IsNullOrEmpty(orgId))
+ _keyWhere = " and a.FSubsidiary ='" + orgId + "'";
+ var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1" + _keyWhere);
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs
new file mode 100644
index 0000000..23b1896
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs
@@ -0,0 +1,98 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class UcLookHuoZhu
+ {
+ /// <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 Component 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.txt_qt018 = new DevExpress.XtraEditors.SearchLookUpEdit();
+ this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.txt_qt025 = new DevExpress.XtraEditors.ComboBoxEdit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt018.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt025.Properties)).BeginInit();
+ this.SuspendLayout();
+ //
+ // txt_qt018
+ //
+ this.txt_qt018.Dock = System.Windows.Forms.DockStyle.Top;
+ this.txt_qt018.EditValue = "[璇烽�夋嫨]";
+ this.txt_qt018.Location = new System.Drawing.Point(0, 24);
+ this.txt_qt018.Name = "txt_qt018";
+ this.txt_qt018.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_qt018.Properties.Appearance.Options.UseFont = true;
+ this.txt_qt018.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_qt018.Properties.PopupView = this.searchLookUpEdit1View;
+ this.txt_qt018.Size = new System.Drawing.Size(263, 28);
+ this.txt_qt018.TabIndex = 312;
+ //
+ // searchLookUpEdit1View
+ //
+ this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+ this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+ this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+ this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+ //
+ // txt_qt025
+ //
+ this.txt_qt025.Dock = System.Windows.Forms.DockStyle.Top;
+ this.txt_qt025.EditValue = "璇烽�夋嫨";
+ this.txt_qt025.Location = new System.Drawing.Point(0, 0);
+ this.txt_qt025.Name = "txt_qt025";
+ this.txt_qt025.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_qt025.Properties.Items.AddRange(new object[] {
+ "璇烽�夋嫨",
+ "1,缁勭粐(BD_OwnerOrg)",
+ "2,渚涘簲鍟�(BD_Supplier)",
+ "3,瀹㈡埛(BD_Customer)"});
+ this.txt_qt025.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_qt025.Size = new System.Drawing.Size(263, 24);
+ this.txt_qt025.TabIndex = 313;
+ //
+ // UcLookHuoZhu
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.txt_qt018);
+ this.Controls.Add(this.txt_qt025);
+ this.Name = "UcLookHuoZhu";
+ this.Size = new System.Drawing.Size(263, 61);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt018.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt025.Properties)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraEditors.SearchLookUpEdit txt_qt018;
+ private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_qt025;
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
new file mode 100644
index 0000000..77e21a0
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
@@ -0,0 +1,215 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Data;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class UcLookHuoZhu : DevExpress.XtraEditors.XtraUserControl
+ {
+
+ /// <summary>
+ ///
+ /// </summary>
+ public string OrgId
+ {
+ get;
+ set;
+ }
+ public bool IsReadly { get; set; }
+
+ public UcLookHuoZhu()
+ {
+ InitializeComponent();
+ txt_qt018.Properties.NullText = "璇烽�夋嫨";
+ this.txt_qt025.SelectedIndexChanged += (s, e) =>
+ {
+ int _strType = txt_qt025.SelectedIndex;
+ string _orgId = OrgId;
+ this.searchLookUpEdit1View.Columns.Clear();
+ txt_qt018.Properties.DataSource = null;
+ if (_strType <= 0) return;
+ string _strMeth = "";
+ string _DisplayMember = "";
+ string _ValueMember = "";
+ PageQueryModel pgq = new PageQueryModel(1, 999999, "", "", "", "");
+ DevExpress.XtraGrid.Columns.GridColumn gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ DevExpress.XtraGrid.Columns.GridColumn gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ DevExpress.XtraGrid.Columns.GridColumn gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ DevExpress.XtraGrid.Columns.GridColumn gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ DevExpress.XtraGrid.Columns.GridColumn gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ switch (_strType)
+ {
+ case 1://缁勭粐
+ pgq = new PageQueryModel(1, 999999, "FID", "asc", "", " and IS_STATUS=1");
+ _strMeth = "Organization/GetListPage";
+ _DisplayMember = "name";
+ _ValueMember = "fid";
+ gridColumn1.Caption = "缁勭粐ID";
+ gridColumn1.FieldName = "fid";
+ gridColumn1.Name = "gridColumn1";
+ gridColumn5.Caption = "缁勭粐鍚嶇О";
+ gridColumn5.FieldName = "name";
+ gridColumn5.Name = "gridColumn5";
+ gridColumn5.Visible = true;
+ gridColumn2.Caption = "缁勭粐缂栧彿";
+ gridColumn2.FieldName = "fNumber";
+ gridColumn2.MinWidth = 80;
+ gridColumn2.Name = "gridColumn2";
+ gridColumn2.UnboundDataType = typeof(string);
+ gridColumn2.Visible = true;
+ gridColumn2.VisibleIndex = 1;
+ gridColumn2.Width = 80;
+ gridColumn4.Caption = "guid";
+ gridColumn4.FieldName = "guid";
+ gridColumn4.Name = "gridColumn4";
+ break;
+ case 2://渚涘簲鍟�
+ pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.supp_no", "asc", "", " and a.FSubsidiary ='" + _orgId + "'");
+ _strMeth = "MesSupplierManager/GetListPage";
+ _DisplayMember = "suppName";
+ _ValueMember = "id";
+ gridColumn5.Caption = "浣跨敤缁勭粐";
+ gridColumn5.FieldName = "fSubsidiary";
+ gridColumn5.Name = "gridColumn5";
+ gridColumn5.Visible = true;
+ gridColumn5.VisibleIndex = 0;
+ gridColumn1.Caption = "渚涘簲鍟咺D";
+ gridColumn1.FieldName = "id";
+ gridColumn1.MaxWidth = 100;
+ gridColumn1.MinWidth = 80;
+ gridColumn1.Name = "gridColumn1";
+ gridColumn1.UnboundDataType = typeof(string);
+ gridColumn1.Width = 100;
+ gridColumn2.Caption = "渚涘簲鍟嗙紪鍙�";
+ gridColumn2.FieldName = "suppNo";
+ gridColumn2.MinWidth = 80;
+ gridColumn2.Name = "gridColumn2";
+ gridColumn2.Visible = true;
+ gridColumn2.VisibleIndex = 2;
+ gridColumn2.Width = 80;
+ gridColumn3.Caption = "渚涘簲鍟嗗悕绉�";
+ gridColumn3.FieldName = "suppName";
+ gridColumn3.MinWidth = 100;
+ gridColumn3.Name = "gridColumn3";
+ gridColumn3.Visible = true;
+ gridColumn3.VisibleIndex = 1;
+ gridColumn3.Width = 100;
+ gridColumn4.Caption = "guid";
+ gridColumn4.FieldName = "guid";
+ gridColumn4.Name = "gridColumn4";
+ break;
+ case 3://瀹㈡埛
+ pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.cust_no", "asc", "", " and a.FSubsidiary ='" + _orgId + "'");
+ _strMeth = "MesCustomerManager/GetListPage";
+ _DisplayMember = "custName";
+ _ValueMember = "id";
+ gridColumn5.Caption = "鎵�鍦ㄧ粍缁�";
+ gridColumn5.FieldName = "fSubsidiary";
+ gridColumn5.MinWidth = 200;
+ gridColumn5.Name = "gridColumn5";
+ gridColumn5.Visible = true;
+ gridColumn5.VisibleIndex = 0;
+ gridColumn5.Width = 200;
+ gridColumn1.Caption = "瀹㈡埛ID";
+ gridColumn1.FieldName = "id";
+ gridColumn1.MinWidth = 50;
+ gridColumn1.Name = "gridColumn1";
+ gridColumn1.Visible = true;
+ gridColumn1.VisibleIndex = 1;
+ gridColumn2.Caption = "瀹㈡埛缂栧彿";
+ gridColumn2.FieldName = "custNo";
+ gridColumn2.MinWidth = 80;
+ gridColumn2.Name = "gridColumn2";
+ gridColumn2.Visible = true;
+ gridColumn2.VisibleIndex = 2;
+ gridColumn2.Width = 80;
+ gridColumn3.Caption = "瀹㈡埛鍚嶇О";
+ gridColumn3.FieldName = "custName";
+ gridColumn3.MinWidth = 100;
+ gridColumn3.Name = "gridColumn3";
+ gridColumn3.Visible = true;
+ gridColumn3.VisibleIndex = 3;
+ gridColumn3.Width = 100;
+ gridColumn4.Caption = "guid";
+ gridColumn4.FieldName = "guid";
+ gridColumn4.Name = "gridColumn4";
+ break;
+ }
+ this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ gridColumn1,
+ gridColumn5,
+ gridColumn3,
+ gridColumn2,
+ gridColumn4 });
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", _strMeth, json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = rtn.rtnData.list;
+ txt_qt018.Properties.DataSource = dt;
+ txt_qt018.Properties.DisplayMember = _DisplayMember;
+ txt_qt018.Properties.ValueMember = _ValueMember;
+ txt_qt018.ForceInitialize();
+ txt_qt018.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
+ }
+
+ /// <summary>
+ /// 璇诲彇璐т富id
+ /// </summary>
+ /// <returns></returns>
+ public string GetHzId()
+ {
+ var row2 = txt_qt018.GetSelectedDataRow() as DataRowView;
+ if (row2 != null)
+ {
+ string inHz = txt_qt025.SelectedIndex > 1 ? row2["Id"].ToString() : row2["fid"].ToString();
+ return inHz;
+ }
+ return "";
+ }
+ /// <summary>
+ /// 璇诲彇璐т富绫诲瀷
+ /// </summary>
+ /// <returns></returns>
+ public string GetHzLx()
+ {
+ if (txt_qt025.SelectedIndex <= 0)
+ return "";
+ string id = txt_qt025.Text.Trim();
+ return id;
+ }
+
+
+ /// <summary>
+ /// 璁剧疆
+ /// </summary>
+ /// <param name="Code"></param>
+ public void SetHzId(string Code)
+ {
+ if (Code == "-1" || string.IsNullOrEmpty(Code))
+ {
+ txt_qt018.EditValue = null;
+ return;
+ }
+ txt_qt018.EditValue = Int64.Parse(((Code.ToString().Trim())));
+ }
+ /// <summary>
+ /// 璁剧疆
+ /// </summary>
+ /// <param name="Code"></param>
+ public void SetHzLx(string Code)
+ {
+ txt_qt018.Text = Code;
+ }
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.resx b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.resx
@@ -0,0 +1,120 @@
+锘�<?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>
+</root>
\ No newline at end of file
--
Gitblit v1.9.3