From b5a5f3fe2ee6b0db77b679c6713265e2393e1d90 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 21 二月 2025 15:32:10 +0800
Subject: [PATCH] 委外
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 40 +
DevApp/Gs.DevApp/Gs.DevApp.csproj | 4
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 10
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs | 32
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs | 394 +++++-----
DevApp/Gs.DevApp/Resources/alignhorizontalcenter1.svg | 9
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs | 1572 ++++++++++++++++++++++++++---------------
DevApp/Gs.DevApp/Resources/alignhorizontalcenter.svg | 9
DevApp/Gs.DevApp/Resources/redtoblack.svg | 16
DevApp/Gs.DevApp/Resources/alignverticalleft.svg | 9
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 2
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 3
DevApp/Gs.DevApp/Properties/Resources.resx | 62 +
13 files changed, 1,340 insertions(+), 822 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index 1002d20..2fe376a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -29,16 +29,16 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1tld009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld007 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld006 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -114,16 +114,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
- this.panel1 = new System.Windows.Forms.Panel();
- this.txt_tbl002 = new Gs.DevApp.UserControl.UcLookWwgd();
- this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
- this.txt_tbl013 = new DevExpress.XtraEditors.CheckEdit();
- this.txt_tbl005 = new DevExpress.XtraEditors.ComboBoxEdit();
- this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
- this.lbGuid = new System.Windows.Forms.Label();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -135,11 +126,20 @@
this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gcMx2 = new DevExpress.XtraGrid.GridControl();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
- this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.panel1 = new System.Windows.Forms.Panel();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_tbl002 = new Gs.DevApp.UserControl.UcLookWwgd();
+ this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_tbl013 = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_tbl005 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+ this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -170,15 +170,15 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.xtraTabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl005.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx1tld009
@@ -305,7 +305,7 @@
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Controls.Add(this.panelMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 376);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 411);
this.tabMxPage1.Text = "閫�鏂欐槑缁�";
//
// gcMx1
@@ -316,7 +316,7 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 278);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 313);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -354,6 +354,7 @@
// gridColumn1
//
this.gridColumn1.Caption = "宸叉墦鍗版暟閲�";
+ this.gridColumn1.FieldName = "ydy";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
@@ -363,6 +364,7 @@
// gridColumn2
//
this.gridColumn2.Caption = "鍙墦鍗版暟閲�";
+ this.gridColumn2.FieldName = "kdy";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
@@ -382,10 +384,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1037,131 +1039,18 @@
this.xtraTabPage3.Size = new System.Drawing.Size(1124, 411);
this.xtraTabPage3.Text = "鏉＄爜鏄庣粏";
//
- // panel1
+ // gcMx2
//
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.labelControl5);
- this.panel1.Controls.Add(this.labelControl4);
- this.panel1.Controls.Add(this.txt_itemName);
- this.panel1.Controls.Add(this.labelControl2);
- this.panel1.Controls.Add(this.txt_tbl002);
- this.panel1.Controls.Add(this.txt_tbl020);
- this.panel1.Controls.Add(this.txt_tbl013);
- this.panel1.Controls.Add(this.txt_tbl005);
- this.panel1.Controls.Add(this.btnSelect);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_tbl021);
- this.panel1.Controls.Add(this.txt_itemNo);
- this.panel1.Controls.Add(this.lb_tbl020);
- this.panel1.Controls.Add(this.lb_tbl013);
- this.panel1.Controls.Add(this.lb_tbl012);
- this.panel1.Controls.Add(this.txt_tbl012);
- this.panel1.Controls.Add(this.lb_tbl011);
- this.panel1.Controls.Add(this.txt_tbl011);
- this.panel1.Controls.Add(this.lb_tbl006);
- this.panel1.Controls.Add(this.txt_tbl006);
- this.panel1.Controls.Add(this.lb_tbl005);
- this.panel1.Controls.Add(this.lb_tbl004);
- this.panel1.Controls.Add(this.txt_itemModel);
- this.panel1.Controls.Add(this.lb_tbl003);
- this.panel1.Controls.Add(this.txt_daa014);
- this.panel1.Controls.Add(this.txt_billNo);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 149);
- this.panel1.TabIndex = 1;
- //
- // txt_tbl002
- //
- this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(85, 48);
- this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(213, 32);
- this.txt_tbl002.TabIndex = 462;
- //
- // txt_tbl020
- //
- this.txt_tbl020.Enabled = false;
- this.txt_tbl020.Location = new System.Drawing.Point(961, 85);
- this.txt_tbl020.Name = "txt_tbl020";
- this.txt_tbl020.Properties.Caption = "";
- this.txt_tbl020.Size = new System.Drawing.Size(94, 24);
- this.txt_tbl020.TabIndex = 461;
- //
- // txt_tbl013
- //
- this.txt_tbl013.Enabled = false;
- this.txt_tbl013.Location = new System.Drawing.Point(852, 85);
- this.txt_tbl013.Name = "txt_tbl013";
- this.txt_tbl013.Properties.Caption = "";
- this.txt_tbl013.Size = new System.Drawing.Size(34, 24);
- this.txt_tbl013.TabIndex = 460;
- //
- // txt_tbl005
- //
- this.txt_tbl005.Location = new System.Drawing.Point(85, 83);
- this.txt_tbl005.Name = "txt_tbl005";
- this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_tbl005.Properties.Items.AddRange(new object[] {
- "鑹搧閫�鏂�",
- "鏉ユ枡涓嶈壇閫�鏂�",
- "浣滀笟涓嶈壇閫�鏂�"});
- this.txt_tbl005.Size = new System.Drawing.Size(213, 24);
- this.txt_tbl005.TabIndex = 459;
- //
- // btnSelect
- //
- this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(11, 113);
- this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(107, 29);
- this.btnSelect.TabIndex = 457;
- this.btnSelect.Text = "閫夊彇鐗╂枡";
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(1010, 119);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(45, 18);
- this.labelControl11.TabIndex = 130;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(1061, 119);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Visible = false;
- //
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1016, 45);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 5;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
- // repositoryItemButtonEdit2
- //
- this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
- this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+ this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.Location = new System.Drawing.Point(0, 0);
+ this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Name = "gcMx2";
+ this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit2});
+ this.gcMx2.Size = new System.Drawing.Size(1124, 411);
+ this.gcMx2.TabIndex = 2;
+ this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx2});
//
// gvMx2
//
@@ -1295,38 +1184,63 @@
this.gvBtnAlawys.VisibleIndex = 8;
this.gvBtnAlawys.Width = 94;
//
- // gcMx2
+ // repositoryItemButtonEdit2
//
- this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.Location = new System.Drawing.Point(0, 0);
- this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Name = "gcMx2";
- this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit2});
- this.gcMx2.Size = new System.Drawing.Size(1124, 411);
- this.gcMx2.TabIndex = 2;
- this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx2});
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
//
- // labelControl2
+ // panel1
//
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(303, 53);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(68, 21);
- this.labelControl2.TabIndex = 463;
- this.labelControl2.Text = "浜у搧鍚嶇О";
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.labelControl5);
+ this.panel1.Controls.Add(this.labelControl4);
+ this.panel1.Controls.Add(this.txt_itemName);
+ this.panel1.Controls.Add(this.labelControl2);
+ this.panel1.Controls.Add(this.txt_tbl002);
+ this.panel1.Controls.Add(this.txt_tbl020);
+ this.panel1.Controls.Add(this.txt_tbl013);
+ this.panel1.Controls.Add(this.txt_tbl005);
+ this.panel1.Controls.Add(this.btnSelect);
+ this.panel1.Controls.Add(this.labelControl11);
+ this.panel1.Controls.Add(this.lbGuid);
+ this.panel1.Controls.Add(this.lb_tbl021);
+ this.panel1.Controls.Add(this.txt_itemNo);
+ this.panel1.Controls.Add(this.lb_tbl020);
+ this.panel1.Controls.Add(this.lb_tbl013);
+ this.panel1.Controls.Add(this.lb_tbl012);
+ this.panel1.Controls.Add(this.txt_tbl012);
+ this.panel1.Controls.Add(this.lb_tbl011);
+ this.panel1.Controls.Add(this.txt_tbl011);
+ this.panel1.Controls.Add(this.lb_tbl006);
+ this.panel1.Controls.Add(this.txt_tbl006);
+ this.panel1.Controls.Add(this.lb_tbl005);
+ this.panel1.Controls.Add(this.lb_tbl004);
+ this.panel1.Controls.Add(this.txt_itemModel);
+ this.panel1.Controls.Add(this.lb_tbl003);
+ this.panel1.Controls.Add(this.txt_daa014);
+ this.panel1.Controls.Add(this.txt_billNo);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1126, 149);
+ this.panel1.TabIndex = 1;
//
- // txt_itemName
+ // labelControl5
//
- this.txt_itemName.Enabled = false;
- this.txt_itemName.Location = new System.Drawing.Point(382, 49);
- this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(150, 28);
- this.txt_itemName.TabIndex = 464;
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(11, 53);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(68, 21);
+ this.labelControl5.TabIndex = 468;
+ this.labelControl5.Text = "濮斿宸ュ崟";
//
// labelControl4
//
@@ -1338,15 +1252,103 @@
this.labelControl4.TabIndex = 467;
this.labelControl4.Text = "鐢宠鍗曞彿";
//
- // labelControl5
+ // txt_itemName
//
- this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(11, 53);
- this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(68, 21);
- this.labelControl5.TabIndex = 468;
- this.labelControl5.Text = "濮斿宸ュ崟";
+ this.txt_itemName.Enabled = false;
+ this.txt_itemName.Location = new System.Drawing.Point(382, 49);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemName.TabIndex = 464;
+ //
+ // labelControl2
+ //
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Location = new System.Drawing.Point(303, 53);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(68, 21);
+ this.labelControl2.TabIndex = 463;
+ this.labelControl2.Text = "浜у搧鍚嶇О";
+ //
+ // txt_tbl002
+ //
+ this.txt_tbl002.IsReadly = false;
+ this.txt_tbl002.Location = new System.Drawing.Point(85, 48);
+ this.txt_tbl002.Name = "txt_tbl002";
+ this.txt_tbl002.Size = new System.Drawing.Size(213, 32);
+ this.txt_tbl002.TabIndex = 462;
+ //
+ // txt_tbl020
+ //
+ this.txt_tbl020.Enabled = false;
+ this.txt_tbl020.Location = new System.Drawing.Point(961, 85);
+ this.txt_tbl020.Name = "txt_tbl020";
+ this.txt_tbl020.Properties.Caption = "";
+ this.txt_tbl020.Size = new System.Drawing.Size(94, 24);
+ this.txt_tbl020.TabIndex = 461;
+ //
+ // txt_tbl013
+ //
+ this.txt_tbl013.Enabled = false;
+ this.txt_tbl013.Location = new System.Drawing.Point(852, 85);
+ this.txt_tbl013.Name = "txt_tbl013";
+ this.txt_tbl013.Properties.Caption = "";
+ this.txt_tbl013.Size = new System.Drawing.Size(34, 24);
+ this.txt_tbl013.TabIndex = 460;
+ //
+ // txt_tbl005
+ //
+ this.txt_tbl005.Location = new System.Drawing.Point(85, 83);
+ this.txt_tbl005.Name = "txt_tbl005";
+ this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_tbl005.Properties.Items.AddRange(new object[] {
+ "鑹搧閫�鏂�",
+ "鏉ユ枡涓嶈壇閫�鏂�",
+ "浣滀笟涓嶈壇閫�鏂�"});
+ this.txt_tbl005.Size = new System.Drawing.Size(213, 24);
+ this.txt_tbl005.TabIndex = 459;
+ //
+ // btnSelect
+ //
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(11, 113);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(107, 29);
+ this.btnSelect.TabIndex = 457;
+ this.btnSelect.Text = "閫夊彇鐗╂枡";
+ //
+ // labelControl11
+ //
+ this.labelControl11.Location = new System.Drawing.Point(1010, 119);
+ this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl11.Name = "labelControl11";
+ this.labelControl11.Size = new System.Drawing.Size(45, 18);
+ this.labelControl11.TabIndex = 130;
+ this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(1061, 119);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(1016, 45);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 5;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
//
// Frm_WwTbl
//
@@ -1389,16 +1391,16 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.xtraTabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl005.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index ae1ef21..dc26a85 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -29,6 +29,7 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "tbl013", "", (value) =>
@@ -84,7 +85,7 @@
};
frm.ShowDialog();
};
- gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
+
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
ucBtnPrint1.rptParameter = "rpt_wwtl{}";
@@ -525,6 +526,7 @@
DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
+ gcMx1.DataSource = null;
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
@@ -711,10 +713,8 @@
txtWlgg.Text = row["tld004"].ToString();
txtWlmc.Text = row["tld003"].ToString();
txtQuantity.Text = row["tld004"].ToString();//鐢宠鎬婚噺
- //txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
- //kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
- txtYdy.Text = "";//宸叉墦鍗版�婚噺
- txtKdy.Text = "";//鍙墦鍗版�婚噺
+ txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
+ txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
index 17f2a00..5f8b7f6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
@@ -29,81 +29,112 @@
/// </summary>
private void InitializeComponent()
{
- this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1rkQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1cItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1unit = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_depotId = new DevExpress.XtraEditors.LabelControl();
- this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_boardItem = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_outType = new DevExpress.XtraEditors.LabelControl();
this.txt_outType = new DevExpress.XtraEditors.TextEdit();
- this.gv_outType = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_workNo = new DevExpress.XtraEditors.LabelControl();
this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_receiver = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_outPart = new DevExpress.XtraEditors.LabelControl();
- this.gv_outPart = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_outDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
- this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
- this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_status = new DevExpress.XtraEditors.LabelControl();
- this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_taskNo = new DevExpress.XtraEditors.LabelControl();
this.txt_taskNo = new DevExpress.XtraEditors.TextEdit();
this.lb_itemOutNo = new DevExpress.XtraEditors.LabelControl();
this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_status = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_reason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_checkRes = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_ebeln = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_depotsCode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_suppNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_urgentFlag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_lineNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_taskLino = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_fbillno = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_fbillLino = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_custNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_custName = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_pickIns = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_fcheckUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_rbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_cbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_fcheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_depotsId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_remark = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.bandedGridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
- this.txt_outPart = new Gs.DevApp.UserControl.UcLookDepartment();
- this.depot_id = new Gs.DevApp.UserControl.UcLookCk();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -119,109 +150,20 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
this.SuspendLayout();
- //
- // gvMx2remark
- //
- this.gvMx2remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2remark.AppearanceCell.Options.UseFont = true;
- this.gvMx2remark.Caption = "澶囨敞 ";
- this.gvMx2remark.FieldName = "remark";
- this.gvMx2remark.MinWidth = 50;
- this.gvMx2remark.Name = "gvMx2remark";
- this.gvMx2remark.Tag = "query_a.REMARK";
- this.gvMx2remark.Visible = true;
- this.gvMx2remark.VisibleIndex = 6;
- this.gvMx2remark.Width = 94;
- //
- // gvMx2depotSectionCode
- //
- this.gvMx2depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2depotSectionCode.AppearanceCell.Options.UseFont = true;
- this.gvMx2depotSectionCode.Caption = "璐т綅缂栫爜 ";
- this.gvMx2depotSectionCode.FieldName = "depotSectionCode";
- this.gvMx2depotSectionCode.MinWidth = 50;
- this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
- this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
- this.gvMx2depotSectionCode.Visible = true;
- this.gvMx2depotSectionCode.VisibleIndex = 5;
- this.gvMx2depotSectionCode.Width = 94;
- //
- // gvMx2depotCode
- //
- this.gvMx2depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
- this.gvMx2depotCode.Caption = "浠撳簱缂栫爜 ";
- this.gvMx2depotCode.FieldName = "depotCode";
- this.gvMx2depotCode.MinWidth = 50;
- this.gvMx2depotCode.Name = "gvMx2depotCode";
- this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
- this.gvMx2depotCode.Visible = true;
- this.gvMx2depotCode.VisibleIndex = 4;
- this.gvMx2depotCode.Width = 94;
- //
- // gvMx2quantity
- //
- this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
- this.gvMx2quantity.Caption = "鏁伴噺";
- this.gvMx2quantity.FieldName = "quantity";
- this.gvMx2quantity.MinWidth = 50;
- this.gvMx2quantity.Name = "gvMx2quantity";
- this.gvMx2quantity.Tag = "query_a.QUANTITY";
- this.gvMx2quantity.Visible = true;
- this.gvMx2quantity.VisibleIndex = 3;
- this.gvMx2quantity.Width = 94;
- //
- // gvMx2lotNo
- //
- this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
- this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
- this.gvMx2lotNo.FieldName = "lotNo";
- this.gvMx2lotNo.MinWidth = 50;
- this.gvMx2lotNo.Name = "gvMx2lotNo";
- this.gvMx2lotNo.Tag = "query_a.LOT_NO";
- this.gvMx2lotNo.Visible = true;
- this.gvMx2lotNo.VisibleIndex = 2;
- this.gvMx2lotNo.Width = 94;
- //
- // gvMx2itemNo
- //
- this.gvMx2itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
- this.gvMx2itemNo.FieldName = "itemNo";
- this.gvMx2itemNo.MinWidth = 50;
- this.gvMx2itemNo.Name = "gvMx2itemNo";
- this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
- this.gvMx2itemNo.Visible = true;
- this.gvMx2itemNo.VisibleIndex = 1;
- this.gvMx2itemNo.Width = 94;
- //
- // gvMx2itemBarcode
- //
- this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
- this.gvMx2itemBarcode.FieldName = "itemBarcode";
- this.gvMx2itemBarcode.MinWidth = 50;
- this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
- this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
- this.gvMx2itemBarcode.Visible = true;
- this.gvMx2itemBarcode.VisibleIndex = 0;
- this.gvMx2itemBarcode.Width = 94;
//
// tabMxPage2
//
@@ -237,156 +179,152 @@
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
this.gcMx2.Size = new System.Drawing.Size(1124, 417);
- this.gcMx2.TabIndex = 0;
+ this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
//
// gvMx2
//
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx2itemBarcode,
- this.gvMx2itemNo,
- this.gvMx2lotNo,
- this.gvMx2quantity,
- this.gvMx2depotCode,
- this.gvMx2depotSectionCode,
- this.gvMx2remark});
+ this.gvMx1itemBarcode,
+ this.gvMx1cItemCode,
+ this.gvMx1itemSname,
+ this.gvMx1itemNo,
+ this.gvMx1quantity,
+ this.gvMx1unit,
+ this.gvMx1depotCode,
+ this.gvMx1depotSectionCode,
+ this.gridColumn2,
+ this.gridColumn7});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx2.OptionsView.ShowGroupPanel = false;
//
- // gvMx1itemId
+ // gvMx1itemBarcode
//
- this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
- this.gvMx1itemId.Caption = "鐗╂枡ID ";
- this.gvMx1itemId.FieldName = "itemId";
- this.gvMx1itemId.MinWidth = 50;
- this.gvMx1itemId.Name = "gvMx1itemId";
- this.gvMx1itemId.Tag = "query_a.item_id";
- this.gvMx1itemId.Visible = true;
- this.gvMx1itemId.VisibleIndex = 9;
- this.gvMx1itemId.Width = 94;
+ this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
+ this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
+ this.gvMx1itemBarcode.FieldName = "itemBarcode";
+ this.gvMx1itemBarcode.MinWidth = 50;
+ this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
+ this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
+ this.gvMx1itemBarcode.Visible = true;
+ this.gvMx1itemBarcode.VisibleIndex = 0;
+ this.gvMx1itemBarcode.Width = 94;
//
- // gvMx1tlQty
+ // gvMx1cItemCode
//
- this.gvMx1tlQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1tlQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1tlQty.Caption = "宸叉壂鏁伴噺 ";
- this.gvMx1tlQty.FieldName = "tlQty";
- this.gvMx1tlQty.MinWidth = 50;
- this.gvMx1tlQty.Name = "gvMx1tlQty";
- this.gvMx1tlQty.Tag = "query_a.tl_qty";
- this.gvMx1tlQty.Visible = true;
- this.gvMx1tlQty.VisibleIndex = 8;
- this.gvMx1tlQty.Width = 94;
+ this.gvMx1cItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
+ this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜";
+ this.gvMx1cItemCode.FieldName = "itemNo";
+ this.gvMx1cItemCode.MinWidth = 50;
+ this.gvMx1cItemCode.Name = "gvMx1cItemCode";
+ this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
+ this.gvMx1cItemCode.Visible = true;
+ this.gvMx1cItemCode.VisibleIndex = 1;
+ this.gvMx1cItemCode.Width = 94;
//
- // gvMx1rkQty
+ // gvMx1itemSname
//
- this.gvMx1rkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1rkQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1rkQty.Caption = "宸插叆搴撴暟 ";
- this.gvMx1rkQty.FieldName = "rkQty";
- this.gvMx1rkQty.MinWidth = 50;
- this.gvMx1rkQty.Name = "gvMx1rkQty";
- this.gvMx1rkQty.Tag = "query_a.rk_qty";
- this.gvMx1rkQty.Visible = true;
- this.gvMx1rkQty.VisibleIndex = 7;
- this.gvMx1rkQty.Width = 94;
- //
- // gvMx1workNo
- //
- this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1workNo.Caption = "浠诲姟鍗曞彿";
- this.gvMx1workNo.FieldName = "workNo";
- this.gvMx1workNo.MinWidth = 50;
- this.gvMx1workNo.Name = "gvMx1workNo";
- this.gvMx1workNo.Tag = "query_a.work_no";
- this.gvMx1workNo.Visible = true;
- this.gvMx1workNo.VisibleIndex = 6;
- this.gvMx1workNo.Width = 94;
- //
- // gvMx1remark
- //
- this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1remark.AppearanceCell.Options.UseFont = true;
- this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
- this.gvMx1remark.FieldName = "remark";
- this.gvMx1remark.MinWidth = 50;
- this.gvMx1remark.Name = "gvMx1remark";
- this.gvMx1remark.Tag = "query_a.remark";
- this.gvMx1remark.Visible = true;
- this.gvMx1remark.VisibleIndex = 5;
- this.gvMx1remark.Width = 94;
- //
- // gvMx1createDate
- //
- this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
- this.gvMx1createDate.Caption = "鐗╂枡瑙勬牸";
- this.gvMx1createDate.FieldName = "createDate";
- this.gvMx1createDate.MinWidth = 50;
- this.gvMx1createDate.Name = "gvMx1createDate";
- this.gvMx1createDate.Tag = "query_a.create_date";
- this.gvMx1createDate.Visible = true;
- this.gvMx1createDate.VisibleIndex = 4;
- this.gvMx1createDate.Width = 94;
- //
- // gvMx1createBy
- //
- this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
- this.gvMx1createBy.Caption = "鐗╂枡鍚嶇О";
- this.gvMx1createBy.FieldName = "createBy";
- this.gvMx1createBy.MinWidth = 50;
- this.gvMx1createBy.Name = "gvMx1createBy";
- this.gvMx1createBy.Tag = "query_a.create_by";
- this.gvMx1createBy.Visible = true;
- this.gvMx1createBy.VisibleIndex = 3;
- this.gvMx1createBy.Width = 94;
- //
- // gvMx1quantity
- //
- this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
- this.gvMx1quantity.Caption = "鐢宠鏁伴噺 ";
- this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 50;
- this.gvMx1quantity.Name = "gvMx1quantity";
- this.gvMx1quantity.Tag = "query_a.quantity";
- this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 2;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1itemSname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
+ this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О";
+ this.gvMx1itemSname.FieldName = "itemName";
+ this.gvMx1itemSname.MinWidth = 50;
+ this.gvMx1itemSname.Name = "gvMx1itemSname";
+ this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
+ this.gvMx1itemSname.Visible = true;
+ this.gvMx1itemSname.VisibleIndex = 2;
+ this.gvMx1itemSname.Width = 94;
//
// gvMx1itemNo
//
this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1itemNo.Caption = "鐗╂枡缂栧彿 ";
- this.gvMx1itemNo.FieldName = "itemNo";
+ this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿";
+ this.gvMx1itemNo.FieldName = "itemModel";
this.gvMx1itemNo.MinWidth = 50;
this.gvMx1itemNo.Name = "gvMx1itemNo";
- this.gvMx1itemNo.Tag = "query_a.item_no";
+ this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
- this.gvMx1itemNo.VisibleIndex = 1;
+ this.gvMx1itemNo.VisibleIndex = 3;
this.gvMx1itemNo.Width = 94;
//
- // gvMx1guid
+ // gvMx1quantity
//
- this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1guid.AppearanceCell.Options.UseFont = true;
- this.gvMx1guid.Caption = "guid ";
- this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
- this.gvMx1guid.Name = "gvMx1guid";
- this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Visible = true;
- this.gvMx1guid.VisibleIndex = 0;
- this.gvMx1guid.Width = 94;
+ this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
+ this.gvMx1quantity.Caption = "鏁伴噺";
+ this.gvMx1quantity.FieldName = "quantity";
+ this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.Name = "gvMx1quantity";
+ this.gvMx1quantity.Tag = "query_a.QUANTITY";
+ this.gvMx1quantity.Visible = true;
+ this.gvMx1quantity.VisibleIndex = 4;
+ this.gvMx1quantity.Width = 94;
+ //
+ // gvMx1unit
+ //
+ this.gvMx1unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1unit.AppearanceCell.Options.UseFont = true;
+ this.gvMx1unit.Caption = "搴撳瓨鍗曚綅";
+ this.gvMx1unit.FieldName = "kcUnit";
+ this.gvMx1unit.MinWidth = 50;
+ this.gvMx1unit.Name = "gvMx1unit";
+ this.gvMx1unit.Tag = "query_a.UNIT";
+ this.gvMx1unit.Visible = true;
+ this.gvMx1unit.VisibleIndex = 5;
+ this.gvMx1unit.Width = 94;
+ //
+ // gvMx1depotCode
+ //
+ this.gvMx1depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
+ this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
+ this.gvMx1depotCode.FieldName = "depotCode";
+ this.gvMx1depotCode.MinWidth = 50;
+ this.gvMx1depotCode.Name = "gvMx1depotCode";
+ this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
+ this.gvMx1depotCode.Visible = true;
+ this.gvMx1depotCode.VisibleIndex = 6;
+ this.gvMx1depotCode.Width = 94;
+ //
+ // gvMx1depotSectionCode
+ //
+ this.gvMx1depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
+ this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
+ this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
+ this.gvMx1depotSectionCode.MinWidth = 50;
+ this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
+ this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
+ this.gvMx1depotSectionCode.Visible = true;
+ this.gvMx1depotSectionCode.VisibleIndex = 7;
+ this.gvMx1depotSectionCode.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "寤虹珛鑰�";
+ this.gridColumn2.FieldName = "createBy";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 8;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn7.FieldName = "createDate";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 9;
+ this.gridColumn7.Width = 94;
//
// tabMxPage1
//
@@ -402,29 +340,104 @@
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.Size = new System.Drawing.Size(1124, 417);
- this.gcMx1.TabIndex = 0;
+ this.gcMx1.TabIndex = 2;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
//
// gvMx1
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx1guid,
- this.gvMx1workNo,
- this.gvMx1itemNo,
- this.gvMx1createBy,
- this.gvMx1createDate,
- this.gvMx1quantity,
- this.gvMx1remark,
- this.gvMx1rkQty,
- this.gvMx1tlQty,
- this.gvMx1itemId});
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gvMx2itemSname,
+ this.gvMx2quantity,
+ this.gvMx2unit,
+ this.gridColumn5,
+ this.gridColumn6});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 0;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn4.FieldName = "itemModel";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.Width = 94;
+ //
+ // gvMx2itemSname
+ //
+ this.gvMx2itemSname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
+ this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
+ this.gvMx2itemSname.FieldName = "itemName";
+ this.gvMx2itemSname.MinWidth = 50;
+ this.gvMx2itemSname.Name = "gvMx2itemSname";
+ this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
+ this.gvMx2itemSname.Visible = true;
+ this.gvMx2itemSname.VisibleIndex = 2;
+ this.gvMx2itemSname.Width = 94;
+ //
+ // gvMx2quantity
+ //
+ this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
+ this.gvMx2quantity.Caption = "鏁伴噺";
+ this.gvMx2quantity.FieldName = "quantity";
+ this.gvMx2quantity.MinWidth = 50;
+ this.gvMx2quantity.Name = "gvMx2quantity";
+ this.gvMx2quantity.Tag = "query_a.QUANTITY";
+ this.gvMx2quantity.Visible = true;
+ this.gvMx2quantity.VisibleIndex = 3;
+ this.gvMx2quantity.Width = 94;
+ //
+ // gvMx2unit
+ //
+ this.gvMx2unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2unit.AppearanceCell.Options.UseFont = true;
+ this.gvMx2unit.Caption = "搴撳瓨鍗曚綅";
+ this.gvMx2unit.FieldName = "kcUnit";
+ this.gvMx2unit.MinWidth = 50;
+ this.gvMx2unit.Name = "gvMx2unit";
+ this.gvMx2unit.Tag = "query_a.UNIT";
+ this.gvMx2unit.Visible = true;
+ this.gvMx2unit.VisibleIndex = 4;
+ this.gvMx2unit.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "寤虹珛鑰�";
+ this.gridColumn5.FieldName = "createBy";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 5;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn6.FieldName = "createDate";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 6;
+ this.gridColumn6.Width = 94;
//
// lb_depotId
//
@@ -435,34 +448,6 @@
this.lb_depotId.Size = new System.Drawing.Size(34, 21);
this.lb_depotId.TabIndex = 571;
this.lb_depotId.Text = "浠撳簱";
- //
- // gv_pbillNo
- //
- this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
- this.gv_pbillNo.Caption = "宸ュ崟鍗曞彿";
- this.gv_pbillNo.FieldName = "pbillNo";
- this.gv_pbillNo.MinWidth = 50;
- this.gv_pbillNo.Name = "gv_pbillNo";
- this.gv_pbillNo.OptionsColumn.AllowEdit = false;
- this.gv_pbillNo.Tag = "query_a.pbill_no";
- this.gv_pbillNo.Visible = true;
- this.gv_pbillNo.VisibleIndex = 3;
- this.gv_pbillNo.Width = 94;
- //
- // gv_boardItem
- //
- this.gv_boardItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_boardItem.AppearanceCell.Options.UseFont = true;
- this.gv_boardItem.Caption = "浜у搧缂栫爜";
- this.gv_boardItem.FieldName = "boardItem";
- this.gv_boardItem.MinWidth = 50;
- this.gv_boardItem.Name = "gv_boardItem";
- this.gv_boardItem.OptionsColumn.AllowEdit = false;
- this.gv_boardItem.Tag = "query_a.board_item";
- this.gv_boardItem.Visible = true;
- this.gv_boardItem.VisibleIndex = 4;
- this.gv_boardItem.Width = 94;
//
// lb_outType
//
@@ -483,20 +468,6 @@
this.txt_outType.Size = new System.Drawing.Size(174, 28);
this.txt_outType.TabIndex = 450;
//
- // gv_outType
- //
- this.gv_outType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_outType.AppearanceCell.Options.UseFont = true;
- this.gv_outType.Caption = "鍑哄簱绫诲埆 ";
- this.gv_outType.FieldName = "outType";
- this.gv_outType.MinWidth = 50;
- this.gv_outType.Name = "gv_outType";
- this.gv_outType.OptionsColumn.AllowEdit = false;
- this.gv_outType.Tag = "query_a.out_type";
- this.gv_outType.Visible = true;
- this.gv_outType.VisibleIndex = 7;
- this.gv_outType.Width = 94;
- //
// lb_workNo
//
this.lb_workNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -516,34 +487,6 @@
this.txt_workNo.Size = new System.Drawing.Size(150, 28);
this.txt_workNo.TabIndex = 387;
//
- // gv_workNo
- //
- this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_workNo.AppearanceCell.Options.UseFont = true;
- this.gv_workNo.Caption = "浠诲姟鍗曞彿";
- this.gv_workNo.FieldName = "workNo";
- this.gv_workNo.MinWidth = 100;
- this.gv_workNo.Name = "gv_workNo";
- this.gv_workNo.OptionsColumn.AllowEdit = false;
- this.gv_workNo.Tag = "query_a.work_no";
- this.gv_workNo.Visible = true;
- this.gv_workNo.VisibleIndex = 2;
- this.gv_workNo.Width = 100;
- //
- // gv_receiver
- //
- this.gv_receiver.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_receiver.AppearanceCell.Options.UseFont = true;
- this.gv_receiver.Caption = "棰嗘枡浜�";
- this.gv_receiver.FieldName = "receiver";
- this.gv_receiver.MinWidth = 50;
- this.gv_receiver.Name = "gv_receiver";
- this.gv_receiver.OptionsColumn.AllowEdit = false;
- this.gv_receiver.Tag = "query_a.receiver";
- this.gv_receiver.Visible = true;
- this.gv_receiver.VisibleIndex = 10;
- this.gv_receiver.Width = 94;
- //
// lb_outPart
//
this.lb_outPart.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -553,34 +496,6 @@
this.lb_outPart.Size = new System.Drawing.Size(73, 21);
this.lb_outPart.TabIndex = 319;
this.lb_outPart.Text = "棰嗘枡閮ㄩ棬 ";
- //
- // gv_outPart
- //
- this.gv_outPart.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_outPart.AppearanceCell.Options.UseFont = true;
- this.gv_outPart.Caption = "棰嗘枡閮ㄩ棬 ";
- this.gv_outPart.FieldName = "outPart";
- this.gv_outPart.MinWidth = 50;
- this.gv_outPart.Name = "gv_outPart";
- this.gv_outPart.OptionsColumn.AllowEdit = false;
- this.gv_outPart.Tag = "query_a.out_part";
- this.gv_outPart.Visible = true;
- this.gv_outPart.VisibleIndex = 11;
- this.gv_outPart.Width = 94;
- //
- // gv_outDate
- //
- this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_outDate.AppearanceCell.Options.UseFont = true;
- this.gv_outDate.Caption = "鍑哄簱鏃ユ湡 ";
- this.gv_outDate.FieldName = "outDate";
- this.gv_outDate.MinWidth = 120;
- this.gv_outDate.Name = "gv_outDate";
- this.gv_outDate.OptionsColumn.AllowEdit = false;
- this.gv_outDate.Tag = "query_a.out_date";
- this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 6;
- this.gv_outDate.Width = 120;
//
// lb_checkDate
//
@@ -601,20 +516,6 @@
this.txt_checkDate.Size = new System.Drawing.Size(168, 28);
this.txt_checkDate.TabIndex = 262;
//
- // gv_checkDate
- //
- this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkDate.AppearanceCell.Options.UseFont = true;
- this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
- this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 120;
- this.gv_checkDate.Name = "gv_checkDate";
- this.gv_checkDate.OptionsColumn.AllowEdit = false;
- this.gv_checkDate.Tag = "query_a.check_date";
- this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 9;
- this.gv_checkDate.Width = 120;
- //
// lb_checkUser
//
this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -633,34 +534,6 @@
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
this.txt_checkUser.Size = new System.Drawing.Size(168, 28);
this.txt_checkUser.TabIndex = 258;
- //
- // gv_checkUser
- //
- this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkUser.AppearanceCell.Options.UseFont = true;
- this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.MinWidth = 50;
- this.gv_checkUser.Name = "gv_checkUser";
- this.gv_checkUser.OptionsColumn.AllowEdit = false;
- this.gv_checkUser.Tag = "query_a.check_user";
- this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 8;
- this.gv_checkUser.Width = 94;
- //
- // gv_reason
- //
- this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_reason.AppearanceCell.Options.UseFont = true;
- this.gv_reason.Caption = "鍑哄簱鍘熷洜 ";
- this.gv_reason.FieldName = "reason";
- this.gv_reason.MinWidth = 50;
- this.gv_reason.Name = "gv_reason";
- this.gv_reason.OptionsColumn.AllowEdit = false;
- this.gv_reason.Tag = "query_a.reason";
- this.gv_reason.Visible = true;
- this.gv_reason.VisibleIndex = 15;
- this.gv_reason.Width = 94;
//
// lb_remark
//
@@ -681,20 +554,6 @@
this.txt_remark.Size = new System.Drawing.Size(171, 28);
this.txt_remark.TabIndex = 243;
//
- // gv_remark
- //
- this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞淇℃伅 ";
- this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
- this.gv_remark.Name = "gv_remark";
- this.gv_remark.OptionsColumn.AllowEdit = false;
- this.gv_remark.Tag = "query_a.remark";
- this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 14;
- this.gv_remark.Width = 94;
- //
// lb_createDate
//
this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -713,20 +572,6 @@
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
this.txt_createDate.Size = new System.Drawing.Size(171, 28);
this.txt_createDate.TabIndex = 226;
- //
- // gv_createDate
- //
- this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
- this.gv_createDate.Name = "gv_createDate";
- this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "query_a.create_date";
- this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 13;
- this.gv_createDate.Width = 94;
//
// lb_createBy
//
@@ -747,20 +592,6 @@
this.txt_createBy.Size = new System.Drawing.Size(171, 28);
this.txt_createBy.TabIndex = 222;
//
- // gv_createBy
- //
- this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
- this.gv_createBy.Name = "gv_createBy";
- this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "query_a.create_by";
- this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 12;
- this.gv_createBy.Width = 94;
- //
// lb_status
//
this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -770,21 +601,6 @@
this.lb_status.Size = new System.Drawing.Size(39, 21);
this.lb_status.TabIndex = 219;
this.lb_status.Text = "瀹℃牳 ";
- //
- // gv_status
- //
- this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_status.AppearanceCell.Options.UseFont = true;
- this.gv_status.Caption = "瀹℃牳鏍囪瘑";
- this.gv_status.FieldName = "statusChk";
- this.gv_status.MaxWidth = 50;
- this.gv_status.MinWidth = 50;
- this.gv_status.Name = "gv_status";
- this.gv_status.OptionsColumn.AllowEdit = false;
- this.gv_status.Tag = "query_a.status";
- this.gv_status.Visible = true;
- this.gv_status.VisibleIndex = 0;
- this.gv_status.Width = 50;
//
// lb_taskNo
//
@@ -824,20 +640,6 @@
this.txt_itemOutNo.Size = new System.Drawing.Size(150, 28);
this.txt_itemOutNo.TabIndex = 213;
//
- // gv_itemOutNo
- //
- this.gv_itemOutNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
- this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿";
- this.gv_itemOutNo.FieldName = "itemOutNo";
- this.gv_itemOutNo.MinWidth = 100;
- this.gv_itemOutNo.Name = "gv_itemOutNo";
- this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
- this.gv_itemOutNo.Tag = "query_a.item_out_no";
- this.gv_itemOutNo.Visible = true;
- this.gv_itemOutNo.VisibleIndex = 1;
- this.gv_itemOutNo.Width = 150;
- //
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
@@ -852,58 +654,6 @@
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
- //
- // gcMain
- //
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
- this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_status,
- this.gv_itemOutNo,
- this.gv_workNo,
- this.gv_pbillNo,
- this.gv_boardItem,
- this.gridColumn1,
- this.gv_outDate,
- this.gv_outType,
- this.gv_checkUser,
- this.gv_checkDate,
- this.gv_receiver,
- this.gv_outPart,
- this.gv_createBy,
- this.gv_createDate,
- this.gv_remark,
- this.gv_reason});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "浜у搧鍚嶇О";
- this.gridColumn1.MinWidth = 120;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 5;
- this.gridColumn1.Width = 120;
//
// xtraTabControl1
//
@@ -924,6 +674,618 @@
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1126, 531);
+ this.gcMain.TabIndex = 4;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand1,
+ this.gridBand2,
+ this.gridBand15,
+ this.gridBand3,
+ this.gridBand5,
+ this.gridBand4,
+ this.gridBand11,
+ this.gridBand6,
+ this.gridBand7,
+ this.gridBand13,
+ this.gridBand14,
+ this.gridBand8});
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
+ this.bandedGridColumn1,
+ this.gv_guid,
+ this.gv_billNo,
+ this.gv_status,
+ this.gv_depotsId,
+ this.gv_reason,
+ this.gv_createBy,
+ this.gv_createDate,
+ this.gv_lastupdateBy,
+ this.gv_lastupdateDate,
+ this.gv_remark,
+ this.gv_checkUser,
+ this.gv_checkDate,
+ this.gv_checkRes,
+ this.gv_checkQty,
+ this.gv_ebeln,
+ this.gv_depotsCode,
+ this.gv_suppNo,
+ this.gv_urgentFlag,
+ this.gv_lineNo,
+ this.gv_taskLino,
+ this.gv_fbillno,
+ this.gv_fbillLino,
+ this.gv_custNo,
+ this.gv_custName,
+ this.gv_cbillNo,
+ this.gv_pickIns,
+ this.gv_fcheckUser,
+ this.gv_fcheckDate,
+ this.gv_rbillNo,
+ this.bandedGridColumn3,
+ this.bandedGridColumn4,
+ this.bandedGridColumn2});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowColumnHeaders = false;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridBand1
+ //
+ this.gridBand1.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand1.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand1.Caption = "瀹℃牳鏍囪瘑";
+ this.gridBand1.Columns.Add(this.gv_status);
+ this.gridBand1.Columns.Add(this.gv_guid);
+ this.gridBand1.Columns.Add(this.gv_reason);
+ this.gridBand1.Columns.Add(this.gv_lastupdateBy);
+ this.gridBand1.Columns.Add(this.gv_lastupdateDate);
+ this.gridBand1.Columns.Add(this.gv_checkRes);
+ this.gridBand1.Columns.Add(this.gv_checkQty);
+ this.gridBand1.Columns.Add(this.gv_ebeln);
+ this.gridBand1.Columns.Add(this.gv_depotsCode);
+ this.gridBand1.Columns.Add(this.gv_suppNo);
+ this.gridBand1.Columns.Add(this.gv_urgentFlag);
+ this.gridBand1.Columns.Add(this.gv_lineNo);
+ this.gridBand1.Columns.Add(this.gv_taskLino);
+ this.gridBand1.Columns.Add(this.gv_fbillno);
+ this.gridBand1.Columns.Add(this.gv_fbillLino);
+ this.gridBand1.Columns.Add(this.gv_custNo);
+ this.gridBand1.Columns.Add(this.gv_custName);
+ this.gridBand1.Columns.Add(this.gv_pickIns);
+ this.gridBand1.Columns.Add(this.gv_fcheckUser);
+ this.gridBand1.Columns.Add(this.gv_rbillNo);
+ this.gridBand1.MinWidth = 50;
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 0;
+ this.gridBand1.Width = 50;
+ //
+ // gv_status
+ //
+ this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_status.AppearanceCell.Options.UseFont = true;
+ this.gv_status.Caption = "鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\\缁撴 ";
+ this.gv_status.FieldName = "checkStatus";
+ this.gv_status.MinWidth = 25;
+ this.gv_status.Name = "gv_status";
+ this.gv_status.OptionsColumn.AllowEdit = false;
+ this.gv_status.Tag = "query_a.STATUS";
+ this.gv_status.Visible = true;
+ this.gv_status.Width = 50;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "ID(SEQ_INV_ID) ";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 25;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.Tag = "query_a.GUID";
+ this.gv_guid.Width = 94;
+ //
+ // gv_reason
+ //
+ this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_reason.AppearanceCell.Options.UseFont = true;
+ this.gv_reason.Caption = "鍘熷洜 ";
+ this.gv_reason.FieldName = "reason";
+ this.gv_reason.MinWidth = 25;
+ this.gv_reason.Name = "gv_reason";
+ this.gv_reason.OptionsColumn.AllowEdit = false;
+ this.gv_reason.Tag = "query_a.REASON";
+ this.gv_reason.Width = 94;
+ //
+ // gv_lastupdateBy
+ //
+ this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
+ this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.MinWidth = 25;
+ this.gv_lastupdateBy.Name = "gv_lastupdateBy";
+ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
+ this.gv_lastupdateBy.Width = 94;
+ //
+ // gv_lastupdateDate
+ //
+ this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
+ this.gv_lastupdateDate.FieldName = "lastupdateDate";
+ this.gv_lastupdateDate.MinWidth = 25;
+ this.gv_lastupdateDate.Name = "gv_lastupdateDate";
+ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
+ this.gv_lastupdateDate.Width = 94;
+ //
+ // gv_checkRes
+ //
+ this.gv_checkRes.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_checkRes.AppearanceCell.Options.UseFont = true;
+ this.gv_checkRes.Caption = "CHECK_RES ";
+ this.gv_checkRes.FieldName = "checkRes";
+ this.gv_checkRes.MinWidth = 25;
+ this.gv_checkRes.Name = "gv_checkRes";
+ this.gv_checkRes.OptionsColumn.AllowEdit = false;
+ this.gv_checkRes.Tag = "query_a.CHECK_RES";
+ this.gv_checkRes.Width = 94;
+ //
+ // gv_checkQty
+ //
+ this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_checkQty.AppearanceCell.Options.UseFont = true;
+ this.gv_checkQty.Caption = "CHECK_QTY ";
+ this.gv_checkQty.FieldName = "checkQty";
+ this.gv_checkQty.MinWidth = 25;
+ this.gv_checkQty.Name = "gv_checkQty";
+ this.gv_checkQty.OptionsColumn.AllowEdit = false;
+ this.gv_checkQty.Tag = "query_a.CHECK_QTY";
+ this.gv_checkQty.Width = 94;
+ //
+ // gv_ebeln
+ //
+ this.gv_ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_ebeln.AppearanceCell.Options.UseFont = true;
+ this.gv_ebeln.Caption = "EBELN ";
+ this.gv_ebeln.FieldName = "ebeln";
+ this.gv_ebeln.MinWidth = 25;
+ this.gv_ebeln.Name = "gv_ebeln";
+ this.gv_ebeln.OptionsColumn.AllowEdit = false;
+ this.gv_ebeln.Tag = "query_a.EBELN";
+ this.gv_ebeln.Width = 64;
+ //
+ // gv_depotsCode
+ //
+ this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
+ this.gv_depotsCode.Caption = "DEPOTS_CODE ";
+ this.gv_depotsCode.FieldName = "depotsCode";
+ this.gv_depotsCode.MinWidth = 25;
+ this.gv_depotsCode.Name = "gv_depotsCode";
+ this.gv_depotsCode.OptionsColumn.AllowEdit = false;
+ this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE";
+ this.gv_depotsCode.Width = 94;
+ //
+ // gv_suppNo
+ //
+ this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_suppNo.AppearanceCell.Options.UseFont = true;
+ this.gv_suppNo.Caption = "SUPP_NO ";
+ this.gv_suppNo.FieldName = "suppNo";
+ this.gv_suppNo.MinWidth = 25;
+ this.gv_suppNo.Name = "gv_suppNo";
+ this.gv_suppNo.OptionsColumn.AllowEdit = false;
+ this.gv_suppNo.Tag = "query_a.SUPP_NO";
+ this.gv_suppNo.Width = 64;
+ //
+ // gv_urgentFlag
+ //
+ this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
+ this.gv_urgentFlag.Caption = "URGENT_FLAG ";
+ this.gv_urgentFlag.FieldName = "urgentFlag";
+ this.gv_urgentFlag.MinWidth = 25;
+ this.gv_urgentFlag.Name = "gv_urgentFlag";
+ this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
+ this.gv_urgentFlag.Tag = "query_a.URGENT_FLAG";
+ this.gv_urgentFlag.Width = 50;
+ //
+ // gv_lineNo
+ //
+ this.gv_lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lineNo.AppearanceCell.Options.UseFont = true;
+ this.gv_lineNo.Caption = "LINE_NO ";
+ this.gv_lineNo.FieldName = "lineNo";
+ this.gv_lineNo.MinWidth = 25;
+ this.gv_lineNo.Name = "gv_lineNo";
+ this.gv_lineNo.OptionsColumn.AllowEdit = false;
+ this.gv_lineNo.Tag = "query_a.LINE_NO";
+ this.gv_lineNo.Width = 64;
+ //
+ // gv_taskLino
+ //
+ this.gv_taskLino.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_taskLino.AppearanceCell.Options.UseFont = true;
+ this.gv_taskLino.Caption = "宸ュ崟琛屽彿 ";
+ this.gv_taskLino.FieldName = "taskLino";
+ this.gv_taskLino.MinWidth = 25;
+ this.gv_taskLino.Name = "gv_taskLino";
+ this.gv_taskLino.OptionsColumn.AllowEdit = false;
+ this.gv_taskLino.Tag = "query_a.TASK_LINO";
+ this.gv_taskLino.Width = 64;
+ //
+ // gv_fbillno
+ //
+ this.gv_fbillno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fbillno.AppearanceCell.Options.UseFont = true;
+ this.gv_fbillno.Caption = "鎶曟枡閫氱煡鍗曞崟鍙� ";
+ this.gv_fbillno.FieldName = "fbillno";
+ this.gv_fbillno.MinWidth = 25;
+ this.gv_fbillno.Name = "gv_fbillno";
+ this.gv_fbillno.OptionsColumn.AllowEdit = false;
+ this.gv_fbillno.Tag = "query_a.FBILLNO";
+ this.gv_fbillno.Width = 64;
+ //
+ // gv_fbillLino
+ //
+ this.gv_fbillLino.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fbillLino.AppearanceCell.Options.UseFont = true;
+ this.gv_fbillLino.Caption = "鎶曟枡鍗曡鍙� ";
+ this.gv_fbillLino.FieldName = "fbillLino";
+ this.gv_fbillLino.MinWidth = 25;
+ this.gv_fbillLino.Name = "gv_fbillLino";
+ this.gv_fbillLino.OptionsColumn.AllowEdit = false;
+ this.gv_fbillLino.Tag = "query_a.FBILL_LINO";
+ this.gv_fbillLino.Width = 64;
+ //
+ // gv_custNo
+ //
+ this.gv_custNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_custNo.AppearanceCell.Options.UseFont = true;
+ this.gv_custNo.Caption = "瀹㈡埛缂栧彿 ";
+ this.gv_custNo.FieldName = "custNo";
+ this.gv_custNo.MinWidth = 25;
+ this.gv_custNo.Name = "gv_custNo";
+ this.gv_custNo.OptionsColumn.AllowEdit = false;
+ this.gv_custNo.Tag = "query_a.CUST_NO";
+ this.gv_custNo.Width = 64;
+ //
+ // gv_custName
+ //
+ this.gv_custName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_custName.AppearanceCell.Options.UseFont = true;
+ this.gv_custName.Caption = "瀹㈡埛鍚嶇О ";
+ this.gv_custName.FieldName = "custName";
+ this.gv_custName.MinWidth = 25;
+ this.gv_custName.Name = "gv_custName";
+ this.gv_custName.OptionsColumn.AllowEdit = false;
+ this.gv_custName.Tag = "query_a.CUST_NAME";
+ this.gv_custName.Width = 64;
+ //
+ // gv_pickIns
+ //
+ this.gv_pickIns.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_pickIns.AppearanceCell.Options.UseFont = true;
+ this.gv_pickIns.Caption = "0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇� ";
+ this.gv_pickIns.FieldName = "pickIns";
+ this.gv_pickIns.MinWidth = 25;
+ this.gv_pickIns.Name = "gv_pickIns";
+ this.gv_pickIns.OptionsColumn.AllowEdit = false;
+ this.gv_pickIns.Tag = "query_a.PICK_INS";
+ this.gv_pickIns.Width = 64;
+ //
+ // gv_fcheckUser
+ //
+ this.gv_fcheckUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckUser.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckUser.Caption = "鍏ュ簱瀹℃牳浜� ";
+ this.gv_fcheckUser.FieldName = "fcheckUser";
+ this.gv_fcheckUser.MinWidth = 25;
+ this.gv_fcheckUser.Name = "gv_fcheckUser";
+ this.gv_fcheckUser.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckUser.Tag = "query_a.FCHECK_USER";
+ this.gv_fcheckUser.Width = 64;
+ //
+ // gv_rbillNo
+ //
+ this.gv_rbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_rbillNo.AppearanceCell.Options.UseFont = true;
+ this.gv_rbillNo.Caption = "浠诲姟姹囨姤鍗�/宸ュ崟鍙凤紙鎴愬搧鍏ュ簱銆侀��鏂欙級 ";
+ this.gv_rbillNo.FieldName = "rbillNo";
+ this.gv_rbillNo.MinWidth = 25;
+ this.gv_rbillNo.Name = "gv_rbillNo";
+ this.gv_rbillNo.OptionsColumn.AllowEdit = false;
+ this.gv_rbillNo.Tag = "query_a.RBILL_NO";
+ this.gv_rbillNo.Width = 64;
+ //
+ // gridBand2
+ //
+ this.gridBand2.Caption = "鍏ュ簱鍗曞彿";
+ this.gridBand2.Columns.Add(this.gv_billNo);
+ this.gridBand2.MinWidth = 25;
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 1;
+ this.gridBand2.Width = 114;
+ //
+ // gv_billNo
+ //
+ this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_billNo.AppearanceCell.Options.UseFont = true;
+ this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 ";
+ this.gv_billNo.FieldName = "billNo";
+ this.gv_billNo.MinWidth = 25;
+ this.gv_billNo.Name = "gv_billNo";
+ this.gv_billNo.OptionsColumn.AllowEdit = false;
+ this.gv_billNo.Tag = "query_a.BILL_NO";
+ this.gv_billNo.Visible = true;
+ this.gv_billNo.Width = 114;
+ //
+ // gridBand15
+ //
+ this.gridBand15.Caption = "鐢宠鍗曞彿";
+ this.gridBand15.Columns.Add(this.bandedGridColumn3);
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 2;
+ this.gridBand15.Width = 94;
+ //
+ // bandedGridColumn3
+ //
+ this.bandedGridColumn3.Caption = "鐢宠鍗曞彿";
+ this.bandedGridColumn3.FieldName = "taskNo";
+ this.bandedGridColumn3.MinWidth = 25;
+ this.bandedGridColumn3.Name = "bandedGridColumn3";
+ this.bandedGridColumn3.Visible = true;
+ this.bandedGridColumn3.Width = 94;
+ //
+ // gridBand3
+ //
+ this.gridBand3.Caption = "宸ュ崟鍗曞彿";
+ this.gridBand3.Columns.Add(this.gv_cbillNo);
+ this.gridBand3.MinWidth = 25;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.VisibleIndex = 3;
+ this.gridBand3.Width = 114;
+ //
+ // gv_cbillNo
+ //
+ this.gv_cbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_cbillNo.AppearanceCell.Options.UseFont = true;
+ this.gv_cbillNo.Caption = "鍒拌揣鍗曞彿/鍏跺畠鍏ュ簱鍗曞彿 ";
+ this.gv_cbillNo.FieldName = "cbillNo";
+ this.gv_cbillNo.MinWidth = 25;
+ this.gv_cbillNo.Name = "gv_cbillNo";
+ this.gv_cbillNo.OptionsColumn.AllowEdit = false;
+ this.gv_cbillNo.Tag = "query_a.CBILL_NO";
+ this.gv_cbillNo.Visible = true;
+ this.gv_cbillNo.Width = 114;
+ //
+ // gridBand5
+ //
+ this.gridBand5.Caption = "鍒涘缓浜�";
+ this.gridBand5.Columns.Add(this.gv_createBy);
+ this.gridBand5.MinWidth = 25;
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 4;
+ this.gridBand5.Width = 66;
+ //
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "鍒涘缓浜� ";
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 25;
+ this.gv_createBy.Name = "gv_createBy";
+ this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.Tag = "query_a.CREATE_BY";
+ this.gv_createBy.Visible = true;
+ this.gv_createBy.Width = 66;
+ //
+ // gridBand4
+ //
+ this.gridBand4.Caption = "鍒涘缓鏃堕棿";
+ this.gridBand4.Columns.Add(this.gv_createDate);
+ this.gridBand4.MinWidth = 25;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 5;
+ this.gridBand4.Width = 146;
+ //
+ // gv_createDate
+ //
+ this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
+ this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 25;
+ this.gv_createDate.Name = "gv_createDate";
+ this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.Tag = "query_a.CREATE_DATE";
+ this.gv_createDate.Visible = true;
+ this.gv_createDate.Width = 146;
+ //
+ // gridBand11
+ //
+ this.gridBand11.Caption = "瀹℃牳浜�";
+ this.gridBand11.Columns.Add(this.gv_checkUser);
+ this.gridBand11.Name = "gridBand11";
+ this.gridBand11.VisibleIndex = 6;
+ this.gridBand11.Width = 94;
+ //
+ // gv_checkUser
+ //
+ this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_checkUser.AppearanceCell.Options.UseFont = true;
+ this.gv_checkUser.Caption = "瀹℃牳浜� ";
+ this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.MinWidth = 25;
+ this.gv_checkUser.Name = "gv_checkUser";
+ this.gv_checkUser.OptionsColumn.AllowEdit = false;
+ this.gv_checkUser.Tag = "query_a.CHECK_USER";
+ this.gv_checkUser.Visible = true;
+ this.gv_checkUser.Width = 94;
+ //
+ // gridBand6
+ //
+ this.gridBand6.Caption = "瀹℃牳鏃ユ湡";
+ this.gridBand6.Columns.Add(this.gv_checkDate);
+ this.gridBand6.Columns.Add(this.gv_fcheckDate);
+ this.gridBand6.MinWidth = 25;
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.VisibleIndex = 7;
+ this.gridBand6.Width = 94;
+ //
+ // gv_checkDate
+ //
+ this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+ this.gv_checkDate.Caption = "CHECK_DATE ";
+ this.gv_checkDate.FieldName = "checkDate";
+ this.gv_checkDate.MinWidth = 25;
+ this.gv_checkDate.Name = "gv_checkDate";
+ this.gv_checkDate.OptionsColumn.AllowEdit = false;
+ this.gv_checkDate.Tag = "query_a.CHECK_DATE";
+ this.gv_checkDate.Visible = true;
+ this.gv_checkDate.Width = 94;
+ //
+ // gv_fcheckDate
+ //
+ this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckDate.Caption = "鍏ュ簱瀹℃牳鏃ユ湡 ";
+ this.gv_fcheckDate.FieldName = "fcheckDate";
+ this.gv_fcheckDate.MinWidth = 25;
+ this.gv_fcheckDate.Name = "gv_fcheckDate";
+ this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckDate.Tag = "query_a.FCHECK_DATE";
+ this.gv_fcheckDate.Width = 138;
+ //
+ // gridBand7
+ //
+ this.gridBand7.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand7.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand7.Caption = "鏀惰揣浠�";
+ this.gridBand7.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand10,
+ this.gridBand9});
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 8;
+ this.gridBand7.Width = 183;
+ //
+ // gridBand10
+ //
+ this.gridBand10.Caption = "浠撳簱ID";
+ this.gridBand10.Columns.Add(this.gv_depotsId);
+ this.gridBand10.MinWidth = 50;
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 0;
+ this.gridBand10.Width = 89;
+ //
+ // gv_depotsId
+ //
+ this.gv_depotsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotsId.AppearanceCell.Options.UseFont = true;
+ this.gv_depotsId.Caption = "浠撳簱 ";
+ this.gv_depotsId.FieldName = "dptCode";
+ this.gv_depotsId.MinWidth = 25;
+ this.gv_depotsId.Name = "gv_depotsId";
+ this.gv_depotsId.OptionsColumn.AllowEdit = false;
+ this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
+ this.gv_depotsId.Visible = true;
+ this.gv_depotsId.Width = 89;
+ //
+ // gridBand9
+ //
+ this.gridBand9.Caption = "浠撳簱鍚嶇О";
+ this.gridBand9.Columns.Add(this.bandedGridColumn1);
+ this.gridBand9.MinWidth = 80;
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 1;
+ this.gridBand9.Width = 94;
+ //
+ // bandedGridColumn1
+ //
+ this.bandedGridColumn1.Caption = "浠撳簱鍚嶇О";
+ this.bandedGridColumn1.FieldName = "depotName";
+ this.bandedGridColumn1.MinWidth = 25;
+ this.bandedGridColumn1.Name = "bandedGridColumn1";
+ this.bandedGridColumn1.Visible = true;
+ this.bandedGridColumn1.Width = 94;
+ //
+ // gridBand13
+ //
+ this.gridBand13.Caption = "浠诲姟鍗曞彿";
+ this.gridBand13.Columns.Add(this.bandedGridColumn2);
+ this.gridBand13.MinWidth = 25;
+ this.gridBand13.Name = "gridBand13";
+ this.gridBand13.VisibleIndex = 9;
+ this.gridBand13.Width = 94;
+ //
+ // bandedGridColumn2
+ //
+ this.bandedGridColumn2.Caption = "浠诲姟鍗曞彿";
+ this.bandedGridColumn2.FieldName = "workNo";
+ this.bandedGridColumn2.MinWidth = 25;
+ this.bandedGridColumn2.Name = "bandedGridColumn2";
+ this.bandedGridColumn2.Visible = true;
+ this.bandedGridColumn2.Width = 94;
+ //
+ // gridBand14
+ //
+ this.gridBand14.Caption = "澶囨敞淇℃伅";
+ this.gridBand14.Columns.Add(this.gv_remark);
+ this.gridBand14.MinWidth = 25;
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 10;
+ this.gridBand14.Width = 119;
+ //
+ // gv_remark
+ //
+ this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_remark.AppearanceCell.Options.UseFont = true;
+ this.gv_remark.Caption = "澶囨敞 ";
+ this.gv_remark.FieldName = "remark";
+ this.gv_remark.MinWidth = 25;
+ this.gv_remark.Name = "gv_remark";
+ this.gv_remark.OptionsColumn.AllowEdit = false;
+ this.gv_remark.Tag = "query_a.REMARK";
+ this.gv_remark.Visible = true;
+ this.gv_remark.Width = 119;
+ //
+ // gridBand8
+ //
+ this.gridBand8.Caption = "鍏ュ簱缁勭粐";
+ this.gridBand8.Columns.Add(this.bandedGridColumn4);
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.VisibleIndex = 11;
+ this.gridBand8.Width = 94;
+ //
+ // bandedGridColumn4
+ //
+ this.bandedGridColumn4.Caption = "鍏ュ簱缁勭粐";
+ this.bandedGridColumn4.FieldName = "rkOrg";
+ this.bandedGridColumn4.MinWidth = 25;
+ this.bandedGridColumn4.Name = "bandedGridColumn4";
+ this.bandedGridColumn4.Visible = true;
+ this.bandedGridColumn4.Width = 94;
//
// pageBar1
//
@@ -960,8 +1322,8 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_outPart);
- this.panel1.Controls.Add(this.depot_id);
+ this.panel1.Controls.Add(this.textEdit2);
+ this.panel1.Controls.Add(this.textEdit1);
this.panel1.Controls.Add(this.txt_status);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
@@ -992,23 +1354,6 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1126, 121);
this.panel1.TabIndex = 1;
- //
- // txt_outPart
- //
- this.txt_outPart.IsReadly = false;
- this.txt_outPart.Location = new System.Drawing.Point(342, 19);
- this.txt_outPart.Name = "txt_outPart";
- this.txt_outPart.Size = new System.Drawing.Size(174, 28);
- this.txt_outPart.TabIndex = 574;
- //
- // depot_id
- //
- this.depot_id.IsReadly = false;
- this.depot_id.Location = new System.Drawing.Point(342, 51);
- this.depot_id.Margin = new System.Windows.Forms.Padding(0);
- this.depot_id.Name = "depot_id";
- this.depot_id.Size = new System.Drawing.Size(174, 28);
- this.depot_id.TabIndex = 573;
//
// txt_status
//
@@ -1048,6 +1393,24 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // textEdit1
+ //
+ this.textEdit1.Location = new System.Drawing.Point(342, 51);
+ 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(174, 28);
+ this.textEdit1.TabIndex = 573;
+ //
+ // textEdit2
+ //
+ this.textEdit2.Location = new System.Drawing.Point(342, 17);
+ 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(174, 28);
+ this.textEdit2.TabIndex = 574;
+ //
// Frm_WwTblDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1073,11 +1436,11 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
@@ -1085,13 +1448,13 @@
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_status.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);
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
@@ -1100,80 +1463,113 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotSectionCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2lotNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
- private DevExpress.XtraGrid.GridControl gcMx2;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1tlQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1rkQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraEditors.LabelControl lb_depotId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_pbillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_boardItem;
private DevExpress.XtraEditors.LabelControl lb_outType;
private DevExpress.XtraEditors.TextEdit txt_outType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_outType;
private DevExpress.XtraEditors.LabelControl lb_workNo;
private DevExpress.XtraEditors.TextEdit txt_workNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_workNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_receiver;
private DevExpress.XtraEditors.LabelControl lb_outPart;
- private DevExpress.XtraGrid.Columns.GridColumn gv_outPart;
- private DevExpress.XtraGrid.Columns.GridColumn gv_outDate;
private DevExpress.XtraEditors.LabelControl lb_checkDate;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraEditors.LabelControl lb_checkUser;
private DevExpress.XtraEditors.TextEdit txt_checkUser;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
- private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraEditors.LabelControl lb_createDate;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraEditors.LabelControl lb_createBy;
private DevExpress.XtraEditors.TextEdit txt_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraEditors.LabelControl lb_status;
- private DevExpress.XtraGrid.Columns.GridColumn gv_status;
private DevExpress.XtraEditors.LabelControl lb_taskNo;
private DevExpress.XtraEditors.TextEdit txt_taskNo;
private DevExpress.XtraEditors.LabelControl lb_itemOutNo;
private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
private DevExpress.XtraEditors.CheckEdit txt_status;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private UserControl.UcLookCk depot_id;
- private UserControl.UcLookDepartment txt_outPart;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.GridControl gcMx2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1cItemCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemSname;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1unit;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView gridView1;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_status;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_guid;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_reason;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lastupdateBy;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lastupdateDate;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkRes;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkQty;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_ebeln;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_depotsCode;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppNo;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_urgentFlag;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_lineNo;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_taskLino;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fbillno;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fbillLino;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_custNo;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_custName;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_pickIns;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fcheckUser;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_rbillNo;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_billNo;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn3;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_cbillNo;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_createBy;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_createDate;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkUser;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_checkDate;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fcheckDate;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_depotsId;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_remark;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn4;
+ private DevExpress.XtraEditors.TextEdit textEdit2;
+ private DevExpress.XtraEditors.TextEdit textEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
index 2006c72..bfdf3c2 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs
@@ -23,7 +23,10 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "statusChk", "", (value) =>
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -36,7 +39,6 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- depot_id.getSuppler("");
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -45,7 +47,19 @@
Task.Delay(100);
getPageList(1);
}
-
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemOutNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
/// <summary>
/// 鍒嗛〉浜嬩欢
@@ -157,6 +171,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -213,6 +228,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -229,6 +245,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
}
else
{
@@ -320,12 +337,15 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkUser", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 76d869b..b08d780 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1457,6 +1457,10 @@
<None Include="Resources\globalcolorscheme_16x16.png" />
<None Include="Resources\convert_16x161.png" />
<None Include="Resources\time.svg" />
+ <None Include="Resources\redtoblack.svg" />
+ <None Include="Resources\alignhorizontalcenter.svg" />
+ <None Include="Resources\alignhorizontalcenter1.svg" />
+ <None Include="Resources\alignverticalleft.svg" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index db14552..a05c277 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -131,12 +131,42 @@
}
/// <summary>
+ /// 鏌ユ壘 DevExpress.Utils.Svg.SvgImage 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static DevExpress.Utils.Svg.SvgImage alignhorizontalcenter {
+ get {
+ object obj = ResourceManager.GetObject("alignhorizontalcenter", resourceCulture);
+ return ((DevExpress.Utils.Svg.SvgImage)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 DevExpress.Utils.Svg.SvgImage 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static DevExpress.Utils.Svg.SvgImage alignhorizontalcenter1 {
+ get {
+ object obj = ResourceManager.GetObject("alignhorizontalcenter1", resourceCulture);
+ return ((DevExpress.Utils.Svg.SvgImage)(obj));
+ }
+ }
+
+ /// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
internal static System.Drawing.Bitmap alignmiddlecenter_32x32 {
get {
object obj = ResourceManager.GetObject("alignmiddlecenter_32x32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 DevExpress.Utils.Svg.SvgImage 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static DevExpress.Utils.Svg.SvgImage alignverticalleft {
+ get {
+ object obj = ResourceManager.GetObject("alignverticalleft", resourceCulture);
+ return ((DevExpress.Utils.Svg.SvgImage)(obj));
}
}
@@ -1351,6 +1381,16 @@
}
/// <summary>
+ /// 鏌ユ壘 DevExpress.Utils.Svg.SvgImage 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static DevExpress.Utils.Svg.SvgImage redtoblack {
+ get {
+ object obj = ResourceManager.GetObject("redtoblack", resourceCulture);
+ return ((DevExpress.Utils.Svg.SvgImage)(obj));
+ }
+ }
+
+ /// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
internal static System.Drawing.Bitmap refresh_32x32 {
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 9bf4ac3..5633198 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -161,8 +161,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="forcetesting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\forcetesting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="publicfix_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\publicfix_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="formatnumbergeneral_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\formatnumbergeneral_16x16.png;System.Drawing.Bitmap,
@@ -216,6 +216,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
<data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -259,6 +262,9 @@
</data>
<data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -333,6 +339,9 @@
<data name="lookup&reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="redtoblack" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\redtoblack.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
<data name="zoom100_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zoom100_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -342,6 +351,9 @@
<value>..\Resources\salesperiodlifetime_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="forcetesting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\forcetesting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="editrangepermission_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editrangepermission_16x16.png;System.Drawing.Bitmap,
@@ -475,8 +487,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="convert_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\convert_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -636,18 +650,11 @@
<data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\first_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -727,13 +734,18 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="group2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group2_32x32.png;System.Drawing.Bitmap,
+ <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="group2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group2_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -791,8 +803,10 @@
<data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="trackingchanges_allmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\trackingchanges_allmarkup_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -800,8 +814,8 @@
<data name="printernetwork_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\printernetwork_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="publicfix_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\publicfix_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="convert_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\convert_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -848,10 +862,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="lookup&reference_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -877,7 +889,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/alignhorizontalcenter.svg b/DevApp/Gs.DevApp/Resources/alignhorizontalcenter.svg
new file mode 100644
index 0000000..93a178e
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/alignhorizontalcenter.svg
@@ -0,0 +1,9 @@
+锘�<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+ <style type="text/css">
+ .Black{fill:#727272;}
+ .Green{fill:#039C23;}
+</style>
+ <path d="M31,0H1C0.5,0,0,0.5,0,1v30c0,0.5,0.5,1,1,1h30c0.5,0,1-0.5,1-1V1C32,0.5,31.5,0,31,0z M30,30H2V2h28V30z" class="Black" />
+ <rect x="4" y="12" width="24" height="8" class="Green" />
+</svg>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/alignhorizontalcenter1.svg b/DevApp/Gs.DevApp/Resources/alignhorizontalcenter1.svg
new file mode 100644
index 0000000..93a178e
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/alignhorizontalcenter1.svg
@@ -0,0 +1,9 @@
+锘�<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+ <style type="text/css">
+ .Black{fill:#727272;}
+ .Green{fill:#039C23;}
+</style>
+ <path d="M31,0H1C0.5,0,0,0.5,0,1v30c0,0.5,0.5,1,1,1h30c0.5,0,1-0.5,1-1V1C32,0.5,31.5,0,31,0z M30,30H2V2h28V30z" class="Black" />
+ <rect x="4" y="12" width="24" height="8" class="Green" />
+</svg>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/alignverticalleft.svg b/DevApp/Gs.DevApp/Resources/alignverticalleft.svg
new file mode 100644
index 0000000..cf5e842
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/alignverticalleft.svg
@@ -0,0 +1,9 @@
+锘�<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+ <style type="text/css">
+ .Black{fill:#727272;}
+ .Green{fill:#039C23;}
+</style>
+ <path d="M31,0H1C0.5,0,0,0.5,0,1v30c0,0.5,0.5,1,1,1h30c0.5,0,1-0.5,1-1V1C32,0.5,31.5,0,31,0z M30,30H2V2h28V30z" class="Black" />
+ <rect x="4" y="4" width="8" height="24" class="Green" />
+</svg>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/redtoblack.svg b/DevApp/Gs.DevApp/Resources/redtoblack.svg
new file mode 100644
index 0000000..ffd4ff8
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/redtoblack.svg
@@ -0,0 +1,16 @@
+锘�<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Red_to_Black" style="enable-background:new 0 0 32 32">
+ <style type="text/css">
+ .Red{fill:#D11C1C;}
+ .Black{fill:#727272;}
+ .st0{opacity:0.5;}
+</style>
+ <circle cx="9" cy="9" r="7" class="Red" />
+ <g class="st0">
+ <circle cx="9" cy="25" r="7" class="Black" />
+ </g>
+ <g class="st0">
+ <circle cx="25" cy="9" r="7" class="Red" />
+ </g>
+ <circle cx="25" cy="25" r="7" class="Black" />
+</svg>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 8ee9837..3675002 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -114,7 +114,7 @@
this.btnHelp,
this.btnLayout});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 52;
+ this.barManager1.MaxItemId = 54;
//
// bar2
//
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 773b32d..758f5ad 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -6,6 +6,7 @@
using System.Net;
using System.Windows.Forms;
using DevExpress.XtraBars;
+using DevExpress.XtraBars.Commands;
using DevExpress.XtraEditors;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
@@ -74,7 +75,7 @@
if (parentForm != null)
{
PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
- if (specificControl== null)
+ if (specificControl == null)
return false;
if (specificControl.Tag == null)
return false;
--
Gitblit v1.9.3