From 7fe9ca3eeeba579e2570fd475ff279bfee4ed398 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 14 八月 2025 17:43:09 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx | 32
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | 7
DevApp/Gs.DevApp/App.config | 3
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 319 ++++++------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 6
DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs | 10
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 2
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 802 +++++++++++++++----------------
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 25
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 140 ++--
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 114 +++-
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 28
12 files changed, 789 insertions(+), 699 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_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index 8cfb3bf..1f67336 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -178,6 +178,8 @@
{
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_dptId.IsReadly = true;
}
/// <summary>
/// 鏂板浜嬩欢
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..0e26bbc 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,12 @@
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;
+
}
/// <summary>
@@ -455,7 +469,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 +713,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -748,6 +762,11 @@
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
getGxList(dy.aboutGuid.ToString());
+
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_lotNo.Enabled = false;
+ txt_kbList.Enabled = false;
+ // txt_fPurchaserId.IsReadly = true;
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -796,7 +815,6 @@
if (e.Page.Name == "tabMxPage2")
{
ucChouJianList1.getList14();
-
}
if (e.Page.Name == "tabMxPage3")
{
@@ -851,7 +869,6 @@
btnLoad.Enabled = bl;
ucChouJianList1.IsReadOnly(!bl);
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
-
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
index 7bb7bb2..9b808d8 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();
@@ -70,12 +71,12 @@
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_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();
@@ -95,6 +96,7 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = 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 +123,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 +132,8 @@
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();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -159,12 +160,12 @@
((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_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();
@@ -184,6 +185,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -192,11 +194,10 @@
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();
this.SuspendLayout();
//
// toolBarMenu1
@@ -287,7 +288,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 +308,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 +321,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 +334,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 +347,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 +372,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 +383,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 +426,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 +436,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 +446,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
//
@@ -500,12 +510,12 @@
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_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.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -525,11 +535,11 @@
//
this.ucBtnPrint98.allClickKey = null;
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(672, 109);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(683, 111);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(326, 29);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(332, 29);
this.ucBtnPrint98.TabIndex = 9;
//
// lbGuid
@@ -542,10 +552,10 @@
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(99, 10);
+ this.txt_releaseNo.Location = new System.Drawing.Point(99, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(239, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(244, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
//
@@ -559,65 +569,65 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(759, 10);
+ this.txt_itemName.Location = new System.Drawing.Point(770, 12);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(239, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(245, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 231;
//
// txt_itemNo2
//
- this.txt_itemNo2.Location = new System.Drawing.Point(429, 10);
+ this.txt_itemNo2.Location = new System.Drawing.Point(434, 12);
this.txt_itemNo2.Name = "txt_itemNo2";
- this.txt_itemNo2.Size = new System.Drawing.Size(239, 24);
+ this.txt_itemNo2.Size = new System.Drawing.Size(245, 24);
this.txt_itemNo2.StyleController = this.layoutMx1;
this.txt_itemNo2.TabIndex = 232;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(759, 43);
+ this.txt_createBy.Location = new System.Drawing.Point(770, 45);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(239, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(245, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 233;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1089, 43);
+ this.txt_createDate.Location = new System.Drawing.Point(1106, 45);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(241, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(245, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 234;
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(99, 43);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(99, 45);
this.txt_fbatchQty.Name = "txt_fbatchQty";
- this.txt_fbatchQty.Size = new System.Drawing.Size(239, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(244, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.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(434, 111);
+ this.txt_fmrmode.Name = "txt_fmrmode";
+ this.txt_fmrmode.Size = new System.Drawing.Size(245, 24);
+ this.txt_fmrmode.StyleController = this.layoutMx1;
+ this.txt_fmrmode.TabIndex = 237;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(1089, 10);
+ this.txt_itemModel.Location = new System.Drawing.Point(1106, 12);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(241, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(245, 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.Location = new System.Drawing.Point(99, 78);
this.txt_erpCheckBy.Name = "txt_erpCheckBy";
- this.txt_erpCheckBy.Size = new System.Drawing.Size(239, 24);
+ this.txt_erpCheckBy.Size = new System.Drawing.Size(244, 24);
this.txt_erpCheckBy.StyleController = this.layoutMx1;
this.txt_erpCheckBy.TabIndex = 241;
//
@@ -631,33 +641,33 @@
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(429, 43);
+ this.txt_lineName.Location = new System.Drawing.Point(434, 45);
this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Size = new System.Drawing.Size(239, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(245, 24);
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, 111);
+ this.txt_daa001.Name = "txt_daa001";
+ this.txt_daa001.Size = new System.Drawing.Size(244, 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(770, 78);
this.txt_msg.Name = "txt_msg";
- this.txt_msg.Size = new System.Drawing.Size(571, 24);
+ this.txt_msg.Size = new System.Drawing.Size(581, 24);
this.txt_msg.StyleController = this.layoutMx1;
this.txt_msg.TabIndex = 246;
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(429, 76);
+ this.txt_fngHandle.Location = new System.Drawing.Point(434, 78);
this.txt_fngHandle.Name = "txt_fngHandle";
- this.txt_fngHandle.Size = new System.Drawing.Size(239, 24);
+ this.txt_fngHandle.Size = new System.Drawing.Size(245, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 247;
//
@@ -714,33 +724,33 @@
this.layoutControlItem13});
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});
- this.Root.Size = new System.Drawing.Size(1342, 152);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1363, 152);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -748,38 +758,38 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(335, 33);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo2;
- this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem5.Text = "浜у搧缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_itemName;
- this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem2.Text = "浜у搧鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_createBy;
- this.layoutControlItem6.Location = new System.Drawing.Point(660, 33);
+ this.layoutControlItem6.Location = new System.Drawing.Point(671, 33);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem6.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem6.Text = "寮�鍗曚汉";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
@@ -789,28 +799,28 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 33);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem9.Size = new System.Drawing.Size(335, 33);
this.layoutControlItem9.Text = "闇�杩斿伐鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(990, 33);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1007, 33);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem7.Text = "寮�鍗曟棩鏈�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem11.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
@@ -820,64 +830,76 @@
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.Size = new System.Drawing.Size(335, 33);
this.layoutControlItem14.Text = "宸茶繑宸ユ暟閲�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem15
//
- this.layoutControlItem15.Control = this.txt_workNo;
+ this.layoutControlItem15.Control = this.txt_daa001;
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.Size = new System.Drawing.Size(335, 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.Control = this.txt_fmrmode;
+ this.layoutControlItem10.Location = new System.Drawing.Point(335, 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.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem10.Text = "杩斿伐宸ュ簭";
this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_lineName;
- this.layoutControlItem12.Location = new System.Drawing.Point(330, 33);
+ this.layoutControlItem12.Location = new System.Drawing.Point(335, 33);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem12.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem12.Text = "浜х嚎";
this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_fngHandle;
- this.layoutControlItem17.Location = new System.Drawing.Point(330, 66);
+ this.layoutControlItem17.Location = new System.Drawing.Point(335, 66);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem17.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem17.Text = "澶勭疆缁撴灉";
this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_msg;
- this.layoutControlItem16.Location = new System.Drawing.Point(660, 66);
+ this.layoutControlItem16.Location = new System.Drawing.Point(671, 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.Size = new System.Drawing.Size(672, 33);
this.layoutControlItem16.Text = "杩濊绫诲埆";
this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.ucBtnPrint98;
+ this.layoutControlItem13.Location = new System.Drawing.Point(671, 99);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem13.Text = "纭畾鎵撳嵃";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
//
// tabMx
//
@@ -1070,7 +1092,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 +1102,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 +1114,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 +1126,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 +1136,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 +1146,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 +1156,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 +1166,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 +1176,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 +1186,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 +1303,17 @@
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;
+ //
// Frm_WomFanGong
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1340,12 +1350,12 @@
((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_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();
@@ -1365,6 +1375,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1373,11 +1384,10 @@
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();
this.ResumeLayout(false);
}
@@ -1429,7 +1439,7 @@
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_fmrmode;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
@@ -1455,7 +1465,7 @@
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.XtraEditors.TextEdit txt_daa001;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraEditors.TextEdit txt_msg;
private DevExpress.XtraEditors.TextEdit txt_fngHandle;
@@ -1477,5 +1487,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn63;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn64;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
}
}
\ 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_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 062cfef..56d4c84 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,6 @@
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();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -452,6 +452,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 +500,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
@@ -2562,11 +2562,11 @@
//
this.layShuLiang.Controls.Add(this.txt_iCount_1);
this.layShuLiang.Controls.Add(this.txt_yuliang_1);
- this.layShuLiang.Location = new System.Drawing.Point(654, 44);
+ this.layShuLiang.Location = new System.Drawing.Point(662, 44);
this.layShuLiang.Name = "layShuLiang";
this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
this.layShuLiang.Root = this.layoutControlGroup3;
- this.layShuLiang.Size = new System.Drawing.Size(317, 28);
+ this.layShuLiang.Size = new System.Drawing.Size(321, 28);
this.layShuLiang.TabIndex = 475;
this.layShuLiang.Text = "dataLayoutControl1";
//
@@ -2575,16 +2575,16 @@
this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
this.txt_iCount_1.StyleController = this.layShuLiang;
this.txt_iCount_1.TabIndex = 5;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
this.txt_yuliang_1.StyleController = this.layShuLiang;
this.txt_yuliang_1.TabIndex = 6;
//
@@ -2609,7 +2609,7 @@
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem25
@@ -2617,7 +2617,7 @@
this.layoutControlItem25.Control = this.txt_iCount_1;
this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2625,16 +2625,16 @@
//
this.layoutControlItem39.Control = this.txt_yuliang_1;
this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
+ this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
+ this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(973, 10);
+ this.radOut.Location = new System.Drawing.Point(985, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2643,7 +2643,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(321, 32);
+ this.radOut.Size = new System.Drawing.Size(325, 32);
this.radOut.StyleController = this.layoutMx99;
this.radOut.TabIndex = 473;
//
@@ -2651,29 +2651,29 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(985, 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(321, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12);
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(230, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
this.txt_psnQty_1.StyleController = this.layoutMx99;
this.txt_psnQty_1.TabIndex = 330;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(420, 44);
+ this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2681,11 +2681,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(420, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(424, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(234, 24);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
@@ -2696,7 +2696,7 @@
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(234, 24);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
@@ -2706,7 +2706,7 @@
this.txt_zQty.Location = new System.Drawing.Point(99, 12);
this.txt_zQty.Name = "txt_zQty";
this.txt_zQty.Properties.ReadOnly = true;
- this.txt_zQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(234, 24);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2734,7 +2734,7 @@
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 323D;
+ columnDefinition11.Width = 328D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition7,
columnDefinition8,
@@ -2748,7 +2748,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2756,21 +2756,21 @@
this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
@@ -2780,12 +2780,12 @@
this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(975, 32);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2798,18 +2798,18 @@
this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2819,21 +2819,21 @@
this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
+ this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.layShuLiang;
- this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
+ this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -2843,7 +2843,7 @@
this.layoutControlItem36.Control = this.txt_zQty;
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
@@ -3032,6 +3032,27 @@
this.gridColumn32.Visible = true;
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
//
@@ -3350,8 +3371,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 +3381,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,27 +3764,6 @@
this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
this.ucBtnPrint101.TabIndex = 0;
//
- // 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);
- //
// Frm_Womdaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -3892,6 +3890,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 +3938,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);
}
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/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/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index c116ced..9302d84 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1710,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) =>
{
@@ -1825,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) =>
{
//榛樿閫変腑琛屼笉鍙樿壊
@@ -1909,6 +1928,7 @@
};
}
}
+
private static void ActiveEditor_MouseUp(object sender, MouseEventArgs e)
{
BaseEdit edit = sender as BaseEdit;
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();
--
Gitblit v1.9.3