From e2fffcde27c802e06b4e15ea100c1df838b6ea52 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 06 十二月 2025 10:42:27 +0800
Subject: [PATCH] 委外加工出库增加仓库库存
---
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs | 1
DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.Designer.cs | 87 +++++++++++++--------
DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.cs | 1
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs | 149 ++++++++++++++++++++-----------------
4 files changed, 136 insertions(+), 102 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.Designer.cs
index 8099a4e..2d831e6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.Designer.cs
@@ -44,6 +44,7 @@
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -58,17 +59,20 @@
this.panelControl2.Controls.Add(this.panelControl1);
this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelControl2.Location = new System.Drawing.Point(0, 0);
+ this.panelControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panelControl2.Name = "panelControl2";
- this.panelControl2.Size = new System.Drawing.Size(1128, 682);
+ this.panelControl2.Size = new System.Drawing.Size(1410, 834);
this.panelControl2.TabIndex = 4;
//
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain.Location = new System.Drawing.Point(2, 2);
this.gcMain.MainView = this.gridView1;
+ this.gcMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1124, 635);
+ this.gcMain.Size = new System.Drawing.Size(1406, 777);
this.gcMain.TabIndex = 2;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -78,7 +82,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.colChkInt,
this.gridColumn2,
@@ -90,12 +94,14 @@
this.gridColumn7,
this.gridColumn11,
this.gridColumn8,
- this.gridColumn9});
+ this.gridColumn9,
+ this.gridColumn10});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 60;
+ this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 75;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
@@ -104,116 +110,116 @@
this.colChkInt.Caption = ".";
this.colChkInt.FieldName = "chkInt";
this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
- this.colChkInt.MinWidth = 25;
+ this.colChkInt.MinWidth = 31;
this.colChkInt.Name = "colChkInt";
this.colChkInt.Visible = true;
this.colChkInt.VisibleIndex = 0;
- this.colChkInt.Width = 94;
+ this.colChkInt.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡ID";
this.gridColumn2.FieldName = "itemId";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡缂栫爜";
this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
this.gridColumn4.FieldName = "itemName";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
this.gridColumn5.FieldName = "itemModel";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 7;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍗曚綅";
this.gridColumn6.FieldName = "dwName";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 4;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "闇�棰嗙敤閲�";
this.gridColumn1.FieldName = "dab006";
- this.gridColumn1.MinWidth = 24;
+ this.gridColumn1.MinWidth = 30;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 5;
- this.gridColumn1.Width = 90;
+ this.gridColumn1.Width = 112;
//
// gridColumn7
//
this.gridColumn7.Caption = "宸查鏁伴噺";
this.gridColumn7.FieldName = "dab007";
- this.gridColumn7.MinWidth = 24;
+ this.gridColumn7.MinWidth = 30;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 6;
- this.gridColumn7.Width = 90;
+ this.gridColumn7.Width = 112;
//
// gridColumn11
//
this.gridColumn11.Caption = "dabGuid";
this.gridColumn11.FieldName = "dabGuid";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "濮斿宸ュ崟鍙�";
this.gridColumn8.FieldName = "bld001";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 1;
- this.gridColumn8.Width = 60;
//
// gridColumn9
//
this.gridColumn9.Caption = "鍏ュ簱璐т富";
this.gridColumn9.FieldName = "stockownerName";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 8;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(2, 637);
+ this.panelControl1.Location = new System.Drawing.Point(2, 779);
+ this.panelControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1124, 43);
+ this.panelControl1.Size = new System.Drawing.Size(1406, 53);
this.panelControl1.TabIndex = 5;
//
// btnIn
@@ -222,19 +228,31 @@
this.btnIn.Appearance.Options.UseBackColor = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
- this.btnIn.Location = new System.Drawing.Point(1028, 2);
+ this.btnIn.Location = new System.Drawing.Point(1286, 2);
+ this.btnIn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnIn.Name = "btnIn";
- this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.Size = new System.Drawing.Size(118, 49);
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "搴撳瓨瀵规瘮";
+ this.gridColumn10.FieldName = "stockNum";
+ this.gridColumn10.MinWidth = 30;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 9;
+ this.gridColumn10.Width = 94;
+ //
// UcWwBlclSelectAll
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1410, 834);
this.Controls.Add(this.panelControl2);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "UcWwBlclSelectAll";
@@ -267,5 +285,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.cs b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.cs
index 8cbe102..346b69c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.cs
@@ -51,6 +51,7 @@
dab006 = dr["dab006"].ToString(),
dab007 = dr["dab007"].ToString(),
bld001 = dr["bld001"].ToString(),
+ stockNum = dr["stockNum"].ToString(),
});
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
index 321acbf..23efff3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
@@ -123,6 +123,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -183,7 +184,7 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1601, 98);
@@ -195,7 +196,7 @@
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
this.xtraTabControl1.Size = new System.Drawing.Size(1601, 736);
@@ -207,7 +208,7 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1599, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
@@ -218,7 +219,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -238,10 +239,10 @@
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
this.gcMain1.Size = new System.Drawing.Size(1599, 635);
this.gcMain1.TabIndex = 2;
@@ -471,7 +472,7 @@
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.Size = new System.Drawing.Size(1599, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
@@ -481,7 +482,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -516,7 +517,7 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem16});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(663, 385, 812, 500);
this.layoutMx1.Root = this.Root;
@@ -527,19 +528,19 @@
// txt_wwGys
//
this.txt_wwGys.IsReadly = false;
- this.txt_wwGys.Location = new System.Drawing.Point(494, 90);
+ this.txt_wwGys.Location = new System.Drawing.Point(490, 90);
this.txt_wwGys.Margin = new System.Windows.Forms.Padding(0);
this.txt_wwGys.Name = "txt_wwGys";
- this.txt_wwGys.Size = new System.Drawing.Size(303, 28);
+ this.txt_wwGys.Size = new System.Drawing.Size(307, 28);
this.txt_wwGys.TabIndex = 448;
//
// txt_orgId
//
this.txt_orgId.IsReadly = false;
- this.txt_orgId.Location = new System.Drawing.Point(494, 52);
- this.txt_orgId.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txt_orgId.Location = new System.Drawing.Point(490, 51);
+ this.txt_orgId.Margin = new System.Windows.Forms.Padding(5);
this.txt_orgId.Name = "txt_orgId";
- this.txt_orgId.Size = new System.Drawing.Size(303, 28);
+ this.txt_orgId.Size = new System.Drawing.Size(307, 28);
this.txt_orgId.TabIndex = 447;
//
// lbGuid
@@ -554,65 +555,65 @@
//
// txt_bl007
//
- this.txt_bl007.Location = new System.Drawing.Point(101, 52);
- this.txt_bl007.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bl007.Location = new System.Drawing.Point(96, 51);
+ this.txt_bl007.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl007.Name = "txt_bl007";
this.txt_bl007.Properties.Appearance.Options.UseFont = true;
- this.txt_bl007.Size = new System.Drawing.Size(302, 28);
+ this.txt_bl007.Size = new System.Drawing.Size(306, 28);
this.txt_bl007.StyleController = this.layoutMx1;
this.txt_bl007.TabIndex = 228;
//
// txt_blNo
//
- this.txt_blNo.Location = new System.Drawing.Point(101, 14);
- this.txt_blNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_blNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_blNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_blNo.Name = "txt_blNo";
this.txt_blNo.Properties.Appearance.Options.UseFont = true;
this.txt_blNo.Properties.Tag = "readOnly";
- this.txt_blNo.Size = new System.Drawing.Size(302, 28);
+ this.txt_blNo.Size = new System.Drawing.Size(306, 28);
this.txt_blNo.StyleController = this.layoutMx1;
this.txt_blNo.TabIndex = 211;
this.txt_blNo.Tag = "readonly";
//
// txt_bl006
//
- this.txt_bl006.Location = new System.Drawing.Point(1282, 52);
- this.txt_bl006.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bl006.Location = new System.Drawing.Point(1280, 51);
+ this.txt_bl006.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl006.Name = "txt_bl006";
this.txt_bl006.Properties.Appearance.Options.UseFont = true;
- this.txt_bl006.Size = new System.Drawing.Size(303, 28);
+ this.txt_bl006.Size = new System.Drawing.Size(307, 28);
this.txt_bl006.StyleController = this.layoutMx1;
this.txt_bl006.TabIndex = 226;
this.txt_bl006.Tag = "readonly";
//
// txt_checkUserName
//
- this.txt_checkUserName.Location = new System.Drawing.Point(1282, 14);
- this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkUserName.Location = new System.Drawing.Point(1280, 12);
+ this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkUserName.Name = "txt_checkUserName";
this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUserName.Size = new System.Drawing.Size(303, 28);
+ this.txt_checkUserName.Size = new System.Drawing.Size(307, 28);
this.txt_checkUserName.StyleController = this.layoutMx1;
this.txt_checkUserName.TabIndex = 267;
this.txt_checkUserName.Tag = "readonly";
//
// txt_bl018
//
- this.txt_bl018.Location = new System.Drawing.Point(1195, 90);
- this.txt_bl018.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bl018.Location = new System.Drawing.Point(1196, 90);
+ this.txt_bl018.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl018.Name = "txt_bl018";
this.txt_bl018.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_bl018.Size = new System.Drawing.Size(390, 27);
+ this.txt_bl018.Size = new System.Drawing.Size(391, 27);
this.txt_bl018.StyleController = this.layoutMx1;
this.txt_bl018.TabIndex = 295;
//
// txt_bl017
//
this.txt_bl017.Enabled = false;
- this.txt_bl017.Location = new System.Drawing.Point(494, 14);
- this.txt_bl017.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bl017.Location = new System.Drawing.Point(490, 12);
+ this.txt_bl017.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl017.Name = "txt_bl017";
- this.txt_bl017.Size = new System.Drawing.Size(303, 28);
+ this.txt_bl017.Size = new System.Drawing.Size(307, 28);
this.txt_bl017.StyleController = this.layoutMx1;
this.txt_bl017.TabIndex = 296;
this.txt_bl017.Tag = "readonly";
@@ -620,8 +621,8 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(14, 90);
- this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnSelect.Location = new System.Drawing.Point(12, 90);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(171, 34);
this.btnSelect.StyleController = this.layoutMx1;
@@ -630,20 +631,20 @@
//
// txt_createByName
//
- this.txt_createByName.Location = new System.Drawing.Point(888, 14);
- this.txt_createByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_createByName.Location = new System.Drawing.Point(885, 12);
+ this.txt_createByName.Margin = new System.Windows.Forms.Padding(4);
this.txt_createByName.Name = "txt_createByName";
- this.txt_createByName.Size = new System.Drawing.Size(303, 28);
+ this.txt_createByName.Size = new System.Drawing.Size(307, 28);
this.txt_createByName.StyleController = this.layoutMx1;
this.txt_createByName.TabIndex = 445;
this.txt_createByName.Tag = "readonly";
//
// txt_bl005
//
- this.txt_bl005.Location = new System.Drawing.Point(888, 52);
- this.txt_bl005.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bl005.Location = new System.Drawing.Point(885, 51);
+ this.txt_bl005.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl005.Name = "txt_bl005";
- this.txt_bl005.Size = new System.Drawing.Size(303, 28);
+ this.txt_bl005.Size = new System.Drawing.Size(307, 28);
this.txt_bl005.StyleController = this.layoutMx1;
this.txt_bl005.TabIndex = 446;
this.txt_bl005.Tag = "readonly";
@@ -709,29 +710,29 @@
this.layoutControlItem1.Control = this.txt_blNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(393, 38);
+ this.layoutControlItem1.Size = new System.Drawing.Size(394, 39);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_bl017;
- this.layoutControlItem8.Location = new System.Drawing.Point(393, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(394, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem8.Size = new System.Drawing.Size(395, 39);
this.layoutControlItem8.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.btnSelect;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 76);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 78);
this.layoutControlItem13.MaxSize = new System.Drawing.Size(175, 38);
this.layoutControlItem13.MinSize = new System.Drawing.Size(119, 38);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(393, 38);
+ this.layoutControlItem13.Size = new System.Drawing.Size(394, 40);
this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem13.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
@@ -740,21 +741,21 @@
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_bl007;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 38);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 39);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(393, 38);
+ this.layoutControlItem14.Size = new System.Drawing.Size(394, 39);
this.layoutControlItem14.Text = "鍗曟嵁澶囨敞";
this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_bl018;
- this.layoutControlItem15.Location = new System.Drawing.Point(1181, 76);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1184, 78);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem15.Size = new System.Drawing.Size(395, 40);
this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
@@ -762,70 +763,70 @@
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_bl006;
- this.layoutControlItem3.Location = new System.Drawing.Point(1181, 38);
+ this.layoutControlItem3.Location = new System.Drawing.Point(1184, 39);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem3.Size = new System.Drawing.Size(395, 39);
this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_checkUserName;
- this.layoutControlItem4.Location = new System.Drawing.Point(1181, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(1184, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem4.Size = new System.Drawing.Size(395, 39);
this.layoutControlItem4.Text = "瀹℃牳浜哄憳";
this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_createByName;
- this.layoutControlItem2.Location = new System.Drawing.Point(787, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(789, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem2.Size = new System.Drawing.Size(395, 39);
this.layoutControlItem2.Text = "鍒跺崟浜哄憳";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_bl005;
- this.layoutControlItem5.Location = new System.Drawing.Point(787, 38);
+ this.layoutControlItem5.Location = new System.Drawing.Point(789, 39);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(394, 38);
+ this.layoutControlItem5.Size = new System.Drawing.Size(395, 39);
this.layoutControlItem5.Text = "鍒跺崟鏃堕棿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// 缁勭粐鏈烘瀯
//
this.缁勭粐鏈烘瀯.Control = this.txt_orgId;
- this.缁勭粐鏈烘瀯.Location = new System.Drawing.Point(393, 38);
+ this.缁勭粐鏈烘瀯.Location = new System.Drawing.Point(394, 39);
this.缁勭粐鏈烘瀯.Name = "缁勭粐鏈烘瀯";
this.缁勭粐鏈烘瀯.OptionsTableLayoutItem.ColumnIndex = 1;
this.缁勭粐鏈烘瀯.OptionsTableLayoutItem.RowIndex = 1;
- this.缁勭粐鏈烘瀯.Size = new System.Drawing.Size(394, 38);
+ this.缁勭粐鏈烘瀯.Size = new System.Drawing.Size(395, 39);
this.缁勭粐鏈烘瀯.TextSize = new System.Drawing.Size(72, 22);
//
// 渚涘簲鍟�
//
this.渚涘簲鍟�.Control = this.txt_wwGys;
- this.渚涘簲鍟�.Location = new System.Drawing.Point(393, 76);
+ this.渚涘簲鍟�.Location = new System.Drawing.Point(394, 78);
this.渚涘簲鍟�.Name = "渚涘簲鍟�";
this.渚涘簲鍟�.OptionsTableLayoutItem.ColumnIndex = 1;
this.渚涘簲鍟�.OptionsTableLayoutItem.RowIndex = 2;
- this.渚涘簲鍟�.Size = new System.Drawing.Size(394, 38);
+ this.渚涘簲鍟�.Size = new System.Drawing.Size(395, 40);
this.渚涘簲鍟�.TextSize = new System.Drawing.Size(72, 22);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
- this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
this.tabMx.Size = new System.Drawing.Size(1599, 545);
@@ -836,7 +837,7 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1597, 507);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
@@ -844,10 +845,10 @@
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemSearchLookUpEdit1,
@@ -875,7 +876,8 @@
this.dabGuid,
this.gvMxDel,
this.gridColumn9,
- this.gridColumn11});
+ this.gridColumn11,
+ this.gridColumn13});
this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -1191,13 +1193,23 @@
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
this.picCheckBox.Location = new System.Drawing.Point(1235, 67);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
this.picCheckBox.Name = "picCheckBox";
this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "搴撳瓨鏁伴噺";
+ this.gridColumn13.FieldName = "stockNum";
+ this.gridColumn13.MinWidth = 30;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 10;
+ this.gridColumn13.Width = 112;
//
// WwBlcl
//
@@ -1206,7 +1218,7 @@
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "WwBlcl";
this.Size = new System.Drawing.Size(1601, 834);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1344,5 +1356,6 @@
private DevExpress.XtraLayout.LayoutControlItem 缁勭粐鏈烘瀯;
private DevExpress.XtraLayout.LayoutControlItem 渚涘簲鍟�;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
index 1b789c1..006a55b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -91,6 +91,7 @@
_row["bld008"] = dym.dab007;//宸查鐢ㄩ噺
_row["bld009"] = dym.dwName;//鍗曚綅
_row["bld001"] = dym.bld001;//宸ュ崟鍙�
+ _row["stockNum"] = dym.stockNum;//搴撳瓨鏁伴噺
_Table.Rows.Add(_row);
idx++;
}
--
Gitblit v1.9.3