From 6b2f223d8fe4dd12aa64780b0dc742f5fc9bbf5e Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 08 五月 2025 11:00:14 +0800 Subject: [PATCH] fqc --- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 956 +++++++++++++++++----------------- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 4 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 2 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 2 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 4 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 2 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs | 53 + DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 605 +++++++++------------ DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 2 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 17 12 files changed, 797 insertions(+), 854 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs index e38fbe0..0f18bec 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs @@ -112,6 +112,7 @@ this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -127,6 +128,7 @@ this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -225,6 +227,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; + this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -237,7 +240,8 @@ // // split1.Panel2 // - this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.split1.Panel2.Text = "Panel2"; + this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1126, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; @@ -534,7 +538,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); - this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 // @@ -545,6 +549,7 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; + this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); this.splitMx1.SplitterPosition = 137; this.splitMx1.TabIndex = 0; @@ -963,7 +968,8 @@ this.gvMx1remark, this.gvMx1itemId, this.gridColumn3, - this.gridColumn2}); + this.gridColumn2, + this.gridColumn12}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -1037,7 +1043,7 @@ this.gvMx1workNo.Name = "gvMx1workNo"; this.gvMx1workNo.Tag = "query_a.work_no"; this.gvMx1workNo.Visible = true; - this.gvMx1workNo.VisibleIndex = 4; + this.gvMx1workNo.VisibleIndex = 5; this.gvMx1workNo.Width = 94; // // gvMx1remark @@ -1049,7 +1055,7 @@ this.gvMx1remark.Name = "gvMx1remark"; this.gvMx1remark.Tag = "query_a.remark"; this.gvMx1remark.Visible = true; - this.gvMx1remark.VisibleIndex = 5; + this.gvMx1remark.VisibleIndex = 6; this.gvMx1remark.Width = 94; // // gvMx1itemId @@ -1060,8 +1066,6 @@ this.gvMx1itemId.MinWidth = 50; this.gvMx1itemId.Name = "gvMx1itemId"; this.gvMx1itemId.Tag = "query_a.item_id"; - this.gvMx1itemId.Visible = true; - this.gvMx1itemId.VisibleIndex = 6; this.gvMx1itemId.Width = 94; // // gridColumn3 @@ -1083,6 +1087,16 @@ this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 7; this.gridColumn2.Width = 94; + // + // gridColumn12 + // + this.gridColumn12.Caption = "鐗╂枡鍗曚綅"; + this.gridColumn12.FieldName = "dwName"; + this.gridColumn12.MinWidth = 25; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 4; + this.gridColumn12.Width = 94; // // tabMxPage2 // @@ -1115,7 +1129,8 @@ this.gvMx2depotSectionCode, this.gridColumn6, this.gridColumn5, - this.gvMx2remark}); + this.gvMx2remark, + this.gridColumn13}); this.gvMx2.GridControl = this.gcMx2; this.gvMx2.Name = "gvMx2"; this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -1189,7 +1204,7 @@ this.gvMx2depotCode.Name = "gvMx2depotCode"; this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE"; this.gvMx2depotCode.Visible = true; - this.gvMx2depotCode.VisibleIndex = 5; + this.gvMx2depotCode.VisibleIndex = 6; this.gvMx2depotCode.Width = 94; // // gvMx2depotSectionCode @@ -1201,7 +1216,7 @@ this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode"; this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE"; this.gvMx2depotSectionCode.Visible = true; - this.gvMx2depotSectionCode.VisibleIndex = 6; + this.gvMx2depotSectionCode.VisibleIndex = 7; this.gvMx2depotSectionCode.Width = 94; // // gridColumn6 @@ -1211,7 +1226,7 @@ this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 7; + this.gridColumn6.VisibleIndex = 8; this.gridColumn6.Width = 94; // // gridColumn5 @@ -1221,7 +1236,7 @@ this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 8; + this.gridColumn5.VisibleIndex = 9; this.gridColumn5.Width = 94; // // gvMx2remark @@ -1233,7 +1248,7 @@ this.gvMx2remark.Name = "gvMx2remark"; this.gvMx2remark.Tag = "query_a.REMARK"; this.gvMx2remark.Visible = true; - this.gvMx2remark.VisibleIndex = 9; + this.gvMx2remark.VisibleIndex = 10; this.gvMx2remark.Width = 94; // // picCheckBox @@ -1246,6 +1261,16 @@ this.picCheckBox.TabIndex = 8; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; + // + // gridColumn13 + // + this.gridColumn13.Caption = "鐗╂枡鍗曚綅"; + this.gridColumn13.FieldName = "dwName"; + this.gridColumn13.MinWidth = 25; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 5; + this.gridColumn13.Width = 94; // // Frm_MesInvItemOut_SCLL // @@ -1408,5 +1433,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem sp_fSubsidiary; private DevExpress.Utils.ToolTipController tips; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs index 7f15d1a..ef1066f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs @@ -95,7 +95,7 @@ ucBtnPrint1.guidKey = rowGuid; if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.ucBtnPrint1.rptParameter = "return false"; return; diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs index 4761c0e..bd07800 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs @@ -114,7 +114,7 @@ ucBtnPrint1.guidKey = rowGuid; if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.ucBtnPrint1.rptParameter = "return false"; return; @@ -226,7 +226,7 @@ } if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.toolBarMenu1.rptParameter = "return false"; return; diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs index e9c0765..5504ff3 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs @@ -86,7 +86,7 @@ ucBtnPrint1.guidKey = rowGuid; if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.ucBtnPrint1.rptParameter = "return false"; return; diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs index 6aed20f..977844f 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs @@ -69,7 +69,6 @@ this.gcMain1 = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_daa027 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -111,10 +110,8 @@ this.txt_daa009 = new DevExpress.XtraEditors.TextEdit(); this.txt_daa013 = new DevExpress.XtraEditors.TextEdit(); this.txt_daa001 = new DevExpress.XtraEditors.TextEdit(); - this.textEdit1 = new DevExpress.XtraEditors.TextEdit(); this.txt_daa008 = new DevExpress.XtraEditors.TextEdit(); this.txt_saleOrderNo = new DevExpress.XtraEditors.TextEdit(); - this.txt_daa028 = new DevExpress.XtraEditors.TextEdit(); this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit(); this.txt_daa014 = new DevExpress.XtraEditors.TextEdit(); this.txt_daa022Remark = new DevExpress.XtraEditors.TextEdit(); @@ -140,24 +137,22 @@ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -297,10 +292,8 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_daa009.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Remark.Properties)).BeginInit(); @@ -326,24 +319,22 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -483,7 +474,6 @@ this.gridView1.ColumnPanelRowHeight = 50; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn5, - this.gv_daa027, this.gridColumn7, this.gridColumn10, this.gridColumn12, @@ -536,22 +526,6 @@ this.gridColumn5.VisibleIndex = 0; this.gridColumn5.Width = 50; // - // gv_daa027 - // - this.gv_daa027.AppearanceCell.Options.UseFont = true; - this.gv_daa027.AppearanceHeader.Options.UseTextOptions = true; - this.gv_daa027.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; - this.gv_daa027.Caption = "澶囨枡瀹屾垚"; - this.gv_daa027.FieldName = "daa027Chk"; - this.gv_daa027.MaxWidth = 50; - this.gv_daa027.MinWidth = 50; - this.gv_daa027.Name = "gv_daa027"; - this.gv_daa027.OptionsColumn.AllowEdit = false; - this.gv_daa027.Tag = "query_a.daa027"; - this.gv_daa027.Visible = true; - this.gv_daa027.VisibleIndex = 1; - this.gv_daa027.Width = 50; - // // gridColumn7 // this.gridColumn7.Caption = "鏄惁榻愬"; @@ -561,7 +535,7 @@ this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Tag = "query_a.jabs"; this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 2; + this.gridColumn7.VisibleIndex = 1; this.gridColumn7.Width = 50; // // gridColumn10 @@ -573,7 +547,7 @@ this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Tag = "query_a.jabs"; this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 3; + this.gridColumn10.VisibleIndex = 2; this.gridColumn10.Width = 50; // // gridColumn12 @@ -585,7 +559,7 @@ this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Tag = "query_a.jabs"; this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 4; + this.gridColumn12.VisibleIndex = 3; this.gridColumn12.Width = 50; // // gridColumn6 @@ -597,7 +571,7 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Tag = "query_a.jabs"; this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 5; + this.gridColumn6.VisibleIndex = 4; this.gridColumn6.Width = 50; // // gridColumn27 @@ -607,7 +581,7 @@ this.gridColumn27.MinWidth = 25; this.gridColumn27.Name = "gridColumn27"; this.gridColumn27.Visible = true; - this.gridColumn27.VisibleIndex = 6; + this.gridColumn27.VisibleIndex = 5; this.gridColumn27.Width = 94; // // gv_daa018 @@ -620,7 +594,7 @@ this.gv_daa018.OptionsColumn.AllowEdit = false; this.gv_daa018.Tag = "query_a.daa018"; this.gv_daa018.Visible = true; - this.gv_daa018.VisibleIndex = 7; + this.gv_daa018.VisibleIndex = 6; this.gv_daa018.Width = 90; // // gridColoun100 @@ -631,7 +605,7 @@ this.gridColoun100.Name = "gridColoun100"; this.gridColoun100.Tag = "org.fnamber"; this.gridColoun100.Visible = true; - this.gridColoun100.VisibleIndex = 8; + this.gridColoun100.VisibleIndex = 7; this.gridColoun100.Width = 250; // // gv_daa001 @@ -644,7 +618,7 @@ this.gv_daa001.OptionsColumn.AllowEdit = false; this.gv_daa001.Tag = "query_a.daa001"; this.gv_daa001.Visible = true; - this.gv_daa001.VisibleIndex = 9; + this.gv_daa001.VisibleIndex = 8; this.gv_daa001.Width = 120; // // gv_daa021 @@ -657,7 +631,7 @@ this.gv_daa021.OptionsColumn.AllowEdit = false; this.gv_daa021.Tag = "query_a.daa021"; this.gv_daa021.Visible = true; - this.gv_daa021.VisibleIndex = 10; + this.gv_daa021.VisibleIndex = 9; this.gv_daa021.Width = 100; // // gridColumn3 @@ -667,7 +641,7 @@ this.gridColumn3.MinWidth = 50; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 11; + this.gridColumn3.VisibleIndex = 10; this.gridColumn3.Width = 94; // // gv_daa003 @@ -680,7 +654,7 @@ this.gv_daa003.OptionsColumn.AllowEdit = false; this.gv_daa003.Tag = "query_a.daa003"; this.gv_daa003.Visible = true; - this.gv_daa003.VisibleIndex = 12; + this.gv_daa003.VisibleIndex = 11; this.gv_daa003.Width = 150; // // gv_daa004 @@ -693,7 +667,7 @@ this.gv_daa004.OptionsColumn.AllowEdit = false; this.gv_daa004.Tag = "query_a.daa004"; this.gv_daa004.Visible = true; - this.gv_daa004.VisibleIndex = 13; + this.gv_daa004.VisibleIndex = 12; this.gv_daa004.Width = 150; // // gv_daa008 @@ -707,7 +681,7 @@ this.gv_daa008.OptionsColumn.AllowEdit = false; this.gv_daa008.Tag = "query_a.daa008"; this.gv_daa008.Visible = true; - this.gv_daa008.VisibleIndex = 14; + this.gv_daa008.VisibleIndex = 13; this.gv_daa008.Width = 50; // // gv_daa011 @@ -721,7 +695,7 @@ this.gv_daa011.OptionsColumn.AllowEdit = false; this.gv_daa011.Tag = "query_a.daa011"; this.gv_daa011.Visible = true; - this.gv_daa011.VisibleIndex = 15; + this.gv_daa011.VisibleIndex = 14; this.gv_daa011.Width = 50; // // gridColumn4 @@ -732,7 +706,7 @@ this.gridColumn4.MinWidth = 50; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 16; + this.gridColumn4.VisibleIndex = 15; this.gridColumn4.Width = 50; // // gv_daa010 @@ -746,7 +720,7 @@ this.gv_daa010.OptionsColumn.AllowEdit = false; this.gv_daa010.Tag = "query_a.daa010"; this.gv_daa010.Visible = true; - this.gv_daa010.VisibleIndex = 18; + this.gv_daa010.VisibleIndex = 17; this.gv_daa010.Width = 50; // // gv_daa005 @@ -760,7 +734,7 @@ this.gv_daa005.OptionsColumn.AllowEdit = false; this.gv_daa005.Tag = "query_a.daa005"; this.gv_daa005.Visible = true; - this.gv_daa005.VisibleIndex = 19; + this.gv_daa005.VisibleIndex = 18; this.gv_daa005.Width = 50; // // gv_cust @@ -773,7 +747,7 @@ this.gv_cust.OptionsColumn.AllowEdit = false; this.gv_cust.Tag = "query_a.cust"; this.gv_cust.Visible = true; - this.gv_cust.VisibleIndex = 20; + this.gv_cust.VisibleIndex = 19; this.gv_cust.Width = 100; // // gridColumn1 @@ -783,7 +757,7 @@ this.gridColumn1.MinWidth = 50; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 21; + this.gridColumn1.VisibleIndex = 20; this.gridColumn1.Width = 94; // // gv_daa015 @@ -796,7 +770,7 @@ this.gv_daa015.OptionsColumn.AllowEdit = false; this.gv_daa015.Tag = "query_a.daa015"; this.gv_daa015.Visible = true; - this.gv_daa015.VisibleIndex = 22; + this.gv_daa015.VisibleIndex = 21; this.gv_daa015.Width = 94; // // gv_daa009 @@ -809,7 +783,7 @@ this.gv_daa009.OptionsColumn.AllowEdit = false; this.gv_daa009.Tag = "query_a.daa009"; this.gv_daa009.Visible = true; - this.gv_daa009.VisibleIndex = 17; + this.gv_daa009.VisibleIndex = 16; this.gv_daa009.Width = 94; // // gv_prepareTime @@ -822,7 +796,7 @@ this.gv_prepareTime.OptionsColumn.AllowEdit = false; this.gv_prepareTime.Tag = "query_a.prepare_time"; this.gv_prepareTime.Visible = true; - this.gv_prepareTime.VisibleIndex = 23; + this.gv_prepareTime.VisibleIndex = 22; this.gv_prepareTime.Width = 180; // // gv_daa028 @@ -835,7 +809,7 @@ this.gv_daa028.OptionsColumn.AllowEdit = false; this.gv_daa028.Tag = "query_a.daa028"; this.gv_daa028.Visible = true; - this.gv_daa028.VisibleIndex = 24; + this.gv_daa028.VisibleIndex = 23; this.gv_daa028.Width = 180; // // gv_daa016 @@ -848,7 +822,7 @@ this.gv_daa016.OptionsColumn.AllowEdit = false; this.gv_daa016.Tag = "query_a.daa016"; this.gv_daa016.Visible = true; - this.gv_daa016.VisibleIndex = 25; + this.gv_daa016.VisibleIndex = 24; this.gv_daa016.Width = 180; // // gv_daa017 @@ -861,7 +835,7 @@ this.gv_daa017.OptionsColumn.AllowEdit = false; this.gv_daa017.Tag = "query_a.daa017"; this.gv_daa017.Visible = true; - this.gv_daa017.VisibleIndex = 26; + this.gv_daa017.VisibleIndex = 25; this.gv_daa017.Width = 180; // // gv_mesStartProd @@ -874,7 +848,7 @@ this.gv_mesStartProd.OptionsColumn.AllowEdit = false; this.gv_mesStartProd.Tag = "query_a.mes_start_prod"; this.gv_mesStartProd.Visible = true; - this.gv_mesStartProd.VisibleIndex = 27; + this.gv_mesStartProd.VisibleIndex = 26; this.gv_mesStartProd.Width = 180; // // gv_mesEndProd @@ -887,7 +861,7 @@ this.gv_mesEndProd.OptionsColumn.AllowEdit = false; this.gv_mesEndProd.Tag = "query_a.mes_end_prod"; this.gv_mesEndProd.Visible = true; - this.gv_mesEndProd.VisibleIndex = 28; + this.gv_mesEndProd.VisibleIndex = 27; this.gv_mesEndProd.Width = 180; // // gridColumn21 @@ -897,7 +871,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; - this.gridColumn21.VisibleIndex = 29; + this.gridColumn21.VisibleIndex = 28; this.gridColumn21.Width = 94; // // gridColumn22 @@ -907,7 +881,7 @@ this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; - this.gridColumn22.VisibleIndex = 30; + this.gridColumn22.VisibleIndex = 29; this.gridColumn22.Width = 94; // // gridColumn23 @@ -925,7 +899,7 @@ this.gridColumn24.MinWidth = 25; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; - this.gridColumn24.VisibleIndex = 31; + this.gridColumn24.VisibleIndex = 30; this.gridColumn24.Width = 94; // // gridColumn25 @@ -935,7 +909,7 @@ this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Visible = true; - this.gridColumn25.VisibleIndex = 32; + this.gridColumn25.VisibleIndex = 31; this.gridColumn25.Width = 94; // // gridColumn26 @@ -945,7 +919,7 @@ this.gridColumn26.MinWidth = 25; this.gridColumn26.Name = "gridColumn26"; this.gridColumn26.Visible = true; - this.gridColumn26.VisibleIndex = 33; + this.gridColumn26.VisibleIndex = 32; this.gridColumn26.Width = 94; // // pageBar1 @@ -994,10 +968,8 @@ this.layoutMx1.Controls.Add(this.txt_daa009); this.layoutMx1.Controls.Add(this.txt_daa013); this.layoutMx1.Controls.Add(this.txt_daa001); - this.layoutMx1.Controls.Add(this.textEdit1); this.layoutMx1.Controls.Add(this.txt_daa008); this.layoutMx1.Controls.Add(this.txt_saleOrderNo); - this.layoutMx1.Controls.Add(this.txt_daa028); this.layoutMx1.Controls.Add(this.txt_mesStartProd); this.layoutMx1.Controls.Add(this.txt_daa014); this.layoutMx1.Controls.Add(this.txt_daa022Remark); @@ -1039,10 +1011,10 @@ // // txt_daa009 // - this.txt_daa009.Location = new System.Drawing.Point(420, 152); + this.txt_daa009.Location = new System.Drawing.Point(114, 152); this.txt_daa009.Name = "txt_daa009"; this.txt_daa009.Properties.Appearance.Options.UseFont = true; - this.txt_daa009.Size = new System.Drawing.Size(506, 24); + this.txt_daa009.Size = new System.Drawing.Size(517, 24); this.txt_daa009.StyleController = this.layoutMx1; this.txt_daa009.TabIndex = 240; this.txt_daa009.Tag = ""; @@ -1062,57 +1034,37 @@ this.txt_daa001.Location = new System.Drawing.Point(114, 12); this.txt_daa001.Name = "txt_daa001"; this.txt_daa001.Properties.Appearance.Options.UseFont = true; - this.txt_daa001.Size = new System.Drawing.Size(200, 24); + this.txt_daa001.Size = new System.Drawing.Size(205, 24); this.txt_daa001.StyleController = this.layoutMx1; this.txt_daa001.TabIndex = 216; this.txt_daa001.Tag = "readonly"; // - // textEdit1 - // - this.textEdit1.Location = new System.Drawing.Point(420, 40); - this.textEdit1.Name = "textEdit1"; - this.textEdit1.Properties.Appearance.Options.UseFont = true; - this.textEdit1.Size = new System.Drawing.Size(200, 24); - this.textEdit1.StyleController = this.layoutMx1; - this.textEdit1.TabIndex = 467; - this.textEdit1.Tag = "readonly"; - // // txt_daa008 // - this.txt_daa008.Location = new System.Drawing.Point(726, 12); + this.txt_daa008.Location = new System.Drawing.Point(737, 12); this.txt_daa008.Name = "txt_daa008"; this.txt_daa008.Properties.Appearance.Options.UseFont = true; - this.txt_daa008.Size = new System.Drawing.Size(200, 24); + this.txt_daa008.Size = new System.Drawing.Size(206, 24); this.txt_daa008.StyleController = this.layoutMx1; this.txt_daa008.TabIndex = 235; this.txt_daa008.Tag = "readonly"; // // txt_saleOrderNo // - this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68); + this.txt_saleOrderNo.Location = new System.Drawing.Point(737, 124); this.txt_saleOrderNo.Name = "txt_saleOrderNo"; this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true; - this.txt_saleOrderNo.Size = new System.Drawing.Size(200, 24); + this.txt_saleOrderNo.Size = new System.Drawing.Size(206, 24); this.txt_saleOrderNo.StyleController = this.layoutMx1; this.txt_saleOrderNo.TabIndex = 465; this.txt_saleOrderNo.Tag = "readonly"; // - // txt_daa028 - // - this.txt_daa028.Location = new System.Drawing.Point(420, 68); - this.txt_daa028.Name = "txt_daa028"; - this.txt_daa028.Properties.Appearance.Options.UseFont = true; - this.txt_daa028.Size = new System.Drawing.Size(200, 24); - this.txt_daa028.StyleController = this.layoutMx1; - this.txt_daa028.TabIndex = 341; - this.txt_daa028.Tag = "readonly"; - // // txt_mesStartProd // - this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 40); + this.txt_mesStartProd.Location = new System.Drawing.Point(1049, 12); this.txt_mesStartProd.Name = "txt_mesStartProd"; this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true; - this.txt_mesStartProd.Size = new System.Drawing.Size(202, 24); + this.txt_mesStartProd.Size = new System.Drawing.Size(206, 24); this.txt_mesStartProd.StyleController = this.layoutMx1; this.txt_mesStartProd.TabIndex = 336; this.txt_mesStartProd.Tag = "readonly"; @@ -1122,117 +1074,117 @@ this.txt_daa014.Location = new System.Drawing.Point(114, 40); this.txt_daa014.Name = "txt_daa014"; this.txt_daa014.Properties.Appearance.Options.UseFont = true; - this.txt_daa014.Size = new System.Drawing.Size(200, 24); + this.txt_daa014.Size = new System.Drawing.Size(205, 24); this.txt_daa014.StyleController = this.layoutMx1; this.txt_daa014.TabIndex = 327; this.txt_daa014.Tag = "readonly"; // // txt_daa022Remark // - this.txt_daa022Remark.Location = new System.Drawing.Point(420, 12); + this.txt_daa022Remark.Location = new System.Drawing.Point(425, 12); this.txt_daa022Remark.Name = "txt_daa022Remark"; this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true; - this.txt_daa022Remark.Size = new System.Drawing.Size(200, 24); + this.txt_daa022Remark.Size = new System.Drawing.Size(206, 24); this.txt_daa022Remark.StyleController = this.layoutMx1; this.txt_daa022Remark.TabIndex = 462; this.txt_daa022Remark.Tag = "readonly"; // // txt_daa010 // - this.txt_daa010.Location = new System.Drawing.Point(726, 40); + this.txt_daa010.Location = new System.Drawing.Point(737, 40); this.txt_daa010.Name = "txt_daa010"; this.txt_daa010.Properties.Appearance.Options.UseFont = true; - this.txt_daa010.Size = new System.Drawing.Size(200, 24); + this.txt_daa010.Size = new System.Drawing.Size(206, 24); this.txt_daa010.StyleController = this.layoutMx1; this.txt_daa010.TabIndex = 243; this.txt_daa010.Tag = "readonly"; // // txt_mesEndProd // - this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 68); + this.txt_mesEndProd.Location = new System.Drawing.Point(1049, 40); this.txt_mesEndProd.Name = "txt_mesEndProd"; this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true; - this.txt_mesEndProd.Size = new System.Drawing.Size(202, 24); + this.txt_mesEndProd.Size = new System.Drawing.Size(206, 24); this.txt_mesEndProd.StyleController = this.layoutMx1; this.txt_mesEndProd.TabIndex = 338; this.txt_mesEndProd.Tag = "readonly"; // // txt_daa011 // - this.txt_daa011.Location = new System.Drawing.Point(726, 68); + this.txt_daa011.Location = new System.Drawing.Point(737, 68); this.txt_daa011.Name = "txt_daa011"; this.txt_daa011.Properties.Appearance.Options.UseFont = true; - this.txt_daa011.Size = new System.Drawing.Size(200, 24); + this.txt_daa011.Size = new System.Drawing.Size(206, 24); this.txt_daa011.StyleController = this.layoutMx1; this.txt_daa011.TabIndex = 247; this.txt_daa011.Tag = "readonly"; // // txt_dptName // - this.txt_dptName.Location = new System.Drawing.Point(726, 96); + this.txt_dptName.Location = new System.Drawing.Point(425, 40); this.txt_dptName.Name = "txt_dptName"; this.txt_dptName.Properties.Appearance.Options.UseFont = true; - this.txt_dptName.Size = new System.Drawing.Size(200, 24); + this.txt_dptName.Size = new System.Drawing.Size(206, 24); this.txt_dptName.StyleController = this.layoutMx1; this.txt_dptName.TabIndex = 258; this.txt_dptName.Tag = "readonly"; // // txt_daa016 // - this.txt_daa016.Location = new System.Drawing.Point(1032, 96); + this.txt_daa016.Location = new System.Drawing.Point(1049, 68); this.txt_daa016.Name = "txt_daa016"; this.txt_daa016.Properties.Appearance.Options.UseFont = true; - this.txt_daa016.Size = new System.Drawing.Size(202, 24); + this.txt_daa016.Size = new System.Drawing.Size(206, 24); this.txt_daa016.StyleController = this.layoutMx1; this.txt_daa016.TabIndex = 273; this.txt_daa016.Tag = "readonly"; // // txt_daa029 // - this.txt_daa029.Location = new System.Drawing.Point(114, 96); + this.txt_daa029.Location = new System.Drawing.Point(114, 68); this.txt_daa029.Name = "txt_daa029"; this.txt_daa029.Properties.Appearance.Options.UseFont = true; - this.txt_daa029.Size = new System.Drawing.Size(200, 24); + this.txt_daa029.Size = new System.Drawing.Size(205, 24); this.txt_daa029.StyleController = this.layoutMx1; this.txt_daa029.TabIndex = 217; this.txt_daa029.Tag = "readonly"; // // txt_lineName // - this.txt_lineName.Location = new System.Drawing.Point(420, 96); + this.txt_lineName.Location = new System.Drawing.Point(425, 96); this.txt_lineName.Name = "txt_lineName"; this.txt_lineName.Properties.Appearance.Options.UseFont = true; - this.txt_lineName.Size = new System.Drawing.Size(200, 24); + this.txt_lineName.Size = new System.Drawing.Size(206, 24); this.txt_lineName.StyleController = this.layoutMx1; this.txt_lineName.TabIndex = 267; this.txt_lineName.Tag = "readonly"; // // txt_daa017 // - this.txt_daa017.Location = new System.Drawing.Point(1032, 124); + this.txt_daa017.Location = new System.Drawing.Point(1049, 96); this.txt_daa017.Name = "txt_daa017"; this.txt_daa017.Properties.Appearance.Options.UseFont = true; - this.txt_daa017.Size = new System.Drawing.Size(202, 24); + this.txt_daa017.Size = new System.Drawing.Size(206, 24); this.txt_daa017.StyleController = this.layoutMx1; this.txt_daa017.TabIndex = 280; this.txt_daa017.Tag = "readonly"; // // txt_daa003 // - this.txt_daa003.Location = new System.Drawing.Point(114, 152); + this.txt_daa003.Location = new System.Drawing.Point(114, 96); this.txt_daa003.Name = "txt_daa003"; this.txt_daa003.Properties.Appearance.Options.UseFont = true; - this.txt_daa003.Size = new System.Drawing.Size(200, 24); + this.txt_daa003.Size = new System.Drawing.Size(205, 24); this.txt_daa003.StyleController = this.layoutMx1; this.txt_daa003.TabIndex = 219; this.txt_daa003.Tag = "readonly"; // // txt_dwName // - this.txt_dwName.Location = new System.Drawing.Point(1032, 12); + this.txt_dwName.Location = new System.Drawing.Point(737, 96); this.txt_dwName.Name = "txt_dwName"; this.txt_dwName.Properties.Appearance.Options.UseFont = true; - this.txt_dwName.Size = new System.Drawing.Size(202, 24); + this.txt_dwName.Size = new System.Drawing.Size(206, 24); this.txt_dwName.StyleController = this.layoutMx1; this.txt_dwName.TabIndex = 226; this.txt_dwName.Tag = "readonly"; @@ -1242,7 +1194,7 @@ this.txt_daa004.Location = new System.Drawing.Point(114, 124); this.txt_daa004.Name = "txt_daa004"; this.txt_daa004.Properties.Appearance.Options.UseFont = true; - this.txt_daa004.Size = new System.Drawing.Size(200, 24); + this.txt_daa004.Size = new System.Drawing.Size(205, 24); this.txt_daa004.StyleController = this.layoutMx1; this.txt_daa004.TabIndex = 222; this.txt_daa004.Tag = "readonly"; @@ -1257,17 +1209,17 @@ // // txt_lineNo // - this.txt_lineNo.Location = new System.Drawing.Point(420, 124); + this.txt_lineNo.Location = new System.Drawing.Point(425, 124); this.txt_lineNo.Name = "txt_lineNo"; - this.txt_lineNo.Size = new System.Drawing.Size(200, 24); + this.txt_lineNo.Size = new System.Drawing.Size(206, 24); this.txt_lineNo.StyleController = this.layoutMx1; this.txt_lineNo.TabIndex = 474; // // txt_dptNo // - this.txt_dptNo.Location = new System.Drawing.Point(726, 124); + this.txt_dptNo.Location = new System.Drawing.Point(425, 68); this.txt_dptNo.Name = "txt_dptNo"; - this.txt_dptNo.Size = new System.Drawing.Size(200, 24); + this.txt_dptNo.Size = new System.Drawing.Size(206, 24); this.txt_dptNo.StyleController = this.layoutMx1; this.txt_dptNo.TabIndex = 475; // @@ -1315,24 +1267,22 @@ this.layoutControlItem3, this.layoutControlItem5, this.layoutControlItem7, - this.layoutControlItem9, - this.layoutControlItem10, this.layoutControlItem11, - this.layoutControlItem13, - this.layoutControlItem14, - this.layoutControlItem17, - this.layoutControlItem19, this.layoutControlItem6, - this.layoutControlItem2, + this.layoutControlItem14, + this.layoutControlItem20, + this.layoutControlItem41, this.layoutControlItem15, this.layoutControlItem4, this.layoutControlItem8, this.layoutControlItem12, this.layoutControlItem16, - this.layoutControlItem28, - this.layoutControlItem20, this.layoutControlItem40, - this.layoutControlItem41}); + this.layoutControlItem9, + this.layoutControlItem13, + this.layoutControlItem19, + this.layoutControlItem17, + this.layoutControlItem28}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1367,7 +1317,7 @@ rowDefinition4, rowDefinition5, rowDefinition6}); - this.Root.Size = new System.Drawing.Size(1246, 188); + this.Root.Size = new System.Drawing.Size(1267, 188); this.Root.TextVisible = false; // // layoutControlItem1 @@ -1375,17 +1325,17 @@ this.layoutControlItem1.Control = this.txt_daa001; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(306, 28); + this.layoutControlItem1.Size = new System.Drawing.Size(311, 28); this.layoutControlItem1.Text = "宸ュ崟鍗曞彿"; this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_daa008; - this.layoutControlItem3.Location = new System.Drawing.Point(612, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(623, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(306, 28); + this.layoutControlItem3.Size = new System.Drawing.Size(312, 28); this.layoutControlItem3.Text = "宸ュ崟鏁伴噺"; this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); // @@ -1395,73 +1345,170 @@ this.layoutControlItem5.Location = new System.Drawing.Point(0, 28); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(306, 28); + this.layoutControlItem5.Size = new System.Drawing.Size(311, 28); this.layoutControlItem5.Text = "鎶曟枡鍗曞彿"; this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_daa010; - this.layoutControlItem7.Location = new System.Drawing.Point(612, 28); + this.layoutControlItem7.Location = new System.Drawing.Point(623, 28); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(306, 28); + this.layoutControlItem7.Size = new System.Drawing.Size(312, 28); this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺"; this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_saleOrderNo; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 56); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(306, 28); - this.layoutControlItem9.Text = "闇�姹傚崟鍙�"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_daa028; - this.layoutControlItem10.Location = new System.Drawing.Point(306, 56); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem10.Size = new System.Drawing.Size(306, 28); - this.layoutControlItem10.Text = "澶囨枡鏃堕棿"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_daa011; - this.layoutControlItem11.Location = new System.Drawing.Point(612, 56); + this.layoutControlItem11.Location = new System.Drawing.Point(623, 56); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(306, 28); + this.layoutControlItem11.Size = new System.Drawing.Size(312, 28); this.layoutControlItem11.Text = "宸茬敓浜ч噺"; this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); // - // layoutControlItem13 + // layoutControlItem6 // - this.layoutControlItem13.Control = this.txt_daa029; - this.layoutControlItem13.Location = new System.Drawing.Point(0, 84); - this.layoutControlItem13.Name = "layoutControlItem13"; - this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem13.Size = new System.Drawing.Size(306, 28); - this.layoutControlItem13.Text = "浜у搧缂栫爜"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem6.Control = this.txt_daa022Remark; + this.layoutControlItem6.Location = new System.Drawing.Point(311, 0); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem6.Size = new System.Drawing.Size(312, 28); + this.layoutControlItem6.Text = "閫氱煡澶囨枡"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_lineName; - this.layoutControlItem14.Location = new System.Drawing.Point(306, 84); + this.layoutControlItem14.Location = new System.Drawing.Point(311, 84); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem14.Size = new System.Drawing.Size(306, 28); + this.layoutControlItem14.Size = new System.Drawing.Size(312, 28); this.layoutControlItem14.Text = "鐢熶骇绾垮埆"; this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.txt_dptName; + this.layoutControlItem20.Location = new System.Drawing.Point(311, 28); + this.layoutControlItem20.Name = "layoutControlItem20"; + this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem20.Size = new System.Drawing.Size(312, 28); + this.layoutControlItem20.Text = "杞﹂棿鍚嶇О"; + this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem41 + // + this.layoutControlItem41.Control = this.txt_dptNo; + this.layoutControlItem41.Location = new System.Drawing.Point(311, 56); + this.layoutControlItem41.Name = "layoutControlItem41"; + this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem41.Size = new System.Drawing.Size(312, 28); + this.layoutControlItem41.Text = "杞﹂棿缂栫爜"; + this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_dwName; + this.layoutControlItem15.Location = new System.Drawing.Point(623, 84); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem15.Size = new System.Drawing.Size(312, 28); + this.layoutControlItem15.Text = "鍗曚綅"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_mesStartProd; + this.layoutControlItem4.Location = new System.Drawing.Point(935, 0); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem4.Size = new System.Drawing.Size(312, 28); + this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.txt_mesEndProd; + this.layoutControlItem8.Location = new System.Drawing.Point(935, 28); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem8.Size = new System.Drawing.Size(312, 28); + this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_daa016; + this.layoutControlItem12.Location = new System.Drawing.Point(935, 56); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem12.Size = new System.Drawing.Size(312, 28); + this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.txt_daa017; + this.layoutControlItem16.Location = new System.Drawing.Point(935, 84); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem16.Size = new System.Drawing.Size(312, 28); + this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem40 + // + this.layoutControlItem40.Control = this.txt_lineNo; + this.layoutControlItem40.Location = new System.Drawing.Point(311, 112); + this.layoutControlItem40.Name = "layoutControlItem40"; + this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem40.Size = new System.Drawing.Size(312, 28); + this.layoutControlItem40.Text = "绾垮埆缂栫爜"; + this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txt_saleOrderNo; + this.layoutControlItem9.Location = new System.Drawing.Point(623, 112); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem9.Size = new System.Drawing.Size(312, 28); + this.layoutControlItem9.Text = "闇�姹傚崟鍙�"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem13 + // + this.layoutControlItem13.Control = this.txt_daa029; + this.layoutControlItem13.Location = new System.Drawing.Point(0, 56); + this.layoutControlItem13.Name = "layoutControlItem13"; + this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem13.Size = new System.Drawing.Size(311, 28); + this.layoutControlItem13.Text = "浜у搧缂栫爜"; + this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem19 + // + this.layoutControlItem19.Control = this.txt_daa003; + this.layoutControlItem19.Location = new System.Drawing.Point(0, 84); + this.layoutControlItem19.Name = "layoutControlItem19"; + this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem19.Size = new System.Drawing.Size(311, 28); + this.layoutControlItem19.Text = "浜у搧鍚嶇О"; + this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem17 // @@ -1469,139 +1516,20 @@ this.layoutControlItem17.Location = new System.Drawing.Point(0, 112); this.layoutControlItem17.Name = "layoutControlItem17"; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(306, 28); + this.layoutControlItem17.Size = new System.Drawing.Size(311, 28); this.layoutControlItem17.Text = "浜у搧瑙勬牸"; this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem19 - // - this.layoutControlItem19.Control = this.txt_daa003; - this.layoutControlItem19.Location = new System.Drawing.Point(0, 140); - this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem19.Size = new System.Drawing.Size(306, 28); - this.layoutControlItem19.Text = "浜у搧鍚嶇О"; - this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_daa022Remark; - this.layoutControlItem6.Location = new System.Drawing.Point(306, 0); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(306, 28); - this.layoutControlItem6.Text = "閫氱煡澶囨枡"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.textEdit1; - this.layoutControlItem2.Location = new System.Drawing.Point(306, 28); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(306, 28); - this.layoutControlItem2.Text = "澶囨枡鐘舵��"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txt_dwName; - this.layoutControlItem15.Location = new System.Drawing.Point(918, 0); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem15.Size = new System.Drawing.Size(308, 28); - this.layoutControlItem15.Text = "鍗曚綅"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.txt_mesStartProd; - this.layoutControlItem4.Location = new System.Drawing.Point(918, 28); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(308, 28); - this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.txt_mesEndProd; - this.layoutControlItem8.Location = new System.Drawing.Point(918, 56); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(308, 28); - this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_daa016; - this.layoutControlItem12.Location = new System.Drawing.Point(918, 84); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem12.Size = new System.Drawing.Size(308, 28); - this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem16 - // - this.layoutControlItem16.Control = this.txt_daa017; - this.layoutControlItem16.Location = new System.Drawing.Point(918, 112); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem16.Size = new System.Drawing.Size(308, 28); - this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem28 // this.layoutControlItem28.Control = this.txt_daa009; - this.layoutControlItem28.Location = new System.Drawing.Point(306, 140); + this.layoutControlItem28.Location = new System.Drawing.Point(0, 140); this.layoutControlItem28.Name = "layoutControlItem28"; - this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem28.Size = new System.Drawing.Size(612, 28); + this.layoutControlItem28.Size = new System.Drawing.Size(623, 28); this.layoutControlItem28.Text = "宸ュ崟澶囨敞"; this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem20 - // - this.layoutControlItem20.Control = this.txt_dptName; - this.layoutControlItem20.Location = new System.Drawing.Point(612, 84); - this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem20.Size = new System.Drawing.Size(306, 28); - this.layoutControlItem20.Text = "杞﹂棿鍚嶇О"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem40 - // - this.layoutControlItem40.Control = this.txt_lineNo; - this.layoutControlItem40.Location = new System.Drawing.Point(306, 112); - this.layoutControlItem40.Name = "layoutControlItem40"; - this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem40.Size = new System.Drawing.Size(306, 28); - this.layoutControlItem40.Text = "绾垮埆缂栫爜"; - this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem41 - // - this.layoutControlItem41.Control = this.txt_dptNo; - this.layoutControlItem41.Location = new System.Drawing.Point(612, 112); - this.layoutControlItem41.Name = "layoutControlItem41"; - this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem41.Size = new System.Drawing.Size(306, 28); - this.layoutControlItem41.Text = "杞﹂棿缂栫爜"; - this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18); // // tabMx // @@ -2021,7 +1949,7 @@ // this.layShuLiang.Controls.Add(this.txt_iCount_1); this.layShuLiang.Controls.Add(this.txt_yuliang_1); - this.layShuLiang.Location = new System.Drawing.Point(632, 22); + this.layShuLiang.Location = new System.Drawing.Point(632, 44); this.layShuLiang.Name = "layShuLiang"; this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500); this.layShuLiang.Root = this.layoutControlGroup3; @@ -2093,7 +2021,7 @@ // // radOut // - this.radOut.Location = new System.Drawing.Point(943, -12); + this.radOut.Location = new System.Drawing.Point(943, 10); this.radOut.Margin = new System.Windows.Forms.Padding(0); this.radOut.Name = "radOut"; this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; @@ -2108,7 +2036,7 @@ // ucBtnPrint1 // this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(941, 20); + this.ucBtnPrint1.Location = new System.Drawing.Point(941, 42); this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = null; @@ -2117,7 +2045,7 @@ // // txt_psnQty_1 // - this.txt_psnQty_1.Location = new System.Drawing.Point(719, -10); + this.txt_psnQty_1.Location = new System.Drawing.Point(719, 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(219, 24); @@ -2127,7 +2055,7 @@ // // txt_printRemark // - this.txt_printRemark.Location = new System.Drawing.Point(409, 22); + this.txt_printRemark.Location = new System.Drawing.Point(409, 44); this.txt_printRemark.Name = "txt_printRemark"; this.txt_printRemark.Properties.Appearance.Options.UseFont = true; this.txt_printRemark.Size = new System.Drawing.Size(219, 24); @@ -2138,7 +2066,7 @@ // txt_kQty // this.txt_kQty.EditValue = ""; - this.txt_kQty.Location = new System.Drawing.Point(409, -10); + this.txt_kQty.Location = new System.Drawing.Point(409, 12); this.txt_kQty.Name = "txt_kQty"; this.txt_kQty.Properties.Appearance.Options.UseFont = true; this.txt_kQty.Properties.ReadOnly = true; @@ -2149,7 +2077,7 @@ // // txt_yQty // - this.txt_yQty.Location = new System.Drawing.Point(99, 22); + this.txt_yQty.Location = new System.Drawing.Point(99, 44); this.txt_yQty.Name = "txt_yQty"; this.txt_yQty.Properties.Appearance.Options.UseFont = true; this.txt_yQty.Properties.ReadOnly = true; @@ -2160,7 +2088,7 @@ // // txt_zQty // - this.txt_zQty.Location = new System.Drawing.Point(99, -10); + 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(219, 24); @@ -3043,10 +2971,8 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_daa009.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Remark.Properties)).EndInit(); @@ -3072,24 +2998,22 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -3162,7 +3086,6 @@ private DevExpress.XtraGrid.GridControl gcMain1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; - private DevExpress.XtraGrid.Columns.GridColumn gv_daa027; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; @@ -3199,10 +3122,8 @@ private DevExpress.XtraTab.XtraTabPage xtraTabPage2; private DevExpress.XtraEditors.SplitContainerControl splitMx1; private DevExpress.XtraEditors.TextEdit txt_daa013; - private DevExpress.XtraEditors.TextEdit textEdit1; private DevExpress.XtraEditors.TextEdit txt_saleOrderNo; private DevExpress.XtraEditors.TextEdit txt_daa022Remark; - private DevExpress.XtraEditors.TextEdit txt_daa028; private DevExpress.XtraEditors.TextEdit txt_mesEndProd; private DevExpress.XtraEditors.TextEdit txt_mesStartProd; private System.Windows.Forms.Label lbGuid; @@ -3226,13 +3147,7 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; @@ -3284,13 +3199,11 @@ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; private DevExpress.XtraGrid.Columns.GridColumn gridColumn30; private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; private DevExpress.XtraGrid.Columns.GridColumn gridColumn32; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraTab.XtraTabPage xtraTabPage3; private DevExpress.XtraLayout.LayoutControl layoutMx99; private DevExpress.XtraEditors.TextEdit txt_printRemark; @@ -3300,10 +3213,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private UserControl.UcBtnPrint ucBtnPrint1; private DevExpress.XtraEditors.TextEdit txt_psnQty_1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraGrid.GridControl gcMx3; private DevExpress.XtraGrid.Views.Grid.GridView gvMx3; private DevExpress.XtraGrid.Columns.GridColumn gridColumn33; @@ -3323,10 +3232,8 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn34; private DevExpress.XtraGrid.Columns.GridColumn gridColumn35; private DevExpress.Utils.ToolTipController tips; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; private DevExpress.XtraEditors.TextEdit txt_daa015; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; private DevExpress.XtraEditors.RadioGroup radOut; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; @@ -3366,7 +3273,19 @@ private DevExpress.XtraEditors.SplitContainerControl splitMx99; private DevExpress.XtraEditors.TextEdit txt_lineNo; private DevExpress.XtraEditors.TextEdit txt_dptNo; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs index e948ac8..f2e01a5 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs @@ -591,7 +591,7 @@ } if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.ucBtnPrint1.rptParameter = "return false"; return; @@ -629,7 +629,7 @@ } if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_98.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_98.Focus(); this.ucBtnPrint98.rptParameter = "return false"; return; diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs index 00c5b09..e1045dd 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs @@ -99,7 +99,7 @@ ucBtnPrint1.guidKey = rowGuid; if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.ucBtnPrint1.rptParameter = "return false"; return; diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs index 45a08b8..a7f3e02 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs @@ -38,11 +38,9 @@ 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition(); @@ -50,9 +48,11 @@ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); + 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(); @@ -110,6 +110,36 @@ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); + this.layout99 = new DevExpress.XtraLayout.LayoutControl(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); + this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); + this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); + this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); + this.radOut = new DevExpress.XtraEditors.RadioGroup(); + this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); + this.txtWlid = new DevExpress.XtraEditors.TextEdit(); + this.txtWlmc = new DevExpress.XtraEditors.TextEdit(); + this.txtWlgg = new DevExpress.XtraEditors.TextEdit(); + this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); + this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); + this.txt_yQty = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -129,17 +159,6 @@ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.radOut = new DevExpress.XtraEditors.RadioGroup(); - this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); - this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); - this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); - this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); - this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); - this.txt_yQty = new DevExpress.XtraEditors.TextEdit(); - this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); - this.txtWlgg = new DevExpress.XtraEditors.TextEdit(); - this.txtWlmc = new DevExpress.XtraEditors.TextEdit(); - this.txtWlid = new DevExpress.XtraEditors.TextEdit(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -159,25 +178,6 @@ this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); - this.layout99 = new DevExpress.XtraLayout.LayoutControl(); - this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); - this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); - this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit(); - this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -228,21 +228,6 @@ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit(); - this.tabMxPage2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit(); this.split99.Panel1.SuspendLayout(); @@ -251,6 +236,22 @@ this.split99.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit(); this.layout99.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); @@ -261,14 +262,13 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); - this.layoutControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + this.tabMxPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -974,6 +974,402 @@ this.tabMxPage1.Size = new System.Drawing.Size(1342, 386); this.tabMxPage1.Text = "鏉ユ枡淇℃伅鏄庣粏"; // + // split99 + // + this.split99.Dock = System.Windows.Forms.DockStyle.Fill; + this.split99.Horizontal = false; + this.split99.Location = new System.Drawing.Point(0, 0); + this.split99.Name = "split99"; + // + // split99.Panel1 + // + this.split99.Panel1.Controls.Add(this.layout99); + this.split99.Panel1.Text = "Panel1"; + // + // split99.Panel2 + // + this.split99.Panel2.Controls.Add(this.gcMx1); + this.split99.Panel2.Text = "Panel2"; + this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; + this.split99.Size = new System.Drawing.Size(1342, 386); + this.split99.SplitterPosition = 116; + this.split99.TabIndex = 2; + // + // layout99 + // + this.layout99.Controls.Add(this.layoutControl1); + this.layout99.Controls.Add(this.lbMxGuid); + this.layout99.Controls.Add(this.ucBtnPrint1); + this.layout99.Controls.Add(this.radOut); + this.layout99.Controls.Add(this.txt_psnQty_1); + this.layout99.Controls.Add(this.txtWlid); + this.layout99.Controls.Add(this.txtWlmc); + this.layout99.Controls.Add(this.txtWlgg); + this.layout99.Controls.Add(this.txt_kQty); + this.layout99.Controls.Add(this.txtQuantity); + this.layout99.Controls.Add(this.txt_yQty); + this.layout99.Dock = System.Windows.Forms.DockStyle.Fill; + this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem24}); + this.layout99.Location = new System.Drawing.Point(0, 0); + this.layout99.Name = "layout99"; + this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500); + this.layout99.Root = this.layoutControlGroup1; + this.layout99.Size = new System.Drawing.Size(1342, 116); + this.layout99.TabIndex = 0; + this.layout99.Text = "layoutControl1"; + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.txt_iCount_1); + this.layoutControl1.Controls.Add(this.txt_yuliang_1); + this.layoutControl1.Location = new System.Drawing.Point(692, 76); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.layoutControlGroup2; + this.layoutControl1.Size = new System.Drawing.Size(336, 28); + this.layoutControl1.TabIndex = 477; + this.layoutControl1.Text = "layoutControl1"; + // + // txt_iCount_1 + // + this.txt_iCount_1.Location = new System.Drawing.Point(104, 2); + this.txt_iCount_1.Name = "txt_iCount_1"; + this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; + this.txt_iCount_1.Properties.ReadOnly = true; + this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true; + this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); + this.txt_iCount_1.StyleController = this.layoutControl1; + this.txt_iCount_1.TabIndex = 264; + this.txt_iCount_1.Tag = "ReadOnly"; + this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�"; + // + // txt_yuliang_1 + // + this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); + this.txt_yuliang_1.Name = "txt_yuliang_1"; + this.txt_yuliang_1.Properties.ReadOnly = true; + this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); + this.txt_yuliang_1.StyleController = this.layoutControl1; + this.txt_yuliang_1.TabIndex = 265; + // + // layoutControlGroup2 + // + this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup2.GroupBordersVisible = false; + this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem26, + this.layoutControlItem27}); + this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.layoutControlGroup2.Name = "layoutControlGroup2"; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition5, + columnDefinition6}); + rowDefinition5.Height = 100D; + rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition5}); + this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28); + this.layoutControlGroup2.TextVisible = false; + // + // layoutControlItem26 + // + this.layoutControlItem26.Control = this.txt_iCount_1; + this.layoutControlItem26.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem26.Name = "layoutControlItem26"; + this.layoutControlItem26.Size = new System.Drawing.Size(168, 28); + this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��"; + this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem27 + // + this.layoutControlItem27.Control = this.txt_yuliang_1; + this.layoutControlItem27.Location = new System.Drawing.Point(168, 0); + this.layoutControlItem27.Name = "layoutControlItem27"; + this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem27.Size = new System.Drawing.Size(168, 28); + this.layoutControlItem27.Text = "鎵撳嵃浣欐暟"; + this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); + // + // lbMxGuid + // + this.lbMxGuid.Location = new System.Drawing.Point(1032, 119); + this.lbMxGuid.Name = "lbMxGuid"; + this.lbMxGuid.Size = new System.Drawing.Size(58, 18); + this.lbMxGuid.StyleController = this.layout99; + this.lbMxGuid.TabIndex = 229; + this.lbMxGuid.Text = "lbMxGuid"; + this.lbMxGuid.Visible = false; + // + // ucBtnPrint1 + // + this.ucBtnPrint1.guidKey = null; + this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42); + this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); + this.ucBtnPrint1.Name = "ucBtnPrint1"; + this.ucBtnPrint1.rptParameter = "rpt_daa"; + this.ucBtnPrint1.Size = new System.Drawing.Size(338, 32); + this.ucBtnPrint1.TabIndex = 232; + // + // radOut + // + this.radOut.Location = new System.Drawing.Point(1033, 10); + this.radOut.Margin = new System.Windows.Forms.Padding(0); + this.radOut.Name = "radOut"; + this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; + this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")}); + this.radOut.Size = new System.Drawing.Size(227, 28); + this.radOut.StyleController = this.layout99; + this.radOut.TabIndex = 476; + // + // txt_psnQty_1 + // + this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44); + this.txt_psnQty_1.Name = "txt_psnQty_1"; + this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; + this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true; + this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); + this.txt_psnQty_1.StyleController = this.layout99; + this.txt_psnQty_1.TabIndex = 263; + this.txt_psnQty_1.Tag = "ReadOnly"; + this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺"; + // + // txtWlid + // + this.txtWlid.Location = new System.Drawing.Point(114, 12); + this.txtWlid.Name = "txtWlid"; + this.txtWlid.Properties.Appearance.Options.UseFont = true; + this.txtWlid.Properties.ReadOnly = true; + this.txtWlid.Size = new System.Drawing.Size(234, 24); + this.txtWlid.StyleController = this.layout99; + this.txtWlid.TabIndex = 214; + // + // txtWlmc + // + this.txtWlmc.Location = new System.Drawing.Point(114, 44); + this.txtWlmc.Name = "txtWlmc"; + this.txtWlmc.Properties.Appearance.Options.UseFont = true; + this.txtWlmc.Properties.ReadOnly = true; + this.txtWlmc.Size = new System.Drawing.Size(234, 24); + this.txtWlmc.StyleController = this.layout99; + this.txtWlmc.TabIndex = 216; + // + // txtWlgg + // + this.txtWlgg.Location = new System.Drawing.Point(114, 76); + this.txtWlgg.Name = "txtWlgg"; + this.txtWlgg.Properties.Appearance.Options.UseFont = true; + this.txtWlgg.Properties.ReadOnly = true; + this.txtWlgg.Size = new System.Drawing.Size(574, 24); + this.txtWlgg.StyleController = this.layout99; + this.txtWlgg.TabIndex = 218; + // + // txt_kQty + // + this.txt_kQty.Location = new System.Drawing.Point(794, 12); + this.txt_kQty.Name = "txt_kQty"; + this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; + this.txt_kQty.Properties.Appearance.Options.UseFont = true; + this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; + this.txt_kQty.Properties.ReadOnly = true; + this.txt_kQty.Size = new System.Drawing.Size(234, 24); + this.txt_kQty.StyleController = this.layout99; + this.txt_kQty.TabIndex = 224; + // + // txtQuantity + // + this.txtQuantity.Location = new System.Drawing.Point(454, 12); + this.txtQuantity.Name = "txtQuantity"; + this.txtQuantity.Properties.Appearance.Options.UseFont = true; + this.txtQuantity.Properties.ReadOnly = true; + this.txtQuantity.Size = new System.Drawing.Size(234, 24); + this.txtQuantity.StyleController = this.layout99; + this.txtQuantity.TabIndex = 220; + // + // txt_yQty + // + this.txt_yQty.Location = new System.Drawing.Point(454, 44); + this.txt_yQty.Name = "txt_yQty"; + this.txt_yQty.Properties.Appearance.Options.UseFont = true; + this.txt_yQty.Properties.ReadOnly = true; + this.txt_yQty.Size = new System.Drawing.Size(234, 24); + this.txt_yQty.StyleController = this.layout99; + this.txt_yQty.TabIndex = 222; + // + // layoutControlItem24 + // + this.layoutControlItem24.Control = this.lbMxGuid; + this.layoutControlItem24.Location = new System.Drawing.Point(1020, 107); + this.layoutControlItem24.Name = "layoutControlItem24"; + this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem24.Size = new System.Drawing.Size(340, 54); + this.layoutControlItem24.Text = "lbMxGuid"; + this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem24.TextVisible = false; + // + // layoutControlGroup1 + // + this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup1.GroupBordersVisible = false; + this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem15, + this.layoutControlItem16, + this.layoutControlItem17, + this.layoutControlItem18, + this.layoutControlItem19, + this.layoutControlItem20, + this.layoutControlItem21, + this.layoutControlItem22, + this.layoutControlItem23, + this.layoutControlItem25}); + this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.layoutControlGroup1.Name = "Root"; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; + columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition9.Width = 100D; + columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition10.Width = 100D; + this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition7, + columnDefinition8, + columnDefinition9, + columnDefinition10}); + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition7.Height = 100D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition8.Height = 100D; + rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition6, + rowDefinition7, + rowDefinition8}); + this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116); + this.layoutControlGroup1.TextVisible = false; + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txtWlid; + this.layoutControlItem15.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem15.Text = "鐗╂枡缂栧彿"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem16 + // + this.layoutControlItem16.Control = this.txtWlmc; + this.layoutControlItem16.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem16.Name = "layoutControlItem16"; + this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem16.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem16.Text = "鐗╂枡鍚嶇О"; + this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem17 + // + this.layoutControlItem17.Control = this.txtWlgg; + this.layoutControlItem17.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem17.Size = new System.Drawing.Size(680, 32); + this.layoutControlItem17.Text = "鐗╂枡瑙勬牸"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem18 + // + this.layoutControlItem18.Control = this.txtQuantity; + this.layoutControlItem18.Location = new System.Drawing.Point(340, 0); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem18.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem19 + // + this.layoutControlItem19.Control = this.txt_yQty; + this.layoutControlItem19.Location = new System.Drawing.Point(340, 32); + this.layoutControlItem19.Name = "layoutControlItem19"; + this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem19.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺"; + this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.txt_kQty; + this.layoutControlItem20.Location = new System.Drawing.Point(680, 0); + this.layoutControlItem20.Name = "layoutControlItem20"; + this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem20.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem20.Text = "鍙墦鍗版�绘暟"; + this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem21 + // + this.layoutControlItem21.Control = this.txt_psnQty_1; + this.layoutControlItem21.Location = new System.Drawing.Point(680, 32); + this.layoutControlItem21.Name = "layoutControlItem21"; + this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem21.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem21.Text = "姣忓紶鏉$爜鏁伴噺"; + this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem22 + // + this.layoutControlItem22.Control = this.radOut; + this.layoutControlItem22.Location = new System.Drawing.Point(1020, 0); + this.layoutControlItem22.MaxSize = new System.Drawing.Size(230, 28); + this.layoutControlItem22.MinSize = new System.Drawing.Size(230, 28); + this.layoutControlItem22.Name = "layoutControlItem22"; + this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); + this.layoutControlItem22.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem22.Text = "鑷姩璁$畻"; + this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem22.TextVisible = false; + // + // layoutControlItem23 + // + this.layoutControlItem23.Control = this.ucBtnPrint1; + this.layoutControlItem23.Location = new System.Drawing.Point(1020, 32); + this.layoutControlItem23.Name = "layoutControlItem23"; + this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); + this.layoutControlItem23.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳"; + this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem23.TextVisible = false; + // + // layoutControlItem25 + // + this.layoutControlItem25.Control = this.layoutControl1; + this.layoutControlItem25.Location = new System.Drawing.Point(680, 64); + this.layoutControlItem25.Name = "layoutControlItem25"; + this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem25.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺"; + this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem25.TextVisible = false; + // // gcMx1 // this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1206,127 +1602,6 @@ this.gridColumn12.VisibleIndex = 14; this.gridColumn12.Width = 94; // - // radOut - // - this.radOut.Location = new System.Drawing.Point(1033, 10); - this.radOut.Margin = new System.Windows.Forms.Padding(0); - this.radOut.Name = "radOut"; - this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; - this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"), - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"), - new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")}); - this.radOut.Size = new System.Drawing.Size(227, 28); - this.radOut.StyleController = this.layout99; - this.radOut.TabIndex = 476; - // - // txt_iCount_1 - // - this.txt_iCount_1.Location = new System.Drawing.Point(104, 2); - this.txt_iCount_1.Name = "txt_iCount_1"; - this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; - this.txt_iCount_1.Properties.ReadOnly = true; - this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true; - this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); - this.txt_iCount_1.StyleController = this.layoutControl1; - this.txt_iCount_1.TabIndex = 264; - this.txt_iCount_1.Tag = "ReadOnly"; - this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�"; - // - // txt_psnQty_1 - // - this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44); - this.txt_psnQty_1.Name = "txt_psnQty_1"; - this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; - this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true; - this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); - this.txt_psnQty_1.StyleController = this.layout99; - this.txt_psnQty_1.TabIndex = 263; - this.txt_psnQty_1.Tag = "ReadOnly"; - this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺"; - // - // ucBtnPrint1 - // - this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42); - this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); - this.ucBtnPrint1.Name = "ucBtnPrint1"; - this.ucBtnPrint1.rptParameter = "rpt_daa"; - this.ucBtnPrint1.Size = new System.Drawing.Size(338, 32); - this.ucBtnPrint1.TabIndex = 232; - // - // lbMxGuid - // - this.lbMxGuid.Location = new System.Drawing.Point(1032, 119); - this.lbMxGuid.Name = "lbMxGuid"; - this.lbMxGuid.Size = new System.Drawing.Size(58, 18); - this.lbMxGuid.StyleController = this.layout99; - this.lbMxGuid.TabIndex = 229; - this.lbMxGuid.Text = "lbMxGuid"; - this.lbMxGuid.Visible = false; - // - // txt_kQty - // - this.txt_kQty.Location = new System.Drawing.Point(794, 12); - this.txt_kQty.Name = "txt_kQty"; - this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; - this.txt_kQty.Properties.Appearance.Options.UseFont = true; - this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; - this.txt_kQty.Properties.ReadOnly = true; - this.txt_kQty.Size = new System.Drawing.Size(234, 24); - this.txt_kQty.StyleController = this.layout99; - this.txt_kQty.TabIndex = 224; - // - // txt_yQty - // - this.txt_yQty.Location = new System.Drawing.Point(454, 44); - this.txt_yQty.Name = "txt_yQty"; - this.txt_yQty.Properties.Appearance.Options.UseFont = true; - this.txt_yQty.Properties.ReadOnly = true; - this.txt_yQty.Size = new System.Drawing.Size(234, 24); - this.txt_yQty.StyleController = this.layout99; - this.txt_yQty.TabIndex = 222; - // - // txtQuantity - // - this.txtQuantity.Location = new System.Drawing.Point(454, 12); - this.txtQuantity.Name = "txtQuantity"; - this.txtQuantity.Properties.Appearance.Options.UseFont = true; - this.txtQuantity.Properties.ReadOnly = true; - this.txtQuantity.Size = new System.Drawing.Size(234, 24); - this.txtQuantity.StyleController = this.layout99; - this.txtQuantity.TabIndex = 220; - // - // txtWlgg - // - this.txtWlgg.Location = new System.Drawing.Point(114, 76); - this.txtWlgg.Name = "txtWlgg"; - this.txtWlgg.Properties.Appearance.Options.UseFont = true; - this.txtWlgg.Properties.ReadOnly = true; - this.txtWlgg.Size = new System.Drawing.Size(574, 24); - this.txtWlgg.StyleController = this.layout99; - this.txtWlgg.TabIndex = 218; - // - // txtWlmc - // - this.txtWlmc.Location = new System.Drawing.Point(114, 44); - this.txtWlmc.Name = "txtWlmc"; - this.txtWlmc.Properties.Appearance.Options.UseFont = true; - this.txtWlmc.Properties.ReadOnly = true; - this.txtWlmc.Size = new System.Drawing.Size(234, 24); - this.txtWlmc.StyleController = this.layout99; - this.txtWlmc.TabIndex = 216; - // - // txtWlid - // - this.txtWlid.Location = new System.Drawing.Point(114, 12); - this.txtWlid.Name = "txtWlid"; - this.txtWlid.Properties.Appearance.Options.UseFont = true; - this.txtWlid.Properties.ReadOnly = true; - this.txtWlid.Size = new System.Drawing.Size(234, 24); - this.txtWlid.StyleController = this.layout99; - this.txtWlid.TabIndex = 214; - // // tabMxPage2 // this.tabMxPage2.Controls.Add(this.gcMx2); @@ -1532,281 +1807,6 @@ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // - // split99 - // - this.split99.Dock = System.Windows.Forms.DockStyle.Fill; - this.split99.Horizontal = false; - this.split99.Location = new System.Drawing.Point(0, 0); - this.split99.Name = "split99"; - // - // split99.split99_Panel1 - // - this.split99.Panel1.Controls.Add(this.layout99); - this.split99.Panel1.Text = "Panel1"; - // - // split99.split99_Panel2 - // - this.split99.Panel2.Controls.Add(this.gcMx1); - this.split99.Panel2.Text = "Panel2"; - this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split99.Size = new System.Drawing.Size(1342, 386); - this.split99.SplitterPosition = 116; - this.split99.TabIndex = 2; - // - // layout99 - // - this.layout99.Controls.Add(this.layoutControl1); - this.layout99.Controls.Add(this.lbMxGuid); - this.layout99.Controls.Add(this.ucBtnPrint1); - this.layout99.Controls.Add(this.radOut); - this.layout99.Controls.Add(this.txt_psnQty_1); - this.layout99.Controls.Add(this.txtWlid); - this.layout99.Controls.Add(this.txtWlmc); - this.layout99.Controls.Add(this.txtWlgg); - this.layout99.Controls.Add(this.txt_kQty); - this.layout99.Controls.Add(this.txtQuantity); - this.layout99.Controls.Add(this.txt_yQty); - this.layout99.Dock = System.Windows.Forms.DockStyle.Fill; - this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem24}); - this.layout99.Location = new System.Drawing.Point(0, 0); - this.layout99.Name = "layout99"; - this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500); - this.layout99.Root = this.layoutControlGroup1; - this.layout99.Size = new System.Drawing.Size(1342, 116); - this.layout99.TabIndex = 0; - this.layout99.Text = "layoutControl1"; - // - // layoutControlGroup1 - // - this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup1.GroupBordersVisible = false; - this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem15, - this.layoutControlItem16, - this.layoutControlItem17, - this.layoutControlItem18, - this.layoutControlItem19, - this.layoutControlItem20, - this.layoutControlItem21, - this.layoutControlItem22, - this.layoutControlItem23, - this.layoutControlItem25}); - this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; - this.layoutControlGroup1.Name = "Root"; - columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition7.Width = 100D; - columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition8.Width = 100D; - columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition9.Width = 100D; - columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition10.Width = 100D; - this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition7, - columnDefinition8, - columnDefinition9, - columnDefinition10}); - rowDefinition6.Height = 100D; - rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition7.Height = 100D; - rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition8.Height = 100D; - rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition6, - rowDefinition7, - rowDefinition8}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116); - this.layoutControlGroup1.TextVisible = false; - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txtWlid; - this.layoutControlItem15.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem15.Text = "鐗╂枡缂栧彿"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem16 - // - this.layoutControlItem16.Control = this.txtWlmc; - this.layoutControlItem16.Location = new System.Drawing.Point(0, 32); - this.layoutControlItem16.Name = "layoutControlItem16"; - this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem16.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem16.Text = "鐗╂枡鍚嶇О"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem17 - // - this.layoutControlItem17.Control = this.txtWlgg; - this.layoutControlItem17.Location = new System.Drawing.Point(0, 64); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem17.Size = new System.Drawing.Size(680, 32); - this.layoutControlItem17.Text = "鐗╂枡瑙勬牸"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem18 - // - this.layoutControlItem18.Control = this.txtQuantity; - this.layoutControlItem18.Location = new System.Drawing.Point(340, 0); - this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem18.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem19 - // - this.layoutControlItem19.Control = this.txt_yQty; - this.layoutControlItem19.Location = new System.Drawing.Point(340, 32); - this.layoutControlItem19.Name = "layoutControlItem19"; - this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem19.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺"; - this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem20 - // - this.layoutControlItem20.Control = this.txt_kQty; - this.layoutControlItem20.Location = new System.Drawing.Point(680, 0); - this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem20.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem20.Text = "鍙墦鍗版�绘暟"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem21 - // - this.layoutControlItem21.Control = this.txt_psnQty_1; - this.layoutControlItem21.Location = new System.Drawing.Point(680, 32); - this.layoutControlItem21.Name = "layoutControlItem21"; - this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem21.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem21.Text = "姣忓紶鏉$爜鏁伴噺"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem22 - // - this.layoutControlItem22.Control = this.radOut; - this.layoutControlItem22.Location = new System.Drawing.Point(1020, 0); - this.layoutControlItem22.MaxSize = new System.Drawing.Size(230, 28); - this.layoutControlItem22.MinSize = new System.Drawing.Size(230, 28); - this.layoutControlItem22.Name = "layoutControlItem22"; - this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); - this.layoutControlItem22.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem22.Text = "鑷姩璁$畻"; - this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem22.TextVisible = false; - // - // layoutControlItem23 - // - this.layoutControlItem23.Control = this.ucBtnPrint1; - this.layoutControlItem23.Location = new System.Drawing.Point(1020, 32); - this.layoutControlItem23.Name = "layoutControlItem23"; - this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); - this.layoutControlItem23.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳"; - this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem23.TextVisible = false; - // - // layoutControlItem24 - // - this.layoutControlItem24.Control = this.lbMxGuid; - this.layoutControlItem24.Location = new System.Drawing.Point(1020, 107); - this.layoutControlItem24.Name = "layoutControlItem24"; - this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem24.Size = new System.Drawing.Size(340, 54); - this.layoutControlItem24.Text = "lbMxGuid"; - this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem24.TextVisible = false; - // - // layoutControl1 - // - this.layoutControl1.Controls.Add(this.txt_iCount_1); - this.layoutControl1.Controls.Add(this.txt_yuliang_1); - this.layoutControl1.Location = new System.Drawing.Point(692, 76); - this.layoutControl1.Name = "layoutControl1"; - this.layoutControl1.Root = this.layoutControlGroup2; - this.layoutControl1.Size = new System.Drawing.Size(336, 28); - this.layoutControl1.TabIndex = 477; - this.layoutControl1.Text = "layoutControl1"; - // - // layoutControlItem25 - // - this.layoutControlItem25.Control = this.layoutControl1; - this.layoutControlItem25.Location = new System.Drawing.Point(680, 64); - this.layoutControlItem25.Name = "layoutControlItem25"; - this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem25.Size = new System.Drawing.Size(340, 32); - this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺"; - this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem25.TextVisible = false; - // - // layoutControlGroup2 - // - this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; - this.layoutControlGroup2.GroupBordersVisible = false; - this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem26, - this.layoutControlItem27}); - this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; - this.layoutControlGroup2.Name = "layoutControlGroup2"; - columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition5.Width = 100D; - columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition6.Width = 100D; - this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6}); - rowDefinition5.Height = 100D; - rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition5}); - this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); - this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28); - this.layoutControlGroup2.TextVisible = false; - // - // layoutControlItem26 - // - this.layoutControlItem26.Control = this.txt_iCount_1; - this.layoutControlItem26.Location = new System.Drawing.Point(0, 0); - this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.Size = new System.Drawing.Size(168, 28); - this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��"; - this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); - // - // txt_yuliang_1 - // - this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); - this.txt_yuliang_1.Name = "txt_yuliang_1"; - this.txt_yuliang_1.Properties.ReadOnly = true; - this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); - this.txt_yuliang_1.StyleController = this.layoutControl1; - this.txt_yuliang_1.TabIndex = 265; - // - // layoutControlItem27 - // - this.layoutControlItem27.Control = this.txt_yuliang_1; - this.layoutControlItem27.Location = new System.Drawing.Point(168, 0); - this.layoutControlItem27.Name = "layoutControlItem27"; - this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem27.Size = new System.Drawing.Size(168, 28); - this.layoutControlItem27.Text = "鎵撳嵃浣欐暟"; - this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); - // // Frm_ArrivalBarcode // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1866,21 +1866,6 @@ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit(); - this.tabMxPage2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit(); this.split99.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit(); @@ -1889,6 +1874,22 @@ this.split99.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit(); this.layout99.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); @@ -1899,14 +1900,13 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); - this.layoutControl1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + this.tabMxPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); this.ResumeLayout(false); } diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs index 78a82cd..39dcb89 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs @@ -46,7 +46,7 @@ ucBtnPrint1.guidKey = rowGuid; if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.ucBtnPrint1.rptParameter = "return false"; return; diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs index 632e717..a2c4afb 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs @@ -59,7 +59,7 @@ } if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.ucBtnPrint1.rptParameter = "return false"; return; diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs index 05c63ff..58e0d98 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs @@ -84,7 +84,7 @@ ucBtnPrint1.guidKey = rowGuid; if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); txt_iCount_1.Focus(); this.ucBtnPrint1.rptParameter = "return false"; return; diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs index 4102f34..0efbe39 100644 --- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs +++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs @@ -2123,25 +2123,22 @@ string t2 = box2.Text.Trim(); if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t1)) return; + if (Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(t1) <= 0) + return; decimal? dc = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(sum); decimal? dc1 = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(t1); - - int dividend = int.Parse(sum); // 琚櫎鏁� - int divisor = int.Parse(t1); // 闄ゆ暟 - - int quotient = dividend / divisor; // 鏁存暟閮ㄥ垎 - int remainder = dividend % divisor; // 浣欐暟 - + decimal dividend = decimal.Parse(sum); // 琚櫎鏁� + decimal divisor = decimal.Parse(t1); // 闄ゆ暟 + decimal quotient = dividend / divisor; // 鏁存暟閮ㄥ垎 + decimal remainder = dividend % divisor; // 浣欐暟 box2.Text = quotient.ToString(); - if (rd.SelectedIndex == 0) txt_yuliang.Text = remainder.ToString(); } catch (Exception ex) { - Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message); + Gs.DevApp.ToolBox.MsgHelper.ShowError("杈撳叆鏁版嵁閿欒:"+ex.Message); } - } public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut, DevExpress.XtraEditors.TextEdit txt_yuliang = null) { -- Gitblit v1.9.3