From ef9fbbf17dd3de1c135d09b0f233b0b53bd17546 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 22 二月 2025 15:30:25 +0800
Subject: [PATCH] 调拨
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 63 ++----
DevApp/Gs.DevApp/UserControl/SelectHz.cs | 120 +++++++++++
DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs | 90 ++++----
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 291 ++++++++++++++++++----------
4 files changed, 366 insertions(+), 198 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index d4c043b..2f220e3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -64,16 +64,16 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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 editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -109,6 +109,7 @@
this.rptDrCw = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDrHz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -119,6 +120,7 @@
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDcHz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_isWc = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billno = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -144,9 +146,9 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
- this.comboBoxEdit4 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_drhzlx = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
- this.comboBoxEdit3 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_dchzlx = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.comboBoxEdit2 = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
@@ -174,8 +176,10 @@
this.lb_fbilltypeid = new DevExpress.XtraEditors.LabelControl();
this.lb_id = new DevExpress.XtraEditors.LabelControl();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.rptDrHz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.rptDcHz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+ this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -187,7 +191,9 @@
((System.ComponentModel.ISupportInitialize)(this.rptDrOrg)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptDrCk)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptDrCw)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDrHz)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcHz)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -197,8 +203,8 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit4.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit3.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_drhzlx.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dchzlx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
@@ -210,8 +216,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_shDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptDrHz)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptDcHz)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
@@ -503,6 +509,10 @@
//
// gridColumn9
//
+ this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn9.Caption = "璋冨嚭缁勭粐";
this.gridColumn9.ColumnEdit = this.rptDcOrg;
this.gridColumn9.FieldName = "dcOrg";
@@ -523,6 +533,10 @@
//
// gridColumn10
//
+ this.gridColumn10.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn10.Caption = "璋冨嚭浠撳簱";
this.gridColumn10.ColumnEdit = this.rptDcCk;
this.gridColumn10.FieldName = "dcCk";
@@ -543,13 +557,13 @@
//
// gridColumn11
//
+ this.gridColumn11.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn11.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn11.Caption = "璋冨嚭浠撲綅";
this.gridColumn11.ColumnEdit = this.rptDcCw;
this.gridColumn11.FieldName = "dcCw";
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 10;
this.gridColumn11.Width = 94;
//
// rptDcCw
@@ -563,13 +577,17 @@
//
// gridColumn12
//
+ this.gridColumn12.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn12.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn12.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn12.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn12.Caption = "璋冨叆缁勭粐";
this.gridColumn12.ColumnEdit = this.rptDrOrg;
this.gridColumn12.FieldName = "drOrg";
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 11;
+ this.gridColumn12.VisibleIndex = 10;
this.gridColumn12.Width = 94;
//
// rptDrOrg
@@ -583,13 +601,17 @@
//
// gridColumn16
//
+ this.gridColumn16.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn16.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn16.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn16.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn16.Caption = "璋冨叆浠撳簱";
this.gridColumn16.ColumnEdit = this.rptDrCk;
this.gridColumn16.FieldName = "drCk";
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 12;
+ this.gridColumn16.VisibleIndex = 11;
this.gridColumn16.Width = 94;
//
// rptDrCk
@@ -608,8 +630,6 @@
this.gridColumn17.FieldName = "drCw";
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 13;
this.gridColumn17.Width = 94;
//
// rptDrCw
@@ -623,24 +643,42 @@
//
// gridColumn23
//
+ this.gridColumn23.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn23.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn23.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn23.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn23.Caption = "璋冨嚭璐т富";
+ this.gridColumn23.ColumnEdit = this.rptDcHz;
this.gridColumn23.FieldName = "dcHz";
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 14;
+ this.gridColumn23.VisibleIndex = 12;
this.gridColumn23.Width = 94;
//
// gridColumn24
//
+ this.gridColumn24.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn24.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn24.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn24.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn24.Caption = "璋冨叆璐т富";
this.gridColumn24.ColumnEdit = this.rptDrHz;
this.gridColumn24.FieldName = "drHz";
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 15;
+ this.gridColumn24.VisibleIndex = 13;
this.gridColumn24.Width = 94;
+ //
+ // rptDrHz
+ //
+ this.rptDrHz.AutoHeight = false;
+ editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.rptDrHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptDrHz.Name = "rptDrHz";
+ this.rptDrHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrHz_ButtonClick);
//
// gvMxDel
//
@@ -649,16 +687,16 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 16;
+ this.gvMxDel.VisibleIndex = 14;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions9.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -727,6 +765,15 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Width = 94;
+ //
+ // rptDcHz
+ //
+ this.rptDcHz.AutoHeight = false;
+ editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.rptDcHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptDcHz.Name = "rptDcHz";
+ this.rptDcHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcHz_ButtonClick);
//
// gridColumn22
//
@@ -1060,9 +1107,13 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.comboBoxEdit4);
+ this.panel1.Controls.Add(this.labelControl7);
+ this.panel1.Controls.Add(this.textEdit1);
+ this.panel1.Controls.Add(this.labelControl8);
+ this.panel1.Controls.Add(this.textEdit2);
+ this.panel1.Controls.Add(this.txt_drhzlx);
this.panel1.Controls.Add(this.labelControl6);
- this.panel1.Controls.Add(this.comboBoxEdit3);
+ this.panel1.Controls.Add(this.txt_dchzlx);
this.panel1.Controls.Add(this.labelControl5);
this.panel1.Controls.Add(this.comboBoxEdit2);
this.panel1.Controls.Add(this.labelControl4);
@@ -1096,53 +1147,53 @@
this.panel1.Size = new System.Drawing.Size(1126, 164);
this.panel1.TabIndex = 1;
//
- // comboBoxEdit4
+ // txt_drhzlx
//
- this.comboBoxEdit4.EditValue = "鏍囧噯";
- this.comboBoxEdit4.Location = new System.Drawing.Point(471, 100);
- this.comboBoxEdit4.Name = "comboBoxEdit4";
- this.comboBoxEdit4.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.txt_drhzlx.EditValue = "鏍囧噯";
+ this.txt_drhzlx.Location = new System.Drawing.Point(442, 100);
+ this.txt_drhzlx.Name = "txt_drhzlx";
+ this.txt_drhzlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.comboBoxEdit4.Properties.Items.AddRange(new object[] {
+ this.txt_drhzlx.Properties.Items.AddRange(new object[] {
"璇烽�夋嫨",
"缁勭粐(BD_OwnerOrg)",
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
- this.comboBoxEdit4.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.comboBoxEdit4.Size = new System.Drawing.Size(182, 24);
- this.comboBoxEdit4.TabIndex = 382;
+ this.txt_drhzlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_drhzlx.Size = new System.Drawing.Size(182, 24);
+ this.txt_drhzlx.TabIndex = 382;
//
// labelControl6
//
this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl6.Appearance.Options.UseFont = true;
- this.labelControl6.Location = new System.Drawing.Point(358, 102);
+ this.labelControl6.Location = new System.Drawing.Point(329, 102);
this.labelControl6.Name = "labelControl6";
this.labelControl6.Size = new System.Drawing.Size(107, 21);
this.labelControl6.TabIndex = 381;
this.labelControl6.Text = "璋冨叆璐т富绫诲瀷 ";
//
- // comboBoxEdit3
+ // txt_dchzlx
//
- this.comboBoxEdit3.EditValue = "鏍囧噯";
- this.comboBoxEdit3.Location = new System.Drawing.Point(471, 72);
- this.comboBoxEdit3.Name = "comboBoxEdit3";
- this.comboBoxEdit3.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.txt_dchzlx.EditValue = "鏍囧噯";
+ this.txt_dchzlx.Location = new System.Drawing.Point(442, 72);
+ this.txt_dchzlx.Name = "txt_dchzlx";
+ this.txt_dchzlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.comboBoxEdit3.Properties.Items.AddRange(new object[] {
+ this.txt_dchzlx.Properties.Items.AddRange(new object[] {
"璇烽�夋嫨",
"缁勭粐(BD_OwnerOrg)",
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
- this.comboBoxEdit3.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.comboBoxEdit3.Size = new System.Drawing.Size(182, 24);
- this.comboBoxEdit3.TabIndex = 380;
+ this.txt_dchzlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_dchzlx.Size = new System.Drawing.Size(182, 24);
+ this.txt_dchzlx.TabIndex = 380;
//
// labelControl5
//
this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(358, 74);
+ this.labelControl5.Location = new System.Drawing.Point(329, 74);
this.labelControl5.Name = "labelControl5";
this.labelControl5.Size = new System.Drawing.Size(107, 21);
this.labelControl5.TabIndex = 379;
@@ -1151,7 +1202,7 @@
// comboBoxEdit2
//
this.comboBoxEdit2.EditValue = "鏍囧噯";
- this.comboBoxEdit2.Location = new System.Drawing.Point(432, 43);
+ this.comboBoxEdit2.Location = new System.Drawing.Point(403, 43);
this.comboBoxEdit2.Name = "comboBoxEdit2";
this.comboBoxEdit2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1166,7 +1217,7 @@
//
this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl4.Appearance.Options.UseFont = true;
- this.labelControl4.Location = new System.Drawing.Point(358, 45);
+ this.labelControl4.Location = new System.Drawing.Point(329, 45);
this.labelControl4.Name = "labelControl4";
this.labelControl4.Size = new System.Drawing.Size(73, 21);
this.labelControl4.TabIndex = 377;
@@ -1175,7 +1226,7 @@
// txt_sqOrg
//
this.txt_sqOrg.IsReadly = false;
- this.txt_sqOrg.Location = new System.Drawing.Point(432, 10);
+ this.txt_sqOrg.Location = new System.Drawing.Point(403, 10);
this.txt_sqOrg.Name = "txt_sqOrg";
this.txt_sqOrg.Size = new System.Drawing.Size(221, 30);
this.txt_sqOrg.TabIndex = 376;
@@ -1184,7 +1235,7 @@
//
this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(358, 15);
+ this.labelControl3.Location = new System.Drawing.Point(329, 15);
this.labelControl3.Name = "labelControl3";
this.labelControl3.Size = new System.Drawing.Size(68, 21);
this.labelControl3.TabIndex = 375;
@@ -1200,24 +1251,24 @@
this.comboBoxEdit1.Properties.Items.AddRange(new object[] {
"鏍囧噯"});
this.comboBoxEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.comboBoxEdit1.Size = new System.Drawing.Size(186, 24);
+ this.comboBoxEdit1.Size = new System.Drawing.Size(227, 24);
this.comboBoxEdit1.TabIndex = 374;
//
// labelControl2
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(20, 74);
+ this.labelControl2.Location = new System.Drawing.Point(21, 74);
this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(73, 21);
+ this.labelControl2.Size = new System.Drawing.Size(68, 21);
this.labelControl2.TabIndex = 373;
- this.labelControl2.Text = "涓氬姟绫诲瀷 ";
+ this.labelControl2.Text = "涓氬姟绫诲瀷";
//
// labelControl1
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(54, 134);
+ this.labelControl1.Location = new System.Drawing.Point(54, 132);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(34, 21);
this.labelControl1.TabIndex = 372;
@@ -1225,17 +1276,17 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(94, 131);
+ this.txt_remark.Location = new System.Drawing.Point(94, 129);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(559, 28);
+ this.txt_remark.Size = new System.Drawing.Size(530, 28);
this.txt_remark.TabIndex = 371;
//
// txt_isWc
//
this.txt_isWc.Enabled = false;
- this.txt_isWc.Location = new System.Drawing.Point(941, 74);
+ this.txt_isWc.Location = new System.Drawing.Point(818, 131);
this.txt_isWc.Name = "txt_isWc";
this.txt_isWc.Properties.Caption = "";
this.txt_isWc.Size = new System.Drawing.Size(39, 24);
@@ -1244,7 +1295,7 @@
// txt_shState
//
this.txt_shState.Enabled = false;
- this.txt_shState.Location = new System.Drawing.Point(830, 74);
+ this.txt_shState.Location = new System.Drawing.Point(704, 131);
this.txt_shState.Name = "txt_shState";
this.txt_shState.Properties.Caption = "";
this.txt_shState.Size = new System.Drawing.Size(29, 24);
@@ -1262,7 +1313,7 @@
"閫�璐�(RETURN)",
"鏅��(GENERAL)"});
this.txt_ftransferdirect.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_ftransferdirect.Size = new System.Drawing.Size(186, 24);
+ this.txt_ftransferdirect.Size = new System.Drawing.Size(227, 24);
this.txt_ftransferdirect.TabIndex = 362;
//
// txt_fbilltypeid
@@ -1280,12 +1331,12 @@
"鍒嗛攢鐩存帴璋冩嫧鍗�(ZJDBO4_SYS)",
"VMI鐩存帴璋冩嫧鍗�(ZJDBO5_SYS)"});
this.txt_fbilltypeid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fbilltypeid.Size = new System.Drawing.Size(186, 24);
+ this.txt_fbilltypeid.Size = new System.Drawing.Size(227, 24);
this.txt_fbilltypeid.TabIndex = 361;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(986, 77);
+ this.labelControl11.Location = new System.Drawing.Point(962, 22);
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);
@@ -1295,7 +1346,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(1037, 77);
+ this.lbGuid.Location = new System.Drawing.Point(1012, 22);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1304,7 +1355,7 @@
//
this.lb_isWc.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isWc.Appearance.Options.UseFont = true;
- this.lb_isWc.Location = new System.Drawing.Point(865, 76);
+ this.lb_isWc.Location = new System.Drawing.Point(742, 133);
this.lb_isWc.Name = "lb_isWc";
this.lb_isWc.Size = new System.Drawing.Size(73, 21);
this.lb_isWc.TabIndex = 360;
@@ -1314,7 +1365,7 @@
//
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(20, 15);
+ this.lb_billno.Location = new System.Drawing.Point(21, 15);
this.lb_billno.Name = "lb_billno";
this.lb_billno.Size = new System.Drawing.Size(68, 21);
this.lb_billno.TabIndex = 327;
@@ -1327,78 +1378,78 @@
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(186, 28);
+ this.txt_billno.Size = new System.Drawing.Size(227, 28);
this.txt_billno.TabIndex = 327;
//
// lb_shState
//
this.lb_shState.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_shState.Appearance.Options.UseFont = true;
- this.lb_shState.Location = new System.Drawing.Point(753, 76);
+ this.lb_shState.Location = new System.Drawing.Point(632, 133);
this.lb_shState.Name = "lb_shState";
- this.lb_shState.Size = new System.Drawing.Size(73, 21);
+ this.lb_shState.Size = new System.Drawing.Size(68, 21);
this.lb_shState.TabIndex = 267;
- this.lb_shState.Text = "瀹℃牳鐘舵�� ";
+ this.lb_shState.Text = "瀹℃牳鐘舵��";
//
// lb_shDate
//
this.lb_shDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_shDate.Appearance.Options.UseFont = true;
- this.lb_shDate.Location = new System.Drawing.Point(753, 45);
+ this.lb_shDate.Location = new System.Drawing.Point(632, 103);
this.lb_shDate.Name = "lb_shDate";
- this.lb_shDate.Size = new System.Drawing.Size(73, 21);
+ this.lb_shDate.Size = new System.Drawing.Size(68, 21);
this.lb_shDate.TabIndex = 262;
- this.lb_shDate.Text = "瀹℃牳鏃堕棿 ";
+ this.lb_shDate.Text = "瀹℃牳鏃堕棿";
//
// txt_shDate
//
this.txt_shDate.Enabled = false;
- this.txt_shDate.Location = new System.Drawing.Point(830, 41);
+ this.txt_shDate.Location = new System.Drawing.Point(704, 99);
this.txt_shDate.Name = "txt_shDate";
this.txt_shDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_shDate.Properties.Appearance.Options.UseFont = true;
- this.txt_shDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_shDate.Size = new System.Drawing.Size(166, 28);
this.txt_shDate.TabIndex = 262;
//
// lb_shBy
//
this.lb_shBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_shBy.Appearance.Options.UseFont = true;
- this.lb_shBy.Location = new System.Drawing.Point(770, 15);
+ this.lb_shBy.Location = new System.Drawing.Point(649, 74);
this.lb_shBy.Name = "lb_shBy";
- this.lb_shBy.Size = new System.Drawing.Size(56, 21);
+ this.lb_shBy.Size = new System.Drawing.Size(51, 21);
this.lb_shBy.TabIndex = 258;
- this.lb_shBy.Text = "瀹℃牳浜� ";
+ this.lb_shBy.Text = "瀹℃牳浜�";
//
// txt_shBy
//
this.txt_shBy.Enabled = false;
- this.txt_shBy.Location = new System.Drawing.Point(830, 11);
+ this.txt_shBy.Location = new System.Drawing.Point(704, 70);
this.txt_shBy.Name = "txt_shBy";
this.txt_shBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_shBy.Properties.Appearance.Options.UseFont = true;
- this.txt_shBy.Size = new System.Drawing.Size(150, 28);
+ this.txt_shBy.Size = new System.Drawing.Size(166, 28);
this.txt_shBy.TabIndex = 258;
//
// lb_ftransferdirect
//
this.lb_ftransferdirect.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftransferdirect.Appearance.Options.UseFont = true;
- this.lb_ftransferdirect.Location = new System.Drawing.Point(20, 102);
+ this.lb_ftransferdirect.Location = new System.Drawing.Point(21, 102);
this.lb_ftransferdirect.Name = "lb_ftransferdirect";
- this.lb_ftransferdirect.Size = new System.Drawing.Size(73, 21);
+ this.lb_ftransferdirect.Size = new System.Drawing.Size(68, 21);
this.lb_ftransferdirect.TabIndex = 213;
- this.lb_ftransferdirect.Text = "璋冩嫧鏂瑰悜 ";
+ this.lb_ftransferdirect.Text = "璋冩嫧鏂瑰悜";
//
// lb_fbilltypeid
//
this.lb_fbilltypeid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fbilltypeid.Appearance.Options.UseFont = true;
- this.lb_fbilltypeid.Location = new System.Drawing.Point(20, 45);
+ this.lb_fbilltypeid.Location = new System.Drawing.Point(21, 45);
this.lb_fbilltypeid.Name = "lb_fbilltypeid";
- this.lb_fbilltypeid.Size = new System.Drawing.Size(73, 21);
+ this.lb_fbilltypeid.Size = new System.Drawing.Size(68, 21);
this.lb_fbilltypeid.TabIndex = 211;
- this.lb_fbilltypeid.Text = "鍗曟嵁绫诲瀷 ";
+ this.lb_fbilltypeid.Text = "鍗曟嵁绫诲瀷";
//
// lb_id
//
@@ -1421,23 +1472,45 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // rptDrHz
+ // labelControl7
//
- this.rptDrHz.AutoHeight = false;
- editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.rptDrHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.rptDrHz.Name = "rptDrHz";
- this.rptDrHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrHz_ButtonClick);
+ this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl7.Appearance.Options.UseFont = true;
+ this.labelControl7.Location = new System.Drawing.Point(632, 45);
+ this.labelControl7.Name = "labelControl7";
+ this.labelControl7.Size = new System.Drawing.Size(68, 21);
+ this.labelControl7.TabIndex = 385;
+ this.labelControl7.Text = "鐢宠鏃堕棿";
//
- // rptDcHz
+ // textEdit1
//
- this.rptDcHz.AutoHeight = false;
- editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.rptDcHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.rptDcHz.Name = "rptDcHz";
- this.rptDcHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcHz_ButtonClick);
+ this.textEdit1.Enabled = false;
+ this.textEdit1.Location = new System.Drawing.Point(704, 41);
+ this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.textEdit1.Properties.Appearance.Options.UseFont = true;
+ this.textEdit1.Size = new System.Drawing.Size(166, 28);
+ this.textEdit1.TabIndex = 386;
+ //
+ // labelControl8
+ //
+ this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl8.Appearance.Options.UseFont = true;
+ this.labelControl8.Location = new System.Drawing.Point(649, 15);
+ this.labelControl8.Name = "labelControl8";
+ this.labelControl8.Size = new System.Drawing.Size(51, 21);
+ this.labelControl8.TabIndex = 383;
+ this.labelControl8.Text = "鐢宠浜�";
+ //
+ // textEdit2
+ //
+ this.textEdit2.Enabled = false;
+ this.textEdit2.Location = new System.Drawing.Point(704, 11);
+ this.textEdit2.Name = "textEdit2";
+ this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.textEdit2.Properties.Appearance.Options.UseFont = true;
+ this.textEdit2.Size = new System.Drawing.Size(166, 28);
+ this.textEdit2.TabIndex = 384;
//
// Frm_MesDbck
//
@@ -1460,7 +1533,9 @@
((System.ComponentModel.ISupportInitialize)(this.rptDrOrg)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptDrCk)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptDrCw)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDrHz)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcHz)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1471,8 +1546,8 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit4.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit3.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_drhzlx.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dchzlx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
@@ -1484,8 +1559,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_shDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptDrHz)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptDcHz)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1559,13 +1634,13 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit1;
private DevExpress.XtraEditors.LabelControl labelControl2;
- private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit3;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_dchzlx;
private DevExpress.XtraEditors.LabelControl labelControl5;
private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit2;
private DevExpress.XtraEditors.LabelControl labelControl4;
private UserControl.UcLookOrg txt_sqOrg;
private DevExpress.XtraEditors.LabelControl labelControl3;
- private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit4;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_drhzlx;
private DevExpress.XtraEditors.LabelControl labelControl6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
@@ -1592,5 +1667,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDrHz;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDcHz;
+ private DevExpress.XtraEditors.LabelControl labelControl7;
+ private DevExpress.XtraEditors.TextEdit textEdit1;
+ private DevExpress.XtraEditors.LabelControl labelControl8;
+ private DevExpress.XtraEditors.TextEdit textEdit2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 96b8c05..033d35d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -43,20 +43,15 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //璁剧疆浠撳簱閫夋嫨
- //txt_invFcode.getSuppler("");
- //txt_fromFcode.getSuppler("");
+ //璁剧疆鐢宠缁勭粐
this.txt_sqOrg.EditChanged += (s, e) =>
{
- //txt_fstockoutorgidNo.Text = txt_invFcode.GetOrgName();
- //txt_fowneroutidhead.Text = txt_invFcode.GetOrgId();
- var _obj = new
- {
- currentPage = 1,
- everyPageSize = 999999,
- sortName = "",
- keyWhere = "",
- };
+ string _sqGuid = txt_sqOrg.GetId();
+ if (string.IsNullOrEmpty(_sqGuid))
+ return;
+ System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
+ sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
var json = JsonConvert.SerializeObject(_obj);
try
{
@@ -71,10 +66,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
- //this.txt_fromFcode.EditChanged += (s, e) => {
- // txt_fstockorgidNo.Text = txt_fromFcode.GetOrgName();
- // txt_fowneridhead.Text = txt_fromFcode.GetOrgId();
- //};
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -719,19 +710,13 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
- //var dr = gvMx1.GetDataRow(rowhandle);
- //if (dr["drCkGuid"] == null)
- //{
- // MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
- // return;
- //};
- //var strCkGuid = dr["drCkGuid"].ToString();
- //if (string.IsNullOrEmpty(strCkGuid))
- //{
- // MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
- // return;
- //};
- SelectHz frm = new SelectHz("", "");
+ int _drhzlx = txt_drhzlx.SelectedIndex;
+ if (_drhzlx <= 0)
+ {
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆璐т富绫诲瀷锛�");
+ return;
+ }
+ SelectHz frm = new SelectHz("", _drhzlx.ToString());
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
@@ -752,19 +737,13 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
- //var dr = gvMx1.GetDataRow(rowhandle);
- //if (dr["drCkGuid"] == null)
- //{
- // MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
- // return;
- //};
- //var strCkGuid = dr["drCkGuid"].ToString();
- //if (string.IsNullOrEmpty(strCkGuid))
- //{
- // MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
- // return;
- //};
- SelectHz frm = new SelectHz("", "");
+ int _drhzlx = txt_dchzlx.SelectedIndex;
+ if (_drhzlx <= 0)
+ {
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭璐т富绫诲瀷锛�");
+ return;
+ }
+ SelectHz frm = new SelectHz("", _drhzlx.ToString());
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs
index c767fb7..d7a4273 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs
@@ -35,9 +35,9 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_Name = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_no = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_time = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -64,9 +64,9 @@
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_operationTime,
- this.gv_operationTable,
- this.gv_userName,
+ this.gv_Name,
+ this.gv_no,
+ this.gv_time,
this.gv_Btn});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
@@ -74,45 +74,45 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gv_operationTime
+ // gv_Name
//
- this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_operationTime.AppearanceCell.Options.UseFont = true;
- this.gv_operationTime.Caption = "缁勭粐鍚嶇О";
- this.gv_operationTime.FieldName = "name";
- this.gv_operationTime.MinWidth = 10;
- this.gv_operationTime.Name = "gv_operationTime";
- this.gv_operationTime.OptionsColumn.AllowEdit = false;
- this.gv_operationTime.Tag = "query_OPERATION_TIME";
- this.gv_operationTime.Visible = true;
- this.gv_operationTime.VisibleIndex = 0;
- this.gv_operationTime.Width = 300;
+ this.gv_Name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_Name.AppearanceCell.Options.UseFont = true;
+ this.gv_Name.Caption = "鍚嶇О";
+ this.gv_Name.FieldName = "name";
+ this.gv_Name.MinWidth = 10;
+ this.gv_Name.Name = "gv_Name";
+ this.gv_Name.OptionsColumn.AllowEdit = false;
+ this.gv_Name.Tag = "query_OPERATION_TIME";
+ this.gv_Name.Visible = true;
+ this.gv_Name.VisibleIndex = 0;
+ this.gv_Name.Width = 300;
//
- // gv_operationTable
+ // gv_no
//
- this.gv_operationTable.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_operationTable.AppearanceCell.Options.UseFont = true;
- this.gv_operationTable.Caption = "缁勭粐缂栧彿";
- this.gv_operationTable.FieldName = "fNumber";
- this.gv_operationTable.MinWidth = 10;
- this.gv_operationTable.Name = "gv_operationTable";
- this.gv_operationTable.OptionsColumn.AllowEdit = false;
- this.gv_operationTable.Tag = "query_OPERATION_TABLE";
- this.gv_operationTable.Visible = true;
- this.gv_operationTable.VisibleIndex = 1;
- this.gv_operationTable.Width = 100;
+ this.gv_no.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_no.AppearanceCell.Options.UseFont = true;
+ this.gv_no.Caption = "缂栧彿";
+ this.gv_no.FieldName = "fNumber";
+ this.gv_no.MinWidth = 10;
+ this.gv_no.Name = "gv_no";
+ this.gv_no.OptionsColumn.AllowEdit = false;
+ this.gv_no.Tag = "query_OPERATION_TABLE";
+ this.gv_no.Visible = true;
+ this.gv_no.VisibleIndex = 1;
+ this.gv_no.Width = 100;
//
- // gv_userName
+ // gv_time
//
- this.gv_userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_userName.AppearanceCell.Options.UseFont = true;
- this.gv_userName.Caption = "鍚屾鏃堕棿";
- this.gv_userName.FieldName = "edtTime";
- this.gv_userName.MinWidth = 10;
- this.gv_userName.Name = "gv_userName";
- this.gv_userName.OptionsColumn.AllowEdit = false;
- this.gv_userName.Tag = "query_USER_NAME";
- this.gv_userName.Width = 250;
+ this.gv_time.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_time.AppearanceCell.Options.UseFont = true;
+ this.gv_time.Caption = "鍚屾鏃堕棿";
+ this.gv_time.FieldName = "edtTime";
+ this.gv_time.MinWidth = 10;
+ this.gv_time.Name = "gv_time";
+ this.gv_time.OptionsColumn.AllowEdit = false;
+ this.gv_time.Tag = "query_USER_NAME";
+ this.gv_time.Width = 250;
//
// gv_Btn
//
@@ -135,7 +135,7 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // SelectOrg
+ // SelectHz
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -144,7 +144,7 @@
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "SelectOrg";
+ this.Name = "SelectHz";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "閫夋嫨缁勭粐";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
@@ -158,9 +158,9 @@
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
- private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
- private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_Name;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_no;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_time;
private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.cs b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
index ed99ac5..0e0c7ea 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectHz.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
@@ -21,16 +21,33 @@
private List<FilterEntity> _filterList = new List<FilterEntity>();
public SelectHz(string strOrgGuid, string strHzType)
{
+ _strOrgGuid = strOrgGuid;
+ _strHzType = strHzType;
InitializeComponent();
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gridView1);
Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
- getPageList(1);
+ switch (_strHzType)
+ {
+ case "1":
+ gv_Name.FieldName = "name";
+ gv_no.FieldName = "fNumber";
+ getPageList(1);
+ break;
+ case "2":
+ gv_Name.FieldName = "suppName";
+ gv_no.FieldName = "suppNo";
+ getPageListGys(1);
+ break;
+ case "3":
+ gv_Name.FieldName = "custName";
+ gv_no.FieldName = "custNo";
+ getPageListCus(1);
+ break;
+ }
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
- _strOrgGuid = strOrgGuid;
- _strHzType = strHzType;
}
-
+
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
@@ -82,7 +99,19 @@
{
return;
}
- var mxName = dr["name"].ToString();
+ var mxName = "";
+ switch (_strHzType)
+ {
+ case "1":
+ mxName = dr["name"].ToString();
+ break;
+ case "2":
+ mxName = dr["suppName"].ToString();
+ break;
+ case "3":
+ mxName = dr["custName"].ToString();
+ break;
+ }
var list = new List<dynamic>();
list.Add(new
{
@@ -99,5 +128,86 @@
/// </summary>
public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageListGys(int curPage)
+ {
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.supp_no",
+ "asc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "MesSupplierManager/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageListCus(int curPage)
+ {
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.cust_no",
+ "asc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "MesCustomerManager/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3