From 8eca9ec2bfdf7450ed4b36f814a64be788ec59ea Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 22 二月 2025 15:50:05 +0800
Subject: [PATCH] 调拨
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 101 ++++++++---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 332 ++++++++++++++++++++--------------------
2 files changed, 236 insertions(+), 197 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index 2f220e3..fc7cecc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -29,51 +29,51 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
- 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 editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions13 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject49 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject50 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject51 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject52 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions14 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject53 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject54 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject55 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject56 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions15 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject57 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject58 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject59 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject60 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions16 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject61 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject62 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject63 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject64 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions17 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject65 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject66 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject67 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject68 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions18 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject69 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject70 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject71 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject72 = new DevExpress.Utils.SerializableAppearanceObject();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -108,6 +108,7 @@
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptDrCw = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDcHz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptDrHz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -120,7 +121,6 @@
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();
@@ -146,22 +146,26 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ 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.txt_drhzlx = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
this.txt_dchzlx = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
- this.comboBoxEdit2 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_dblx = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
this.txt_sqOrg = new Gs.DevApp.UserControl.UcLookOrg();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
- this.comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_ywlx = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_isWc = new DevExpress.XtraEditors.CheckEdit();
this.txt_shState = new DevExpress.XtraEditors.CheckEdit();
this.txt_ftransferdirect = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_fbilltypeid = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_djlx = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.lb_isWc = new DevExpress.XtraEditors.LabelControl();
@@ -176,10 +180,6 @@
this.lb_fbilltypeid = new DevExpress.XtraEditors.LabelControl();
this.lb_id = new DevExpress.XtraEditors.LabelControl();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- 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();
@@ -191,9 +191,9 @@
((System.ComponentModel.ISupportInitialize)(this.rptDrOrg)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptDrCk)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptDrCw)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcHz)).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();
@@ -203,21 +203,21 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.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_dblx.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ywlx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isWc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftransferdirect.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fbilltypeid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billno.Properties)).BeginInit();
((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.textEdit1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
@@ -525,9 +525,9 @@
// rptDcOrg
//
this.rptDcOrg.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
+ editorButtonImageOptions10.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
this.rptDcOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, 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, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcOrg.Name = "rptDcOrg";
this.rptDcOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcOrg_ButtonClick);
//
@@ -549,9 +549,9 @@
// rptDcCk
//
this.rptDcCk.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions11.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, 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, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcCk.Name = "rptDcCk";
this.rptDcCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCk_ButtonClick);
//
@@ -569,9 +569,9 @@
// rptDcCw
//
this.rptDcCw.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions12.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcCw.Name = "rptDcCw";
this.rptDcCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCw_ButtonClick);
//
@@ -593,9 +593,9 @@
// rptDrOrg
//
this.rptDrOrg.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions13.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions13, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject49, serializableAppearanceObject50, serializableAppearanceObject51, serializableAppearanceObject52, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrOrg.Name = "rptDrOrg";
this.rptDrOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrOrg_ButtonClick);
//
@@ -617,9 +617,9 @@
// rptDrCk
//
this.rptDrCk.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions14.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions14, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject53, serializableAppearanceObject54, serializableAppearanceObject55, serializableAppearanceObject56, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrCk.Name = "rptDrCk";
this.rptDrCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCk_ButtonClick);
//
@@ -635,9 +635,9 @@
// rptDrCw
//
this.rptDrCw.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions15.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions15, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject57, serializableAppearanceObject58, serializableAppearanceObject59, serializableAppearanceObject60, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrCw.Name = "rptDrCw";
this.rptDrCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCw_ButtonClick);
//
@@ -655,6 +655,15 @@
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 12;
this.gridColumn23.Width = 94;
+ //
+ // rptDcHz
+ //
+ this.rptDcHz.AutoHeight = false;
+ editorButtonImageOptions16.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, editorButtonImageOptions16, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject61, serializableAppearanceObject62, serializableAppearanceObject63, serializableAppearanceObject64, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptDcHz.Name = "rptDcHz";
+ this.rptDcHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcHz_ButtonClick);
//
// gridColumn24
//
@@ -674,9 +683,9 @@
// rptDrHz
//
this.rptDrHz.AutoHeight = false;
- editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions17.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)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions17, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject65, serializableAppearanceObject66, serializableAppearanceObject67, serializableAppearanceObject68, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrHz.Name = "rptDrHz";
this.rptDrHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrHz_ButtonClick);
//
@@ -693,10 +702,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions9.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions18.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions18.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, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions18, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject69, serializableAppearanceObject70, serializableAppearanceObject71, serializableAppearanceObject72, "", 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);
@@ -765,15 +774,6 @@
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
//
@@ -1115,18 +1115,18 @@
this.panel1.Controls.Add(this.labelControl6);
this.panel1.Controls.Add(this.txt_dchzlx);
this.panel1.Controls.Add(this.labelControl5);
- this.panel1.Controls.Add(this.comboBoxEdit2);
+ this.panel1.Controls.Add(this.txt_dblx);
this.panel1.Controls.Add(this.labelControl4);
this.panel1.Controls.Add(this.txt_sqOrg);
this.panel1.Controls.Add(this.labelControl3);
- this.panel1.Controls.Add(this.comboBoxEdit1);
+ this.panel1.Controls.Add(this.txt_ywlx);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.labelControl1);
this.panel1.Controls.Add(this.txt_remark);
this.panel1.Controls.Add(this.txt_isWc);
this.panel1.Controls.Add(this.txt_shState);
this.panel1.Controls.Add(this.txt_ftransferdirect);
- this.panel1.Controls.Add(this.txt_fbilltypeid);
+ this.panel1.Controls.Add(this.txt_djlx);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_isWc);
@@ -1147,6 +1147,46 @@
this.panel1.Size = new System.Drawing.Size(1126, 164);
this.panel1.TabIndex = 1;
//
+ // labelControl7
+ //
+ 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 = "鐢宠鏃堕棿";
+ //
+ // textEdit1
+ //
+ 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;
+ //
// txt_drhzlx
//
this.txt_drhzlx.EditValue = "鏍囧噯";
@@ -1155,7 +1195,7 @@
this.txt_drhzlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_drhzlx.Properties.Items.AddRange(new object[] {
- "璇烽�夋嫨",
+ "-璇烽�夋嫨-",
"缁勭粐(BD_OwnerOrg)",
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
@@ -1181,7 +1221,7 @@
this.txt_dchzlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_dchzlx.Properties.Items.AddRange(new object[] {
- "璇烽�夋嫨",
+ "-璇烽�夋嫨-",
"缁勭粐(BD_OwnerOrg)",
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
@@ -1199,19 +1239,19 @@
this.labelControl5.TabIndex = 379;
this.labelControl5.Text = "璋冨嚭璐т富绫诲瀷 ";
//
- // comboBoxEdit2
+ // txt_dblx
//
- this.comboBoxEdit2.EditValue = "鏍囧噯";
- this.comboBoxEdit2.Location = new System.Drawing.Point(403, 43);
- this.comboBoxEdit2.Name = "comboBoxEdit2";
- this.comboBoxEdit2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.txt_dblx.EditValue = "鏍囧噯";
+ this.txt_dblx.Location = new System.Drawing.Point(403, 43);
+ this.txt_dblx.Name = "txt_dblx";
+ this.txt_dblx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.comboBoxEdit2.Properties.Items.AddRange(new object[] {
+ this.txt_dblx.Properties.Items.AddRange(new object[] {
"缁勭粐鍐呰皟鎷�",
"璺ㄧ粍缁囪皟鎷�"});
- this.comboBoxEdit2.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.comboBoxEdit2.Size = new System.Drawing.Size(221, 24);
- this.comboBoxEdit2.TabIndex = 378;
+ this.txt_dblx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_dblx.Size = new System.Drawing.Size(221, 24);
+ this.txt_dblx.TabIndex = 378;
//
// labelControl4
//
@@ -1241,18 +1281,18 @@
this.labelControl3.TabIndex = 375;
this.labelControl3.Text = "鐢宠缁勭粐";
//
- // comboBoxEdit1
+ // txt_ywlx
//
- this.comboBoxEdit1.EditValue = "鏍囧噯";
- this.comboBoxEdit1.Location = new System.Drawing.Point(94, 72);
- this.comboBoxEdit1.Name = "comboBoxEdit1";
- this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.txt_ywlx.EditValue = "鏍囧噯";
+ this.txt_ywlx.Location = new System.Drawing.Point(94, 72);
+ this.txt_ywlx.Name = "txt_ywlx";
+ this.txt_ywlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.comboBoxEdit1.Properties.Items.AddRange(new object[] {
+ this.txt_ywlx.Properties.Items.AddRange(new object[] {
"鏍囧噯"});
- this.comboBoxEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.comboBoxEdit1.Size = new System.Drawing.Size(227, 24);
- this.comboBoxEdit1.TabIndex = 374;
+ this.txt_ywlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_ywlx.Size = new System.Drawing.Size(227, 24);
+ this.txt_ywlx.TabIndex = 374;
//
// labelControl2
//
@@ -1316,23 +1356,23 @@
this.txt_ftransferdirect.Size = new System.Drawing.Size(227, 24);
this.txt_ftransferdirect.TabIndex = 362;
//
- // txt_fbilltypeid
+ // txt_djlx
//
- this.txt_fbilltypeid.EditValue = "-璇烽�夋嫨-";
- this.txt_fbilltypeid.Location = new System.Drawing.Point(94, 43);
- this.txt_fbilltypeid.Name = "txt_fbilltypeid";
- this.txt_fbilltypeid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.txt_djlx.EditValue = "-璇烽�夋嫨-";
+ this.txt_djlx.Location = new System.Drawing.Point(94, 43);
+ this.txt_djlx.Name = "txt_djlx";
+ this.txt_djlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fbilltypeid.Properties.Items.AddRange(new object[] {
+ this.txt_djlx.Properties.Items.AddRange(new object[] {
"-璇烽�夋嫨-",
"鏍囧噯鐩存帴璋冩嫧鍗�(ZJDBO1_SYS)",
"瀵勫敭鐩存帴璋冩嫧鍗�(ZJDBO2_SYS)",
"濮斿鐩存帴璋冩嫧鍗�(ZIDBO3_SYS)",
"鍒嗛攢鐩存帴璋冩嫧鍗�(ZJDBO4_SYS)",
"VMI鐩存帴璋冩嫧鍗�(ZJDBO5_SYS)"});
- this.txt_fbilltypeid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fbilltypeid.Size = new System.Drawing.Size(227, 24);
- this.txt_fbilltypeid.TabIndex = 361;
+ this.txt_djlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_djlx.Size = new System.Drawing.Size(227, 24);
+ this.txt_djlx.TabIndex = 361;
//
// labelControl11
//
@@ -1472,46 +1512,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // labelControl7
- //
- 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 = "鐢宠鏃堕棿";
- //
- // textEdit1
- //
- 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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1533,9 +1533,9 @@
((System.ComponentModel.ISupportInitialize)(this.rptDrOrg)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptDrCk)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptDrCw)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcHz)).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();
@@ -1546,21 +1546,21 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.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_dblx.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ywlx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isWc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftransferdirect.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fbilltypeid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billno.Properties)).EndInit();
((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.textEdit1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1619,7 +1619,7 @@
private DevExpress.XtraEditors.LabelControl lb_ftransferdirect;
private DevExpress.XtraEditors.LabelControl lb_fbilltypeid;
private DevExpress.XtraEditors.LabelControl lb_id;
- private DevExpress.XtraEditors.ComboBoxEdit txt_fbilltypeid;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_djlx;
private DevExpress.XtraEditors.ComboBoxEdit txt_ftransferdirect;
private DevExpress.XtraEditors.CheckEdit txt_isWc;
private DevExpress.XtraEditors.CheckEdit txt_shState;
@@ -1632,11 +1632,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit1;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_ywlx;
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.ComboBoxEdit txt_dchzlx;
private DevExpress.XtraEditors.LabelControl labelControl5;
- private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit2;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_dblx;
private DevExpress.XtraEditors.LabelControl labelControl4;
private UserControl.UcLookOrg txt_sqOrg;
private DevExpress.XtraEditors.LabelControl labelControl3;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 033d35d..0d6d267 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -7,7 +7,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -29,6 +28,7 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "shState", "", (value) =>
{
@@ -170,18 +170,19 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- if (xtraTabControl1.SelectedTabPageIndex == 1)
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim());
else
{
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
/// <summary>
@@ -201,7 +202,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(rowGuid);
+ getModel(lbGuid.Text.Trim());
}
else
{
@@ -233,26 +234,49 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- // string _inCkId = txt_invFcode.GetId();//鍑�
- // string _inRkId = txt_fromFcode.GetId();//鍏�
- //if (string.IsNullOrEmpty(_inCkId))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍑鸿揣浠撳簱锛�");
- // txt_invFcode.Focus();
- // return;
- //}
- //if (string.IsNullOrEmpty(_inRkId))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀惰揣浠撳簱锛�");
- // txt_fromFcode.Focus();
- // return;
- //}
+ string djlx=txt_djlx.SelectedText.ToString();
+ string ywlx=txt_ywlx.SelectedText.ToString();
+ string dbfx=txt_ftransferdirect.SelectedText.ToString();
+ string sqOrg = txt_sqOrg.GetId();
+ string dblx = txt_dblx.SelectedText.ToString();
+ string dchzlx=txt_dchzlx.SelectedText.ToString();
+ string drhzlx=txt_drhzlx.SelectedText.ToString();
+ if (txt_djlx.SelectedIndex<=0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ txt_djlx.Focus();
+ return;
+ }
+ if (txt_ftransferdirect.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
+ txt_ftransferdirect.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(sqOrg))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢宠缁勭粐锛�");
+ txt_sqOrg.Focus();
+ return;
+ }
+ if (txt_dchzlx.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨嚭璐т富绫诲瀷锛�");
+ txt_dchzlx.Focus();
+ return;
+ }
+ if (txt_drhzlx.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨叆璐т富绫诲瀷锛�");
+ txt_drhzlx.Focus();
+ return;
+ }
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
//inCkId = _inCkId,//鍑轰粨
//inRkId = _inRkId,//鍏ュ簱
- inDjlx = txt_fbilltypeid.Text.Trim(),//鍗曟嵁绫诲瀷
+ inDjlx = txt_djlx.Text.Trim(),//鍗曟嵁绫诲瀷
inDbfx = txt_ftransferdirect.Text.Trim(),//璋冩嫧鏂瑰悜
inRemark = txt_remark.Text.Trim(),//澶囨敞
list = new List<dynamic>(),
@@ -295,10 +319,9 @@
lbGuid.Text = _rtn.rtnData.outGuid;
txt_billno.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
- //List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- //gvList.Add(gvMx1);
- //UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
- //ucLookHuoZhu1.Enabled = false;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
toolBarMenu1.currentAction = "";
}
}
@@ -307,7 +330,19 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billno, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
/// <summary>
///
/// </summary>
@@ -331,6 +366,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -387,6 +423,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -487,6 +524,8 @@
gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
gvMx1.SetFocusedRowCellValue("itemMpdel", SelectedDataRow["itemModel"].ToString());
gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
--
Gitblit v1.9.3