From 73d47d0d2ff835761df928c5897a1535b9b4f3bd Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 12 八月 2025 08:41:57 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 25 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 8
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 5
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 287 +++++++++++++++++------------------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 40 ++--
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 88 +++++-----
7 files changed, 221 insertions(+), 233 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
index 77cfe3e..5d2713a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -66,7 +66,6 @@
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -100,9 +99,6 @@
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -111,7 +107,6 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -146,6 +141,10 @@
this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -183,9 +182,6 @@
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
@@ -194,7 +190,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
@@ -207,6 +202,10 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptCk)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -295,7 +294,6 @@
this.gv_checkDate,
this.gv_returnMethod,
this.gv_returnType,
- this.gv_depotId,
this.gv_suppId,
this.gv_remark,
this.gridColumn7,
@@ -441,18 +439,6 @@
this.gv_returnType.VisibleIndex = 9;
this.gv_returnType.Width = 94;
//
- // gv_depotId
- //
- this.gv_depotId.AppearanceCell.Options.UseFont = true;
- this.gv_depotId.Caption = "浠撳簱";
- this.gv_depotId.FieldName = "dptName";
- this.gv_depotId.Name = "gv_depotId";
- this.gv_depotId.OptionsColumn.AllowEdit = false;
- this.gv_depotId.Tag = "query_a.DEPOT_ID";
- this.gv_depotId.Visible = true;
- this.gv_depotId.VisibleIndex = 10;
- this.gv_depotId.Width = 94;
- //
// gv_suppId
//
this.gv_suppId.AppearanceCell.Options.UseFont = true;
@@ -462,7 +448,7 @@
this.gv_suppId.OptionsColumn.AllowEdit = false;
this.gv_suppId.Tag = "query_a.SUPP_ID";
this.gv_suppId.Visible = true;
- this.gv_suppId.VisibleIndex = 11;
+ this.gv_suppId.VisibleIndex = 10;
this.gv_suppId.Width = 94;
//
// gv_remark
@@ -474,7 +460,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 12;
+ this.gv_remark.VisibleIndex = 11;
this.gv_remark.Width = 94;
//
// gridColumn7
@@ -492,7 +478,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 13;
+ this.gridColumn11.VisibleIndex = 12;
this.gridColumn11.Width = 94;
//
// pageBar1
@@ -532,7 +518,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 187;
+ this.splitMx1.SplitterPosition = 166;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -565,38 +551,38 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 187);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 166);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_fOwnerIdHead
//
this.txt_fOwnerIdHead.IsReadly = false;
- this.txt_fOwnerIdHead.Location = new System.Drawing.Point(360, 147);
+ this.txt_fOwnerIdHead.Location = new System.Drawing.Point(355, 132);
this.txt_fOwnerIdHead.Name = "txt_fOwnerIdHead";
- this.txt_fOwnerIdHead.Size = new System.Drawing.Size(200, 24);
+ this.txt_fOwnerIdHead.Size = new System.Drawing.Size(195, 24);
this.txt_fOwnerIdHead.TabIndex = 537;
//
// txt_fPurchaseDeptId
//
this.txt_fPurchaseDeptId.IsReadly = false;
- this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(636, 147);
+ this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(626, 132);
this.txt_fPurchaseDeptId.Name = "txt_fPurchaseDeptId";
- this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(200, 24);
+ this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(195, 24);
this.txt_fPurchaseDeptId.TabIndex = 535;
//
// txt_fRequireOrgId
//
this.txt_fRequireOrgId.IsReadly = false;
- this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 147);
+ this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 132);
this.txt_fRequireOrgId.Name = "txt_fRequireOrgId";
- this.txt_fRequireOrgId.Size = new System.Drawing.Size(200, 24);
+ this.txt_fRequireOrgId.Size = new System.Drawing.Size(195, 24);
this.txt_fRequireOrgId.TabIndex = 534;
//
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 108);
+ this.btnSelect.Location = new System.Drawing.Point(12, 96);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(116, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -615,15 +601,15 @@
// txt_thOrgId
//
this.txt_thOrgId.IsReadly = false;
- this.txt_thOrgId.Location = new System.Drawing.Point(84, 44);
+ this.txt_thOrgId.Location = new System.Drawing.Point(84, 40);
this.txt_thOrgId.Name = "txt_thOrgId";
- this.txt_thOrgId.Size = new System.Drawing.Size(200, 24);
+ this.txt_thOrgId.Size = new System.Drawing.Size(195, 24);
this.txt_thOrgId.TabIndex = 526;
//
// txt_returnType
//
this.txt_returnType.EditValue = "-璇烽�夋嫨-";
- this.txt_returnType.Location = new System.Drawing.Point(360, 76);
+ this.txt_returnType.Location = new System.Drawing.Point(355, 40);
this.txt_returnType.Name = "txt_returnType";
this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -635,7 +621,7 @@
"渚涘簲鍟嗙墿鍝佸彿閿欒",
"閲囪喘鏂欏彿鍙樻洿"});
this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_returnType.Size = new System.Drawing.Size(200, 24);
+ this.txt_returnType.Size = new System.Drawing.Size(195, 24);
this.txt_returnType.StyleController = this.layoutMx1;
this.txt_returnType.TabIndex = 521;
//
@@ -644,7 +630,7 @@
this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(195, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
@@ -652,7 +638,7 @@
// txt_returnMethod
//
this.txt_returnMethod.EditValue = "-璇烽�夋嫨-";
- this.txt_returnMethod.Location = new System.Drawing.Point(360, 44);
+ this.txt_returnMethod.Location = new System.Drawing.Point(355, 12);
this.txt_returnMethod.Name = "txt_returnMethod";
this.txt_returnMethod.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -661,35 +647,35 @@
"閫�鏂欒ˉ鏂�",
"閫�鏂欏苟鎵ｆ"});
this.txt_returnMethod.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_returnMethod.Size = new System.Drawing.Size(200, 24);
+ this.txt_returnMethod.Size = new System.Drawing.Size(195, 24);
this.txt_returnMethod.StyleController = this.layoutMx1;
this.txt_returnMethod.TabIndex = 520;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(912, 44);
+ this.txt_checkDate.Location = new System.Drawing.Point(897, 40);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(202, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(196, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 226;
this.txt_checkDate.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(636, 76);
+ this.txt_remark.Location = new System.Drawing.Point(355, 68);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(200, 24);
+ this.txt_remark.Size = new System.Drawing.Size(195, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 252;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(912, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(897, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(202, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(196, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 222;
this.txt_checkUser.Tag = "readonly";
@@ -697,56 +683,56 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(84, 76);
+ this.txt_suppId.Location = new System.Drawing.Point(84, 68);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(200, 24);
+ this.txt_suppId.Size = new System.Drawing.Size(195, 24);
this.txt_suppId.TabIndex = 259;
//
// txt_isOut
//
- this.txt_isOut.Location = new System.Drawing.Point(288, 12);
+ this.txt_isOut.Location = new System.Drawing.Point(554, 68);
this.txt_isOut.Name = "txt_isOut";
this.txt_isOut.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_isOut.Size = new System.Drawing.Size(272, 24);
+ this.txt_isOut.Size = new System.Drawing.Size(267, 24);
this.txt_isOut.StyleController = this.layoutMx1;
this.txt_isOut.TabIndex = 527;
this.txt_isOut.Tag = "readOnly";
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(840, 76);
+ this.txt_status.Location = new System.Drawing.Point(825, 68);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(274, 24);
+ this.txt_status.Size = new System.Drawing.Size(268, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 528;
this.txt_status.Tag = "readonly";
//
// txt_isFinish
//
- this.txt_isFinish.Location = new System.Drawing.Point(840, 108);
+ this.txt_isFinish.Location = new System.Drawing.Point(825, 96);
this.txt_isFinish.Name = "txt_isFinish";
this.txt_isFinish.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_isFinish.Size = new System.Drawing.Size(274, 24);
+ this.txt_isFinish.Size = new System.Drawing.Size(268, 24);
this.txt_isFinish.StyleController = this.layoutMx1;
this.txt_isFinish.TabIndex = 529;
this.txt_isFinish.Tag = "readonly";
//
// lastUpdateUser
//
- this.lastUpdateUser.Location = new System.Drawing.Point(636, 12);
+ this.lastUpdateUser.Location = new System.Drawing.Point(626, 12);
this.lastUpdateUser.Name = "lastUpdateUser";
- this.lastUpdateUser.Size = new System.Drawing.Size(200, 24);
+ this.lastUpdateUser.Size = new System.Drawing.Size(195, 24);
this.lastUpdateUser.StyleController = this.layoutMx1;
this.lastUpdateUser.TabIndex = 530;
this.lastUpdateUser.Tag = "readonly";
//
// lastUpdateTime
//
- this.lastUpdateTime.Location = new System.Drawing.Point(636, 44);
+ this.lastUpdateTime.Location = new System.Drawing.Point(626, 40);
this.lastUpdateTime.Name = "lastUpdateTime";
- this.lastUpdateTime.Size = new System.Drawing.Size(200, 24);
+ this.lastUpdateTime.Size = new System.Drawing.Size(195, 24);
this.lastUpdateTime.StyleController = this.layoutMx1;
this.lastUpdateTime.TabIndex = 531;
this.lastUpdateTime.Tag = "readonly";
@@ -761,13 +747,13 @@
//
// txt_fHasLinkRad
//
- this.txt_fHasLinkRad.Location = new System.Drawing.Point(360, 108);
+ this.txt_fHasLinkRad.Location = new System.Drawing.Point(355, 96);
this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�")});
this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_fHasLinkRad.Size = new System.Drawing.Size(200, 35);
+ this.txt_fHasLinkRad.Size = new System.Drawing.Size(195, 32);
this.txt_fHasLinkRad.StyleController = this.layoutMx1;
this.txt_fHasLinkRad.TabIndex = 533;
//
@@ -801,9 +787,6 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
this.layoutControlItem2,
- this.layoutControlItem6,
- this.layoutControlItem5,
- this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem14,
@@ -812,11 +795,14 @@
this.layoutControlItem4,
this.layoutControlItem16,
this.layoutControlItem12,
- this.layoutControlItem7,
this.layoutControlItem3,
this.layItem1,
this.layItem4,
- this.layItem2});
+ this.layItem2,
+ this.layoutControlItem5,
+ this.layoutControlItem6,
+ this.layoutControlItem7,
+ this.layoutControlItem8});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -838,7 +824,7 @@
rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition3.Height = 100D;
rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 39D;
+ rowDefinition4.Height = 36D;
rowDefinition4.SizeType = System.Windows.Forms.SizeType.AutoSize;
rowDefinition5.Height = 100D;
rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -848,7 +834,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1126, 187);
+ this.Root.Size = new System.Drawing.Size(1105, 168);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -856,72 +842,39 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_thOrgId;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem2.Text = "閫夋嫨缁勭粐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_returnType;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 64);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem6.Text = "閫�鏂欏師鍥�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_returnMethod;
- this.layoutControlItem5.Location = new System.Drawing.Point(276, 32);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem5.Text = "閫�鏂欐柟寮�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_isOut;
- this.layoutControlItem8.Location = new System.Drawing.Point(276, 0);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem8.Text = "濮斿鏍囪瘑";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem8.TextVisible = false;
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_checkUser;
this.layoutControlItem9.CustomizationFormText = "瀹℃牳浜哄憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(828, 32);
+ this.layoutControlItem10.Location = new System.Drawing.Point(813, 28);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
@@ -929,32 +882,32 @@
//
this.layoutControlItem14.Control = this.lastUpdateUser;
this.layoutControlItem14.CustomizationFormText = "鏈�鍚庢洿鏂�";
- this.layoutControlItem14.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem14.Text = "鏇存柊浜哄憳";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.lastUpdateTime;
- this.layoutControlItem15.Location = new System.Drawing.Point(552, 32);
+ this.layoutControlItem15.Location = new System.Drawing.Point(542, 28);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem15.Text = "鏇存柊鏃堕棿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_status;
- this.layoutControlItem11.Location = new System.Drawing.Point(828, 64);
+ this.layoutControlItem11.Location = new System.Drawing.Point(813, 56);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(278, 32);
+ this.layoutControlItem11.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -962,22 +915,22 @@
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_suppId;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem4.Text = "閫変緵搴斿晢";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(276, 39);
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫�璐ф槑缁�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -986,36 +939,25 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_isFinish;
- this.layoutControlItem12.Location = new System.Drawing.Point(828, 96);
+ this.layoutControlItem12.Location = new System.Drawing.Point(813, 84);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(278, 39);
+ this.layoutControlItem12.Size = new System.Drawing.Size(272, 36);
this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_remark;
- this.layoutControlItem7.Location = new System.Drawing.Point(552, 64);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem7.Text = "鐢宠澶囨敞";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layoutControlItem3.AppearanceItemCaption.Options.UseBackColor = true;
this.layoutControlItem3.Control = this.txt_fHasLinkRad;
- this.layoutControlItem3.Location = new System.Drawing.Point(276, 96);
+ this.layoutControlItem3.Location = new System.Drawing.Point(271, 84);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 39);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 36);
this.layoutControlItem3.Text = "婧愬崟绫诲瀷";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1024,10 +966,10 @@
this.layItem1.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem1.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem1.Control = this.txt_fRequireOrgId;
- this.layItem1.Location = new System.Drawing.Point(0, 135);
+ this.layItem1.Location = new System.Drawing.Point(0, 120);
this.layItem1.Name = "layItem1";
this.layItem1.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem1.Size = new System.Drawing.Size(276, 32);
+ this.layItem1.Size = new System.Drawing.Size(271, 28);
this.layItem1.Text = "闇�姹傜粍缁�";
this.layItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1036,11 +978,11 @@
this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem4.Control = this.txt_fOwnerIdHead;
- this.layItem4.Location = new System.Drawing.Point(276, 135);
+ this.layItem4.Location = new System.Drawing.Point(271, 120);
this.layItem4.Name = "layItem4";
this.layItem4.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItem4.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem4.Size = new System.Drawing.Size(276, 32);
+ this.layItem4.Size = new System.Drawing.Size(271, 28);
this.layItem4.Text = "璐т富";
this.layItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1049,11 +991,11 @@
this.layItem2.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem2.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem2.Control = this.txt_fPurchaseDeptId;
- this.layItem2.Location = new System.Drawing.Point(552, 135);
+ this.layItem2.Location = new System.Drawing.Point(542, 120);
this.layItem2.Name = "layItem2";
this.layItem2.OptionsTableLayoutItem.ColumnIndex = 2;
this.layItem2.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem2.Size = new System.Drawing.Size(276, 32);
+ this.layItem2.Size = new System.Drawing.Size(271, 28);
this.layItem2.Text = "閲囪喘閮ㄩ棬";
this.layItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1063,7 +1005,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 371);
+ this.tabMx.Size = new System.Drawing.Size(1126, 392);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1072,7 +1014,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 339);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 360);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
@@ -1084,7 +1026,7 @@
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.rptCk});
- this.gcMx1.Size = new System.Drawing.Size(1124, 339);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 360);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1392,6 +1334,50 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_returnMethod;
+ this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem5.Text = "閫�鏂欐柟寮�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_returnType;
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem6.Text = "閫�鏂欏師鍥�";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_remark;
+ this.layoutControlItem7.Location = new System.Drawing.Point(271, 56);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem7.Text = "鐢宠澶囨敞";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_isOut;
+ this.layoutControlItem8.Location = new System.Drawing.Point(542, 56);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem8.Text = "濮斿鏍囪瘑";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem8.TextVisible = false;
+ //
// Frm_MesCgthSq
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1439,9 +1425,6 @@
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
@@ -1450,7 +1433,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
@@ -1463,6 +1445,10 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptCk)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
this.ResumeLayout(false);
}
@@ -1485,7 +1471,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod;
private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private UserControls.Data.UcPageBar pageBar1;
@@ -1506,9 +1491,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraEditors.CheckEdit txt_isOut;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.CheckEdit txt_status;
private DevExpress.XtraEditors.CheckEdit txt_isFinish;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
@@ -1554,7 +1536,6 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptCk;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraEditors.RadioGroup txt_fHasLinkRad;
private UserControl.UcLookDepartment txt_fPurchaseDeptId;
private UserControl.UcLookOrg txt_fRequireOrgId;
@@ -1564,5 +1545,9 @@
private DevExpress.XtraLayout.LayoutControlItem layItem1;
private DevExpress.XtraLayout.LayoutControlItem layItem4;
private DevExpress.XtraLayout.LayoutControlItem layItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index abc60a4..c7a3bc0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -515,7 +515,7 @@
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 6;
+ this.gv_lotNo.VisibleIndex = 3;
this.gv_lotNo.Width = 120;
//
// gv_lifnr
@@ -553,8 +553,6 @@
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 = 8;
this.gv_itemId.Width = 30;
//
// gv_itemNo
@@ -567,7 +565,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 9;
+ this.gv_itemNo.VisibleIndex = 8;
this.gv_itemNo.Width = 136;
//
// gv_boardStyle
@@ -580,7 +578,7 @@
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 10;
+ this.gv_boardStyle.VisibleIndex = 9;
this.gv_boardStyle.Width = 164;
//
// gridColumn14
@@ -591,7 +589,7 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 11;
+ this.gridColumn14.VisibleIndex = 10;
this.gridColumn14.Width = 200;
//
// gv_fbatchQty
@@ -604,7 +602,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_fcheckResu
@@ -617,7 +615,7 @@
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 4;
+ this.gv_fcheckResu.VisibleIndex = 5;
this.gv_fcheckResu.Width = 50;
//
// gv_fcovertQty
@@ -642,7 +640,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 13;
+ this.gv_remarks.VisibleIndex = 12;
this.gv_remarks.Width = 100;
//
// gv_fcheckBy
@@ -655,7 +653,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 14;
+ this.gv_fcheckBy.VisibleIndex = 13;
this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
@@ -668,7 +666,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 16;
+ this.gv_fcheckDate.VisibleIndex = 15;
this.gv_fcheckDate.Width = 182;
//
// gv_createBy
@@ -681,7 +679,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 15;
+ this.gv_createBy.VisibleIndex = 14;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -691,7 +689,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 17;
+ this.gridColumn15.VisibleIndex = 16;
this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
@@ -704,7 +702,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 18;
+ this.gv_lastupdateBy.VisibleIndex = 17;
this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
@@ -717,7 +715,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 19;
+ this.gv_lastupdateDate.VisibleIndex = 18;
this.gv_lastupdateDate.Width = 120;
//
// gv_fngHandle
@@ -730,7 +728,7 @@
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 5;
+ this.gv_fngHandle.VisibleIndex = 6;
this.gv_fngHandle.Width = 100;
//
// bandedGridColumn1
@@ -741,7 +739,7 @@
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 20;
+ this.bandedGridColumn1.VisibleIndex = 19;
this.bandedGridColumn1.Width = 250;
//
// gridColumn18
@@ -751,7 +749,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 21;
+ this.gridColumn18.VisibleIndex = 20;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -761,7 +759,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 22;
+ this.gridColumn19.VisibleIndex = 21;
this.gridColumn19.Width = 94;
//
// gridColumn17
@@ -779,7 +777,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 23;
+ this.gridColumn23.VisibleIndex = 22;
this.gridColumn23.Width = 94;
//
// gridColumn30
@@ -798,7 +796,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.VisibleIndex = 4;
this.gridColumn5.Width = 94;
//
// gridColumn6
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 6917f0c..e5fee83 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -62,6 +62,7 @@
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
btnYcReport.Click += BtnYcReport_Click;
+ #region 浜旀閲嶉噺
//鍏抽棴鏃堕噴鏀総imer
this.Disposed += (s, e) =>
{
@@ -149,6 +150,8 @@
_setWeigth(99, "");
};
+ #endregion
+
}
/// <summary>
/// 鎻愪氦绉伴噸
@@ -258,7 +261,7 @@
string strGuid = lbGuid.Text.Trim();
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -280,7 +283,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -293,7 +296,7 @@
int intHandle = this.gvMx1.FocusedRowHandle;
if (intHandle < 0)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛氳閫夋嫨妫�楠岄」鐩紒");
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛氳閫夋嫨妫�楠岄」鐩紒");
return;
}
if (e.KeyCode == Keys.Enter)
@@ -342,7 +345,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
@@ -505,7 +508,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -533,7 +536,7 @@
toolBarMenu1.isSetBtn = false;
if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
txt_fngDesc.Focus();
return;
}
@@ -605,7 +608,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -621,7 +624,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -673,11 +676,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -733,7 +736,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index 41affff..216d718 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -266,7 +266,7 @@
toolBarMenu1.guidKey = rowGuid;
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵"))
@@ -280,9 +280,9 @@
{
var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -291,10 +291,12 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index e850eef..021522d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -287,7 +287,6 @@
{
array1.Add(a);
}
-
DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
if (dt1.Rows.Count > 0)
{
@@ -321,11 +320,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index bda50d5..1d1c252 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -793,7 +793,7 @@
this.txt_billNo.Location = new System.Drawing.Point(109, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(234, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(229, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
//
@@ -807,41 +807,41 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(780, 12);
+ this.txt_suppName.Location = new System.Drawing.Point(769, 12);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(235, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(229, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 231;
//
// txt_documentTypeTxt
//
- this.txt_documentTypeTxt.Location = new System.Drawing.Point(444, 12);
+ this.txt_documentTypeTxt.Location = new System.Drawing.Point(439, 12);
this.txt_documentTypeTxt.Name = "txt_documentTypeTxt";
- this.txt_documentTypeTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_documentTypeTxt.Size = new System.Drawing.Size(229, 24);
this.txt_documentTypeTxt.StyleController = this.layoutMx1;
this.txt_documentTypeTxt.TabIndex = 232;
//
// txt_suppNo
//
- this.txt_suppNo.Location = new System.Drawing.Point(780, 40);
+ this.txt_suppNo.Location = new System.Drawing.Point(769, 40);
this.txt_suppNo.Name = "txt_suppNo";
- this.txt_suppNo.Size = new System.Drawing.Size(235, 24);
+ this.txt_suppNo.Size = new System.Drawing.Size(229, 24);
this.txt_suppNo.StyleController = this.layoutMx1;
this.txt_suppNo.TabIndex = 233;
//
// txt_closeStatusTxt
//
- this.txt_closeStatusTxt.Location = new System.Drawing.Point(1116, 40);
+ this.txt_closeStatusTxt.Location = new System.Drawing.Point(1099, 40);
this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
- this.txt_closeStatusTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_closeStatusTxt.Size = new System.Drawing.Size(231, 24);
this.txt_closeStatusTxt.StyleController = this.layoutMx1;
this.txt_closeStatusTxt.TabIndex = 234;
//
// txt_cancellationStatusTxt
//
- this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1116, 68);
+ this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1099, 68);
this.txt_cancellationStatusTxt.Name = "txt_cancellationStatusTxt";
- this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(231, 24);
this.txt_cancellationStatusTxt.StyleController = this.layoutMx1;
this.txt_cancellationStatusTxt.TabIndex = 235;
//
@@ -849,39 +849,39 @@
//
this.txt_dptName.Location = new System.Drawing.Point(109, 40);
this.txt_dptName.Name = "txt_dptName";
- this.txt_dptName.Size = new System.Drawing.Size(234, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(229, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 236;
//
// txt_purchaseDate
//
- this.txt_purchaseDate.Location = new System.Drawing.Point(444, 40);
+ this.txt_purchaseDate.Location = new System.Drawing.Point(439, 40);
this.txt_purchaseDate.Name = "txt_purchaseDate";
- this.txt_purchaseDate.Size = new System.Drawing.Size(235, 24);
+ this.txt_purchaseDate.Size = new System.Drawing.Size(229, 24);
this.txt_purchaseDate.StyleController = this.layoutMx1;
this.txt_purchaseDate.TabIndex = 237;
//
// txt_docStusTxt
//
- this.txt_docStusTxt.Location = new System.Drawing.Point(1116, 12);
+ this.txt_docStusTxt.Location = new System.Drawing.Point(1099, 12);
this.txt_docStusTxt.Name = "txt_docStusTxt";
- this.txt_docStusTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_docStusTxt.Size = new System.Drawing.Size(231, 24);
this.txt_docStusTxt.StyleController = this.layoutMx1;
this.txt_docStusTxt.TabIndex = 238;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(780, 68);
+ this.txt_createDate.Location = new System.Drawing.Point(769, 68);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(235, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(229, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 239;
//
// txt_erpCheckDate
//
- this.txt_erpCheckDate.Location = new System.Drawing.Point(444, 68);
+ this.txt_erpCheckDate.Location = new System.Drawing.Point(439, 68);
this.txt_erpCheckDate.Name = "txt_erpCheckDate";
- this.txt_erpCheckDate.Size = new System.Drawing.Size(235, 24);
+ this.txt_erpCheckDate.Size = new System.Drawing.Size(229, 24);
this.txt_erpCheckDate.StyleController = this.layoutMx1;
this.txt_erpCheckDate.TabIndex = 240;
//
@@ -889,7 +889,7 @@
//
this.txt_erpCheckBy.Location = new System.Drawing.Point(109, 68);
this.txt_erpCheckBy.Name = "txt_erpCheckBy";
- this.txt_erpCheckBy.Size = new System.Drawing.Size(234, 24);
+ this.txt_erpCheckBy.Size = new System.Drawing.Size(229, 24);
this.txt_erpCheckBy.StyleController = this.layoutMx1;
this.txt_erpCheckBy.TabIndex = 241;
//
@@ -956,7 +956,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1363, 104);
+ this.Root.Size = new System.Drawing.Size(1342, 104);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -964,38 +964,38 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(335, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem1.Text = "閲囪喘鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_documentTypeTxt;
- this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem5.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_suppName;
- this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_suppNo;
- this.layoutControlItem6.Location = new System.Drawing.Point(671, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(660, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem6.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1005,72 +1005,72 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(335, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem9.Text = "閲囪喘閮ㄩ棬";
this.layoutControlItem9.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_purchaseDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(335, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(330, 28);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem10.Text = "閲囪喘鏃ユ湡";
this.layoutControlItem10.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_cancellationStatusTxt;
- this.layoutControlItem8.Location = new System.Drawing.Point(1007, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(990, 56);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem8.Text = "浣滃簾鐘舵��";
this.layoutControlItem8.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_closeStatusTxt;
- this.layoutControlItem7.Location = new System.Drawing.Point(1007, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(990, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem7.Text = "鍏抽棴鐘舵��";
this.layoutControlItem7.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_docStusTxt;
- this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem11.Text = "鍗曟嵁鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(671, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(660, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem12.Text = "鍚屾鏃堕棿";
this.layoutControlItem12.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_erpCheckDate;
- this.layoutControlItem13.Location = new System.Drawing.Point(335, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(330, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem13.Text = "ERP瀹℃牳鏃堕棿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1080,7 +1080,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(335, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem14.Text = "ERP瀹℃牳浜�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1518,7 +1518,7 @@
this.gridColumn20.AppearanceCell.Options.UseForeColor = true;
this.gridColumn20.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
this.gridColumn20.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn20.Caption = "绱瀹炴敹閲�";
+ this.gridColumn20.Caption = "绱瀹炲叆搴�";
this.gridColumn20.FieldName = "qty9";
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 4488ac2..bd2410e 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -454,6 +454,7 @@
lst.Add(btnLianBan.Name);
// lst.Add(btnEsc.Name);
lst.Add(btnGx.Name);
+ lst.Add(btnWeight.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
--
Gitblit v1.9.3