From ae28c33700e413d5acf60d1e48bbc9870bdef5a5 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 15 八月 2025 11:27:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx | 32
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs | 3
DevApp/Gs.DevApp/App.config | 3
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs | 11
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 6
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 802 ++++++-------
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs | 8
DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs | 39
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs | 45
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 114 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 147 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | 140 +-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 104
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 146 +-
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs | 10
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 24
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 1
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs | 33
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 23
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.resx | 0
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 2
DevApp/Gs.DevApp/Gs.DevApp.csproj | 10
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.cs | 4
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs | 21
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 3
DevApp/Gs.DevApp/UserControl/UcDictionary.cs | 3
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 16
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 29
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs | 14
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | 7
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs | 3
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs | 862 ++++-----------
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs | 34
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 430 ++++---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 6
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs | 22
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 79
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 122 --
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 29
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 2
43 files changed, 1,507 insertions(+), 1,894 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index de7edef..973ebc5 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -44,7 +44,8 @@
<add key="Version" value="0.1" />
<add key="IsAutoUpdater" value="0" />
<add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" />
- <add key="ToastSeconds" value="3" />
+ <add key="ToastSeconds" value="5" />
+ <add key="AsyncSeconds" value="2" />
</appSettings>
<userSettings>
<Gs.DevApp.Properties.Settings>
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 452fc35..8da868d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -63,18 +63,17 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_remark5 = new Gs.DevApp.UserControl.UcDictionary();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_isFkc = new DevExpress.XtraEditors.TextEdit();
this.txt_isNg = new DevExpress.XtraEditors.TextEdit();
this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
this.txt_zuid = new DevExpress.XtraEditors.TextEdit();
this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_description = new DevExpress.XtraEditors.TextEdit();
this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -82,11 +81,11 @@
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -125,7 +124,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
@@ -133,11 +131,11 @@
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -236,8 +234,7 @@
this.gridColumn3,
this.gridColumn8,
this.gridColumn9,
- this.gridColumn10,
- this.gridColumn12});
+ this.gridColumn10});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -286,8 +283,8 @@
// gv_depottype
//
this.gv_depottype.AppearanceCell.Options.UseFont = true;
- this.gv_depottype.Caption = "浠撳簱灞炴��";
- this.gv_depottype.FieldName = "depottype";
+ this.gv_depottype.Caption = "Mes浠撳簱灞炴��";
+ this.gv_depottype.FieldName = "remark5";
this.gv_depottype.MinWidth = 50;
this.gv_depottype.Name = "gv_depottype";
this.gv_depottype.OptionsColumn.AllowEdit = false;
@@ -330,8 +327,6 @@
this.gv_isFkc.Name = "gv_isFkc";
this.gv_isFkc.OptionsColumn.AllowEdit = false;
this.gv_isFkc.Tag = "query_a.is_fkc";
- this.gv_isFkc.Visible = true;
- this.gv_isFkc.VisibleIndex = 5;
this.gv_isFkc.Width = 60;
//
// gridColumn2
@@ -343,7 +338,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "query_a.zuid";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 6;
+ this.gridColumn2.VisibleIndex = 5;
this.gridColumn2.Width = 50;
//
// gridColumn6
@@ -354,7 +349,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.SUPPLIER_ID";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 70;
//
// gridColumn5
@@ -365,7 +360,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "query_a.Client_Id";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 8;
+ this.gridColumn5.VisibleIndex = 7;
this.gridColumn5.Width = 60;
//
// gridColumn4
@@ -376,7 +371,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "query_a.department";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 9;
+ this.gridColumn4.VisibleIndex = 8;
this.gridColumn4.Width = 60;
//
// gridColumn7
@@ -387,7 +382,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "query_a.Phone";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 10;
+ this.gridColumn7.VisibleIndex = 9;
this.gridColumn7.Width = 60;
//
// gridColumn3
@@ -398,7 +393,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Tag = "query_a.lastupdate_date";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 14;
+ this.gridColumn3.VisibleIndex = 12;
this.gridColumn3.Width = 180;
//
// gridColumn8
@@ -416,7 +411,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 11;
+ this.gridColumn9.VisibleIndex = 10;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -426,18 +421,8 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 13;
+ this.gridColumn10.VisibleIndex = 11;
this.gridColumn10.Width = 94;
- //
- // gridColumn12
- //
- this.gridColumn12.Caption = "鐗规畩浠�";
- this.gridColumn12.FieldName = "remark5";
- this.gridColumn12.MinWidth = 25;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 12;
- this.gridColumn12.Width = 94;
//
// pageBar1
//
@@ -476,17 +461,18 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1264, 570);
+ this.splitMx1.SplitterPosition = 76;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_remark5);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_isFkc);
this.layoutMx1.Controls.Add(this.txt_isNg);
this.layoutMx1.Controls.Add(this.txt_depotCode);
this.layoutMx1.Controls.Add(this.txt_zuid);
this.layoutMx1.Controls.Add(this.txt_depotName);
- this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_description);
this.layoutMx1.Controls.Add(this.txt_depottype);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -497,9 +483,19 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(460, 453, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1264, 100);
+ this.layoutMx1.Size = new System.Drawing.Size(1264, 76);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_remark5
+ //
+ this.txt_remark5.BtnTxt = "浠撳簱灞炴��";
+ this.txt_remark5.Location = new System.Drawing.Point(945, 12);
+ this.txt_remark5.Name = "txt_remark5";
+ this.txt_remark5.Size = new System.Drawing.Size(307, 52);
+ this.txt_remark5.TabIndex = 292;
+ this.txt_remark5.TextTxt = "";
+ this.txt_remark5.WhereTxt = " a.s_type=\'浠撳簱灞炴�' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
//
// lbGuid
//
@@ -512,7 +508,7 @@
//
// txt_isFkc
//
- this.txt_isFkc.Location = new System.Drawing.Point(1032, 12);
+ this.txt_isFkc.Location = new System.Drawing.Point(721, 12);
this.txt_isFkc.Name = "txt_isFkc";
this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
this.txt_isFkc.Size = new System.Drawing.Size(220, 24);
@@ -522,7 +518,7 @@
//
// txt_isNg
//
- this.txt_isNg.Location = new System.Drawing.Point(1032, 52);
+ this.txt_isNg.Location = new System.Drawing.Point(721, 40);
this.txt_isNg.Name = "txt_isNg";
this.txt_isNg.Properties.Appearance.Options.UseFont = true;
this.txt_isNg.Size = new System.Drawing.Size(220, 24);
@@ -560,19 +556,9 @@
this.txt_depotName.TabIndex = 216;
this.txt_depotName.Tag = "readonly";
//
- // txt_createBy
- //
- this.txt_createBy.Location = new System.Drawing.Point(721, 12);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(220, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 219;
- this.txt_createBy.Tag = "readonly";
- //
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(99, 52);
+ this.txt_description.Location = new System.Drawing.Point(99, 40);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Options.UseFont = true;
this.txt_description.Size = new System.Drawing.Size(220, 24);
@@ -582,7 +568,7 @@
//
// txt_depottype
//
- this.txt_depottype.Location = new System.Drawing.Point(410, 52);
+ this.txt_depottype.Location = new System.Drawing.Point(410, 40);
this.txt_depottype.Name = "txt_depottype";
this.txt_depottype.Properties.Appearance.Options.UseFont = true;
this.txt_depottype.Size = new System.Drawing.Size(220, 24);
@@ -620,11 +606,11 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
this.layoutControlItem2,
- this.layoutControlItem3,
this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem7,
- this.layoutControlItem8});
+ this.layoutControlItem8,
+ this.layoutControlItem10});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -647,7 +633,7 @@
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2});
- this.Root.Size = new System.Drawing.Size(1264, 100);
+ this.Root.Size = new System.Drawing.Size(1264, 76);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -655,7 +641,7 @@
this.layoutControlItem1.Control = this.txt_depotCode;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem1.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem1.Text = "浠撳簱缂栫爜";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
@@ -665,62 +651,64 @@
this.layoutControlItem2.Location = new System.Drawing.Point(311, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem2.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem2.Text = "浠撳簱鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(622, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(311, 40);
- this.layoutControlItem3.Text = "浠撳簱璐熻矗浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_description;
this.layoutControlItem4.CustomizationFormText = "浠撳簱澶囨敞";
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 40);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem4.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem4.Text = "浠撳簱澶囨敞";
this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_depottype;
- this.layoutControlItem5.Location = new System.Drawing.Point(311, 40);
+ this.layoutControlItem5.Location = new System.Drawing.Point(311, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem5.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem5.Text = "浠撳簱绫诲瀷";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_isFkc;
- this.layoutControlItem7.Location = new System.Drawing.Point(933, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(622, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem7.Text = "鍏佽璐熷簱瀛�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_isNg;
- this.layoutControlItem8.Location = new System.Drawing.Point(933, 40);
+ this.layoutControlItem8.Location = new System.Drawing.Point(622, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(311, 40);
+ this.layoutControlItem8.Size = new System.Drawing.Size(311, 28);
this.layoutControlItem8.Text = "绂佺敤鐘舵��";
this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_remark5;
+ this.layoutControlItem10.Location = new System.Drawing.Point(933, 0);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(311, 56);
+ this.layoutControlItem10.Text = "浠撳簱灞炴��";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem10.TextVisible = false;
//
// tabMx
//
@@ -728,7 +716,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(1264, 458);
+ this.tabMx.Size = new System.Drawing.Size(1264, 482);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -737,7 +725,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1262, 426);
+ this.tabMxPage1.Size = new System.Drawing.Size(1262, 450);
this.tabMxPage1.Text = "浠撲綅鍒楄〃";
//
// gcMx1
@@ -748,7 +736,7 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1262, 426);
+ this.gcMx1.Size = new System.Drawing.Size(1262, 450);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -909,7 +897,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
@@ -917,11 +904,11 @@
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -960,17 +947,14 @@
private DevExpress.XtraEditors.TextEdit txt_isFkc;
private DevExpress.XtraEditors.TextEdit txt_zuid;
private DevExpress.XtraEditors.TextEdit txt_depottype;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_description;
private DevExpress.XtraEditors.TextEdit txt_depotName;
private DevExpress.XtraEditors.TextEdit txt_depotCode;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -988,9 +972,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraEditors.TextEdit txt_isNg;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private UserControl.UcDictionary txt_remark5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 43a7424..1805406 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -203,6 +203,7 @@
DepotCode = txt_depotCode.Text,
DepotName = txt_depotName.Text,
Description = txt_description.Text,
+ Remark5=txt_remark5.TextTxt.Trim(),
list = lst
};
try
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index 34fefd9..1f67336 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -102,7 +102,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_lineNo, gridView1, "lineNo");
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -116,12 +116,14 @@
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
+ else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -176,6 +178,8 @@
{
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_dptId.IsReadly = true;
}
/// <summary>
/// 鏂板浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs
index 854d8e2..50747af 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs
@@ -40,6 +40,7 @@
this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_del = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -65,7 +66,8 @@
this.gv_operationTime,
this.gv_userName,
this.gv_operationTable,
- this.gv_del});
+ this.gv_del,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -82,7 +84,7 @@
this.gv_operationTime.OptionsColumn.ReadOnly = true;
this.gv_operationTime.ToolTip = "query_a.OPERATION_TIME";
this.gv_operationTime.Visible = true;
- this.gv_operationTime.VisibleIndex = 2;
+ this.gv_operationTime.VisibleIndex = 3;
this.gv_operationTime.Width = 390;
//
// gv_userName
@@ -95,7 +97,7 @@
this.gv_userName.OptionsColumn.ReadOnly = true;
this.gv_userName.Tag = "query_a.USER_NAME";
this.gv_userName.Visible = true;
- this.gv_userName.VisibleIndex = 1;
+ this.gv_userName.VisibleIndex = 2;
this.gv_userName.Width = 310;
//
// gv_operationTable
@@ -118,7 +120,7 @@
this.gv_del.MinWidth = 25;
this.gv_del.Name = "gv_del";
this.gv_del.Visible = true;
- this.gv_del.VisibleIndex = 3;
+ this.gv_del.VisibleIndex = 4;
this.gv_del.Width = 94;
//
// repositoryItemButtonEdit1
@@ -131,6 +133,16 @@
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "渚涘簲鍟咺D";
+ this.gridColumn1.FieldName = "id";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.Width = 94;
//
// Frm_SupplierSrm
//
@@ -161,5 +173,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
private DevExpress.XtraGrid.Columns.GridColumn gv_del;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
index 531952a..4c06af7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -350,7 +350,7 @@
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 4;
+ this.gv_outDate.VisibleIndex = 7;
this.gv_outDate.Width = 120;
//
// gv_outType
@@ -363,7 +363,7 @@
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
- this.gv_outType.VisibleIndex = 5;
+ this.gv_outType.VisibleIndex = 8;
this.gv_outType.Width = 94;
//
// gv_checkUser
@@ -376,7 +376,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 6;
+ this.gv_checkUser.VisibleIndex = 9;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -389,7 +389,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 7;
+ this.gv_checkDate.VisibleIndex = 10;
this.gv_checkDate.Width = 120;
//
// gv_receiver
@@ -402,7 +402,7 @@
this.gv_receiver.OptionsColumn.AllowEdit = false;
this.gv_receiver.Tag = "query_a.receiver";
this.gv_receiver.Visible = true;
- this.gv_receiver.VisibleIndex = 8;
+ this.gv_receiver.VisibleIndex = 11;
this.gv_receiver.Width = 94;
//
// gv_createBy
@@ -415,7 +415,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 9;
+ this.gv_createBy.VisibleIndex = 12;
this.gv_createBy.Width = 94;
//
// gv_createDate
@@ -428,7 +428,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 10;
+ this.gv_createDate.VisibleIndex = 13;
this.gv_createDate.Width = 94;
//
// gv_remark
@@ -441,7 +441,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 11;
+ this.gv_remark.VisibleIndex = 14;
this.gv_remark.Width = 94;
//
// gv_workNo
@@ -454,7 +454,7 @@
this.gv_workNo.OptionsColumn.AllowEdit = false;
this.gv_workNo.Tag = "query_a.work_no";
this.gv_workNo.Visible = true;
- this.gv_workNo.VisibleIndex = 12;
+ this.gv_workNo.VisibleIndex = 4;
this.gv_workNo.Width = 100;
//
// gv_pbillNo
@@ -467,7 +467,7 @@
this.gv_pbillNo.OptionsColumn.AllowEdit = false;
this.gv_pbillNo.Tag = "query_a.pbill_no";
this.gv_pbillNo.Visible = true;
- this.gv_pbillNo.VisibleIndex = 13;
+ this.gv_pbillNo.VisibleIndex = 6;
this.gv_pbillNo.Width = 94;
//
// gridColumn7
@@ -477,7 +477,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 14;
+ this.gridColumn7.VisibleIndex = 5;
this.gridColumn7.Width = 94;
//
// gridColumn8
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index a24636d..04b4705 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -373,7 +373,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 94;
//
// gv_qt020
@@ -386,7 +386,7 @@
this.gv_qt020.OptionsColumn.AllowEdit = false;
this.gv_qt020.Tag = "query_a.qt020";
this.gv_qt020.Visible = true;
- this.gv_qt020.VisibleIndex = 6;
+ this.gv_qt020.VisibleIndex = 7;
this.gv_qt020.Width = 94;
//
// gridColumn4
@@ -396,7 +396,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 7;
+ this.gridColumn4.VisibleIndex = 13;
this.gridColumn4.Width = 94;
//
// gv_qt005
@@ -435,7 +435,7 @@
this.gv_qt008.OptionsColumn.AllowEdit = false;
this.gv_qt008.Tag = "query_a.qt008";
this.gv_qt008.Visible = true;
- this.gv_qt008.VisibleIndex = 10;
+ this.gv_qt008.VisibleIndex = 5;
this.gv_qt008.Width = 94;
//
// gv_qt010
@@ -448,7 +448,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 11;
+ this.gv_qt010.VisibleIndex = 10;
this.gv_qt010.Width = 94;
//
// gv_qt016
@@ -461,7 +461,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 12;
+ this.gv_qt016.VisibleIndex = 11;
this.gv_qt016.Width = 94;
//
// gv_qt002
@@ -474,7 +474,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 13;
+ this.gv_qt002.VisibleIndex = 12;
this.gv_qt002.Width = 94;
//
// gridColumn5
@@ -1485,7 +1485,7 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(952, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(971, 27);
this.picCheckBox.Name = "picCheckBox";
this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index f0d6a28..ea0ab06 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -279,7 +279,6 @@
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
ucLookHuoZhu1.Enabled = true;
-
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
@@ -317,12 +316,12 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璐т富锛�");
return;
}
- if (txt_qt019.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- txt_qt019.Focus();
- return;
- }
+ //if (txt_qt019.SelectedIndex <= 0)
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ // txt_qt019.Focus();
+ // return;
+ //}
if (string.IsNullOrEmpty(inLyOrg))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
@@ -675,10 +674,18 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
+ else
+ {
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ }
+
}
else
MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -775,7 +782,5 @@
};
frm.ShowDialog();
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
index ded1164..5b97f88 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
@@ -356,7 +356,7 @@
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 3;
+ this.gv_outDate.VisibleIndex = 5;
this.gv_outDate.Width = 120;
//
// gv_outType
@@ -369,7 +369,7 @@
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
- this.gv_outType.VisibleIndex = 4;
+ this.gv_outType.VisibleIndex = 6;
this.gv_outType.Width = 94;
//
// gv_checkUser
@@ -382,7 +382,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 5;
+ this.gv_checkUser.VisibleIndex = 7;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -395,7 +395,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 6;
+ this.gv_checkDate.VisibleIndex = 8;
this.gv_checkDate.Width = 120;
//
// gv_receiver
@@ -408,7 +408,7 @@
this.gv_receiver.OptionsColumn.AllowEdit = false;
this.gv_receiver.Tag = "query_a.receiver";
this.gv_receiver.Visible = true;
- this.gv_receiver.VisibleIndex = 7;
+ this.gv_receiver.VisibleIndex = 9;
this.gv_receiver.Width = 94;
//
// gv_outPart
@@ -421,7 +421,7 @@
this.gv_outPart.OptionsColumn.AllowEdit = false;
this.gv_outPart.Tag = "query_a.out_part";
this.gv_outPart.Visible = true;
- this.gv_outPart.VisibleIndex = 8;
+ this.gv_outPart.VisibleIndex = 10;
this.gv_outPart.Width = 94;
//
// gv_createBy
@@ -434,7 +434,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 9;
+ this.gv_createBy.VisibleIndex = 11;
this.gv_createBy.Width = 94;
//
// gv_createDate
@@ -447,7 +447,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 10;
+ this.gv_createDate.VisibleIndex = 12;
this.gv_createDate.Width = 94;
//
// gv_remark
@@ -460,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 = 11;
+ this.gv_remark.VisibleIndex = 13;
this.gv_remark.Width = 94;
//
// gridColumn1
@@ -478,7 +478,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 12;
+ this.gridColumn6.VisibleIndex = 14;
this.gridColumn6.Width = 94;
//
// gridColumn8
@@ -488,7 +488,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 13;
+ this.gridColumn8.VisibleIndex = 15;
this.gridColumn8.Width = 94;
//
// gridColumn10
@@ -498,7 +498,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 14;
+ this.gridColumn10.VisibleIndex = 16;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -508,7 +508,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 15;
+ this.gridColumn11.VisibleIndex = 17;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -518,7 +518,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 16;
+ this.gridColumn12.VisibleIndex = 18;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -528,7 +528,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 17;
+ this.gridColumn13.VisibleIndex = 19;
this.gridColumn13.Width = 94;
//
// gridColumn7
@@ -538,7 +538,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 18;
+ this.gridColumn7.VisibleIndex = 3;
this.gridColumn7.Width = 94;
//
// gridColumn14
@@ -548,7 +548,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 19;
+ this.gridColumn14.VisibleIndex = 4;
this.gridColumn14.Width = 94;
//
// pageBar1
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
index 1c9c173..7923e7a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
@@ -188,7 +188,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
private void getModel(string strGuid)
@@ -198,7 +198,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -256,50 +256,13 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
- private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
- gvMx2.CloseEditor();
- gvMx2.UpdateCurrentRow();
- var rowhandle = gvMx2.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gvMx2.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- if (string.IsNullOrEmpty(mxGuid))
- {
- gvMx2.DeleteRow(rowhandle);
- return;
- }
- var strJson = "";
- var lst = new List<string>();
- lst.Add(mxGuid);
- try
- {
- strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModelMx2",
- JsonConvert.SerializeObject(lst));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
-
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
index acc8db9..57d79c5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
@@ -391,7 +391,7 @@
this.gv_reason.OptionsColumn.AllowEdit = false;
this.gv_reason.Tag = "query_a.reason";
this.gv_reason.Visible = true;
- this.gv_reason.VisibleIndex = 11;
+ this.gv_reason.VisibleIndex = 12;
this.gv_reason.Width = 94;
//
// gv_fmrmode
@@ -403,7 +403,7 @@
this.gv_fmrmode.OptionsColumn.AllowEdit = false;
this.gv_fmrmode.Tag = "query_a.fmrmode";
this.gv_fmrmode.Visible = true;
- this.gv_fmrmode.VisibleIndex = 12;
+ this.gv_fmrmode.VisibleIndex = 11;
this.gv_fmrmode.Width = 94;
//
// gridColumn19
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs
index eeb3986..eb17e59 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs
@@ -168,7 +168,8 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 27182c5..921a4dd 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -118,39 +118,43 @@
this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
this.txt_lineId = new DevExpress.XtraEditors.TextEdit();
this.txt_kbSl = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.txt_itemId1111 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_boxQty11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_boxQty11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -216,10 +220,6 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
- this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -270,39 +270,43 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -346,10 +350,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -563,8 +563,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 = 7;
this.gv_itemId.Width = 30;
//
// gv_itemNo
@@ -577,7 +575,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 = 136;
//
// gv_boardStyle
@@ -590,7 +588,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 = 164;
//
// gridColumn14
@@ -601,7 +599,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_fcovertQty
@@ -615,7 +613,7 @@
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 11;
+ this.gv_fcovertQty.VisibleIndex = 10;
this.gv_fcovertQty.Width = 60;
//
// gv_fbatchQty
@@ -628,7 +626,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_remarks
@@ -641,7 +639,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
@@ -654,7 +652,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
@@ -667,7 +665,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 15;
+ this.gv_fcheckDate.VisibleIndex = 14;
this.gv_fcheckDate.Width = 182;
//
// gv_createBy
@@ -680,7 +678,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 16;
+ this.gv_createBy.VisibleIndex = 15;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -690,7 +688,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
@@ -703,7 +701,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
@@ -716,7 +714,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;
//
// gridColumn18
@@ -726,7 +724,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 20;
+ this.gridColumn18.VisibleIndex = 19;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -736,7 +734,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 21;
+ this.gridColumn19.VisibleIndex = 20;
this.gridColumn19.Width = 94;
//
// gridColumn30
@@ -753,8 +751,6 @@
this.gridColumn13.FieldName = "lineId";
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 22;
this.gridColumn13.Width = 94;
//
// gridColumn17
@@ -771,8 +767,6 @@
this.gridColumn7.FieldName = "djType";
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 23;
this.gridColumn7.Width = 94;
//
// pageBar1
@@ -858,7 +852,10 @@
this.layoutControlItem21,
this.txt_itemId1111,
this.layoutControlItem4,
- this.layoutControlItem29});
+ this.layoutControlItem29,
+ this.layoutControlItem23,
+ this.layoutControlItem31,
+ this.layoutControlItem33});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(789, 440, 812, 500);
@@ -872,15 +869,15 @@
this.txt_fzrId.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fzrId.Appearance.Options.UseForeColor = true;
this.txt_fzrId.IsReadly = false;
- this.txt_fzrId.Location = new System.Drawing.Point(1059, 152);
+ this.txt_fzrId.Location = new System.Drawing.Point(1074, 152);
this.txt_fzrId.Name = "txt_fzrId";
- this.txt_fzrId.Size = new System.Drawing.Size(250, 24);
+ this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
this.txt_fzrId.TabIndex = 839;
//
// txt_zrType
//
this.txt_zrType.EditValue = "-璇烽�夋嫨-";
- this.txt_zrType.Location = new System.Drawing.Point(1059, 124);
+ this.txt_zrType.Location = new System.Drawing.Point(1074, 124);
this.txt_zrType.Name = "txt_zrType";
this.txt_zrType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -889,14 +886,14 @@
"1:鐢熶骇璐ｄ换",
"2:闈炵敓浜ц矗浠�"});
this.txt_zrType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_zrType.Size = new System.Drawing.Size(250, 24);
+ this.txt_zrType.Size = new System.Drawing.Size(256, 24);
this.txt_zrType.StyleController = this.layoutMx1;
this.txt_zrType.TabIndex = 838;
//
// txt_fngHandle
//
this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
- this.txt_fngHandle.Location = new System.Drawing.Point(1059, 96);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1074, 96);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -905,16 +902,16 @@
"1:杩斿伐"});
this.txt_fngHandle.Properties.NullText = "-璇烽�夋嫨-";
this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fngHandle.Size = new System.Drawing.Size(250, 24);
+ this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 837;
//
// txt_msg
//
this.txt_msg.BtnTxt = "杩濊绫诲埆";
- this.txt_msg.Location = new System.Drawing.Point(987, 12);
+ this.txt_msg.Location = new System.Drawing.Point(1002, 12);
this.txt_msg.Name = "txt_msg";
- this.txt_msg.Size = new System.Drawing.Size(322, 80);
+ this.txt_msg.Size = new System.Drawing.Size(328, 80);
this.txt_msg.TabIndex = 814;
this.txt_msg.TextTxt = "";
this.txt_msg.WhereTxt = " a.s_type=\'杩濊绫诲埆\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -922,9 +919,9 @@
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(409, 96);
+ this.txt_suppId.Location = new System.Drawing.Point(414, 96);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(249, 24);
+ this.txt_suppId.Size = new System.Drawing.Size(254, 24);
this.txt_suppId.TabIndex = 811;
//
// lbGuid
@@ -938,126 +935,126 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(409, 208);
+ this.txt_remarks.Location = new System.Drawing.Point(84, 208);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(249, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(254, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(734, 124);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(744, 68);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(409, 12);
+ this.txt_releaseNo.Location = new System.Drawing.Point(414, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(249, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(734, 152);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(744, 96);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo1
//
- this.txt_lotNo1.Location = new System.Drawing.Point(409, 124);
+ this.txt_lotNo1.Location = new System.Drawing.Point(414, 124);
this.txt_lotNo1.Name = "txt_lotNo1";
this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo1.Size = new System.Drawing.Size(249, 24);
+ this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
this.txt_lotNo1.StyleController = this.layoutMx1;
this.txt_lotNo1.TabIndex = 262;
this.txt_lotNo1.Tag = "";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 152);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 124);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(249, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(84, 208);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 180);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(734, 68);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(744, 12);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(249, 24);
+ this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckBy.StyleController = this.layoutMx1;
this.txt_fcheckBy.TabIndex = 217;
this.txt_fcheckBy.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(409, 40);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(414, 40);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(734, 208);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(744, 152);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(249, 24);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(254, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
this.txt_fsubmitBy.TabIndex = 804;
this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(734, 180);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(744, 124);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(249, 24);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(254, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
this.txt_fsubmitDate.TabIndex = 805;
this.txt_fsubmitDate.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(987, 208);
+ this.txt_fsubmit.Location = new System.Drawing.Point(672, 180);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(322, 24);
+ this.txt_fsubmit.Size = new System.Drawing.Size(326, 24);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
//
// txt_fmanageNo
//
- this.txt_fmanageNo.Location = new System.Drawing.Point(409, 180);
+ this.txt_fmanageNo.Location = new System.Drawing.Point(414, 180);
this.txt_fmanageNo.Name = "txt_fmanageNo";
- this.txt_fmanageNo.Size = new System.Drawing.Size(249, 24);
+ this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24);
this.txt_fmanageNo.StyleController = this.layoutMx1;
this.txt_fmanageNo.TabIndex = 807;
this.txt_fmanageNo.Tag = "";
@@ -1073,21 +1070,20 @@
//
// txt_lifnr
//
- this.txt_lifnr.Location = new System.Drawing.Point(409, 68);
+ this.txt_lifnr.Location = new System.Drawing.Point(414, 68);
this.txt_lifnr.Name = "txt_lifnr";
- this.txt_lifnr.Size = new System.Drawing.Size(249, 24);
+ this.txt_lifnr.Size = new System.Drawing.Size(254, 24);
this.txt_lifnr.StyleController = this.layoutMx1;
this.txt_lifnr.TabIndex = 809;
//
// txt_djType
//
- this.txt_djType.EditValue = "-璇烽�夋嫨-";
- this.txt_djType.Location = new System.Drawing.Point(84, 12);
+ this.txt_djType.EditValue = "1:甯歌娴佺▼";
+ this.txt_djType.Location = new System.Drawing.Point(84, 10);
this.txt_djType.Name = "txt_djType";
this.txt_djType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_djType.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
"1:甯歌娴佺▼"});
this.txt_djType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_djType.Size = new System.Drawing.Size(249, 24);
@@ -1105,28 +1101,28 @@
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(734, 96);
+ this.txt_checkStates.Location = new System.Drawing.Point(744, 40);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
- this.txt_checkStates.Size = new System.Drawing.Size(249, 24);
+ this.txt_checkStates.Size = new System.Drawing.Size(254, 24);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 819;
this.txt_checkStates.Tag = "readonly";
//
// txt_epTag
//
- this.txt_epTag.Location = new System.Drawing.Point(409, 152);
+ this.txt_epTag.Location = new System.Drawing.Point(414, 152);
this.txt_epTag.Name = "txt_epTag";
this.txt_epTag.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_epTag.Size = new System.Drawing.Size(249, 24);
+ this.txt_epTag.Size = new System.Drawing.Size(254, 24);
this.txt_epTag.StyleController = this.layoutMx1;
this.txt_epTag.TabIndex = 820;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(734, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(734, 10);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Size = new System.Drawing.Size(249, 24);
this.txt_createBy.StyleController = this.layoutMx1;
@@ -1135,7 +1131,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(734, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(734, 38);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Size = new System.Drawing.Size(249, 24);
this.txt_createDate.StyleController = this.layoutMx1;
@@ -1144,39 +1140,39 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 180);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 152);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(249, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(254, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 825;
this.txt_itemName.Tag = "readonly";
//
// txt_kbList
//
- this.txt_kbList.Location = new System.Drawing.Point(84, 68);
+ this.txt_kbList.Location = new System.Drawing.Point(84, 40);
this.txt_kbList.Name = "txt_kbList";
this.txt_kbList.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_kbList.Size = new System.Drawing.Size(249, 24);
+ this.txt_kbList.Size = new System.Drawing.Size(254, 24);
this.txt_kbList.StyleController = this.layoutMx1;
this.txt_kbList.TabIndex = 830;
//
// txt_lotNo
//
this.txt_lotNo.EditValue = "";
- this.txt_lotNo.Location = new System.Drawing.Point(84, 40);
+ this.txt_lotNo.Location = new System.Drawing.Point(84, 12);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_lotNo.Size = new System.Drawing.Size(249, 24);
+ this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 831;
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(84, 124);
+ this.txt_lineName.Location = new System.Drawing.Point(84, 96);
this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Size = new System.Drawing.Size(249, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(254, 24);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 832;
this.txt_lineName.Tag = "readonly";
@@ -1201,12 +1197,24 @@
//
// txt_kbSl
//
- this.txt_kbSl.Location = new System.Drawing.Point(84, 96);
+ this.txt_kbSl.Location = new System.Drawing.Point(84, 68);
this.txt_kbSl.Name = "txt_kbSl";
- this.txt_kbSl.Size = new System.Drawing.Size(249, 24);
+ this.txt_kbSl.Size = new System.Drawing.Size(254, 24);
this.txt_kbSl.StyleController = this.layoutMx1;
this.txt_kbSl.TabIndex = 835;
this.txt_kbSl.Tag = "readonly";
+ //
+ // txt_fmrmode
+ //
+ this.txt_fmrmode.Location = new System.Drawing.Point(1074, 180);
+ this.txt_fmrmode.Name = "txt_fmrmode";
+ this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_fmrmode.Properties.NullText = "-璇烽�夋嫨-";
+ this.txt_fmrmode.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_fmrmode.Size = new System.Drawing.Size(256, 24);
+ this.txt_fmrmode.StyleController = this.layoutMx1;
+ this.txt_fmrmode.TabIndex = 840;
//
// layoutControlItem17
//
@@ -1253,40 +1261,78 @@
this.layoutControlItem4.Text = "绾垮埆ID";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.txt_workNo;
+ this.layoutControlItem29.Location = new System.Drawing.Point(990, 174);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem29.Size = new System.Drawing.Size(332, 29);
+ this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_djType;
+ this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_createBy;
+ this.layoutControlItem31.Location = new System.Drawing.Point(650, 0);
+ this.layoutControlItem31.Name = "layoutControlItem31";
+ this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem31.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem33
+ //
+ this.layoutControlItem33.Control = this.txt_createDate;
+ this.layoutControlItem33.Location = new System.Drawing.Point(650, 28);
+ this.layoutControlItem33.Name = "layoutControlItem33";
+ this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem33.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem31,
- this.layoutControlItem10,
- this.layoutControlItem32,
- this.layoutControlItem8,
- this.layoutControlItem33,
- this.layoutControlItem2,
- this.layoutControlItem6,
- this.layoutControlItem34,
- this.layoutControlItem5,
this.layoutControlItem1,
- this.layoutControlItem28,
- this.txt_boxQty11,
this.layoutControlItem9,
this.layoutControlItem22,
this.layoutControlItem24,
this.layoutControlItem3,
this.txt_epTagtxt,
this.layoutControlItem18,
- this.txt_lineName111,
- this.layoutControlItem30,
- this.layoutControlItem23,
this.layoutControlItem13,
this.layoutControlItem7,
this.layoutControlItem35,
- this.layoutControlItem16,
- this.layoutControlItem15,
this.layoutControlItem27,
this.layoutControlItem25,
+ this.layoutControlItem28,
+ this.txt_boxQty11,
+ this.layoutControlItem30,
+ this.txt_lineName111,
+ this.layoutControlItem5,
+ this.layoutControlItem34,
+ this.layoutControlItem6,
this.layoutControlItem12,
+ this.layoutControlItem8,
+ this.layoutControlItem32,
+ this.layoutControlItem10,
+ this.layoutControlItem2,
+ this.layoutControlItem16,
+ this.layoutControlItem15,
this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
@@ -1328,308 +1374,298 @@
rowDefinition6,
rowDefinition7,
rowDefinition8});
- this.Root.Size = new System.Drawing.Size(1321, 244);
+ this.Root.Size = new System.Drawing.Size(1342, 244);
this.Root.TextVisible = false;
- //
- // layoutControlItem31
- //
- this.layoutControlItem31.Control = this.txt_createBy;
- this.layoutControlItem31.Location = new System.Drawing.Point(650, 0);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem31.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(650, 112);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem32
- //
- this.layoutControlItem32.Control = this.txt_checkStates;
- this.layoutControlItem32.Location = new System.Drawing.Point(650, 84);
- this.layoutControlItem32.Name = "layoutControlItem32";
- this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(650, 56);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem33
- //
- this.layoutControlItem33.Control = this.txt_createDate;
- this.layoutControlItem33.Location = new System.Drawing.Point(650, 28);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(650, 140);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem2.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 196);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem6.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem34
- //
- this.layoutControlItem34.Control = this.txt_itemName;
- this.layoutControlItem34.Location = new System.Drawing.Point(0, 168);
- this.layoutControlItem34.Name = "layoutControlItem34";
- this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem34.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem34.Text = "浜у搧鍚嶇О";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 140);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem5.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem5.Text = "浜у搧缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_releaseNo;
- this.layoutControlItem1.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem1.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.txt_lotNo;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 28);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem28.Text = "閫夋嫨宸ュ崟";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_boxQty11
- //
- this.txt_boxQty11.Control = this.txt_kbList;
- this.txt_boxQty11.Location = new System.Drawing.Point(0, 56);
- this.txt_boxQty11.Name = "txt_boxQty11";
- this.txt_boxQty11.OptionsTableLayoutItem.RowIndex = 2;
- this.txt_boxQty11.Size = new System.Drawing.Size(325, 28);
- this.txt_boxQty11.Text = "閫佹绠辩爜";
- this.txt_boxQty11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(325, 28);
+ this.layoutControlItem9.Location = new System.Drawing.Point(330, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem9.Text = "鎶芥鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_lifnr;
- this.layoutControlItem22.Location = new System.Drawing.Point(325, 56);
+ this.layoutControlItem22.Location = new System.Drawing.Point(330, 56);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem22.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟";
this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_suppId;
- this.layoutControlItem24.Location = new System.Drawing.Point(325, 84);
+ this.layoutControlItem24.Location = new System.Drawing.Point(330, 84);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem24.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem24.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem24.Text = "瀹㈡埛缂栫爜";
this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo1;
- this.layoutControlItem3.Location = new System.Drawing.Point(325, 112);
+ this.layoutControlItem3.Location = new System.Drawing.Point(330, 112);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// txt_epTagtxt
//
this.txt_epTagtxt.Control = this.txt_epTag;
- this.txt_epTagtxt.Location = new System.Drawing.Point(325, 140);
+ this.txt_epTagtxt.Location = new System.Drawing.Point(330, 140);
this.txt_epTagtxt.Name = "txt_epTagtxt";
this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 1;
this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 5;
- this.txt_epTagtxt.Size = new System.Drawing.Size(325, 28);
+ this.txt_epTagtxt.Size = new System.Drawing.Size(330, 28);
this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_fmanageNo;
- this.layoutControlItem18.Location = new System.Drawing.Point(325, 168);
+ this.layoutControlItem18.Location = new System.Drawing.Point(330, 168);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem18.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem18.Text = "娴佺▼缂栧彿";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_lineName111
- //
- this.txt_lineName111.Control = this.txt_lineName;
- this.txt_lineName111.Location = new System.Drawing.Point(0, 112);
- this.txt_lineName111.Name = "txt_lineName111";
- this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 4;
- this.txt_lineName111.Size = new System.Drawing.Size(325, 28);
- this.txt_lineName111.Text = "鐢熶骇绾垮埆";
- this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem30
- //
- this.layoutControlItem30.Control = this.txt_kbSl;
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 84);
- this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem30.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem30.Text = "閫佹鏁伴噺";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem23
- //
- this.layoutControlItem23.Control = this.txt_djType;
- this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_fngHandle;
- this.layoutControlItem13.Location = new System.Drawing.Point(975, 84);
+ this.layoutControlItem13.Location = new System.Drawing.Point(990, 84);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem13.Text = "澶勭疆缁撴灉";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_zrType;
- this.layoutControlItem7.Location = new System.Drawing.Point(975, 112);
+ this.layoutControlItem7.Location = new System.Drawing.Point(990, 112);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem7.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem7.Text = "鍒ゅ畾璐ｄ换";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_fzrId;
- this.layoutControlItem35.Location = new System.Drawing.Point(975, 140);
+ this.layoutControlItem35.Location = new System.Drawing.Point(990, 140);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem35.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem35.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem35.Text = "璐ｄ换浜�";
this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem29
+ // layoutControlItem27
//
- this.layoutControlItem29.Control = this.txt_workNo;
- this.layoutControlItem29.Location = new System.Drawing.Point(990, 174);
- this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem29.Size = new System.Drawing.Size(332, 29);
- this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem27.Control = this.txt_msg;
+ this.layoutControlItem27.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
+ this.layoutControlItem27.Size = new System.Drawing.Size(332, 84);
+ this.layoutControlItem27.Text = "杩濊绫诲埆";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.txt_fmrmode;
+ this.layoutControlItem25.Location = new System.Drawing.Point(990, 168);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem25.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem25.Text = "杩斿伐宸ュ簭";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txt_lotNo;
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem28.Text = "閫夋嫨宸ュ崟";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // txt_boxQty11
+ //
+ this.txt_boxQty11.Control = this.txt_kbList;
+ this.txt_boxQty11.Location = new System.Drawing.Point(0, 28);
+ this.txt_boxQty11.Name = "txt_boxQty11";
+ this.txt_boxQty11.OptionsTableLayoutItem.RowIndex = 1;
+ this.txt_boxQty11.Size = new System.Drawing.Size(330, 28);
+ this.txt_boxQty11.Text = "閫佹绠辩爜";
+ this.txt_boxQty11.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem30
+ //
+ this.layoutControlItem30.Control = this.txt_kbSl;
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem30.Name = "layoutControlItem30";
+ this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem30.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem30.Text = "閫佹鏁伴噺";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // txt_lineName111
+ //
+ this.txt_lineName111.Control = this.txt_lineName;
+ this.txt_lineName111.Location = new System.Drawing.Point(0, 84);
+ this.txt_lineName111.Name = "txt_lineName111";
+ this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 3;
+ this.txt_lineName111.Size = new System.Drawing.Size(330, 28);
+ this.txt_lineName111.Text = "鐢熶骇绾垮埆";
+ this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_itemNo;
+ this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem5.Text = "浜у搧缂栫爜";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem34
+ //
+ this.layoutControlItem34.Control = this.txt_itemName;
+ this.layoutControlItem34.Location = new System.Drawing.Point(0, 140);
+ this.layoutControlItem34.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem34.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem34.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_itemModel;
+ this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 168);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_remarks;
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 196);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem12.Text = "澶囨敞璇存槑";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fcheckBy;
+ this.layoutControlItem8.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem32
+ //
+ this.layoutControlItem32.Control = this.txt_checkStates;
+ this.layoutControlItem32.Location = new System.Drawing.Point(660, 28);
+ this.layoutControlItem32.Name = "layoutControlItem32";
+ this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem32.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_fcheckResu;
+ this.layoutControlItem10.Location = new System.Drawing.Point(660, 56);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_fcheckDate;
+ this.layoutControlItem2.Location = new System.Drawing.Point(660, 84);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(650, 168);
+ this.layoutControlItem16.Location = new System.Drawing.Point(660, 112);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem16.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem16.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(650, 196);
+ this.layoutControlItem15.Location = new System.Drawing.Point(660, 140);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem15.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem15.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem27
+ // layoutControlItem14
//
- this.layoutControlItem27.Control = this.txt_msg;
- this.layoutControlItem27.Location = new System.Drawing.Point(975, 0);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
- this.layoutControlItem27.Size = new System.Drawing.Size(326, 84);
- this.layoutControlItem27.Text = "杩濊绫诲埆";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem27.TextVisible = false;
+ this.layoutControlItem14.Control = this.txt_fsubmit;
+ this.layoutControlItem14.Location = new System.Drawing.Point(660, 168);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
//
// xtraTabControl2
//
@@ -2321,7 +2357,7 @@
//
this.tabMxPage2.Controls.Add(this.ucChouJianList1);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1340, 362);
+ this.tabMxPage2.Size = new System.Drawing.Size(1340, 402);
this.tabMxPage2.Text = "浜у搧鏉＄爜鏄庣粏";
//
// ucChouJianList1
@@ -2330,14 +2366,14 @@
this.ucChouJianList1.Location = new System.Drawing.Point(0, 0);
this.ucChouJianList1.Name = "ucChouJianList1";
this.ucChouJianList1.pGuid = null;
- this.ucChouJianList1.Size = new System.Drawing.Size(1340, 362);
+ this.ucChouJianList1.Size = new System.Drawing.Size(1340, 402);
this.ucChouJianList1.TabIndex = 0;
//
// tabMxPage3
//
this.tabMxPage3.Controls.Add(this.ucUpFileList1);
this.tabMxPage3.Name = "tabMxPage3";
- this.tabMxPage3.Size = new System.Drawing.Size(1340, 362);
+ this.tabMxPage3.Size = new System.Drawing.Size(1340, 402);
this.tabMxPage3.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
@@ -2347,7 +2383,7 @@
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1340, 362);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1340, 402);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -2382,52 +2418,6 @@
// gridView4
//
this.gridView4.Name = "gridView4";
- //
- // txt_fmrmode
- //
- this.txt_fmrmode.Location = new System.Drawing.Point(1059, 180);
- this.txt_fmrmode.Name = "txt_fmrmode";
- this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fmrmode.Properties.NullText = "-璇烽�夋嫨-";
- this.txt_fmrmode.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fmrmode.Size = new System.Drawing.Size(250, 24);
- this.txt_fmrmode.StyleController = this.layoutMx1;
- this.txt_fmrmode.TabIndex = 840;
- //
- // layoutControlItem25
- //
- this.layoutControlItem25.Control = this.txt_fmrmode;
- this.layoutControlItem25.Location = new System.Drawing.Point(975, 168);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem25.Size = new System.Drawing.Size(326, 28);
- this.layoutControlItem25.Text = "杩斿伐宸ュ簭";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(325, 196);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem12.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem12.Text = "澶囨敞璇存槑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(975, 196);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem14.Size = new System.Drawing.Size(326, 28);
- this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem14.TextVisible = false;
//
// Frm_FqcDetect01
//
@@ -2489,39 +2479,43 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2565,10 +2559,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
this.ResumeLayout(false);
}
@@ -2696,11 +2686,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
@@ -2708,15 +2694,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDefectDetails;
private DevExpress.XtraEditors.ButtonEdit txt_kbList;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraEditors.ButtonEdit txt_lotNo;
private DevExpress.XtraEditors.TextEdit txt_lineName;
private DevExpress.XtraEditors.TextEdit txt_itemId;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
- private DevExpress.XtraLayout.LayoutControlItem txt_boxQty11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
@@ -2729,8 +2710,6 @@
private UcChouJianList ucChouJianList1;
private DevExpress.XtraEditors.TextEdit txt_kbSl;
private DevExpress.XtraLayout.LayoutControlItem txt_itemId1111;
- private DevExpress.XtraLayout.LayoutControlItem txt_lineName111;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
private DevExpress.XtraEditors.ComboBoxEdit txt_zrType;
private UserControl.UcLookStaff txt_fzrId;
@@ -2739,12 +2718,23 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControlItem txt_boxQty11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+ private DevExpress.XtraLayout.LayoutControlItem txt_lineName111;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 83cda47..8b8ac2d 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -403,6 +403,14 @@
this.ucUpFileList1.pGuid = "";
this.ucChouJianList1.pGuid = "";
this.setEable(false);
+
+ //澧炲姞鐨勬椂鍊欑姝�2025-08-14 beg
+ this.txt_msg.Enabled = false;
+ this.txt_fngHandle.Enabled = false;
+ this.txt_zrType.Enabled = false;
+ this.txt_fzrId.Enabled = false;
+ this.txt_fmrmode.Enabled = false;
+ //澧炲姞鐨勬椂鍊欑姝�2025-08-14 end
}
/// <summary>
/// 淇敼浜嬩欢
@@ -432,6 +440,16 @@
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
this.setEable(true);
}
+
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_lotNo.Enabled = false;
+ txt_kbList.Enabled = false;
+ //txt_fPurchaserId.IsReadly = true;
+ this.txt_msg.Enabled = true;
+ this.txt_fngHandle.Enabled = true;
+ this.txt_zrType.Enabled = true;
+ this.txt_fzrId.Enabled = true;
+ this.txt_fmrmode.Enabled = true;
}
/// <summary>
@@ -455,7 +473,7 @@
string _txt_lotNo1 = txt_lotNo1.Text.Trim();//閫佹鎵瑰彿
string _txt_lotNo = txt_lotNo.Text.Trim();//鐢熶骇宸ュ崟
string _kbList = txt_kbList.Text.Trim();
- if (txt_djType.SelectedIndex <= 0)
+ if (txt_djType.SelectedIndex < 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
txt_djType.Focus();
@@ -699,7 +717,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -796,7 +814,6 @@
if (e.Page.Name == "tabMxPage2")
{
ucChouJianList1.getList14();
-
}
if (e.Page.Name == "tabMxPage3")
{
@@ -851,7 +868,6 @@
btnLoad.Enabled = bl;
ucChouJianList1.IsReadOnly(!bl);
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
-
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 4dbca7e..3e064ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -111,7 +111,9 @@
this.txt_qt033 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit();
+ this.txt_isIqc = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -211,8 +213,6 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_isIqc = new DevExpress.XtraEditors.CheckEdit();
- this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -247,7 +247,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -319,8 +321,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -469,7 +469,7 @@
this.gv_qt003.OptionsColumn.AllowEdit = false;
this.gv_qt003.Tag = "query_a.qt003";
this.gv_qt003.Visible = true;
- this.gv_qt003.VisibleIndex = 4;
+ this.gv_qt003.VisibleIndex = 12;
this.gv_qt003.Width = 94;
//
// gv_qt019
@@ -482,7 +482,7 @@
this.gv_qt019.OptionsColumn.AllowEdit = false;
this.gv_qt019.Tag = "query_a.qt019";
this.gv_qt019.Visible = true;
- this.gv_qt019.VisibleIndex = 5;
+ this.gv_qt019.VisibleIndex = 13;
this.gv_qt019.Width = 94;
//
// gv_qt005
@@ -495,7 +495,7 @@
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 6;
+ this.gv_qt005.VisibleIndex = 4;
this.gv_qt005.Width = 94;
//
// gv_qt001
@@ -508,7 +508,7 @@
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 7;
+ this.gv_qt001.VisibleIndex = 5;
this.gv_qt001.Width = 200;
//
// gv_qt016
@@ -521,7 +521,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 8;
+ this.gv_qt016.VisibleIndex = 9;
this.gv_qt016.Width = 94;
//
// gv_qt002
@@ -534,7 +534,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 9;
+ this.gv_qt002.VisibleIndex = 10;
this.gv_qt002.Width = 180;
//
// gv_qt010
@@ -547,7 +547,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 10;
+ this.gv_qt010.VisibleIndex = 11;
this.gv_qt010.Width = 94;
//
// gridColumn13
@@ -557,7 +557,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 11;
+ this.gridColumn13.VisibleIndex = 14;
this.gridColumn13.Width = 94;
//
// gridColumn14
@@ -567,7 +567,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 12;
+ this.gridColumn14.VisibleIndex = 15;
this.gridColumn14.Width = 94;
//
// gridColumn21
@@ -577,7 +577,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 13;
+ this.gridColumn21.VisibleIndex = 16;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -587,7 +587,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 14;
+ this.gridColumn22.VisibleIndex = 6;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -597,7 +597,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 15;
+ this.gridColumn23.VisibleIndex = 7;
this.gridColumn23.Width = 94;
//
// gridColumn24
@@ -607,7 +607,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 16;
+ this.gridColumn24.VisibleIndex = 8;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -707,7 +707,8 @@
this.layoutMx1.Controls.Add(this.txt_isIqc);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem12});
+ this.layoutControlItem12,
+ this.layoutControlItem36});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(289, 480, 812, 500);
@@ -930,6 +931,16 @@
this.txt_qt035.StyleController = this.layoutMx1;
this.txt_qt035.TabIndex = 340;
//
+ // txt_isIqc
+ //
+ this.txt_isIqc.Location = new System.Drawing.Point(340, 155);
+ this.txt_isIqc.Name = "txt_isIqc";
+ this.txt_isIqc.Properties.Caption = "鏄惁闇�瑕両QC,鍒跺崟瀹℃牳鍚庣敓鏁�";
+ this.txt_isIqc.Size = new System.Drawing.Size(324, 24);
+ this.txt_isIqc.StyleController = this.layoutMx1;
+ this.txt_isIqc.TabIndex = 341;
+ this.txt_isIqc.Tag = "readonly";
+ //
// layoutControlItem12
//
this.layoutControlItem12.Control = this.lbGuid;
@@ -941,6 +952,18 @@
this.layoutControlItem12.Text = "lbGuid";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
+ //
+ // layoutControlItem36
+ //
+ this.layoutControlItem36.Control = this.txt_isIqc;
+ this.layoutControlItem36.Location = new System.Drawing.Point(328, 143);
+ this.layoutControlItem36.Name = "layoutControlItem36";
+ this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem36.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem36.Text = "iqc鏍囪瘑";
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem36.TextVisible = false;
//
// Root
//
@@ -967,8 +990,7 @@
this.layoutControlItem35,
this.layoutControlItem2,
this.layoutControlItem15,
- this.layoutControlItem14,
- this.layoutControlItem36});
+ this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1122,6 +1144,7 @@
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem18.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem18.Text = "璐㈠姟瀹℃牳鏍囪瘑";
this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem18.TextVisible = false;
//
@@ -1188,6 +1211,7 @@
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem21.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem21.Text = "閲囪喘瀹℃牳鏍囪瘑";
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
//
@@ -1311,11 +1335,11 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 49);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(336, 33);
this.ucBtnPrint1.TabIndex = 480;
//
// radOut
@@ -1329,7 +1353,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(336, 32);
+ this.radOut.Size = new System.Drawing.Size(336, 33);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 479;
//
@@ -1337,10 +1361,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 84);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 86);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 32);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 33);
this.layoutControl1.TabIndex = 478;
this.layoutControl1.Text = "layoutControl1";
//
@@ -1384,7 +1408,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 33);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1392,7 +1416,7 @@
this.layoutControlItem33.Control = this.txt_iCount_1;
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.Size = new System.Drawing.Size(168, 32);
+ this.layoutControlItem33.Size = new System.Drawing.Size(168, 33);
this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1402,7 +1426,7 @@
this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(168, 32);
+ this.layoutControlItem34.Size = new System.Drawing.Size(168, 33);
this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1420,7 +1444,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 49);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -1439,7 +1463,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 48);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 49);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1459,7 +1483,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 48);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 49);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1469,7 +1493,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 84);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 86);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1529,7 +1553,7 @@
rowDefinition8,
rowDefinition9,
rowDefinition10});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 131);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -1538,7 +1562,7 @@
this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem23.Text = "鎵撳嵃鏂瑰紡";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1546,11 +1570,11 @@
// layoutControlItem22
//
this.layoutControlItem22.Control = this.layoutControl1;
- this.layoutControlItem22.Location = new System.Drawing.Point(680, 72);
+ this.layoutControlItem22.Location = new System.Drawing.Point(680, 74);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem22.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1563,7 +1587,7 @@
this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem27.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1572,11 +1596,11 @@
this.layoutControlItem28.Control = this.txt_psnQty_1;
this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem28.CustomizationFormText = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 36);
+ this.layoutControlItem28.Location = new System.Drawing.Point(680, 37);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1588,7 +1612,7 @@
this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1597,11 +1621,11 @@
this.layoutControlItem26.Control = this.txt_yQty;
this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem26.CustomizationFormText = "宸叉墦鍗版�婚噺";
- this.layoutControlItem26.Location = new System.Drawing.Point(340, 36);
+ this.layoutControlItem26.Location = new System.Drawing.Point(340, 37);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1612,7 +1636,7 @@
this.layoutControlItem24.CustomizationFormText = "鐗╂枡缂栫爜";
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem24.Text = "鐗╂枡缂栫爜";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1621,10 +1645,10 @@
this.layoutControlItem29.Control = this.txtWlmc;
this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem29.CustomizationFormText = "鐗╂枡鍚嶇О";
- this.layoutControlItem29.Location = new System.Drawing.Point(0, 36);
+ this.layoutControlItem29.Location = new System.Drawing.Point(0, 37);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem29.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem29.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1633,22 +1657,22 @@
this.layoutControlItem30.Control = this.txtWlgg;
this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem30.CustomizationFormText = "鐗╂枡瑙勬牸";
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 72);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 74);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem30.Size = new System.Drawing.Size(680, 36);
+ this.layoutControlItem30.Size = new System.Drawing.Size(680, 37);
this.layoutControlItem30.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 36);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1020, 37);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem31.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -2178,27 +2202,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_isIqc
- //
- this.txt_isIqc.Location = new System.Drawing.Point(340, 155);
- this.txt_isIqc.Name = "txt_isIqc";
- this.txt_isIqc.Properties.Caption = "鏄惁闇�瑕両QC";
- this.txt_isIqc.Size = new System.Drawing.Size(324, 24);
- this.txt_isIqc.StyleController = this.layoutMx1;
- this.txt_isIqc.TabIndex = 341;
- this.txt_isIqc.Tag = "readonly";
- //
- // layoutControlItem36
- //
- this.layoutControlItem36.Control = this.txt_isIqc;
- this.layoutControlItem36.Location = new System.Drawing.Point(328, 143);
- this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem36.Size = new System.Drawing.Size(328, 29);
- this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem36.TextVisible = false;
- //
// Frm_MesItemQtrk
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2243,7 +2246,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -2315,8 +2320,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index f07b552..a472296 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -846,7 +846,8 @@
foreach (dynamic dym in lst)
{
if (stringBuilder.Length > 0)
- stringBuilder.Append("|");
+ // stringBuilder.Append("|");//|鍜寏宸茶鍗犵敤
+ stringBuilder.Append("&");
stringBuilder.Append(dym.dicTxt);
}
gvMx1.SetFocusedRowCellValue("qd012", stringBuilder.ToString());
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
index 28d56cb..a2b45e1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -353,8 +353,6 @@
this.gv_depotsCode.Name = "gv_depotsCode";
this.gv_depotsCode.OptionsColumn.AllowEdit = false;
this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE";
- this.gv_depotsCode.Visible = true;
- this.gv_depotsCode.VisibleIndex = 3;
this.gv_depotsCode.Width = 94;
//
// gv_depotsId
@@ -367,7 +365,7 @@
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
this.gv_depotsId.Visible = true;
- this.gv_depotsId.VisibleIndex = 4;
+ this.gv_depotsId.VisibleIndex = 3;
this.gv_depotsId.Width = 89;
//
// bandedGridColumn1
@@ -377,7 +375,7 @@
this.bandedGridColumn1.MinWidth = 25;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 5;
+ this.bandedGridColumn1.VisibleIndex = 4;
this.bandedGridColumn1.Width = 94;
//
// gv_createBy
@@ -390,7 +388,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 6;
+ this.gv_createBy.VisibleIndex = 5;
this.gv_createBy.Width = 66;
//
// gv_createDate
@@ -403,7 +401,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 7;
+ this.gv_createDate.VisibleIndex = 6;
this.gv_createDate.Width = 146;
//
// gv_lastupdateBy
@@ -416,7 +414,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 8;
+ this.gv_lastupdateBy.VisibleIndex = 7;
this.gv_lastupdateBy.Width = 94;
//
// gv_lastupdateDate
@@ -429,7 +427,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 9;
+ this.gv_lastupdateDate.VisibleIndex = 8;
this.gv_lastupdateDate.Width = 94;
//
// gv_remark
@@ -442,7 +440,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 10;
+ this.gv_remark.VisibleIndex = 9;
this.gv_remark.Width = 119;
//
// bandedGridColumn4
@@ -452,7 +450,7 @@
this.bandedGridColumn4.MinWidth = 25;
this.bandedGridColumn4.Name = "bandedGridColumn4";
this.bandedGridColumn4.Visible = true;
- this.bandedGridColumn4.VisibleIndex = 11;
+ this.bandedGridColumn4.VisibleIndex = 10;
this.bandedGridColumn4.Width = 94;
//
// gv_checkUser
@@ -465,7 +463,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 12;
+ this.gv_checkUser.VisibleIndex = 11;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -478,7 +476,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 13;
+ this.gv_checkDate.VisibleIndex = 12;
this.gv_checkDate.Width = 94;
//
// bandedGridColumn3
@@ -488,7 +486,7 @@
this.bandedGridColumn3.MinWidth = 25;
this.bandedGridColumn3.Name = "bandedGridColumn3";
this.bandedGridColumn3.Visible = true;
- this.bandedGridColumn3.VisibleIndex = 14;
+ this.bandedGridColumn3.VisibleIndex = 13;
this.bandedGridColumn3.Width = 94;
//
// bandedGridColumn5
@@ -498,7 +496,7 @@
this.bandedGridColumn5.MinWidth = 25;
this.bandedGridColumn5.Name = "bandedGridColumn5";
this.bandedGridColumn5.Visible = true;
- this.bandedGridColumn5.VisibleIndex = 15;
+ this.bandedGridColumn5.VisibleIndex = 14;
this.bandedGridColumn5.Width = 94;
//
// gv_guid
@@ -519,7 +517,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 16;
+ this.gridColumn7.VisibleIndex = 15;
this.gridColumn7.Width = 94;
//
// gridColumn8
@@ -529,7 +527,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 17;
+ this.gridColumn8.VisibleIndex = 16;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -539,7 +537,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 18;
+ this.gridColumn9.VisibleIndex = 17;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -549,7 +547,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 19;
+ this.gridColumn10.VisibleIndex = 18;
this.gridColumn10.Width = 94;
//
// pageBar1
@@ -634,136 +632,136 @@
//
// txt_ckName
//
- this.txt_ckName.Location = new System.Drawing.Point(445, 105);
+ this.txt_ckName.Location = new System.Drawing.Point(415, 105);
this.txt_ckName.Name = "txt_ckName";
this.txt_ckName.Properties.Appearance.Options.UseFont = true;
- this.txt_ckName.Size = new System.Drawing.Size(225, 24);
+ this.txt_ckName.Size = new System.Drawing.Size(255, 24);
this.txt_ckName.StyleController = this.layoutMx1;
this.txt_ckName.TabIndex = 609;
//
// txt_sqRemark
//
- this.txt_sqRemark.Location = new System.Drawing.Point(114, 136);
+ this.txt_sqRemark.Location = new System.Drawing.Point(84, 136);
this.txt_sqRemark.Name = "txt_sqRemark";
this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_sqRemark.Size = new System.Drawing.Size(556, 24);
+ this.txt_sqRemark.Size = new System.Drawing.Size(586, 24);
this.txt_sqRemark.StyleController = this.layoutMx1;
this.txt_sqRemark.TabIndex = 240;
//
// txt_hz
//
- this.txt_hz.Location = new System.Drawing.Point(114, 105);
+ this.txt_hz.Location = new System.Drawing.Point(84, 105);
this.txt_hz.Name = "txt_hz";
this.txt_hz.Properties.Appearance.Options.UseFont = true;
- this.txt_hz.Size = new System.Drawing.Size(225, 24);
+ this.txt_hz.Size = new System.Drawing.Size(255, 24);
this.txt_hz.StyleController = this.layoutMx1;
this.txt_hz.TabIndex = 602;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1107, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(1077, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(227, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(257, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 608;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(776, 105);
+ this.txt_createDate.Location = new System.Drawing.Point(746, 105);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(225, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(255, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 222;
//
// txt_lyfx
//
- this.txt_lyfx.Location = new System.Drawing.Point(776, 43);
+ this.txt_lyfx.Location = new System.Drawing.Point(746, 43);
this.txt_lyfx.Name = "txt_lyfx";
this.txt_lyfx.Properties.Appearance.Options.UseFont = true;
- this.txt_lyfx.Size = new System.Drawing.Size(225, 24);
+ this.txt_lyfx.Size = new System.Drawing.Size(255, 24);
this.txt_lyfx.StyleController = this.layoutMx1;
this.txt_lyfx.TabIndex = 604;
//
// txt_hzlx
//
- this.txt_hzlx.Location = new System.Drawing.Point(114, 74);
+ this.txt_hzlx.Location = new System.Drawing.Point(84, 74);
this.txt_hzlx.Name = "txt_hzlx";
this.txt_hzlx.Properties.Appearance.Options.UseFont = true;
- this.txt_hzlx.Size = new System.Drawing.Size(225, 24);
+ this.txt_hzlx.Size = new System.Drawing.Size(255, 24);
this.txt_hzlx.StyleController = this.layoutMx1;
this.txt_hzlx.TabIndex = 600;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(445, 74);
+ this.txt_gysName.Location = new System.Drawing.Point(415, 74);
this.txt_gysName.Name = "txt_gysName";
this.txt_gysName.Properties.Appearance.Options.UseFont = true;
- this.txt_gysName.Size = new System.Drawing.Size(225, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(255, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 595;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ 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(225, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(255, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_abtNo
//
- this.txt_abtNo.Location = new System.Drawing.Point(445, 12);
+ this.txt_abtNo.Location = new System.Drawing.Point(415, 12);
this.txt_abtNo.Name = "txt_abtNo";
this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
- this.txt_abtNo.Size = new System.Drawing.Size(225, 24);
+ this.txt_abtNo.Size = new System.Drawing.Size(255, 24);
this.txt_abtNo.StyleController = this.layoutMx1;
this.txt_abtNo.TabIndex = 507;
//
// txt_djlx
//
- this.txt_djlx.Location = new System.Drawing.Point(776, 12);
+ this.txt_djlx.Location = new System.Drawing.Point(746, 12);
this.txt_djlx.Name = "txt_djlx";
this.txt_djlx.Properties.Appearance.Options.UseFont = true;
- this.txt_djlx.Size = new System.Drawing.Size(225, 24);
+ this.txt_djlx.Size = new System.Drawing.Size(255, 24);
this.txt_djlx.StyleController = this.layoutMx1;
this.txt_djlx.TabIndex = 598;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(776, 74);
+ this.txt_createBy.Location = new System.Drawing.Point(746, 74);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(225, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(255, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 219;
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(445, 43);
+ this.txt_dptName.Location = new System.Drawing.Point(415, 43);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(225, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(255, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 596;
//
// txt_kcOrg
//
- this.txt_kcOrg.Location = new System.Drawing.Point(114, 43);
+ this.txt_kcOrg.Location = new System.Drawing.Point(84, 43);
this.txt_kcOrg.Name = "txt_kcOrg";
this.txt_kcOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_kcOrg.Size = new System.Drawing.Size(225, 24);
+ this.txt_kcOrg.Size = new System.Drawing.Size(255, 24);
this.txt_kcOrg.StyleController = this.layoutMx1;
this.txt_kcOrg.TabIndex = 593;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1107, 43);
+ this.txt_checkDate.Location = new System.Drawing.Point(1077, 43);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(227, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(257, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 587;
//
@@ -778,19 +776,19 @@
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(1107, 105);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(1077, 105);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(227, 24);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(257, 24);
this.txt_lastupdateBy.StyleController = this.layoutMx1;
this.txt_lastupdateBy.TabIndex = 610;
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(1107, 136);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(1077, 136);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(227, 24);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(257, 24);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 611;
//
@@ -870,7 +868,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
@@ -880,7 +878,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem2.Text = "鐢宠鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
@@ -890,7 +888,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
@@ -900,7 +898,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(333, 31);
this.layoutControlItem4.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
@@ -910,7 +908,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem5.Text = "搴撳瓨缁勭粐";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
@@ -921,7 +919,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem6.Text = "閮ㄩ棬";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
@@ -932,7 +930,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem7.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem7.Text = "搴撳瓨鏂瑰悜";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
@@ -943,7 +941,7 @@
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem8.Size = new System.Drawing.Size(333, 31);
this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
@@ -953,7 +951,7 @@
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem9.Text = "璐т富绫诲瀷";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
@@ -964,7 +962,7 @@
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem10.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem10.Text = "渚涘簲鍟�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
@@ -975,7 +973,7 @@
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem11.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem11.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
@@ -997,7 +995,7 @@
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem13.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem13.Text = "璐т富";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
@@ -1008,7 +1006,7 @@
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem14.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem14.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
@@ -1019,7 +1017,7 @@
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem15.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem15.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
@@ -1030,7 +1028,7 @@
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem16.Size = new System.Drawing.Size(662, 32);
this.layoutControlItem16.Text = "鐢宠澶囨敞";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem17
//
@@ -1040,8 +1038,8 @@
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem17.Size = new System.Drawing.Size(333, 31);
- this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem17.Text = "鏇存柊浜哄憳";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
@@ -1051,8 +1049,8 @@
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem18.Size = new System.Drawing.Size(333, 32);
- this.layoutControlItem18.Text = "鏈�鍚庢洿鏂版椂闂�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem18.Text = "鏇存柊鏃堕棿";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
index 11c3bc2..c1f9da0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
@@ -175,7 +175,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -244,11 +244,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);
}
}
@@ -274,7 +274,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -291,9 +291,9 @@
_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());
@@ -302,10 +302,12 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkUser", 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/RkQC/Frm_SctlDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.Designer.cs
similarity index 93%
rename from DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.Designer.cs
index f7b3494..66696a1 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.Designer.cs
@@ -2,7 +2,7 @@
namespace Gs.DevApp.DevFrm.RkQC
{
- partial class Frm_SctlDetect01
+ partial class Frm_ShouTuoDetect01
{
/// <summary>
/// Required designer variable.
@@ -30,7 +30,7 @@
/// </summary>
private void InitializeComponent()
{
- this.rkDetect011 = new Gs.DevApp.DevFrm.RkQC.RkDetect01(QcSeason.鐢熶骇閫�鏂欏叆搴撴.ToString());
+ this.rkDetect011 = new Gs.DevApp.DevFrm.RkQC.RkDetect01(QcSeason.鍙楁墭鍏ュ簱.ToString());
this.SuspendLayout();
//
// rkDetect011
@@ -48,7 +48,7 @@
this.ClientSize = new System.Drawing.Size(1118, 648);
this.Controls.Add(this.rkDetect011);
this.Name = "Frm_RkDetect01";
- this.Text = "鐢熶骇閫�鏂欏叆搴撴";
+ this.Text = "鍙楁墭鍏ュ簱鍏ュ簱妫�";
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.cs
similarity index 75%
rename from DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.cs
rename to DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.cs
index 170a961..f9e88bb 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.cs
@@ -11,9 +11,9 @@
namespace Gs.DevApp.DevFrm.RkQC
{
- public partial class Frm_SctlDetect01 : DevExpress.XtraEditors.XtraForm
+ public partial class Frm_ShouTuoDetect01 : DevExpress.XtraEditors.XtraForm
{
- public Frm_SctlDetect01()
+ public Frm_ShouTuoDetect01()
{
InitializeComponent();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.resx b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.resx
similarity index 100%
rename from DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.resx
rename to DevApp/Gs.DevApp/DevFrm/RkQC/Frm_ShouTuoDetect01.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index 1aebbbc..bfab458 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -63,11 +63,20 @@
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
string rptName = "";
- if (strType == QcSeason.鐢熶骇閫�鏂欏叆搴撴.ToString())
- rptName = "rpt_SCTL";
+ if (strType == QcSeason.鍙楁墭鍏ュ簱.ToString())
+ {
+ rptName = "rpt_Strk";
+ layoutControlItem25.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ layoutControlItem27.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ }
else
if (strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString())
+ {
rptName = "rpt_Qtrk";
+ layoutControlItem25.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ layoutControlItem27.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ }
+
else
if (strType == QcSeason.閿�鍞��璐у叆搴撴.ToString())
rptName = "rpt_Xsth";
@@ -130,7 +139,8 @@
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
- if (strAction == "print") {
+ if (strAction == "print")
+ {
try
{
string rptParameter = rptName + "{"
@@ -432,7 +442,13 @@
{
toolBarMenu1.isSetBtn = false;
string rkckid = txt_rkCkId.GetId();
- if (strType != QcSeason.瓒呮湡妫�.ToString())
+ if (strType == QcSeason.瓒呮湡妫�.ToString()
+ || strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString()
+ || strType == QcSeason.鍙楁墭鍏ュ簱.ToString())
+ {
+
+ }
+ else
{
if (string.IsNullOrEmpty(rkckid))
{
@@ -484,7 +500,13 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ if (strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString())
+ {
+ _sbSqlWhere.Append(" and isnull(qtrk.qt028,0)=1 and isnull(qtrk.qt032,0)=1 and isnull(qtrk.qt015,0)=1 ");
+ }
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", " and a.order_type='" + strType + "' " + _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -518,7 +540,6 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
/// 璇诲彇瀹炰綋
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
index 9ccbbba..e54b017 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
@@ -190,7 +190,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 1;
+ this.gridColumn3.VisibleIndex = 2;
this.gridColumn3.Width = 73;
//
// gridColumn2
@@ -200,7 +200,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
+ this.gridColumn2.VisibleIndex = 3;
this.gridColumn2.Width = 73;
//
// gridColumn4
@@ -210,7 +210,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 3;
+ this.gridColumn4.VisibleIndex = 4;
this.gridColumn4.Width = 73;
//
// gv_itemBarcode
@@ -223,7 +223,7 @@
this.gv_itemBarcode.OptionsColumn.AllowEdit = false;
this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gv_itemBarcode.Visible = true;
- this.gv_itemBarcode.VisibleIndex = 4;
+ this.gv_itemBarcode.VisibleIndex = 1;
this.gv_itemBarcode.Width = 73;
//
// gv_quantity
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
index 7bb7bb2..836835d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -29,14 +29,14 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -57,6 +57,7 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -69,13 +70,12 @@
this.txt_itemNo2 = new DevExpress.XtraEditors.TextEdit();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_mrmodeTxt = new DevExpress.XtraEditors.TextEdit();
+ this.txt_kbSl = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
- this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit();
this.txt_aboutGuid = new DevExpress.XtraEditors.TextEdit();
this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
- this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
this.txt_msg = new DevExpress.XtraEditors.TextEdit();
this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -89,12 +89,11 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -121,9 +120,6 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx7 = new DevExpress.XtraGrid.GridControl();
this.gvMx7 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -133,6 +129,13 @@
this.gridColumn63 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn64 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_fgCheckBy = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_fgCheckDatet = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -158,13 +161,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
@@ -178,12 +180,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -192,11 +193,15 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckDatet.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -287,7 +292,8 @@
this.gvcol6,
this.gridColumn10,
this.gridColumn11,
- this.gridColumn13});
+ this.gridColumn13,
+ this.gridColumn18});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -306,7 +312,7 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 0;
+ this.gv_billNo.VisibleIndex = 1;
this.gv_billNo.Width = 120;
//
// gv_documentStatus
@@ -319,7 +325,7 @@
this.gv_documentStatus.OptionsColumn.AllowEdit = false;
this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
this.gv_documentStatus.Visible = true;
- this.gv_documentStatus.VisibleIndex = 4;
+ this.gv_documentStatus.VisibleIndex = 3;
this.gv_documentStatus.Width = 70;
//
// gv_documentType
@@ -332,7 +338,7 @@
this.gv_documentType.OptionsColumn.AllowEdit = false;
this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE";
this.gv_documentType.Visible = true;
- this.gv_documentType.VisibleIndex = 5;
+ this.gv_documentType.VisibleIndex = 4;
this.gv_documentType.Width = 80;
//
// gv_businessType
@@ -345,7 +351,7 @@
this.gv_businessType.OptionsColumn.AllowEdit = false;
this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
this.gv_businessType.Visible = true;
- this.gv_businessType.VisibleIndex = 6;
+ this.gv_businessType.VisibleIndex = 8;
this.gv_businessType.Width = 80;
//
// bandedGridColumn1
@@ -370,7 +376,7 @@
this.gv_closeStatus.OptionsColumn.AllowEdit = false;
this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS";
this.gv_closeStatus.Visible = true;
- this.gv_closeStatus.VisibleIndex = 8;
+ this.gv_closeStatus.VisibleIndex = 9;
this.gv_closeStatus.Width = 80;
//
// bandedGridColumn2
@@ -381,8 +387,6 @@
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.OptionsColumn.AllowEdit = false;
this.bandedGridColumn2.Tag = "query_a.departmentname";
- this.bandedGridColumn2.Visible = true;
- this.bandedGridColumn2.VisibleIndex = 9;
this.bandedGridColumn2.Width = 80;
//
// gv_purchaseDept
@@ -426,7 +430,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 1;
+ this.gridColumn10.VisibleIndex = 0;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -436,7 +440,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 2;
+ this.gridColumn11.VisibleIndex = 5;
this.gridColumn11.Width = 94;
//
// gridColumn13
@@ -446,8 +450,18 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 3;
+ this.gridColumn13.VisibleIndex = 6;
this.gridColumn13.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "宸ュ崟鍗曞彿";
+ this.gridColumn18.FieldName = "daa001";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 2;
+ this.gridColumn18.Width = 94;
//
// pageBar1
//
@@ -499,15 +513,16 @@
this.layoutMx1.Controls.Add(this.txt_itemNo2);
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_fbatchQty);
- this.layoutMx1.Controls.Add(this.txt_mrmodeTxt);
+ this.layoutMx1.Controls.Add(this.txt_kbSl);
+ this.layoutMx1.Controls.Add(this.txt_fmrmode);
this.layoutMx1.Controls.Add(this.txt_itemModel);
- this.layoutMx1.Controls.Add(this.txt_erpCheckBy);
this.layoutMx1.Controls.Add(this.txt_aboutGuid);
this.layoutMx1.Controls.Add(this.txt_lineName);
- this.layoutMx1.Controls.Add(this.txt_workNo);
+ this.layoutMx1.Controls.Add(this.txt_daa001);
this.layoutMx1.Controls.Add(this.txt_msg);
this.layoutMx1.Controls.Add(this.txt_fngHandle);
+ this.layoutMx1.Controls.Add(this.txt_fgCheckBy);
+ this.layoutMx1.Controls.Add(this.txt_fgCheckDatet);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem3,
@@ -525,7 +540,7 @@
//
this.ucBtnPrint98.allClickKey = null;
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(672, 109);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(342, 109);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
@@ -589,21 +604,21 @@
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 234;
//
- // txt_fbatchQty
+ // txt_kbSl
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(99, 43);
- this.txt_fbatchQty.Name = "txt_fbatchQty";
- this.txt_fbatchQty.Size = new System.Drawing.Size(239, 24);
- this.txt_fbatchQty.StyleController = this.layoutMx1;
- this.txt_fbatchQty.TabIndex = 236;
+ this.txt_kbSl.Location = new System.Drawing.Point(99, 43);
+ this.txt_kbSl.Name = "txt_kbSl";
+ this.txt_kbSl.Size = new System.Drawing.Size(239, 24);
+ this.txt_kbSl.StyleController = this.layoutMx1;
+ this.txt_kbSl.TabIndex = 236;
//
- // txt_mrmodeTxt
+ // txt_fmrmode
//
- this.txt_mrmodeTxt.Location = new System.Drawing.Point(429, 109);
- this.txt_mrmodeTxt.Name = "txt_mrmodeTxt";
- this.txt_mrmodeTxt.Size = new System.Drawing.Size(239, 24);
- this.txt_mrmodeTxt.StyleController = this.layoutMx1;
- this.txt_mrmodeTxt.TabIndex = 237;
+ this.txt_fmrmode.Location = new System.Drawing.Point(99, 109);
+ this.txt_fmrmode.Name = "txt_fmrmode";
+ this.txt_fmrmode.Size = new System.Drawing.Size(239, 24);
+ this.txt_fmrmode.StyleController = this.layoutMx1;
+ this.txt_fmrmode.TabIndex = 237;
//
// txt_itemModel
//
@@ -612,14 +627,6 @@
this.txt_itemModel.Size = new System.Drawing.Size(241, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 238;
- //
- // txt_erpCheckBy
- //
- this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 76);
- this.txt_erpCheckBy.Name = "txt_erpCheckBy";
- this.txt_erpCheckBy.Size = new System.Drawing.Size(239, 24);
- this.txt_erpCheckBy.StyleController = this.layoutMx1;
- this.txt_erpCheckBy.TabIndex = 241;
//
// txt_aboutGuid
//
@@ -637,17 +644,17 @@
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 244;
//
- // txt_workNo
+ // txt_daa001
//
- this.txt_workNo.Location = new System.Drawing.Point(99, 109);
- this.txt_workNo.Name = "txt_workNo";
- this.txt_workNo.Size = new System.Drawing.Size(239, 24);
- this.txt_workNo.StyleController = this.layoutMx1;
- this.txt_workNo.TabIndex = 245;
+ this.txt_daa001.Location = new System.Drawing.Point(99, 76);
+ this.txt_daa001.Name = "txt_daa001";
+ this.txt_daa001.Size = new System.Drawing.Size(239, 24);
+ this.txt_daa001.StyleController = this.layoutMx1;
+ this.txt_daa001.TabIndex = 245;
//
// txt_msg
//
- this.txt_msg.Location = new System.Drawing.Point(759, 76);
+ this.txt_msg.Location = new System.Drawing.Point(759, 109);
this.txt_msg.Name = "txt_msg";
this.txt_msg.Size = new System.Drawing.Size(571, 24);
this.txt_msg.StyleController = this.layoutMx1;
@@ -705,41 +712,42 @@
this.layoutControlItem9,
this.layoutControlItem7,
this.layoutControlItem11,
- this.layoutControlItem14,
- this.layoutControlItem15,
- this.layoutControlItem10,
this.layoutControlItem12,
this.layoutControlItem17,
+ this.layoutControlItem15,
+ this.layoutControlItem10,
+ this.layoutControlItem13,
this.layoutControlItem16,
- this.layoutControlItem13});
+ this.layoutControlItem8,
+ this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition13.Width = 100D;
- columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition14.Width = 100D;
- columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition15.Width = 100D;
- columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition16.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition13,
- columnDefinition14,
- columnDefinition15,
- columnDefinition16});
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition16.Height = 100D;
- rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition13,
- rowDefinition14,
- rowDefinition15,
- rowDefinition16});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
this.Root.Size = new System.Drawing.Size(1342, 152);
this.Root.TextVisible = false;
//
@@ -780,12 +788,12 @@
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem6.Text = "寮�鍗曚汉";
+ this.layoutControlItem6.Text = "寮�鍗曚汉鍛�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.txt_fbatchQty;
+ this.layoutControlItem9.Control = this.txt_kbSl;
this.layoutControlItem9.Location = new System.Drawing.Point(0, 33);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
@@ -814,37 +822,6 @@
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_erpCheckBy;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 66);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem14.Text = "宸茶繑宸ユ暟閲�";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_workNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 99);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem15.Text = "宸ュ崟鍗曞彿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_mrmodeTxt;
- this.layoutControlItem10.Location = new System.Drawing.Point(330, 99);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem10.Text = "杩斿伐宸ュ簭";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
- //
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_lineName;
@@ -867,17 +844,37 @@
this.layoutControlItem17.Text = "澶勭疆缁撴灉";
this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
- // layoutControlItem16
+ // layoutControlItem15
//
- this.layoutControlItem16.Control = this.txt_msg;
- this.layoutControlItem16.Location = new System.Drawing.Point(660, 66);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(662, 33);
- this.layoutControlItem16.Text = "杩濊绫诲埆";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem15.Control = this.txt_daa001;
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 66);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem15.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem15.Text = "宸ュ崟鍗曞彿";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_fmrmode;
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 99);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem10.Text = "杩斿伐宸ュ簭";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.ucBtnPrint98;
+ this.layoutControlItem13.Location = new System.Drawing.Point(330, 99);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem13.Text = "纭畾鎵撳嵃";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
//
// tabMx
//
@@ -1070,7 +1067,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 6;
+ this.gridColumn15.VisibleIndex = 5;
this.gridColumn15.Width = 69;
//
// gridColumn16
@@ -1080,7 +1077,7 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 7;
+ this.gridColumn16.VisibleIndex = 6;
this.gridColumn16.Width = 82;
//
// gridColumn17
@@ -1092,7 +1089,7 @@
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Tag = "query_a.PRICING_QTY";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 8;
+ this.gridColumn17.VisibleIndex = 7;
this.gridColumn17.Width = 56;
//
// gridColumn22
@@ -1104,7 +1101,7 @@
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Tag = "query_a.PURCHASE_QTY";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 3;
+ this.gridColumn22.VisibleIndex = 2;
this.gridColumn22.Width = 37;
//
// gridColumn12
@@ -1114,7 +1111,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 5;
+ this.gridColumn12.VisibleIndex = 4;
this.gridColumn12.Width = 146;
//
// gridColumn5
@@ -1124,7 +1121,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.VisibleIndex = 3;
this.gridColumn5.Width = 146;
//
// gridColumn6
@@ -1134,7 +1131,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 2;
+ this.gridColumn6.VisibleIndex = 1;
this.gridColumn6.Width = 142;
//
// gridColumn7
@@ -1144,7 +1141,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 9;
+ this.gridColumn7.VisibleIndex = 8;
this.gridColumn7.Width = 142;
//
// gridColumn8
@@ -1154,7 +1151,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.VisibleIndex = 9;
this.gridColumn8.Width = 156;
//
// gridColumn9
@@ -1164,31 +1161,8 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 11;
+ this.gridColumn9.VisibleIndex = 10;
this.gridColumn9.Width = 94;
- //
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1133, 30);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 9;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.ucBtnPrint98;
- this.layoutControlItem13.Location = new System.Drawing.Point(660, 99);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem13.Text = "纭畾鎵撳嵃";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
//
// xtraTabPage3
//
@@ -1304,6 +1278,67 @@
this.gridColumn65.VisibleIndex = 5;
this.gridColumn65.Width = 94;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(1133, 30);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 9;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_msg;
+ this.layoutControlItem16.Location = new System.Drawing.Point(660, 99);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(662, 33);
+ this.layoutControlItem16.Text = "杩濊绫诲埆";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // txt_fgCheckBy
+ //
+ this.txt_fgCheckBy.Location = new System.Drawing.Point(759, 76);
+ this.txt_fgCheckBy.Name = "txt_fgCheckBy";
+ this.txt_fgCheckBy.Size = new System.Drawing.Size(239, 24);
+ this.txt_fgCheckBy.StyleController = this.layoutMx1;
+ this.txt_fgCheckBy.TabIndex = 248;
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fgCheckBy;
+ this.layoutControlItem8.Location = new System.Drawing.Point(660, 66);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // txt_fgCheckDatet
+ //
+ this.txt_fgCheckDatet.Location = new System.Drawing.Point(1089, 76);
+ this.txt_fgCheckDatet.Name = "txt_fgCheckDatet";
+ this.txt_fgCheckDatet.Size = new System.Drawing.Size(241, 24);
+ this.txt_fgCheckDatet.StyleController = this.layoutMx1;
+ this.txt_fgCheckDatet.TabIndex = 249;
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_fgCheckDatet;
+ this.layoutControlItem14.Location = new System.Drawing.Point(990, 66);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem14.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ //
// Frm_WomFanGong
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1339,13 +1374,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
@@ -1359,12 +1393,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1373,11 +1406,15 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckDatet.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
this.ResumeLayout(false);
}
@@ -1428,14 +1465,12 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
- private DevExpress.XtraEditors.TextEdit txt_mrmodeTxt;
+ private DevExpress.XtraEditors.TextEdit txt_kbSl;
+ private DevExpress.XtraEditors.TextEdit txt_fmrmode;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraEditors.TextEdit txt_erpCheckBy;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private UserControl.UcBtnPrint ucBtnPrint98;
private DevExpress.XtraEditors.TextEdit txt_aboutGuid;
private DevExpress.XtraLayout.LayoutControlItem txt_daa00111111;
@@ -1455,19 +1490,15 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraEditors.TextEdit txt_lineName;
- private DevExpress.XtraEditors.TextEdit txt_workNo;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraEditors.TextEdit txt_daa001;
private DevExpress.XtraEditors.TextEdit txt_msg;
private DevExpress.XtraEditors.TextEdit txt_fngHandle;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private System.Windows.Forms.PictureBox picCheckBox;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraGrid.GridControl gcMx7;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx7;
@@ -1477,5 +1508,14 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn63;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn64;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraEditors.TextEdit txt_fgCheckBy;
+ private DevExpress.XtraEditors.TextEdit txt_fgCheckDatet;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
index cf3c5f1..b296300 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
@@ -35,7 +35,10 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fgCheckStatusChk", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- }, tips);
+ }, tips, true, (strGuid) =>
+ {
+
+ });
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -90,7 +93,7 @@
MsgHelper.ShowError(ex.Message);
}
}
-
+
};
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index cfa6663..b14409c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -30,17 +30,17 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -428,7 +428,7 @@
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Tag = "org.fnamber";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 20;
+ this.gridColumn8.VisibleIndex = 19;
this.gridColumn8.Width = 200;
//
// gv_caa001
@@ -612,8 +612,6 @@
this.gridColumn2.MinWidth = 50;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 15;
this.gridColumn2.Width = 110;
//
// gv_caa016
@@ -626,7 +624,7 @@
this.gv_caa016.OptionsColumn.AllowEdit = false;
this.gv_caa016.Tag = "query_a.CAA016";
this.gv_caa016.Visible = true;
- this.gv_caa016.VisibleIndex = 16;
+ this.gv_caa016.VisibleIndex = 15;
this.gv_caa016.Width = 100;
//
// gridColumn7
@@ -686,7 +684,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 17;
+ this.gridColumn23.VisibleIndex = 16;
this.gridColumn23.Width = 94;
//
// gridColumn24
@@ -736,7 +734,7 @@
this.gridColumn31.MinWidth = 25;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 18;
+ this.gridColumn31.VisibleIndex = 17;
this.gridColumn31.Width = 94;
//
// gridColumn32
@@ -786,7 +784,7 @@
this.gridColumn38.MinWidth = 25;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Visible = true;
- this.gridColumn38.VisibleIndex = 19;
+ this.gridColumn38.VisibleIndex = 18;
this.gridColumn38.Width = 94;
//
// gridColumn39
@@ -804,7 +802,7 @@
this.gridColumn30.MinWidth = 25;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Visible = true;
- this.gridColumn30.VisibleIndex = 21;
+ this.gridColumn30.VisibleIndex = 20;
this.gridColumn30.Width = 94;
//
// gridColumn34
@@ -1331,41 +1329,41 @@
this.layoutControlItem23});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7});
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14});
this.Root.Size = new System.Drawing.Size(1464, 216);
this.Root.TextVisible = false;
//
@@ -2006,8 +2004,6 @@
this.gridColumn18.FieldName = "itemId";
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 2;
this.gridColumn18.Width = 94;
//
// Frm_Womcaa
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index 1315f80..d1f2ac5 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -271,7 +271,7 @@
lbGuid, txt_caa001, gridView1, "caa001");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 062cfef..0a1750f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -51,6 +51,12 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womdaa));
+ 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.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -66,12 +72,6 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womdaa));
- 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -276,6 +276,8 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptTuoBanNbz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
@@ -333,8 +335,7 @@
this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.rptTuoBanNbz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -452,6 +453,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
@@ -499,7 +501,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
this.xtraTabPage5.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -2503,7 +2504,7 @@
// gridColumn62
//
this.gridColumn62.Caption = "鏁版嵁鐘舵��";
- this.gridColumn62.FieldName = "barCodeRemark";
+ this.gridColumn62.FieldName = "bRemark";
this.gridColumn62.MinWidth = 25;
this.gridColumn62.Name = "gridColumn62";
this.gridColumn62.OptionsColumn.ReadOnly = true;
@@ -3033,6 +3034,27 @@
this.gridColumn32.VisibleIndex = 11;
this.gridColumn32.Width = 94;
//
+ // gridColumn54
+ //
+ this.gridColumn54.Caption = "鍙樻洿鍐呭寘瑁呮暟閲�";
+ this.gridColumn54.ColumnEdit = this.rptTuoBanNbz;
+ this.gridColumn54.MinWidth = 25;
+ this.gridColumn54.Name = "gridColumn54";
+ this.gridColumn54.Visible = true;
+ this.gridColumn54.VisibleIndex = 12;
+ this.gridColumn54.Width = 94;
+ //
+ // rptTuoBanNbz
+ //
+ this.rptTuoBanNbz.AutoHeight = false;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.rptTuoBanNbz.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)});
+ this.rptTuoBanNbz.Name = "rptTuoBanNbz";
+ this.rptTuoBanNbz.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.rptTuoBanNbz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptTuoBanNbz_ButtonClick);
+ //
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.splitMx98);
@@ -3257,7 +3279,8 @@
this.gridColumn42,
this.gridColumn43,
this.gridColumn34,
- this.gridColumn35});
+ this.gridColumn35,
+ this.gridColumn55});
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3350,8 +3373,6 @@
this.gridColumn34.MinWidth = 25;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.OptionsColumn.ReadOnly = true;
- this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 5;
this.gridColumn34.Width = 94;
//
// gridColumn35
@@ -3362,7 +3383,7 @@
this.gridColumn35.Name = "gridColumn35";
this.gridColumn35.OptionsColumn.ReadOnly = true;
this.gridColumn35.Visible = true;
- this.gridColumn35.VisibleIndex = 6;
+ this.gridColumn35.VisibleIndex = 5;
this.gridColumn35.Width = 94;
//
// xtraTabPage4
@@ -3745,26 +3766,15 @@
this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
this.ucBtnPrint101.TabIndex = 0;
//
- // gridColumn54
+ // gridColumn55
//
- this.gridColumn54.Caption = "鍙樻洿鍐呭寘瑁呮暟閲�";
- this.gridColumn54.ColumnEdit = this.rptTuoBanNbz;
- this.gridColumn54.MinWidth = 25;
- this.gridColumn54.Name = "gridColumn54";
- this.gridColumn54.Visible = true;
- this.gridColumn54.VisibleIndex = 12;
- this.gridColumn54.Width = 94;
- //
- // rptTuoBanNbz
- //
- this.rptTuoBanNbz.AutoHeight = false;
- editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.rptTuoBanNbz.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)});
- this.rptTuoBanNbz.Name = "rptTuoBanNbz";
- this.rptTuoBanNbz.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.rptTuoBanNbz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptTuoBanNbz_ButtonClick);
+ this.gridColumn55.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn55.FieldName = "bRemark";
+ this.gridColumn55.MinWidth = 25;
+ this.gridColumn55.Name = "gridColumn55";
+ this.gridColumn55.Visible = true;
+ this.gridColumn55.VisibleIndex = 6;
+ this.gridColumn55.Width = 94;
//
// Frm_Womdaa
//
@@ -3892,6 +3902,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
this.splitMx98.Panel1.ResumeLayout(false);
@@ -3939,7 +3950,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
this.xtraTabPage5.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).EndInit();
this.ResumeLayout(false);
}
@@ -4207,5 +4217,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 57e13fd..eb74041 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -21,6 +21,7 @@
public Frm_Womdaa()
{
InitializeComponent();
+ //鍏堥殣钘�4绉嶆墦鍗�
this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
@@ -45,7 +46,6 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx6);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx7);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx8);
- txt_daa015.getSuppler("");
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -610,6 +610,8 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ string lineId = dy.daa013;
+ txt_daa015.getSuppler(txt_daa013.Text.Trim(), lineId);
//鎵樻澘鐮�
txt_zQty.Text = dy.daa008;
txt_yQty.Text = dy.yQty;
@@ -622,7 +624,6 @@
txt_zQty100.Text = dy.daa008;
txt_yQty100.Text = dy.yQty100;
txt_kQty100.Text = dy.kQty100;
-
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -784,6 +785,7 @@
txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
txt_iCount_98.Text = txt_kQty98.Text;//杩芥函鐮�
txt_iCount_100.Text = txt_kQty100.Text;//鍚庣洊鐮�
+
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx
index 2fff337..4c755b8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx
@@ -120,22 +120,22 @@
<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">
<value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAC3RFWHRUaXRsZQBPcGVuO0nJ
- d5IAAAMUSURBVDhPdZNrUIxRGMefaskSw4xvfPEF0UwUJdKmi9wiMTVF1i0l5V5TmmGY0LjFaFzL6qLI
- CmEqlyIl7WaKdkt80U1bre5Lbe3797yKwfDO/Oac95z/8ztnnndeAvBfxMc5nCzdY+jYomhqdd9PrS4R
- dNx6KUl5y5wx+2fhT8SAaxRFy/aQJ88ljtvIZX44tTkG02mHEBIDErKysjJnLIaRDI/i2g/BX0jsN1Pc
- nK0EHkXBSKpK9irUKrygvTaEJskLZYnuAaKEA7QggmjeDiZUfKMRYqGdnGC74acgaTGEwYZh6mHs1aJK
- 4aNPCJ09iSUjf0cqlY6SSCRjzMzMRnOxJWNOlRc9IPRrIfTmw9SdC6H7IYztT1B5ZSXKz7mi/Kwr1Aky
- qM/IUHbaFcXxsiKWjfjVpzfn3SD0vYPQlQOhIxtCexZM+lsw9RSwuJqp4X0+oK8Kpm+VKDm2ECwYVRzn
- TEVHnIlEs/CtAsIXLmxJwUDTJQzUn8dAXQKMn07B+PE4+mvjmMPof38IeXvtRMFEZjRjSaXxLDCoMPg5
- CbqC7XifvgY1qWtQfX01NAofaJJXoerqSry9vAKVF5fj2QFHPI1xxJNoB+RHzm0VrwFD4wO0q2NRmxkE
- k0ED4StfnUdTbwX3RY3BjhIM6Ath1OWhv/E++upuofllPO5FzFJTYawTmlWJqEnzR0PhUQ6/Qk/5QXSr
- YtH1OgZdpVHoLNmPjpe70fE8Au0FYdA/DeHmLsV1uc1hehzlAM3tfdxhT3RWp8NQc/mPoD4/GG25W9D2
- SI7WB0HQ5QRAd9cfeTvtEekxxZYe7bJD0YnVUCV4w/AhhYvC0MLBlpxA6O75oVm5Fp+VvmjK8kHTTW80
- 3liG2gtuyAiaoeUmjiVlsA0e7nWCViHHlxfRHFyFpsyhYEPaEsYT9SkeqFMsYmSoS3ZBcawdEn2nnhQ/
- J6UGTlcpN81E9hYbZG+2wR2e39k4E0r5DNwWCRoiaz2zzho3A62R5je9IcRpsjULzMWfScqMY8b/gwl/
- Ia6NYSwy/KZRht80+g5HViqSsBpE9wAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAE9wZW47Scl3kgAAAxRJREFUOE91
+ k2tQjFEYx59qyRLDjG988QXRTBQl0qaL3CIxNUXWLSXlXlOaYZjQuMVoXMvqosgKYSqXIiXtZop2S3zR
+ TVut7ktt7fv3vIrB8M785pz3nP/zO2eed14C8F/ExzmcLN1j6NiiaGp130+tLhF03HopSXnLnDH7Z+FP
+ xIBrFEXL9pAnzyWO28hlfji1OQbTaYcQEgMSsrKyMmcshpEMj+LaD8FfSOw3U9ycrQQeRcFIqkr2KtQq
+ vKC9NoQmyQtlie4BooQDtCCCaN4OJlR8oxFioZ2cYLvhpyBpMYTBhmHqYezVokrho08InT2JJSN/RyqV
+ jpJIJGPMzMxGc7ElY06VFz0g9Gsh9ObD1J0LofshjO1PUHllJcrPuaL8rCvUCTKoz8hQdtoVxfGyIpaN
+ +NWnN+fdIPS9g9CVA6EjG0J7Fkz6WzD1FLC4mqnhfT6grwqmb5UoObYQLBhVHOdMRUeciUSz8K0Cwhcu
+ bEnBQNMlDNSfx0BdAoyfTsH48Tj6a+OYw+h/fwh5e+1EwURmNGNJpfEsMKgw+DkJuoLteJ++BjWpa1B9
+ fTU0Ch9okleh6upKvL28ApUXl+PZAUc8jXHEk2gH5EfObRWvAUPjA7SrY1GbGQSTQQPhK1+dR1NvBfdF
+ jcGOEgzoC2HU5aG/8T766m6h+WU87kXMUlNhrBOaVYmoSfNHQ+FRDr9CT/lBdKti0fU6Bl2lUegs2Y+O
+ l7vR8TwC7QVh0D8N4eYuxXW5zWF6HOUAze193GFPdFanw1Bz+Y+gPj8Ybblb0PZIjtYHQdDlBEB31x95
+ O+0R6THFlh7tskPRidVQJXjD8CGFi8LQwsGWnEDo7vmhWbkWn5W+aMryQdNNbzTeWIbaC27ICJqh5SaO
+ JWWwDR7udYJWIceXF9EcXIWmzKFgQ9oSxhP1KR6oUyxiZKhLdkFxrB0SfaeeFD8npQZOVyk3zUT2Fhtk
+ b7bBHZ7f2TgTSvkM3BYJGiJrPbPOGjcDrZHmN70hxGmyNQvMxZ9Jyoxjxv+DCX8hro1hLDL8plGG3zT6
+ DkdWKpKwGkT3AAAAAElFTkSuQmCC
</value>
</data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index bb56b81..27494c4 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -181,7 +181,7 @@
lbGuid, txt_hNo, gridView1, "hNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 2eeb425..88cfa51 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -991,7 +991,7 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(633, 76);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 76);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
this.layoutControl1.Size = new System.Drawing.Size(336, 28);
@@ -1077,7 +1077,7 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(971, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 42);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = "rpt_daa";
@@ -1086,7 +1086,7 @@
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(971, 10);
+ this.radOut.Location = new System.Drawing.Point(1030, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1101,7 +1101,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(735, 44);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
@@ -1113,7 +1113,7 @@
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(55, 12);
+ this.txtWlid.Location = new System.Drawing.Point(114, 12);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
@@ -1123,7 +1123,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(55, 44);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 44);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1133,7 +1133,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(55, 76);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 76);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1143,7 +1143,7 @@
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(735, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(794, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
@@ -1155,7 +1155,7 @@
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(395, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(454, 12);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
@@ -1165,7 +1165,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(395, 44);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 44);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1376,6 +1376,7 @@
this.gvMx1.OptionsFilter.AllowFilterEditor = false;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsView.ShowFooter = true;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gvAbtGuid
@@ -1463,6 +1464,8 @@
this.gridColumn8.FieldName = "quantity";
this.gridColumn8.MinWidth = 50;
this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
this.gridColumn8.Width = 83;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
index 1bc9673..78015d1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs
@@ -53,7 +53,7 @@
return;
txt_fCustId.getSuppler(orgId, _ucKh);
//2025-08-11鍔犱笂鍙兘鏄唬绠′粨
- txt_fStockId.getSuppler(orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁Dgc]=1 )");
+ txt_fStockId.getSuppler(orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁浠ｇ鑹搧浠揮=1 )");
};
//閫夋嫨闇�瑕佺殑鏄庣粏
btnSelect.Click += (s, e) =>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
index 490e421..02ebeb0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
@@ -37,16 +37,7 @@
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -90,52 +81,28 @@
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_isFinish = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_qt034 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt033 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tabMx = new DevExpress.XtraTab.XtraTabControl();
- this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
- this.layout99 = new DevExpress.XtraLayout.LayoutControl();
- this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
- this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
- this.radOut = new DevExpress.XtraEditors.RadioGroup();
- this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
- this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txtWlid = new DevExpress.XtraEditors.TextEdit();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
- this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
- this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
- this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
- this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
- this.txtYdy = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -174,6 +141,7 @@
this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -202,58 +170,33 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
- this.split99.Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
this.split99.Panel2.SuspendLayout();
this.split99.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit();
- this.layout99.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
- this.layoutControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
@@ -263,6 +206,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -558,7 +502,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1167, 570);
- this.splitMx1.SplitterPosition = 104;
+ this.splitMx1.SplitterPosition = 134;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -576,6 +520,9 @@
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_isFinish);
+ this.layoutMx1.Controls.Add(this.txt_qt034);
+ this.layoutMx1.Controls.Add(this.txt_qt033);
+ this.layoutMx1.Controls.Add(this.txt_qt032);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem2,
@@ -584,16 +531,16 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(567, 356, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1167, 104);
+ this.layoutMx1.Size = new System.Drawing.Size(1167, 134);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_fCustId
//
this.txt_fCustId.IsReadly = false;
- this.txt_fCustId.Location = new System.Drawing.Point(370, 40);
+ this.txt_fCustId.Location = new System.Drawing.Point(385, 68);
this.txt_fCustId.Name = "txt_fCustId";
- this.txt_fCustId.Size = new System.Drawing.Size(211, 24);
+ this.txt_fCustId.Size = new System.Drawing.Size(196, 24);
this.txt_fCustId.TabIndex = 333;
//
// lbGuid
@@ -607,28 +554,28 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(84, 68);
+ this.txt_remark.Location = new System.Drawing.Point(99, 96);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(497, 24);
+ this.txt_remark.Size = new System.Drawing.Size(482, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_fStockId
//
this.txt_fStockId.IsReadly = false;
- this.txt_fStockId.Location = new System.Drawing.Point(370, 12);
+ this.txt_fStockId.Location = new System.Drawing.Point(99, 68);
this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0);
this.txt_fStockId.Name = "txt_fStockId";
- this.txt_fStockId.Size = new System.Drawing.Size(211, 24);
+ this.txt_fStockId.Size = new System.Drawing.Size(195, 24);
this.txt_fStockId.TabIndex = 301;
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(944, 12);
+ this.txt_checkBy.Location = new System.Drawing.Point(672, 12);
this.txt_checkBy.Name = "txt_checkBy";
this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
- this.txt_checkBy.Size = new System.Drawing.Size(211, 24);
+ this.txt_checkBy.Size = new System.Drawing.Size(196, 24);
this.txt_checkBy.StyleController = this.layoutMx1;
this.txt_checkBy.TabIndex = 267;
this.txt_checkBy.Tag = "readonly";
@@ -636,36 +583,36 @@
// txt_fStockOrgId
//
this.txt_fStockOrgId.IsReadly = false;
- this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 40);
+ this.txt_fStockOrgId.Location = new System.Drawing.Point(99, 40);
this.txt_fStockOrgId.Name = "txt_fStockOrgId";
- this.txt_fStockOrgId.Size = new System.Drawing.Size(210, 24);
+ this.txt_fStockOrgId.Size = new System.Drawing.Size(195, 24);
this.txt_fStockOrgId.TabIndex = 326;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(99, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(210, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(195, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(944, 40);
+ this.txt_checkDate.Location = new System.Drawing.Point(672, 40);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(211, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(196, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 217;
this.txt_checkDate.Tag = "readonly";
//
// txt_isCheck
//
- this.txt_isCheck.Location = new System.Drawing.Point(872, 68);
+ this.txt_isCheck.Location = new System.Drawing.Point(585, 68);
this.txt_isCheck.Name = "txt_isCheck";
- this.txt_isCheck.Properties.Caption = "瀹℃牳鐘舵��";
+ this.txt_isCheck.Properties.Caption = "鍒跺崟瀹℃牳鐘舵��";
this.txt_isCheck.Size = new System.Drawing.Size(283, 24);
this.txt_isCheck.StyleController = this.layoutMx1;
this.txt_isCheck.TabIndex = 330;
@@ -673,18 +620,18 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(657, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(385, 12);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(211, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(196, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 331;
this.txt_createBy.Tag = "readonly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(657, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(385, 40);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(211, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(196, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 332;
this.txt_createDate.Tag = "readonly";
@@ -700,13 +647,41 @@
//
// txt_isFinish
//
- this.txt_isFinish.Location = new System.Drawing.Point(585, 68);
+ this.txt_isFinish.Location = new System.Drawing.Point(585, 96);
this.txt_isFinish.Name = "txt_isFinish";
this.txt_isFinish.Properties.Caption = "瀹岀粨鐘舵��";
this.txt_isFinish.Size = new System.Drawing.Size(283, 24);
this.txt_isFinish.StyleController = this.layoutMx1;
this.txt_isFinish.TabIndex = 335;
this.txt_isFinish.Tag = "readonly";
+ //
+ // txt_qt034
+ //
+ this.txt_qt034.Location = new System.Drawing.Point(959, 12);
+ this.txt_qt034.Name = "txt_qt034";
+ this.txt_qt034.Size = new System.Drawing.Size(196, 24);
+ this.txt_qt034.StyleController = this.layoutMx1;
+ this.txt_qt034.TabIndex = 336;
+ this.txt_qt034.Tag = "readonly";
+ //
+ // txt_qt033
+ //
+ this.txt_qt033.Location = new System.Drawing.Point(959, 40);
+ this.txt_qt033.Name = "txt_qt033";
+ this.txt_qt033.Size = new System.Drawing.Size(196, 24);
+ this.txt_qt033.StyleController = this.layoutMx1;
+ this.txt_qt033.TabIndex = 337;
+ this.txt_qt033.Tag = "readonly";
+ //
+ // txt_qt032
+ //
+ this.txt_qt032.Location = new System.Drawing.Point(872, 68);
+ this.txt_qt032.Name = "txt_qt032";
+ this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鐘舵��";
+ this.txt_qt032.Size = new System.Drawing.Size(283, 24);
+ this.txt_qt032.StyleController = this.layoutMx1;
+ this.txt_qt032.TabIndex = 338;
+ this.txt_qt032.Tag = "readonly";
//
// layoutControlItem2
//
@@ -737,15 +712,18 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
this.layoutControlItem4,
+ this.layoutControlItem13,
+ this.layoutControlItem8,
+ this.layoutControlItem6,
+ this.layoutControlItem14,
+ this.layoutControlItem15,
this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem11,
- this.layoutControlItem14,
- this.layoutControlItem15,
- this.layoutControlItem8,
- this.layoutControlItem3,
- this.layoutControlItem6,
- this.layoutControlItem13});
+ this.layoutControlItem5,
+ this.layoutControlItem7,
+ this.layoutControlItem16,
+ this.layoutControlItem3});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -767,11 +745,14 @@
rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition3.Height = 100D;
rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
- rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1167, 104);
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1167, 134);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -781,7 +762,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(286, 28);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
@@ -791,107 +772,127 @@
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem4.Size = new System.Drawing.Size(286, 28);
this.layoutControlItem4.Text = "搴撳瓨缁勭粐";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_remark;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(573, 30);
+ this.layoutControlItem13.Text = "鐢宠鍘熷洜";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fStockId;
+ this.layoutControlItem8.CustomizationFormText = "浠ｇ浠撳簱";
+ this.layoutControlItem8.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(286, 28);
+ this.layoutControlItem8.Text = "浠ｇ浠撳簱";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_fCustId;
+ this.layoutControlItem6.Location = new System.Drawing.Point(286, 56);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(287, 28);
+ this.layoutControlItem6.Text = "閫夋嫨瀹㈡埛";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_createBy;
+ this.layoutControlItem14.CustomizationFormText = "鐢宠浜�";
+ this.layoutControlItem14.Location = new System.Drawing.Point(286, 0);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem14.Size = new System.Drawing.Size(287, 28);
+ this.layoutControlItem14.Text = "鐢宠浜哄憳";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_createDate;
+ this.layoutControlItem15.Location = new System.Drawing.Point(286, 28);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem15.Size = new System.Drawing.Size(287, 28);
+ this.layoutControlItem15.Text = "鐢宠鏃堕棿";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_checkBy;
- this.layoutControlItem9.Location = new System.Drawing.Point(860, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(573, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.Size = new System.Drawing.Size(287, 28);
- this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.Text = "鍒跺崟瀹℃牳浜�";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(860, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(573, 28);
this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem10.Size = new System.Drawing.Size(287, 28);
- this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.Text = "鍒跺崟瀹℃牳鏈�";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_isCheck;
- this.layoutControlItem11.Location = new System.Drawing.Point(860, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(573, 56);
this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem11.Size = new System.Drawing.Size(287, 28);
this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
//
- // layoutControlItem14
+ // layoutControlItem5
//
- this.layoutControlItem14.Control = this.txt_createBy;
- this.layoutControlItem14.CustomizationFormText = "鐢宠浜�";
- this.layoutControlItem14.Location = new System.Drawing.Point(573, 0);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(287, 28);
- this.layoutControlItem14.Text = "鐢宠浜哄憳";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.Control = this.txt_qt034;
+ this.layoutControlItem5.Location = new System.Drawing.Point(860, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem5.Size = new System.Drawing.Size(287, 28);
+ this.layoutControlItem5.Text = "閲囪喘瀹℃牳浜�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
- // layoutControlItem15
+ // layoutControlItem7
//
- this.layoutControlItem15.Control = this.txt_createDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(573, 28);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(287, 28);
- this.layoutControlItem15.Text = "鐢宠鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.Control = this.txt_qt033;
+ this.layoutControlItem7.Location = new System.Drawing.Point(860, 28);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(287, 28);
+ this.layoutControlItem7.Text = "閲囪喘瀹℃牳鏈�";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
- // layoutControlItem8
+ // layoutControlItem16
//
- this.layoutControlItem8.Control = this.txt_fStockId;
- this.layoutControlItem8.CustomizationFormText = "浠ｇ浠撳簱";
- this.layoutControlItem8.Location = new System.Drawing.Point(286, 0);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(287, 28);
- this.layoutControlItem8.Text = "浠ｇ浠撳簱";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_isFinish;
- this.layoutControlItem3.Location = new System.Drawing.Point(573, 56);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(287, 28);
- this.layoutControlItem3.Text = "瀹岀粨鏍囪瘑";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem3.TextVisible = false;
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_fCustId;
- this.layoutControlItem6.Location = new System.Drawing.Point(286, 28);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(287, 28);
- this.layoutControlItem6.Text = "閫夋嫨瀹㈡埛";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_remark;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(573, 28);
- this.layoutControlItem13.Text = "鐢宠鍘熷洜";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem16.Control = this.txt_qt032;
+ this.layoutControlItem16.Location = new System.Drawing.Point(860, 56);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(287, 28);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
//
// tabMx
//
@@ -899,7 +900,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(1167, 454);
+ this.tabMx.Size = new System.Drawing.Size(1167, 424);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -909,7 +910,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1165, 422);
+ this.tabMxPage1.Size = new System.Drawing.Size(1165, 392);
this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
//
// split99
@@ -921,7 +922,6 @@
//
// split99.Panel1
//
- this.split99.Panel1.Controls.Add(this.layout99);
this.split99.Panel1.Text = "Panel1";
//
// split99.Panel2
@@ -929,376 +929,9 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1165, 422);
- this.split99.SplitterPosition = 126;
+ this.split99.Size = new System.Drawing.Size(1165, 392);
+ this.split99.SplitterPosition = 0;
this.split99.TabIndex = 3;
- //
- // layout99
- //
- this.layout99.Controls.Add(this.lbMxGuid);
- this.layout99.Controls.Add(this.ucBtnPrint1);
- this.layout99.Controls.Add(this.radOut);
- this.layout99.Controls.Add(this.layoutControl1);
- this.layout99.Controls.Add(this.txtWlid);
- this.layout99.Controls.Add(this.txt_psnQty_1);
- this.layout99.Controls.Add(this.txtWlmc);
- this.layout99.Controls.Add(this.txtWlgg);
- this.layout99.Controls.Add(this.txt_kQty);
- this.layout99.Controls.Add(this.txtQuantity);
- this.layout99.Controls.Add(this.txtYdy);
- this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem26});
- this.layout99.Location = new System.Drawing.Point(0, 0);
- this.layout99.Name = "layout99";
- this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(121, 456, 812, 500);
- this.layout99.Root = this.layoutControlGroup1;
- this.layout99.Size = new System.Drawing.Size(1165, 126);
- this.layout99.TabIndex = 0;
- this.layout99.Text = "layoutControl1";
- //
- // lbMxGuid
- //
- this.lbMxGuid.Location = new System.Drawing.Point(1032, 104);
- this.lbMxGuid.Name = "lbMxGuid";
- this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
- this.lbMxGuid.StyleController = this.layout99;
- this.lbMxGuid.TabIndex = 229;
- this.lbMxGuid.Text = "lbMxGuid";
- this.lbMxGuid.Visible = false;
- //
- // ucBtnPrint1
- //
- this.ucBtnPrint1.allClickKey = null;
- this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
- this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
- this.ucBtnPrint1.Name = "ucBtnPrint1";
- this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(338, 32);
- this.ucBtnPrint1.TabIndex = 230;
- //
- // radOut
- //
- this.radOut.Location = new System.Drawing.Point(1030, 10);
- this.radOut.Margin = new System.Windows.Forms.Padding(0);
- this.radOut.Name = "radOut";
- this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
- this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
- this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(340, 32);
- this.radOut.StyleController = this.layout99;
- this.radOut.TabIndex = 476;
- //
- // layoutControl1
- //
- this.layoutControl1.Controls.Add(this.txt_iCount_1);
- this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 76);
- this.layoutControl1.Name = "layoutControl1";
- this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 28);
- this.layoutControl1.TabIndex = 227;
- this.layoutControl1.Text = "layoutControl1";
- //
- // txt_iCount_1
- //
- this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
- this.txt_iCount_1.Name = "txt_iCount_1";
- this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
- this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
- this.txt_iCount_1.StyleController = this.layoutControl1;
- this.txt_iCount_1.TabIndex = 228;
- //
- // txt_yuliang_1
- //
- this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
- this.txt_yuliang_1.Name = "txt_yuliang_1";
- this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
- this.txt_yuliang_1.StyleController = this.layoutControl1;
- this.txt_yuliang_1.TabIndex = 229;
- //
- // layoutControlGroup2
- //
- this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- this.layoutControlGroup2.GroupBordersVisible = false;
- this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem22,
- this.layoutControlItem23});
- this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition4});
- this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
- this.layoutControlGroup2.TextVisible = false;
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.txt_iCount_1;
- this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.Size = new System.Drawing.Size(168, 28);
- this.layoutControlItem22.Text = "鎵撳嵃鏁村紶鏁板��";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem23
- //
- this.layoutControlItem23.Control = this.txt_yuliang_1;
- this.layoutControlItem23.Location = new System.Drawing.Point(168, 0);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(168, 28);
- this.layoutControlItem23.Text = "鎵撳嵃浣欐暟";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
- //
- // txtWlid
- //
- this.txtWlid.Location = new System.Drawing.Point(114, 12);
- this.txtWlid.Name = "txtWlid";
- this.txtWlid.Properties.Appearance.Options.UseFont = true;
- this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(234, 24);
- this.txtWlid.StyleController = this.layout99;
- this.txtWlid.TabIndex = 214;
- //
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
- this.txt_psnQty_1.Name = "txt_psnQty_1";
- this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
- this.txt_psnQty_1.StyleController = this.layout99;
- this.txt_psnQty_1.TabIndex = 226;
- //
- // txtWlmc
- //
- this.txtWlmc.Location = new System.Drawing.Point(114, 44);
- this.txtWlmc.Name = "txtWlmc";
- this.txtWlmc.Properties.Appearance.Options.UseFont = true;
- this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(234, 24);
- this.txtWlmc.StyleController = this.layout99;
- this.txtWlmc.TabIndex = 216;
- //
- // txtWlgg
- //
- this.txtWlgg.Location = new System.Drawing.Point(114, 76);
- this.txtWlgg.Name = "txtWlgg";
- this.txtWlgg.Properties.Appearance.Options.UseFont = true;
- this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(574, 24);
- this.txtWlgg.StyleController = this.layout99;
- this.txtWlgg.TabIndex = 218;
- //
- // txt_kQty
- //
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
- this.txt_kQty.Name = "txt_kQty";
- this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
- this.txt_kQty.Properties.Appearance.Options.UseFont = true;
- this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
- this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(234, 24);
- this.txt_kQty.StyleController = this.layout99;
- this.txt_kQty.TabIndex = 224;
- //
- // txtQuantity
- //
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
- this.txtQuantity.Name = "txtQuantity";
- this.txtQuantity.Properties.Appearance.Options.UseFont = true;
- this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(234, 24);
- this.txtQuantity.StyleController = this.layout99;
- this.txtQuantity.TabIndex = 220;
- //
- // txtYdy
- //
- this.txtYdy.Location = new System.Drawing.Point(454, 44);
- this.txtYdy.Name = "txtYdy";
- this.txtYdy.Properties.Appearance.Options.UseFont = true;
- this.txtYdy.Properties.ReadOnly = true;
- this.txtYdy.Size = new System.Drawing.Size(234, 24);
- this.txtYdy.StyleController = this.layout99;
- this.txtYdy.TabIndex = 222;
- //
- // layoutControlItem26
- //
- this.layoutControlItem26.Control = this.lbMxGuid;
- this.layoutControlItem26.Location = new System.Drawing.Point(1020, 92);
- this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 46);
- this.layoutControlItem26.Text = "lbMxGuid";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem26.TextVisible = false;
- //
- // layoutControlGroup1
- //
- this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- this.layoutControlGroup1.GroupBordersVisible = false;
- this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem5,
- this.layoutControlItem7,
- this.layoutControlItem16,
- this.layoutControlItem17,
- this.layoutControlItem18,
- this.layoutControlItem19,
- this.layoutControlItem20,
- this.layoutControlItem21,
- this.layoutControlItem25,
- this.layoutControlItem24});
- this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.layoutControlGroup1.Name = "Root";
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
- this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
- this.layoutControlGroup1.TextVisible = false;
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txtWlid;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txtWlmc;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 32);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem7.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txtWlgg;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(680, 32);
- this.layoutControlItem16.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txtQuantity;
- this.layoutControlItem17.Location = new System.Drawing.Point(340, 0);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem17.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem17.Text = "鏈鐢宠鎬婚噺";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txtYdy;
- this.layoutControlItem18.Location = new System.Drawing.Point(340, 32);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem18.Text = "宸叉墦鍗版�婚噺";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_kQty;
- this.layoutControlItem19.Location = new System.Drawing.Point(680, 0);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem19.Text = "鍙墦鍗版�绘暟";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_psnQty_1;
- this.layoutControlItem20.Location = new System.Drawing.Point(680, 32);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem20.Text = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.layoutControl1;
- this.layoutControlItem21.Location = new System.Drawing.Point(680, 64);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem21.Text = "鎵撳嵃鏁伴噺";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem21.TextVisible = false;
- //
- // layoutControlItem25
- //
- this.layoutControlItem25.Control = this.ucBtnPrint1;
- this.layoutControlItem25.Location = new System.Drawing.Point(1020, 32);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem25.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem25.Text = "鎵撳嵃鎸夐挳";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem25.TextVisible = false;
- //
- // layoutControlItem24
- //
- this.layoutControlItem24.Control = this.radOut;
- this.layoutControlItem24.Location = new System.Drawing.Point(1020, 0);
- this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem24.Text = "璁＄畻鏂瑰紡";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem24.TextVisible = false;
//
// gcMx1
//
@@ -1309,7 +942,7 @@
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemSearchLookUpEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1165, 284);
+ this.gcMx1.Size = new System.Drawing.Size(1165, 380);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1603,7 +1236,7 @@
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1165, 422);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1165, 392);
this.xtraTabPage3.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -1612,7 +1245,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1165, 422);
+ this.gcMx2.Size = new System.Drawing.Size(1165, 392);
this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1744,6 +1377,18 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_isFinish;
+ this.layoutControlItem3.Location = new System.Drawing.Point(573, 84);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(287, 30);
+ this.layoutControlItem3.Text = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem3.TextVisible = false;
+ //
// Frm_MesShouTuo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1782,58 +1427,33 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
- this.split99.Panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
this.split99.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
this.split99.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
- this.layout99.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
- this.layoutControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
@@ -1843,6 +1463,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
this.ResumeLayout(false);
}
@@ -1876,10 +1497,7 @@
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraEditors.CheckEdit txt_isCheck;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1904,16 +1522,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private UserControl.UcBtnPrint ucBtnPrint1;
- private DevExpress.XtraEditors.LabelControl lbMxGuid;
- private DevExpress.XtraEditors.TextEdit txt_iCount_1;
- private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
- private DevExpress.XtraEditors.TextEdit txt_kQty;
- private DevExpress.XtraEditors.TextEdit txtYdy;
- private DevExpress.XtraEditors.TextEdit txtQuantity;
- private DevExpress.XtraEditors.TextEdit txtWlgg;
- private DevExpress.XtraEditors.TextEdit txtWlmc;
- private DevExpress.XtraEditors.TextEdit txtWlid;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1930,8 +1538,6 @@
private DevExpress.XtraEditors.TextEdit txt_createDate;
private UserControl.UcLookCustomer txt_fCustId;
private DevExpress.XtraEditors.TextEdit txt_guid;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraGrid.Columns.GridColumn gv18;
@@ -1940,34 +1546,26 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraEditors.CheckEdit txt_isFinish;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraEditors.RadioGroup radOut;
private DevExpress.XtraEditors.SplitContainerControl split99;
- private DevExpress.XtraLayout.LayoutControl layout99;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraEditors.TextEdit txt_qt034;
+ private DevExpress.XtraEditors.TextEdit txt_qt033;
+ private DevExpress.XtraEditors.CheckEdit txt_qt032;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControl layoutControl1;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
index 8ffc01c..8d78699 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -59,7 +59,7 @@
return;
txt_fCustId.getSuppler(_orgId, _ucKh);
//2025-08-11鍔犱笂鍙兘鏄唬绠′粨
- txt_fStockId.getSuppler(_orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁Dgc]=1 )");
+ txt_fStockId.getSuppler(_orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁浠ｇ鑹搧浠揮=1 )");
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
@@ -76,92 +76,6 @@
{
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
- };
- gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- this.ucBtnPrint1.btnPrintClick += (s, e) =>
- {
- ucBtnPrint1.guidKey = "";
- string rowGuid = lbMxGuid.Text.Trim();
- ucBtnPrint1.guidKey = rowGuid;
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
- txt_iCount_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
- txt_psnQty_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (lbMxGuid.Text.Trim().Length < 10)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- this.ucBtnPrint1.rptParameter = "rpt_Strk{" + lbMxGuid.Text.Trim()
- + "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
- + "}";
- };
- this.ucBtnPrint1.btnAllClick += (s, e) =>
- {
- string rowGuid = lbMxGuid.Text.Trim();
- if (rowGuid.Length < 10)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- SelectDeleteBar frm = new SelectDeleteBar(rowGuid, QcSeason.鍙楁墭鍏ュ簱.ToString());
- string strCodeList = "";
- string strAction = "";
- frm.UpdateParent += (ss, ee) =>
- {
- strCodeList = ee.StringSingle;
- strAction = ee.Data;
- };
- frm.ShowDialog();
- if (string.IsNullOrEmpty(strCodeList))
- return;
- if (strAction == "print")
- {
- try
- {
- string rptParameter = "rpt_Strk{"
- + "100"
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
- {
- rpt.ShowDialog();
- }
- frm.Close();
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
- }
- }
- };
- //鑷姩璁＄畻鎵撳嵃閲�
- txt_psnQty_1.TextChanged += (s, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
- };
- radOut.SelectedIndexChanged += (s, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -703,9 +617,11 @@
{
getModel(lbGuid.Text.Trim());
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "isCheck", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+
}
else
MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -713,34 +629,6 @@
catch (Exception ex)
{
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
- }
- private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
- {
- if (e.FocusedRowHandle >= 0)
- {
- DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
- lbMxGuid.Text = row["guid"].ToString();
- ucBtnPrint1.guidKey = row["guid"].ToString();
- txtWlid.Text = row["itemNo"].ToString();
- txtWlgg.Text = row["itemModel"].ToString();
- txtWlmc.Text = row["itemName"].ToString();
- txtQuantity.Text = row["sqsl"].ToString();//鐢宠鎬婚噺
- txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
- txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
- }
- else
- {
- lbMxGuid.Text = "";
- ucBtnPrint1.guidKey = "";
- txtWlid.Text = "";
- txtWlgg.Text = "";
- txtWlmc.Text = "";
- txtQuantity.Text = "";
- txtYdy.Text = "";
- txt_kQty.Text = "";
- txt_psnQty_1.Text = "";
- txt_iCount_1.Text = "";
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
index 9b1d4ac..7e06c35 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -56,7 +56,6 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -309,7 +308,6 @@
this.gridColumn11,
this.gridColumn13,
this.gridColumn18,
- this.gridColumn19,
this.gridColumn20,
this.gridColumn21,
this.gridColumn23,
@@ -405,14 +403,6 @@
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 8;
this.gridColumn18.Width = 94;
- //
- // gridColumn19
- //
- this.gridColumn19.Caption = "棰勮浜ч噺";
- this.gridColumn19.FieldName = "daaCl";
- this.gridColumn19.MinWidth = 25;
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Width = 94;
//
// gridColumn20
//
@@ -1674,7 +1664,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
index f3ce19c..f302d4d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -51,6 +51,9 @@
{
getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), badTag);
};
+
+ this.ActiveControl = this.txt_barCode111;
+ txt_barCode111.Focus();
}
/// <summary>
///
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index d0799b7..2c5fe7f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -9,6 +9,7 @@
using NModbus;
using System;
using System.Collections.Generic;
+using System.Configuration;
using System.Data;
using System.Data.SqlClient;
using System.Dynamic;
@@ -76,6 +77,14 @@
//濡傛灉鏄按妫�锛屽彲浠ユ彁浜や簡
if (txt_gx.Text.Trim() == fGxShouJian)
{
+ if (txt_gongWei.Text.Trim().Length <= 0)
+ {
+ Toast vm = new Toast(-1, "~璇锋壂宸ヤ綅鐮亊");
+ vm.Show();
+ this.ActiveControl = this.txt_gongWei;
+ txt_gongWei.Focus();
+ return;
+ }
addModel(goodTag);
}
}
@@ -239,6 +248,8 @@
{
Toast vm = new Toast(-1, "~璇峰厛鎵拷婧爜~");
vm.Show();
+ this.ActiveControl = this.txt_barCode;
+ txt_barCode.Focus();
return;
}
dynamic _obj = getObj(_barCode, _checkResult, _badDescription);
@@ -484,52 +495,57 @@
string SJJG = "";//姘存鏌ョ粨鏋渙k銆乶g
string GWZT = "";//宸ヤ綅鐘舵��
string SJJGZ = "";//姘存鏌ョ粨鏋�1
- System.Text.StringBuilder sbSql1 = new StringBuilder();
- sbSql1.Append($"select MIG004,MIG005 from BASMIG(nolock) where MIG001='ShuiJianZhanWei01' and MIG003='{((BaseEdit)this.txt_gongWei).EditValue.ToString()}'");
- DataTable dataTable1 = this.GetDataTable(sbSql1.ToString(), "tmpBASMIG2");
- if (dataTable1 == null || dataTable1.Rows.Count <= 0)
+ bool blIp = true;
+ blIp = CheckPort(hostName, hostNamePoint);
+ if (blIp)
{
- ((BaseEdit)this.txt_gongWei).EditValue = (object)"";
- LogHelper.Debug(this.ToString(), txt_gongWei.Text + "璇ユ按妫�绔欎綅鐮佷笉瀛樺湪锛岃纭锛�");
- //Toast vm = new Toast(-1, "璇ユ按妫�绔欎綅鐮佷笉瀛樺湪锛岃纭锛�");
- //vm.Show();
- }
- else
- {
- ModbusFactory modbusFactory = new ModbusFactory();
- byte num1 = byte.Parse("1");
- ushort num2 = ushort.Parse("1");
- System.Text.StringBuilder sbSql2 = new StringBuilder();
- sbSql2.Append(string.Format($"select case when MIG006='D' then MIG003+{dataTable1.Rows[0][0]} else MIG003+{dataTable1.Rows[0][1]} end MIG003,MIG004 from BASMIG(nolock) where MIG001 = 'ShuiJianAddress01' order by MIG005"));
- DataTable dataTable2 = GetDataTable(sbSql2.ToString(), "tmpBASMIG3");
- if (dataTable2 == null || dataTable2.Rows.Count <= 0)
+ System.Text.StringBuilder sbSql1 = new StringBuilder();
+ sbSql1.Append($"select MIG004,MIG005 from BASMIG(nolock) where MIG001='ShuiJianZhanWei01' and MIG003='{((BaseEdit)this.txt_gongWei).EditValue.ToString()}'");
+ DataTable dataTable1 = this.GetDataTable(sbSql1.ToString(), "tmpBASMIG2");
+ if (dataTable1 == null || dataTable1.Rows.Count <= 0)
{
((BaseEdit)this.txt_gongWei).EditValue = (object)"";
- LogHelper.Debug(this.ToString(), txt_gongWei.Text + "姘存鍦板潃涓嶅瓨鍦紝璇风‘璁わ紒");
- //Toast vm = new Toast(-1, "姘存鍦板潃涓嶅瓨鍦紝璇风‘璁わ紒");
+ LogHelper.Debug(this.ToString(), txt_gongWei.Text + "璇ユ按妫�绔欎綅鐮佷笉瀛樺湪锛岃纭锛�");
+ //Toast vm = new Toast(-1, "璇ユ按妫�绔欎綅鐮佷笉瀛樺湪锛岃纭锛�");
//vm.Show();
}
else
{
- try
- {
- IModbusMaster master = modbusFactory.CreateMaster(new TcpClient(this.hostName, this.hostNamePoint));
- master.Transport.ReadTimeout = 10000;
- master.Transport.Retries = 10000;
- strCsl1 = master.ReadHoldingRegisters(num1, ushort.Parse(dataTable2.Rows[0]["MIG003"].ToString()), num2)[0].ToString();
- strSw1 = (float.Parse(master.ReadHoldingRegisters(num1, ushort.Parse(dataTable2.Rows[1]["MIG003"].ToString()), num2)[0].ToString()) / 10f).ToString();
- ushort[] numArray = master.ReadHoldingRegisters(num1, ushort.Parse(dataTable2.Rows[2]["MIG003"].ToString()), num2);
- SJJGZ = numArray[0].ToString();
- SJJG = numArray[0].ToString();
- SJJG = (SJJG == "1" ? "OK" : (SJJG == "2" ? "NG" : SJJG));
- GWZT = master.ReadCoils(num1, ushort.Parse(dataTable2.Rows[3]["MIG003"].ToString()), num2)[0].ToString();
- }
- catch (Exception ex)
+ ModbusFactory modbusFactory = new ModbusFactory();
+ byte num1 = byte.Parse("1");
+ ushort num2 = ushort.Parse("1");
+ System.Text.StringBuilder sbSql2 = new StringBuilder();
+ sbSql2.Append(string.Format($"select case when MIG006='D' then MIG003+{dataTable1.Rows[0][0]} else MIG003+{dataTable1.Rows[0][1]} end MIG003,MIG004 from BASMIG(nolock) where MIG001 = 'ShuiJianAddress01' order by MIG005"));
+ DataTable dataTable2 = GetDataTable(sbSql2.ToString(), "tmpBASMIG3");
+ if (dataTable2 == null || dataTable2.Rows.Count <= 0)
{
((BaseEdit)this.txt_gongWei).EditValue = (object)"";
- LogHelper.Debug(this.ToString(), txt_gongWei.Text + ex.Message);
- //Toast vm = new Toast(-1, ex.Message);
+ LogHelper.Debug(this.ToString(), txt_gongWei.Text + "姘存鍦板潃涓嶅瓨鍦紝璇风‘璁わ紒");
+ //Toast vm = new Toast(-1, "姘存鍦板潃涓嶅瓨鍦紝璇风‘璁わ紒");
//vm.Show();
+ }
+ else
+ {
+ try
+ {
+ IModbusMaster master = modbusFactory.CreateMaster(new TcpClient(this.hostName, this.hostNamePoint));
+ master.Transport.ReadTimeout = 10000;
+ master.Transport.Retries = 10000;
+ strCsl1 = master.ReadHoldingRegisters(num1, ushort.Parse(dataTable2.Rows[0]["MIG003"].ToString()), num2)[0].ToString();
+ strSw1 = (float.Parse(master.ReadHoldingRegisters(num1, ushort.Parse(dataTable2.Rows[1]["MIG003"].ToString()), num2)[0].ToString()) / 10f).ToString();
+ ushort[] numArray = master.ReadHoldingRegisters(num1, ushort.Parse(dataTable2.Rows[2]["MIG003"].ToString()), num2);
+ SJJGZ = numArray[0].ToString();
+ SJJG = numArray[0].ToString();
+ SJJG = (SJJG == "1" ? "OK" : (SJJG == "2" ? "NG" : SJJG));
+ GWZT = master.ReadCoils(num1, ushort.Parse(dataTable2.Rows[3]["MIG003"].ToString()), num2)[0].ToString();
+ }
+ catch (Exception ex)
+ {
+ ((BaseEdit)this.txt_gongWei).EditValue = (object)"";
+ LogHelper.Debug(this.ToString(), txt_gongWei.Text + ex.Message);
+ //Toast vm = new Toast(-1, ex.Message);
+ //vm.Show();
+ }
}
}
}
@@ -553,6 +569,32 @@
return ds.Tables[0];
}
}
+
+ private bool CheckPort(string host, int port)
+ {
+ int vanishingSeconds = 3;
+ string _vanishingSeconds = ConfigurationManager.AppSettings["AsyncSeconds"];
+ if (!string.IsNullOrEmpty(_vanishingSeconds))
+ vanishingSeconds = int.Parse(_vanishingSeconds);
+ bool isOpen = false;
+ try
+ {
+ using (var client = new TcpClient())
+ {
+ var result = client.BeginConnect(host, port, null, null);
+ var success = result.AsyncWaitHandle.WaitOne(TimeSpan.FromSeconds(vanishingSeconds)); // 绛夊緟5绉�
+ if (success)
+ {
+ isOpen = true;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(this.ToString(), "CheckPort:" + ex.Message);
+ }
+ return isOpen;
+ }
#endregion
}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 1054851..8022b31 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -683,11 +683,11 @@
<Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs">
<DependentUpon>Frm_QtrkDetect01.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs">
+ <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
- <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+ <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.Designer.cs">
+ <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.cs">
<SubType>Form</SubType>
@@ -1738,8 +1738,8 @@
<EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
<DependentUpon>Frm_Cqsq.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\RkQC\Frm_SctlDetect01.resx">
- <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\RkQC\Frm_ShouTuoDetect01.resx">
+ <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
<DependentUpon>RkDetect01.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index c206f49..9302d84 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -795,6 +795,7 @@
}
else
txt.ReadOnly = isEdt;
+ txt.Checked = false;
continue;
}
//鑷畾涔変粨搴�
@@ -1709,16 +1710,20 @@
}
public delegate void DelegateGetModel(string guid);
public delegate void DelegateGetList(int currentPage);
+
/// <summary>
- /// 璁剧疆涓昏〃鐨勬牱寮�
+ ///
/// </summary>
/// <param name="gridView1">gridview</param>
/// <param name="picCheckBox">鍥炬爣鎸夐挳</param>
- /// <param name="fm"></param>
+ /// <param name="fm">绐椾綋</param>
/// <param name="fileName">瀛楁</param>
/// <param name="icoName">鍥炬爣璺緞</param>
- /// <param name="action"></param>
- public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null, bool isPostSearch = true)
+ /// <param name="action">濮旀墭1</param>
+ /// <param name="tips">楦熷槾鎻愮ず</param>
+ /// <param name="isPostSearch"></param>
+ /// <param name="action2">濮旀墭2</param>
+ public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null, bool isPostSearch = true, DelegateGetModel action2 = null)
{
gridView1.PopupMenuShowing += (s, e) =>
{
@@ -1824,6 +1829,21 @@
view.ActiveEditor.MouseUp += ActiveEditor_MouseUp;
};
}
+ if (action2 != null) {
+ gridView1.FocusedRowChanged += (s, e) =>
+ {
+ int _handle = gridView1.FocusedRowHandle;
+ if (_handle == -1)
+ return;
+ DataRow row = gridView1.GetDataRow(_handle);
+ if (row == null)
+ return;
+ string _guid = row["guid"].ToString();
+ if (string.IsNullOrEmpty(_guid))
+ return;
+ action2(_guid);
+ };
+ }
gridView1.RowStyle += (s, e) =>
{
//榛樿閫変腑琛屼笉鍙樿壊
@@ -1908,6 +1928,7 @@
};
}
}
+
private static void ActiveEditor_MouseUp(object sender, MouseEventArgs e)
{
BaseEdit edit = sender as BaseEdit;
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
index c65a597..34b78f4 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
@@ -28,11 +28,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -41,6 +41,7 @@
this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -49,7 +50,6 @@
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
@@ -62,14 +62,14 @@
//
// gridView1
//
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_operationTime,
this.gv_operationTable,
this.gv_msg,
this.gv_userName,
- this.gv_Btn});
+ this.gv_Btn,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -78,7 +78,6 @@
//
// gv_operationTime
//
-
this.gv_operationTime.AppearanceCell.Options.UseFont = true;
this.gv_operationTime.Caption = "浠撳簱鍚嶇О";
this.gv_operationTime.FieldName = "depotName";
@@ -92,7 +91,6 @@
//
// gv_operationTable
//
-
this.gv_operationTable.AppearanceCell.Options.UseFont = true;
this.gv_operationTable.Caption = "浠撳簱缂栧彿";
this.gv_operationTable.FieldName = "depotCode";
@@ -106,7 +104,6 @@
//
// gv_msg
//
-
this.gv_msg.AppearanceCell.Options.UseFont = true;
this.gv_msg.Caption = "浣跨敤鐘舵��";
this.gv_msg.FieldName = "isNg";
@@ -120,7 +117,6 @@
//
// gv_userName
//
-
this.gv_userName.AppearanceCell.Options.UseFont = true;
this.gv_userName.Caption = "鍚屾鏃堕棿";
this.gv_userName.FieldName = "edtTime";
@@ -137,19 +133,29 @@
this.gv_Btn.MinWidth = 25;
this.gv_Btn.Name = "gv_Btn";
this.gv_Btn.Visible = true;
- this.gv_Btn.VisibleIndex = 3;
+ this.gv_Btn.VisibleIndex = 4;
this.gv_Btn.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ editorButtonImageOptions2.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, 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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "Mes浠撳簱灞炴��";
+ this.gridColumn1.FieldName = "remark5";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.Width = 94;
//
// SelectCk
//
@@ -180,5 +186,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
index a7c0621..894572d 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs
@@ -1,4 +1,6 @@
-锘縰sing DevExpress.Utils.DirectXPaint;
+锘縰sing DevExpress.Charts.Native;
+using DevExpress.Utils.DirectXPaint;
+using DevExpress.Utils.Text.Internal;
using DevExpress.Utils.VisualEffects;
using DevExpress.XtraGrid.Views.Base.ViewInfo;
using Gs.DevApp.DevFrm.Rpt;
@@ -18,6 +20,7 @@
private readonly string _webServiceName = "VArrivalBarcodeManager/";
private string aboutGuid = "";
private string aboutType = "";//鍚庣洊鐮�
+ private string qcGuid = "";//fqc guid锛岀敤浜庨噸鎵撶殑鏃跺��
/// <summary>
///
@@ -36,6 +39,7 @@
this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
this.aboutGuid = _aboutGuid;
this.aboutType = _aboutType;
+ this.qcGuid = _qcGuid;
this.Text = "鎵归噺鎿嶄綔銆�" + this.aboutType + "銆�,銆�" + this.aboutGuid + "銆�";
switch (aboutType)
{
@@ -197,12 +201,12 @@
keyWhere = "",
aboutGuid = this.aboutGuid,
aboutType = this.aboutType,
+ qcGuid=this.qcGuid,
};
var json = JsonConvert.SerializeObject(_obj);
try
{
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "SelectBarcode", json);
+ var strReturn = UtilityHelper.HttpPost("",_webServiceName + "SelectBarcode", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
var dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionary.cs b/DevApp/Gs.DevApp/UserControl/UcDictionary.cs
index d2c5e04..3c11b78 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionary.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionary.cs
@@ -62,7 +62,8 @@
foreach (dynamic dym in lst)
{
if (stringBuilder.Length > 0)
- stringBuilder.Append("|");
+ // stringBuilder.Append("|");//|鍜寏宸茶鍗犵敤
+ stringBuilder.Append("&");
stringBuilder.Append(dym.dicTxt);
}
this.TextTxt = stringBuilder.ToString();
--
Gitblit v1.9.3