From 240c5af0628f97f713d1045b5805e221c5290108 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 31 十二月 2024 16:47:02 +0800
Subject: [PATCH] 采购
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 5
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx | 2
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx | 3
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 125 +++----
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 656 ++++++++++++++++++++--------------------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 122 ++----
7 files changed, 435 insertions(+), 482 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 4c0abeb..283117b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -29,6 +29,7 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01));
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -80,8 +81,6 @@
this.lb_remarks = new DevExpress.XtraEditors.LabelControl();
this.txt_fngDesc = new DevExpress.XtraEditors.TextEdit();
this.lb_lifnr = new DevExpress.XtraEditors.LabelControl();
- this.lb_checkQty = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkQty = new DevExpress.XtraEditors.TextEdit();
this.lb_fbatchQty = new DevExpress.XtraEditors.LabelControl();
this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
this.lb_fcheckBy = new DevExpress.XtraEditors.LabelControl();
@@ -195,6 +194,7 @@
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -212,7 +212,6 @@
this.panMsg.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txtJianYan.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).BeginInit();
@@ -247,7 +246,7 @@
this.tabMxPage1.Controls.Add(this.splitContainerControl1);
this.tabMxPage1.Controls.Add(this.panMsg);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 458);
+ this.tabMxPage1.Size = new System.Drawing.Size(1340, 474);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitContainerControl1
@@ -266,7 +265,7 @@
//
this.splitContainerControl1.Panel2.Controls.Add(this.groupControl1);
this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(1340, 390);
+ this.splitContainerControl1.Size = new System.Drawing.Size(1340, 406);
this.splitContainerControl1.SplitterPosition = 160;
this.splitContainerControl1.TabIndex = 3;
//
@@ -539,7 +538,7 @@
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(1340, 218);
+ this.groupControl1.Size = new System.Drawing.Size(1340, 234);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "鎶芥牱缁撴灉";
//
@@ -549,7 +548,7 @@
this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1336, 188);
+ this.gcMx2.Size = new System.Drawing.Size(1336, 204);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -652,15 +651,15 @@
//
this.lb_remarks.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remarks.Appearance.Options.UseFont = true;
- this.lb_remarks.Location = new System.Drawing.Point(377, 125);
+ this.lb_remarks.Location = new System.Drawing.Point(377, 109);
this.lb_remarks.Name = "lb_remarks";
- this.lb_remarks.Size = new System.Drawing.Size(73, 21);
+ this.lb_remarks.Size = new System.Drawing.Size(68, 21);
this.lb_remarks.TabIndex = 786;
- this.lb_remarks.Text = "涓嶈壇鎻忚堪 ";
+ this.lb_remarks.Text = "涓嶈壇鎻忚堪";
//
// txt_fngDesc
//
- this.txt_fngDesc.Location = new System.Drawing.Point(452, 125);
+ this.txt_fngDesc.Location = new System.Drawing.Point(452, 109);
this.txt_fngDesc.Name = "txt_fngDesc";
this.txt_fngDesc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fngDesc.Properties.Appearance.Options.UseFont = true;
@@ -671,46 +670,26 @@
//
this.lb_lifnr.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lifnr.Appearance.Options.UseFont = true;
- this.lb_lifnr.Location = new System.Drawing.Point(641, 97);
+ this.lb_lifnr.Location = new System.Drawing.Point(641, 80);
this.lb_lifnr.Name = "lb_lifnr";
this.lb_lifnr.Size = new System.Drawing.Size(56, 21);
this.lb_lifnr.TabIndex = 642;
this.lb_lifnr.Text = "渚涘簲鍟� ";
//
- // lb_checkQty
- //
- this.lb_checkQty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_checkQty.Appearance.Options.UseFont = true;
- this.lb_checkQty.Location = new System.Drawing.Point(627, 54);
- this.lb_checkQty.Name = "lb_checkQty";
- this.lb_checkQty.Size = new System.Drawing.Size(73, 21);
- this.lb_checkQty.TabIndex = 258;
- this.lb_checkQty.Text = "鎶芥鏁伴噺 ";
- //
- // txt_checkQty
- //
- this.txt_checkQty.Enabled = false;
- this.txt_checkQty.Location = new System.Drawing.Point(702, 50);
- this.txt_checkQty.Name = "txt_checkQty";
- this.txt_checkQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkQty.Properties.Appearance.Options.UseFont = true;
- this.txt_checkQty.Size = new System.Drawing.Size(150, 28);
- this.txt_checkQty.TabIndex = 258;
- //
// lb_fbatchQty
//
this.lb_fbatchQty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fbatchQty.Appearance.Options.UseFont = true;
- this.lb_fbatchQty.Location = new System.Drawing.Point(870, 55);
+ this.lb_fbatchQty.Location = new System.Drawing.Point(627, 48);
this.lb_fbatchQty.Name = "lb_fbatchQty";
this.lb_fbatchQty.Size = new System.Drawing.Size(73, 21);
this.lb_fbatchQty.TabIndex = 222;
- this.lb_fbatchQty.Text = "鏉ユ枡鏁伴噺 ";
+ this.lb_fbatchQty.Text = "鎵规鏁伴噺 ";
//
// txt_fbatchQty
//
this.txt_fbatchQty.Enabled = false;
- this.txt_fbatchQty.Location = new System.Drawing.Point(945, 51);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(702, 44);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
@@ -721,16 +700,16 @@
//
this.lb_fcheckBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fcheckBy.Appearance.Options.UseFont = true;
- this.lb_fcheckBy.Location = new System.Drawing.Point(377, 54);
+ this.lb_fcheckBy.Location = new System.Drawing.Point(377, 48);
this.lb_fcheckBy.Name = "lb_fcheckBy";
- this.lb_fcheckBy.Size = new System.Drawing.Size(73, 21);
+ this.lb_fcheckBy.Size = new System.Drawing.Size(68, 21);
this.lb_fcheckBy.TabIndex = 217;
- this.lb_fcheckBy.Text = "妫�楠屼汉鍛� ";
+ this.lb_fcheckBy.Text = "妫�楠屼汉鍛�";
//
// txt_fcheckBy
//
this.txt_fcheckBy.Enabled = false;
- this.txt_fcheckBy.Location = new System.Drawing.Point(452, 50);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(452, 44);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
@@ -743,9 +722,9 @@
this.lb_fcheckDate.Appearance.Options.UseFont = true;
this.lb_fcheckDate.Location = new System.Drawing.Point(377, 14);
this.lb_fcheckDate.Name = "lb_fcheckDate";
- this.lb_fcheckDate.Size = new System.Drawing.Size(73, 21);
+ this.lb_fcheckDate.Size = new System.Drawing.Size(68, 21);
this.lb_fcheckDate.TabIndex = 216;
- this.lb_fcheckDate.Text = "妫�楠屾棩鏈� ";
+ this.lb_fcheckDate.Text = "妫�楠屾棩鏈�";
//
// txt_fcheckDate
//
@@ -1156,7 +1135,7 @@
//
this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
this.gridBand21.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand21.Caption = "绫诲瀷(0鏉ユ枡,1鍦ㄥ簱)";
+ this.gridBand21.Caption = "绫诲瀷";
this.gridBand21.Columns.Add(this.gv_ftype);
this.gridBand21.MinWidth = 60;
this.gridBand21.Name = "gridBand21";
@@ -1212,7 +1191,7 @@
this.gridBand8.MinWidth = 300;
this.gridBand8.Name = "gridBand8";
this.gridBand8.VisibleIndex = 11;
- this.gridBand8.Width = 330;
+ this.gridBand8.Width = 300;
//
// gridBand7
//
@@ -1261,7 +1240,8 @@
this.gridBand6.Columns.Add(this.gv_checkQty);
this.gridBand6.MinWidth = 50;
this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 2;
+ this.gridBand6.Visible = false;
+ this.gridBand6.VisibleIndex = -1;
this.gridBand6.Width = 50;
//
// gv_checkQty
@@ -1283,7 +1263,7 @@
this.gridBand9.Columns.Add(this.gv_fcheckResu);
this.gridBand9.MinWidth = 50;
this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 3;
+ this.gridBand9.VisibleIndex = 2;
this.gridBand9.Width = 50;
//
// gv_fcheckResu
@@ -1305,7 +1285,7 @@
this.gridBand15.Columns.Add(this.gv_freceQty);
this.gridBand15.MinWidth = 50;
this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 4;
+ this.gridBand15.VisibleIndex = 3;
this.gridBand15.Width = 50;
//
// gv_freceQty
@@ -1586,10 +1566,10 @@
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl2.Location = new System.Drawing.Point(0, 198);
+ this.xtraTabControl2.Location = new System.Drawing.Point(0, 182);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1342, 490);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1342, 506);
this.xtraTabControl2.TabIndex = 2;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1600,7 +1580,7 @@
this.xtraTabPage3.Controls.Add(this.gcMx3);
this.xtraTabPage3.Controls.Add(this.ucUpFile1);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1340, 458);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1340, 474);
this.xtraTabPage3.Text = "闄勪欢淇℃伅";
//
// gcMx3
@@ -1613,7 +1593,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.repositoryItemButtonEdit3});
- this.gcMx3.Size = new System.Drawing.Size(1340, 401);
+ this.gcMx3.Size = new System.Drawing.Size(1340, 417);
this.gcMx3.TabIndex = 2;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1794,8 +1774,6 @@
this.panel1.Controls.Add(this.lb_modify1Flag);
this.panel1.Controls.Add(this.lb_lotNo);
this.panel1.Controls.Add(this.txt_lotNo);
- this.panel1.Controls.Add(this.lb_checkQty);
- this.panel1.Controls.Add(this.txt_checkQty);
this.panel1.Controls.Add(this.lb_fbatchQty);
this.panel1.Controls.Add(this.txt_fbatchQty);
this.panel1.Controls.Add(this.lb_fcheckBy);
@@ -1808,14 +1786,14 @@
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(1342, 198);
+ this.panel1.Size = new System.Drawing.Size(1342, 182);
this.panel1.TabIndex = 1;
//
// labelControl4
//
this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl4.Appearance.Options.UseFont = true;
- this.labelControl4.Location = new System.Drawing.Point(382, 91);
+ this.labelControl4.Location = new System.Drawing.Point(377, 80);
this.labelControl4.Name = "labelControl4";
this.labelControl4.Size = new System.Drawing.Size(68, 21);
this.labelControl4.TabIndex = 799;
@@ -1824,14 +1802,14 @@
// txt_fcheckResu
//
this.txt_fcheckResu.Enabled = false;
- this.txt_fcheckResu.Location = new System.Drawing.Point(452, 89);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(452, 78);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Size = new System.Drawing.Size(150, 24);
this.txt_fcheckResu.TabIndex = 798;
//
// txt_lotNo1
//
- this.txt_lotNo1.Location = new System.Drawing.Point(452, 160);
+ this.txt_lotNo1.Location = new System.Drawing.Point(452, 144);
this.txt_lotNo1.Name = "txt_lotNo1";
this.txt_lotNo1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
@@ -1842,7 +1820,7 @@
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(416, 163);
+ this.labelControl2.Location = new System.Drawing.Point(411, 147);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(34, 21);
this.labelControl2.TabIndex = 796;
@@ -1852,7 +1830,7 @@
//
this.txt_suppId.Enabled = false;
this.txt_suppId.IsReadly = true;
- this.txt_suppId.Location = new System.Drawing.Point(702, 92);
+ this.txt_suppId.Location = new System.Drawing.Point(702, 75);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
this.txt_suppId.Size = new System.Drawing.Size(309, 30);
@@ -1870,7 +1848,7 @@
// txt_fsubmit
//
this.txt_fsubmit.Enabled = false;
- this.txt_fsubmit.Location = new System.Drawing.Point(1062, 12);
+ this.txt_fsubmit.Location = new System.Drawing.Point(947, 46);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "";
this.txt_fsubmit.Size = new System.Drawing.Size(35, 24);
@@ -1879,7 +1857,7 @@
// txt_itemModel
//
this.txt_itemModel.Enabled = false;
- this.txt_itemModel.Location = new System.Drawing.Point(97, 125);
+ this.txt_itemModel.Location = new System.Drawing.Point(97, 109);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
@@ -1891,7 +1869,7 @@
//
this.txt_itemId.Enabled = false;
this.txt_itemId.IsReadly = true;
- this.txt_itemId.Location = new System.Drawing.Point(97, 48);
+ this.txt_itemId.Location = new System.Drawing.Point(97, 42);
this.txt_itemId.Name = "txt_itemId";
this.txt_itemId.Size = new System.Drawing.Size(266, 33);
this.txt_itemId.TabIndex = 791;
@@ -1901,7 +1879,7 @@
//
this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemModel.Appearance.Options.UseFont = true;
- this.lb_itemModel.Location = new System.Drawing.Point(20, 125);
+ this.lb_itemModel.Location = new System.Drawing.Point(20, 109);
this.lb_itemModel.Name = "lb_itemModel";
this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
this.lb_itemModel.TabIndex = 790;
@@ -1911,7 +1889,7 @@
//
this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tname.Appearance.Options.UseFont = true;
- this.lb_tname.Location = new System.Drawing.Point(20, 91);
+ this.lb_tname.Location = new System.Drawing.Point(20, 80);
this.lb_tname.Name = "lb_tname";
this.lb_tname.Size = new System.Drawing.Size(68, 21);
this.lb_tname.TabIndex = 788;
@@ -1920,7 +1898,7 @@
// txt_itemNo
//
this.txt_itemNo.Enabled = false;
- this.txt_itemNo.Location = new System.Drawing.Point(97, 87);
+ this.txt_itemNo.Location = new System.Drawing.Point(97, 76);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
@@ -1931,7 +1909,7 @@
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(20, 54);
+ this.labelControl1.Location = new System.Drawing.Point(20, 48);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(68, 21);
this.labelControl1.TabIndex = 787;
@@ -1960,11 +1938,11 @@
//
this.lb_fsubmit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fsubmit.Appearance.Options.UseFont = true;
- this.lb_fsubmit.Location = new System.Drawing.Point(983, 14);
+ this.lb_fsubmit.Location = new System.Drawing.Point(870, 48);
this.lb_fsubmit.Name = "lb_fsubmit";
- this.lb_fsubmit.Size = new System.Drawing.Size(73, 21);
+ this.lb_fsubmit.Size = new System.Drawing.Size(68, 21);
this.lb_fsubmit.TabIndex = 360;
- this.lb_fsubmit.Text = "鎻愪氦鏍囪瘑 ";
+ this.lb_fsubmit.Text = "鎻愪氦鏍囪瘑";
//
// lb_modify1Flag
//
@@ -2007,6 +1985,12 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // alertControl1
+ //
+ this.alertControl1.AutoFormDelay = 2000;
+ this.alertControl1.FormDisplaySpeed = DevExpress.XtraBars.Alerter.AlertFormDisplaySpeed.Fast;
+ this.alertControl1.FormLocation = DevExpress.XtraBars.Alerter.AlertFormLocation.TopRight;
+ //
// Frm_MesQaItemsDetect01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2035,7 +2019,6 @@
this.panMsg.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txtJianYan.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).EndInit();
@@ -2083,9 +2066,6 @@
private DevExpress.XtraEditors.TextEdit txt_fngDesc;
private DevExpress.XtraEditors.LabelControl lb_lifnr;
-
- private DevExpress.XtraEditors.LabelControl lb_checkQty;
- private DevExpress.XtraEditors.TextEdit txt_checkQty;
private DevExpress.XtraEditors.LabelControl lb_fbatchQty;
private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
@@ -2224,5 +2204,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand17;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand24;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand25;
+ private DevExpress.XtraBars.Alerter.AlertControl alertControl1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 386d9ec..02d0005 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,4 +1,3 @@
-using DevExpress.Utils.MVVM.Services;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -184,12 +183,13 @@
_webServiceName + "EdtModel12",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ this.alertControl1.Show(this, "鎻愮ず!", _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
txtJianYan.Text = "";
getModel(lbGuid.Text.Trim());
}
+ txtJianYan.Text = "";
}
catch (Exception ex)
{
@@ -445,7 +445,6 @@
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and isnull(fsubmit,0)=0";
- MessageBox.Show(_sbSqlWhere.ToString());
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
index 058296f..5e16aec 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
@@ -139,4 +139,7 @@
LXpJwKHNWwR5hFkSGv9P9BplGcXjOcz3LaG4rmWfJP8CiUU9Vuoq7pwAAAAASUVORK5CYII=
</value>
</data>
+ <metadata name="alertControl1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 014022f..3792317 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -29,22 +29,22 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01Check));
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -100,7 +100,6 @@
this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -119,7 +118,6 @@
this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fngHandle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fversion = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_states = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_iqcDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -775,7 +773,6 @@
this.gv_lotNo,
this.gv_lifnr,
this.gv_releaseNo,
- this.gv_itemId,
this.gv_itemNo,
this.gv_boardStyle,
this.gridColumn14,
@@ -794,7 +791,6 @@
this.gv_lastupdateBy,
this.gv_lastupdateDate,
this.gv_fngHandle,
- this.gv_fversion,
this.gv_states,
this.gv_iqcDate});
this.gridView1.GridControl = this.gcMain;
@@ -896,20 +892,6 @@
this.gv_releaseNo.VisibleIndex = 6;
this.gv_releaseNo.Width = 150;
//
- // gv_itemId
- //
- this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemId.AppearanceCell.Options.UseFont = true;
- this.gv_itemId.Caption = "鐗╂枡ID";
- this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 80;
- this.gv_itemId.Name = "gv_itemId";
- this.gv_itemId.OptionsColumn.AllowEdit = false;
- this.gv_itemId.Tag = "query_a.item_id";
- this.gv_itemId.Visible = true;
- this.gv_itemId.VisibleIndex = 7;
- this.gv_itemId.Width = 80;
- //
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -921,7 +903,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 8;
+ this.gv_itemNo.VisibleIndex = 7;
this.gv_itemNo.Width = 100;
//
// gv_boardStyle
@@ -935,7 +917,7 @@
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 9;
+ this.gv_boardStyle.VisibleIndex = 8;
this.gv_boardStyle.Width = 200;
//
// gridColumn14
@@ -946,7 +928,7 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 10;
+ this.gridColumn14.VisibleIndex = 9;
this.gridColumn14.Width = 200;
//
// gv_fbatchQty
@@ -960,7 +942,7 @@
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 12;
+ this.gv_fbatchQty.VisibleIndex = 11;
this.gv_fbatchQty.Width = 80;
//
// gv_ftype
@@ -974,7 +956,7 @@
this.gv_ftype.OptionsColumn.AllowEdit = false;
this.gv_ftype.Tag = "query_a.ftype";
this.gv_ftype.Visible = true;
- this.gv_ftype.VisibleIndex = 13;
+ this.gv_ftype.VisibleIndex = 12;
this.gv_ftype.Width = 50;
//
// gv_fcheckResu
@@ -988,7 +970,7 @@
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 14;
+ this.gv_fcheckResu.VisibleIndex = 13;
this.gv_fcheckResu.Width = 100;
//
// gv_fcovertQty
@@ -1003,7 +985,7 @@
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 16;
+ this.gv_fcovertQty.VisibleIndex = 15;
this.gv_fcovertQty.Width = 100;
//
// gv_remarks
@@ -1017,7 +999,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 17;
+ this.gv_remarks.VisibleIndex = 16;
this.gv_remarks.Width = 150;
//
// gv_createBy
@@ -1031,7 +1013,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 18;
+ this.gv_createBy.VisibleIndex = 17;
this.gv_createBy.Width = 100;
//
// gv_fcheckBy
@@ -1045,7 +1027,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 19;
+ this.gv_fcheckBy.VisibleIndex = 18;
this.gv_fcheckBy.Width = 100;
//
// gridColumn15
@@ -1056,7 +1038,7 @@
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 20;
+ this.gridColumn15.VisibleIndex = 19;
this.gridColumn15.Width = 180;
//
// gv_fcheckDate
@@ -1070,7 +1052,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 11;
+ this.gv_fcheckDate.VisibleIndex = 10;
this.gv_fcheckDate.Width = 180;
//
// gv_freceQty
@@ -1084,7 +1066,7 @@
this.gv_freceQty.OptionsColumn.AllowEdit = false;
this.gv_freceQty.Tag = "query_a.frece_qty";
this.gv_freceQty.Visible = true;
- this.gv_freceQty.VisibleIndex = 15;
+ this.gv_freceQty.VisibleIndex = 14;
this.gv_freceQty.Width = 100;
//
// gv_checkQty
@@ -1098,7 +1080,7 @@
this.gv_checkQty.OptionsColumn.AllowEdit = false;
this.gv_checkQty.Tag = "query_a.check_qty";
this.gv_checkQty.Visible = true;
- this.gv_checkQty.VisibleIndex = 21;
+ this.gv_checkQty.VisibleIndex = 20;
this.gv_checkQty.Width = 50;
//
// gv_createDate
@@ -1112,7 +1094,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 22;
+ this.gv_createDate.VisibleIndex = 21;
this.gv_createDate.Width = 180;
//
// gv_lastupdateBy
@@ -1126,7 +1108,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 23;
+ this.gv_lastupdateBy.VisibleIndex = 22;
this.gv_lastupdateBy.Width = 100;
//
// gv_lastupdateDate
@@ -1140,7 +1122,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 24;
+ this.gv_lastupdateDate.VisibleIndex = 23;
this.gv_lastupdateDate.Width = 180;
//
// gv_fngHandle
@@ -1154,22 +1136,8 @@
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 25;
+ this.gv_fngHandle.VisibleIndex = 24;
this.gv_fngHandle.Width = 100;
- //
- // gv_fversion
- //
- this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fversion.AppearanceCell.Options.UseFont = true;
- this.gv_fversion.Caption = "鐗堟湰";
- this.gv_fversion.FieldName = "fversion";
- this.gv_fversion.MinWidth = 50;
- this.gv_fversion.Name = "gv_fversion";
- this.gv_fversion.OptionsColumn.AllowEdit = false;
- this.gv_fversion.Tag = "query_a.fversion";
- this.gv_fversion.Visible = true;
- this.gv_fversion.VisibleIndex = 26;
- this.gv_fversion.Width = 50;
//
// gv_states
//
@@ -1182,7 +1150,7 @@
this.gv_states.OptionsColumn.AllowEdit = false;
this.gv_states.Tag = "query_a.states";
this.gv_states.Visible = true;
- this.gv_states.VisibleIndex = 27;
+ this.gv_states.VisibleIndex = 26;
this.gv_states.Width = 50;
//
// gv_iqcDate
@@ -1196,7 +1164,7 @@
this.gv_iqcDate.OptionsColumn.AllowEdit = false;
this.gv_iqcDate.Tag = "query_a.iqc_date";
this.gv_iqcDate.Visible = true;
- this.gv_iqcDate.VisibleIndex = 28;
+ this.gv_iqcDate.VisibleIndex = 27;
this.gv_iqcDate.Width = 180;
//
// pageBar1
@@ -1345,10 +1313,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
+ editorButtonImageOptions4.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", 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);
@@ -1366,10 +1334,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
+ editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -1387,10 +1355,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions6.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", 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);
@@ -1789,7 +1757,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_lifnr;
private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_boardStyle;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
@@ -1808,7 +1775,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_fngHandle;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fversion;
private DevExpress.XtraGrid.Columns.GridColumn gv_states;
private DevExpress.XtraGrid.Columns.GridColumn gv_iqcDate;
private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
index 4e430f1..fd7814d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.resx
@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="editorButtonImageOptions4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 7ef6e5c..7a9a27b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -75,7 +75,6 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
- this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_paymentParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_transportMethod = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -83,57 +82,29 @@
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkFalg = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_documentStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_documentType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_businessType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_purchaseDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_supplier = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_closeStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_purchaseDept = 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_qtyAcceptance = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_purchaser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_qualityReq = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationPerson = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_changereason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_settlementParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_erpCheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_erpCheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -143,6 +114,35 @@
this.panel1 = new System.Windows.Forms.Panel();
this.lbGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_supplier = new Gs.DevApp.UserControl.UcLookSupplier();
+ this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -807,22 +807,6 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gridBand29
- //
- this.gridBand29.Caption = "鏀舵枡缁勭粐";
- this.gridBand29.Columns.Add(this.gv_paymentParty);
- this.gridBand29.Columns.Add(this.gv_transportMethod);
- this.gridBand29.Columns.Add(this.gv_lastupdateDate);
- this.gridBand29.Columns.Add(this.gv_lastupdateBy);
- this.gridBand29.Columns.Add(this.gv_checkDate);
- this.gridBand29.Columns.Add(this.gv_checkBy);
- this.gridBand29.Columns.Add(this.gv_checkFalg);
- this.gridBand29.MinWidth = 250;
- this.gridBand29.Name = "gridBand29";
- this.gridBand29.Visible = false;
- this.gridBand29.VisibleIndex = -1;
- this.gridBand29.Width = 250;
- //
// gv_paymentParty
//
this.gv_paymentParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -907,15 +891,6 @@
this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
this.gv_checkFalg.Width = 100;
//
- // gridBand1
- //
- this.gridBand1.Caption = "ERPID鍙�";
- this.gridBand1.Columns.Add(this.gv_factory);
- this.gridBand1.MinWidth = 80;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.VisibleIndex = 0;
- this.gridBand1.Width = 80;
- //
// gv_factory
//
this.gv_factory.Caption = "ERPID鍙�";
@@ -926,15 +901,6 @@
this.gv_factory.Tag = "query_a.ebelnK3id";
this.gv_factory.Visible = true;
this.gv_factory.Width = 80;
- //
- // gridBand2
- //
- this.gridBand2.Caption = "閲囪喘鍗曞彿";
- this.gridBand2.Columns.Add(this.gv_billNo);
- this.gridBand2.MinWidth = 120;
- this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 1;
- this.gridBand2.Width = 120;
//
// gv_billNo
//
@@ -949,18 +915,6 @@
this.gv_billNo.Visible = true;
this.gv_billNo.Width = 120;
//
- // gridBand3
- //
- this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand3.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
- this.gridBand3.Columns.Add(this.gv_documentStatus);
- this.gridBand3.MinWidth = 130;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.RowCount = 2;
- this.gridBand3.VisibleIndex = 2;
- this.gridBand3.Width = 130;
- //
// gv_documentStatus
//
this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -974,22 +928,11 @@
this.gv_documentStatus.Visible = true;
this.gv_documentStatus.Width = 130;
//
- // gridBand4
- //
- this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand4.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand4.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿";
- this.gridBand4.Columns.Add(this.gv_documentType);
- this.gridBand4.MinWidth = 80;
- this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 3;
- this.gridBand4.Width = 80;
- //
// gv_documentType
//
this.gv_documentType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_documentType.AppearanceCell.Options.UseFont = true;
- this.gv_documentType.Caption = "鍗曟嵁绫诲瀷";
+ this.gv_documentType.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿";
this.gv_documentType.FieldName = "documentType2";
this.gv_documentType.MinWidth = 25;
this.gv_documentType.Name = "gv_documentType";
@@ -997,15 +940,6 @@
this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE";
this.gv_documentType.Visible = true;
this.gv_documentType.Width = 80;
- //
- // gridBand5
- //
- this.gridBand5.Caption = "涓氬姟绫诲瀷";
- this.gridBand5.Columns.Add(this.gv_businessType);
- this.gridBand5.MinWidth = 80;
- this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 4;
- this.gridBand5.Width = 80;
//
// gv_businessType
//
@@ -1020,15 +954,6 @@
this.gv_businessType.Visible = true;
this.gv_businessType.Width = 80;
//
- // gridBand8
- //
- this.gridBand8.Caption = "閲囪喘鏃ユ湡";
- this.gridBand8.Columns.Add(this.gv_purchaseDate);
- this.gridBand8.MinWidth = 170;
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 5;
- this.gridBand8.Width = 170;
- //
// gv_purchaseDate
//
this.gv_purchaseDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1042,48 +967,18 @@
this.gv_purchaseDate.Visible = true;
this.gv_purchaseDate.Width = 170;
//
- // gridBand6
- //
- this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand6.Caption = "渚涘簲鍟�";
- this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand11,
- this.gridBand7});
- this.gridBand6.MinWidth = 200;
- this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 6;
- this.gridBand6.Width = 200;
- //
- // gridBand11
- //
- this.gridBand11.Caption = "ID";
- this.gridBand11.Columns.Add(this.gv_supplier);
- this.gridBand11.Name = "gridBand11";
- this.gridBand11.VisibleIndex = 0;
- this.gridBand11.Width = 66;
- //
// gv_supplier
//
this.gv_supplier.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_supplier.AppearanceCell.Options.UseFont = true;
this.gv_supplier.Caption = "渚涘簲鍟�";
- this.gv_supplier.FieldName = "supplier";
+ this.gv_supplier.FieldName = "suppNo";
this.gv_supplier.MinWidth = 25;
this.gv_supplier.Name = "gv_supplier";
this.gv_supplier.OptionsColumn.AllowEdit = false;
this.gv_supplier.Tag = "query_a.SUPPLIER";
this.gv_supplier.Visible = true;
this.gv_supplier.Width = 66;
- //
- // gridBand7
- //
- this.gridBand7.Caption = "鍚嶇О";
- this.gridBand7.Columns.Add(this.bandedGridColumn1);
- this.gridBand7.MinWidth = 100;
- this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 1;
- this.gridBand7.Width = 134;
//
// bandedGridColumn1
//
@@ -1095,17 +990,6 @@
this.bandedGridColumn1.Tag = "query_a.suppName";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.Width = 134;
- //
- // gridBand9
- //
- this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand9.Caption = "鍏抽棴鏍囪瘑:A鏄�,B鍚�";
- this.gridBand9.Columns.Add(this.gv_closeStatus);
- this.gridBand9.MinWidth = 80;
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 7;
- this.gridBand9.Width = 80;
//
// gv_closeStatus
//
@@ -1120,49 +1004,18 @@
this.gv_closeStatus.Visible = true;
this.gv_closeStatus.Width = 80;
//
- // gridBand10
- //
- this.gridBand10.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand10.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand10.Caption = "閲囪喘閮ㄩ棬";
- this.gridBand10.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand12,
- this.gridBand13});
- this.gridBand10.MinWidth = 100;
- this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 8;
- this.gridBand10.Width = 130;
- //
- // gridBand12
- //
- this.gridBand12.Caption = "缂栧彿";
- this.gridBand12.Columns.Add(this.gv_purchaseDept);
- this.gridBand12.MinWidth = 50;
- this.gridBand12.Name = "gridBand12";
- this.gridBand12.VisibleIndex = 0;
- this.gridBand12.Width = 50;
- //
// gv_purchaseDept
//
this.gv_purchaseDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_purchaseDept.AppearanceCell.Options.UseFont = true;
this.gv_purchaseDept.Caption = "閲囪喘閮ㄩ棬";
- this.gv_purchaseDept.FieldName = "purchaseDept";
+ this.gv_purchaseDept.FieldName = "departmentcode";
this.gv_purchaseDept.MinWidth = 25;
this.gv_purchaseDept.Name = "gv_purchaseDept";
this.gv_purchaseDept.OptionsColumn.AllowEdit = false;
this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT";
this.gv_purchaseDept.Visible = true;
this.gv_purchaseDept.Width = 50;
- //
- // gridBand13
- //
- this.gridBand13.Caption = "鍚嶇О";
- this.gridBand13.Columns.Add(this.bandedGridColumn2);
- this.gridBand13.MinWidth = 80;
- this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 1;
- this.gridBand13.Width = 80;
//
// bandedGridColumn2
//
@@ -1174,17 +1027,6 @@
this.bandedGridColumn2.Tag = "query_a.departmentname";
this.bandedGridColumn2.Visible = true;
this.bandedGridColumn2.Width = 80;
- //
- // gridBand14
- //
- this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand14.Caption = "鏁伴噺楠屾敹";
- this.gridBand14.Columns.Add(this.gv_qtyAcceptance);
- this.gridBand14.MinWidth = 50;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 9;
- this.gridBand14.Width = 50;
//
// gv_qtyAcceptance
//
@@ -1199,15 +1041,6 @@
this.gv_qtyAcceptance.Visible = true;
this.gv_qtyAcceptance.Width = 50;
//
- // gridBand15
- //
- this.gridBand15.Caption = "閲囪喘鍛�";
- this.gridBand15.Columns.Add(this.gv_purchaser);
- this.gridBand15.MinWidth = 60;
- this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 10;
- this.gridBand15.Width = 60;
- //
// gv_purchaser
//
this.gv_purchaser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1220,15 +1053,6 @@
this.gv_purchaser.Tag = "query_a.PURCHASER";
this.gv_purchaser.Visible = true;
this.gv_purchaser.Width = 60;
- //
- // gridBand16
- //
- this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
- this.gridBand16.Columns.Add(this.gv_qualityReq);
- this.gridBand16.MinWidth = 80;
- this.gridBand16.Name = "gridBand16";
- this.gridBand16.VisibleIndex = 11;
- this.gridBand16.Width = 80;
//
// gv_qualityReq
//
@@ -1243,28 +1067,6 @@
this.gv_qualityReq.Visible = true;
this.gv_qualityReq.Width = 80;
//
- // gridBand17
- //
- this.gridBand17.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand17.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand17.Caption = "浣滃簾鐘舵��";
- this.gridBand17.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand19,
- this.gridBand18,
- this.gridBand20});
- this.gridBand17.Name = "gridBand17";
- this.gridBand17.VisibleIndex = 12;
- this.gridBand17.Width = 300;
- //
- // gridBand19
- //
- this.gridBand19.Caption = "浣滃簾鐘舵��";
- this.gridBand19.Columns.Add(this.gv_cancellationStatus);
- this.gridBand19.MinWidth = 60;
- this.gridBand19.Name = "gridBand19";
- this.gridBand19.VisibleIndex = 0;
- this.gridBand19.Width = 60;
- //
// gv_cancellationStatus
//
this.gv_cancellationStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1277,15 +1079,6 @@
this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
this.gv_cancellationStatus.Visible = true;
this.gv_cancellationStatus.Width = 60;
- //
- // gridBand18
- //
- this.gridBand18.Caption = "浣滃簾浜�";
- this.gridBand18.Columns.Add(this.gv_cancellationPerson);
- this.gridBand18.MinWidth = 60;
- this.gridBand18.Name = "gridBand18";
- this.gridBand18.VisibleIndex = 1;
- this.gridBand18.Width = 60;
//
// gv_cancellationPerson
//
@@ -1300,15 +1093,6 @@
this.gv_cancellationPerson.Visible = true;
this.gv_cancellationPerson.Width = 60;
//
- // gridBand20
- //
- this.gridBand20.Caption = "浣滃簾鏃ユ湡";
- this.gridBand20.Columns.Add(this.gv_cancellationDate);
- this.gridBand20.MinWidth = 180;
- this.gridBand20.Name = "gridBand20";
- this.gridBand20.VisibleIndex = 2;
- this.gridBand20.Width = 180;
- //
// gv_cancellationDate
//
this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1321,27 +1105,6 @@
this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
this.gv_cancellationDate.Visible = true;
this.gv_cancellationDate.Width = 180;
- //
- // gridBand21
- //
- this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand21.Caption = "鍒涘缓淇℃伅";
- this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand25,
- this.gridBand22});
- this.gridBand21.Name = "gridBand21";
- this.gridBand21.VisibleIndex = 13;
- this.gridBand21.Width = 260;
- //
- // gridBand25
- //
- this.gridBand25.Caption = "鍒涘缓浜�";
- this.gridBand25.Columns.Add(this.gv_createBy);
- this.gridBand25.MinWidth = 80;
- this.gridBand25.Name = "gridBand25";
- this.gridBand25.VisibleIndex = 0;
- this.gridBand25.Width = 80;
//
// gv_createBy
//
@@ -1356,15 +1119,6 @@
this.gv_createBy.Visible = true;
this.gv_createBy.Width = 80;
//
- // gridBand22
- //
- this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
- this.gridBand22.Columns.Add(this.gv_createDate);
- this.gridBand22.MinWidth = 180;
- this.gridBand22.Name = "gridBand22";
- this.gridBand22.VisibleIndex = 1;
- this.gridBand22.Width = 180;
- //
// gv_createDate
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1377,15 +1131,6 @@
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 180;
- //
- // gridBand23
- //
- this.gridBand23.Caption = "澶囨敞";
- this.gridBand23.Columns.Add(this.gv_remarks);
- this.gridBand23.MinWidth = 100;
- this.gridBand23.Name = "gridBand23";
- this.gridBand23.VisibleIndex = 14;
- this.gridBand23.Width = 100;
//
// gv_remarks
//
@@ -1400,15 +1145,6 @@
this.gv_remarks.Visible = true;
this.gv_remarks.Width = 100;
//
- // gridBand24
- //
- this.gridBand24.Caption = "鍙樻洿鍘熷洜";
- this.gridBand24.Columns.Add(this.gv_changereason);
- this.gridBand24.MinWidth = 100;
- this.gridBand24.Name = "gridBand24";
- this.gridBand24.VisibleIndex = 15;
- this.gridBand24.Width = 100;
- //
// gv_changereason
//
this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1421,28 +1157,6 @@
this.gv_changereason.Tag = "query_a.CHANGEREASON";
this.gv_changereason.Visible = true;
this.gv_changereason.Width = 100;
- //
- // gridBand28
- //
- this.gridBand28.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand28.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand28.Caption = "ERP瀹℃牳淇℃伅";
- this.gridBand28.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand27,
- this.gridBand26});
- this.gridBand28.Name = "gridBand28";
- this.gridBand28.VisibleIndex = 16;
- this.gridBand28.Width = 260;
- //
- // gridBand27
- //
- this.gridBand27.Caption = "瀹℃牳浜�";
- this.gridBand27.Columns.Add(this.gv_settlementParty);
- this.gridBand27.Columns.Add(this.gv_erpCheckBy);
- this.gridBand27.MinWidth = 80;
- this.gridBand27.Name = "gridBand27";
- this.gridBand27.VisibleIndex = 0;
- this.gridBand27.Width = 80;
//
// gv_settlementParty
//
@@ -1468,15 +1182,6 @@
this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
this.gv_erpCheckBy.Visible = true;
this.gv_erpCheckBy.Width = 80;
- //
- // gridBand26
- //
- this.gridBand26.Caption = "ERP瀹℃牳鏃堕棿";
- this.gridBand26.Columns.Add(this.gv_erpCheckDate);
- this.gridBand26.MinWidth = 180;
- this.gridBand26.Name = "gridBand26";
- this.gridBand26.VisibleIndex = 1;
- this.gridBand26.Width = 180;
//
// gv_erpCheckDate
//
@@ -1577,6 +1282,301 @@
this.txt_supplier.Name = "txt_supplier";
this.txt_supplier.Size = new System.Drawing.Size(305, 30);
this.txt_supplier.TabIndex = 227;
+ //
+ // gridBand29
+ //
+ this.gridBand29.Caption = "鏀舵枡缁勭粐";
+ this.gridBand29.Columns.Add(this.gv_paymentParty);
+ this.gridBand29.Columns.Add(this.gv_transportMethod);
+ this.gridBand29.Columns.Add(this.gv_lastupdateDate);
+ this.gridBand29.Columns.Add(this.gv_lastupdateBy);
+ this.gridBand29.Columns.Add(this.gv_checkDate);
+ this.gridBand29.Columns.Add(this.gv_checkBy);
+ this.gridBand29.Columns.Add(this.gv_checkFalg);
+ this.gridBand29.MinWidth = 250;
+ this.gridBand29.Name = "gridBand29";
+ this.gridBand29.Visible = false;
+ this.gridBand29.VisibleIndex = -1;
+ this.gridBand29.Width = 250;
+ //
+ // gridBand1
+ //
+ this.gridBand1.Caption = "ERPID鍙�";
+ this.gridBand1.Columns.Add(this.gv_factory);
+ this.gridBand1.MinWidth = 80;
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 0;
+ this.gridBand1.Width = 80;
+ //
+ // gridBand2
+ //
+ this.gridBand2.Caption = "閲囪喘鍗曞彿";
+ this.gridBand2.Columns.Add(this.gv_billNo);
+ this.gridBand2.MinWidth = 120;
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 1;
+ this.gridBand2.Width = 120;
+ //
+ // gridBand3
+ //
+ this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand3.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
+ this.gridBand3.Columns.Add(this.gv_documentStatus);
+ this.gridBand3.MinWidth = 130;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.RowCount = 2;
+ this.gridBand3.VisibleIndex = 2;
+ this.gridBand3.Width = 130;
+ //
+ // gridBand4
+ //
+ this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand4.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand4.Caption = "鍗曟嵁绫诲瀷";
+ this.gridBand4.Columns.Add(this.gv_documentType);
+ this.gridBand4.MinWidth = 80;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 3;
+ this.gridBand4.Width = 80;
+ //
+ // gridBand5
+ //
+ this.gridBand5.Caption = "涓氬姟绫诲瀷";
+ this.gridBand5.Columns.Add(this.gv_businessType);
+ this.gridBand5.MinWidth = 80;
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 4;
+ this.gridBand5.Width = 80;
+ //
+ // gridBand8
+ //
+ this.gridBand8.Caption = "閲囪喘鏃ユ湡";
+ this.gridBand8.Columns.Add(this.gv_purchaseDate);
+ this.gridBand8.MinWidth = 170;
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.VisibleIndex = 5;
+ this.gridBand8.Width = 170;
+ //
+ // gridBand6
+ //
+ this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand6.Caption = "渚涘簲鍟�";
+ this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand11,
+ this.gridBand7});
+ this.gridBand6.MinWidth = 200;
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.VisibleIndex = 6;
+ this.gridBand6.Width = 200;
+ //
+ // gridBand11
+ //
+ this.gridBand11.Caption = "缂栧彿";
+ this.gridBand11.Columns.Add(this.gv_supplier);
+ this.gridBand11.Name = "gridBand11";
+ this.gridBand11.VisibleIndex = 0;
+ this.gridBand11.Width = 66;
+ //
+ // gridBand7
+ //
+ this.gridBand7.Caption = "鍚嶇О";
+ this.gridBand7.Columns.Add(this.bandedGridColumn1);
+ this.gridBand7.MinWidth = 100;
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 1;
+ this.gridBand7.Width = 134;
+ //
+ // gridBand9
+ //
+ this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand9.Caption = "鍏抽棴鏍囪瘑:A鏄�,B鍚�";
+ this.gridBand9.Columns.Add(this.gv_closeStatus);
+ this.gridBand9.MinWidth = 80;
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 7;
+ this.gridBand9.Width = 80;
+ //
+ // gridBand10
+ //
+ this.gridBand10.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand10.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand10.Caption = "閲囪喘閮ㄩ棬";
+ this.gridBand10.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand12,
+ this.gridBand13});
+ this.gridBand10.MinWidth = 100;
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 8;
+ this.gridBand10.Width = 130;
+ //
+ // gridBand12
+ //
+ this.gridBand12.Caption = "缂栧彿";
+ this.gridBand12.Columns.Add(this.gv_purchaseDept);
+ this.gridBand12.MinWidth = 50;
+ this.gridBand12.Name = "gridBand12";
+ this.gridBand12.VisibleIndex = 0;
+ this.gridBand12.Width = 50;
+ //
+ // gridBand13
+ //
+ this.gridBand13.Caption = "鍚嶇О";
+ this.gridBand13.Columns.Add(this.bandedGridColumn2);
+ this.gridBand13.MinWidth = 80;
+ this.gridBand13.Name = "gridBand13";
+ this.gridBand13.VisibleIndex = 1;
+ this.gridBand13.Width = 80;
+ //
+ // gridBand14
+ //
+ this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand14.Caption = "鏁伴噺楠屾敹";
+ this.gridBand14.Columns.Add(this.gv_qtyAcceptance);
+ this.gridBand14.MinWidth = 50;
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 9;
+ this.gridBand14.Width = 50;
+ //
+ // gridBand15
+ //
+ this.gridBand15.Caption = "閲囪喘鍛�";
+ this.gridBand15.Columns.Add(this.gv_purchaser);
+ this.gridBand15.MinWidth = 60;
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 10;
+ this.gridBand15.Width = 60;
+ //
+ // gridBand16
+ //
+ this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
+ this.gridBand16.Columns.Add(this.gv_qualityReq);
+ this.gridBand16.MinWidth = 80;
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 11;
+ this.gridBand16.Width = 80;
+ //
+ // gridBand17
+ //
+ this.gridBand17.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand17.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand17.Caption = "浣滃簾鐘舵��";
+ this.gridBand17.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand19,
+ this.gridBand18,
+ this.gridBand20});
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 12;
+ this.gridBand17.Width = 300;
+ //
+ // gridBand19
+ //
+ this.gridBand19.Caption = "浣滃簾鐘舵��";
+ this.gridBand19.Columns.Add(this.gv_cancellationStatus);
+ this.gridBand19.MinWidth = 60;
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 0;
+ this.gridBand19.Width = 60;
+ //
+ // gridBand18
+ //
+ this.gridBand18.Caption = "浣滃簾浜�";
+ this.gridBand18.Columns.Add(this.gv_cancellationPerson);
+ this.gridBand18.MinWidth = 60;
+ this.gridBand18.Name = "gridBand18";
+ this.gridBand18.VisibleIndex = 1;
+ this.gridBand18.Width = 60;
+ //
+ // gridBand20
+ //
+ this.gridBand20.Caption = "浣滃簾鏃ユ湡";
+ this.gridBand20.Columns.Add(this.gv_cancellationDate);
+ this.gridBand20.MinWidth = 180;
+ this.gridBand20.Name = "gridBand20";
+ this.gridBand20.VisibleIndex = 2;
+ this.gridBand20.Width = 180;
+ //
+ // gridBand21
+ //
+ this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand21.Caption = "鍒涘缓淇℃伅";
+ this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand25,
+ this.gridBand22});
+ this.gridBand21.Name = "gridBand21";
+ this.gridBand21.VisibleIndex = 13;
+ this.gridBand21.Width = 260;
+ //
+ // gridBand25
+ //
+ this.gridBand25.Caption = "鍒涘缓浜�";
+ this.gridBand25.Columns.Add(this.gv_createBy);
+ this.gridBand25.MinWidth = 80;
+ this.gridBand25.Name = "gridBand25";
+ this.gridBand25.VisibleIndex = 0;
+ this.gridBand25.Width = 80;
+ //
+ // gridBand22
+ //
+ this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
+ this.gridBand22.Columns.Add(this.gv_createDate);
+ this.gridBand22.MinWidth = 180;
+ this.gridBand22.Name = "gridBand22";
+ this.gridBand22.VisibleIndex = 1;
+ this.gridBand22.Width = 180;
+ //
+ // gridBand23
+ //
+ this.gridBand23.Caption = "澶囨敞";
+ this.gridBand23.Columns.Add(this.gv_remarks);
+ this.gridBand23.MinWidth = 100;
+ this.gridBand23.Name = "gridBand23";
+ this.gridBand23.VisibleIndex = 14;
+ this.gridBand23.Width = 100;
+ //
+ // gridBand24
+ //
+ this.gridBand24.Caption = "鍙樻洿鍘熷洜";
+ this.gridBand24.Columns.Add(this.gv_changereason);
+ this.gridBand24.MinWidth = 100;
+ this.gridBand24.Name = "gridBand24";
+ this.gridBand24.VisibleIndex = 15;
+ this.gridBand24.Width = 100;
+ //
+ // gridBand28
+ //
+ this.gridBand28.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand28.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand28.Caption = "ERP瀹℃牳淇℃伅";
+ this.gridBand28.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand27,
+ this.gridBand26});
+ this.gridBand28.Name = "gridBand28";
+ this.gridBand28.VisibleIndex = 16;
+ this.gridBand28.Width = 260;
+ //
+ // gridBand27
+ //
+ this.gridBand27.Caption = "瀹℃牳浜�";
+ this.gridBand27.Columns.Add(this.gv_settlementParty);
+ this.gridBand27.Columns.Add(this.gv_erpCheckBy);
+ this.gridBand27.MinWidth = 80;
+ this.gridBand27.Name = "gridBand27";
+ this.gridBand27.VisibleIndex = 0;
+ this.gridBand27.Width = 80;
+ //
+ // gridBand26
+ //
+ this.gridBand26.Caption = "ERP瀹℃牳鏃堕棿";
+ this.gridBand26.Columns.Add(this.gv_erpCheckDate);
+ this.gridBand26.MinWidth = 180;
+ this.gridBand26.Name = "gridBand26";
+ this.gridBand26.VisibleIndex = 1;
+ this.gridBand26.Width = 180;
//
// Frm_MesRohIn
//
@@ -1693,6 +1693,7 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
private UserControl.UcLookSupplier txt_supplier;
private DevExpress.XtraEditors.LabelControl lbGuid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand29;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
@@ -1722,6 +1723,5 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand28;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand27;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand26;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index f0429a8..7e48bd4 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -460,6 +460,10 @@
lst.Add(btnChk.Name);
lst.Add(btnFchk.Name);
lst.Add(btnDel.Name);
+ lst.Add(btnJianYan.Name);
+ lst.Add(btnFjianYan.Name);
+ lst.Add(btnQuery.Name);
+ lst.Add(btnLog.Name);
_enabledBtn(lst);
}
}
--
Gitblit v1.9.3