From 5f92474a32f3fc3e38f2f19274745720062baee6 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期六, 19 七月 2025 13:59:33 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs | 2 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 73 ++-- DevApp/Gs.DevApp/App.config | 4 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 86 +++-- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 8 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 486 ++++++++++++++++---------------- DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs | 34 +- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 4 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 14 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 87 +++-- DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs | 18 DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs | 6 DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs | 56 +- 13 files changed, 442 insertions(+), 436 deletions(-) diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config index 05b6845..b236262 100644 --- a/DevApp/Gs.DevApp/App.config +++ b/DevApp/Gs.DevApp/App.config @@ -35,9 +35,9 @@ </assemblyBinding> </runtime> <appSettings> - <add key="WebApiUrl" value="http://localhost:5263/" /> + <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> - <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> + <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="LogPath" value="logs" /> <add key="ProductName" value="G-MES V2.0" /> <add key="PageSize" value="50" /> diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs index 1cc3ed5..c887aa3 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs @@ -341,7 +341,7 @@ // this.gv_urgentFlag.AppearanceCell.Options.UseFont = true; this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑"; - this.gv_urgentFlag.FieldName = "urgentFlag"; + this.gv_urgentFlag.FieldName = "urgentFlagTxt"; this.gv_urgentFlag.Name = "gv_urgentFlag"; this.gv_urgentFlag.OptionsColumn.AllowEdit = false; this.gv_urgentFlag.Tag = "query_a.urgent_flag"; @@ -1063,11 +1063,11 @@ this.gvMx1urgentFlag.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true; this.gvMx1urgentFlag.Caption = "鎬ユ枡"; - this.gvMx1urgentFlag.FieldName = "urgentFlag"; + this.gvMx1urgentFlag.FieldName = "urgentFlagTxt"; this.gvMx1urgentFlag.MinWidth = 25; this.gvMx1urgentFlag.Name = "gvMx1urgentFlag"; - this.gvMx1urgentFlag.Tag = "edit"; - this.gvMx1urgentFlag.UnboundDataType = typeof(bool); + this.gvMx1urgentFlag.Tag = ""; + this.gvMx1urgentFlag.UnboundDataType = typeof(string); this.gvMx1urgentFlag.Visible = true; this.gvMx1urgentFlag.VisibleIndex = 1; this.gvMx1urgentFlag.Width = 34; diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs index 523ba16..c825b91 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs @@ -300,7 +300,7 @@ lbGuid, txt_billNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -397,7 +397,7 @@ AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()), ItemId = int.Parse(row["itemId"].ToString()), Quantity = decimal.Parse(row["quantity"].ToString()), - UrgentFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBit(row["urgentFlag"].ToString()), + UrgentFlag = (row["urgentFlagTxt"].ToString().Replace(":","").Replace("鏅��", "").Replace("鎬ユ枡", "").Replace("涓�鑸�", "")), Remark = row["memo"].ToString(), }); } diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs index 49d989e..d7061cc 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdtShow.cs @@ -131,7 +131,6 @@ { MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); getPageList(1, 999999); - } else MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); @@ -148,7 +147,6 @@ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢 /// </summary> public event EventHandler<UpdateParentEventArgs> UpdateParent; - } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs index 9a714e8..3c6ead1 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs @@ -81,10 +81,10 @@ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.picCheckBox = new System.Windows.Forms.PictureBox(); + this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -121,9 +121,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -542,8 +542,8 @@ this.layoutControlItem5, this.layoutControlItem6, this.layoutControlItem11, - this.layoutControlItem12, - this.layoutControlItem4}); + this.layoutControlItem4, + this.layoutControlItem12}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -668,17 +668,6 @@ this.layoutControlItem11.Text = "鐗╂枡缂栫爜"; this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_depotId; - this.layoutControlItem12.Location = new System.Drawing.Point(271, 28); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem12.Size = new System.Drawing.Size(271, 28); - this.layoutControlItem12.Text = "閫夋嫨浠撳簱"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); - // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_itemModel; @@ -700,6 +689,17 @@ this.picCheckBox.TabIndex = 9; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; + // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_depotId; + this.layoutControlItem12.Location = new System.Drawing.Point(271, 28); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem12.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem12.Text = "閫夋嫨浠撳簱"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // FrmBackFlash // @@ -747,9 +747,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); this.ResumeLayout(false); } @@ -795,12 +795,12 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private System.Windows.Forms.PictureBox picCheckBox; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs index 0874d9c..cfa6663 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs @@ -129,6 +129,10 @@ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -144,9 +148,6 @@ this.txt_ypQty1111 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -157,7 +158,9 @@ this.txt_jaBs1111 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -189,9 +192,6 @@ this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -249,6 +249,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); @@ -264,9 +268,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_ypQty1111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); @@ -277,15 +278,14 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_jaBs1111)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((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.layoutControlItem17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -299,7 +299,7 @@ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; - this.toolBarMenu1.Size = new System.Drawing.Size(1285, 80); + this.toolBarMenu1.Size = new System.Drawing.Size(1466, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; @@ -310,7 +310,7 @@ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1285, 602); + this.xtraTabControl1.Size = new System.Drawing.Size(1466, 602); this.xtraTabControl1.TabIndex = 3; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1, @@ -320,7 +320,7 @@ // this.xtraTabPage1.Controls.Add(this.split1); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1283, 570); + this.xtraTabPage1.Size = new System.Drawing.Size(1464, 570); this.xtraTabPage1.Text = "鏁版嵁鍒楄〃"; // // split1 @@ -340,7 +340,7 @@ // this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; - this.split1.Size = new System.Drawing.Size(1283, 570); + this.split1.Size = new System.Drawing.Size(1464, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 4; // @@ -350,7 +350,7 @@ this.gcMain1.Location = new System.Drawing.Point(0, 0); this.gcMain1.MainView = this.gridView1; this.gcMain1.Name = "gcMain1"; - this.gcMain1.Size = new System.Drawing.Size(1283, 519); + this.gcMain1.Size = new System.Drawing.Size(1464, 519); this.gcMain1.TabIndex = 2; this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -681,7 +681,7 @@ // // gridColumn23 // - this.gridColumn23.Caption = "涓嬭揪鏃ユ湡"; + this.gridColumn23.Caption = "Erp璁″垝涓嬭揪"; this.gridColumn23.FieldName = "caa005"; this.gridColumn23.MinWidth = 25; this.gridColumn23.Name = "gridColumn23"; @@ -823,7 +823,7 @@ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(1283, 39); + this.pageBar1.Size = new System.Drawing.Size(1464, 39); this.pageBar1.TabIndex = 4; this.pageBar1.TotalPages = 0; // @@ -831,7 +831,7 @@ // this.xtraTabPage2.Controls.Add(this.splitMx1); this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1283, 570); + this.xtraTabPage2.Size = new System.Drawing.Size(1464, 570); this.xtraTabPage2.Text = "鏁版嵁璇︾粏"; // // splitMx1 @@ -851,7 +851,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(1283, 570); + this.splitMx1.Size = new System.Drawing.Size(1464, 570); this.splitMx1.SplitterPosition = 216; this.splitMx1.TabIndex = 0; // @@ -906,7 +906,7 @@ this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(582, 419, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1283, 216); + this.layoutMx1.Size = new System.Drawing.Size(1464, 216); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -920,163 +920,163 @@ // // txt_wtOrg // - this.txt_wtOrg.Location = new System.Drawing.Point(1061, 124); + this.txt_wtOrg.Location = new System.Drawing.Point(1188, 124); this.txt_wtOrg.Name = "txt_wtOrg"; this.txt_wtOrg.Properties.Appearance.Options.UseFont = true; - this.txt_wtOrg.Size = new System.Drawing.Size(210, 24); + this.txt_wtOrg.Size = new System.Drawing.Size(264, 24); this.txt_wtOrg.StyleController = this.layoutMx1; this.txt_wtOrg.TabIndex = 465; // // txt_scOrg // - this.txt_scOrg.Location = new System.Drawing.Point(1061, 96); + this.txt_scOrg.Location = new System.Drawing.Point(1188, 96); this.txt_scOrg.Name = "txt_scOrg"; this.txt_scOrg.Properties.Appearance.Options.UseFont = true; - this.txt_scOrg.Size = new System.Drawing.Size(210, 24); + this.txt_scOrg.Size = new System.Drawing.Size(264, 24); this.txt_scOrg.StyleController = this.layoutMx1; this.txt_scOrg.TabIndex = 463; // // txt_caa016 // - this.txt_caa016.Location = new System.Drawing.Point(114, 152); + this.txt_caa016.Location = new System.Drawing.Point(105, 152); this.txt_caa016.Name = "txt_caa016"; this.txt_caa016.Properties.Appearance.Options.UseFont = true; - this.txt_caa016.Size = new System.Drawing.Size(525, 24); + this.txt_caa016.Size = new System.Drawing.Size(625, 24); this.txt_caa016.StyleController = this.layoutMx1; this.txt_caa016.TabIndex = 243; // // txt_djlx // - this.txt_djlx.Location = new System.Drawing.Point(745, 68); + this.txt_djlx.Location = new System.Drawing.Point(827, 68); this.txt_djlx.Name = "txt_djlx"; this.txt_djlx.Properties.Appearance.Options.UseFont = true; - this.txt_djlx.Size = new System.Drawing.Size(210, 24); + this.txt_djlx.Size = new System.Drawing.Size(264, 24); this.txt_djlx.StyleController = this.layoutMx1; this.txt_djlx.TabIndex = 461; // // txt_itemModel // - this.txt_itemModel.Location = new System.Drawing.Point(114, 124); + this.txt_itemModel.Location = new System.Drawing.Point(105, 124); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Properties.Appearance.Options.UseFont = true; - this.txt_itemModel.Size = new System.Drawing.Size(209, 24); + this.txt_itemModel.Size = new System.Drawing.Size(264, 24); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 459; // // txt_caa001 // - this.txt_caa001.Location = new System.Drawing.Point(114, 12); + this.txt_caa001.Location = new System.Drawing.Point(105, 12); this.txt_caa001.Name = "txt_caa001"; this.txt_caa001.Properties.Appearance.Options.UseFont = true; - this.txt_caa001.Size = new System.Drawing.Size(209, 24); + this.txt_caa001.Size = new System.Drawing.Size(264, 24); this.txt_caa001.StyleController = this.layoutMx1; this.txt_caa001.TabIndex = 213; // // txt_caa012 // - this.txt_caa012.Location = new System.Drawing.Point(429, 12); + this.txt_caa012.Location = new System.Drawing.Point(466, 12); this.txt_caa012.Name = "txt_caa012"; this.txt_caa012.Properties.Appearance.Options.UseFont = true; - this.txt_caa012.Size = new System.Drawing.Size(210, 24); + this.txt_caa012.Size = new System.Drawing.Size(264, 24); this.txt_caa012.StyleController = this.layoutMx1; this.txt_caa012.TabIndex = 231; // // txt_itemName // - this.txt_itemName.Location = new System.Drawing.Point(114, 96); + this.txt_itemName.Location = new System.Drawing.Point(105, 96); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Properties.Appearance.Options.UseFont = true; - this.txt_itemName.Size = new System.Drawing.Size(209, 24); + this.txt_itemName.Size = new System.Drawing.Size(264, 24); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 457; // // txt_dptName // - this.txt_dptName.Location = new System.Drawing.Point(745, 12); + this.txt_dptName.Location = new System.Drawing.Point(827, 12); this.txt_dptName.Name = "txt_dptName"; this.txt_dptName.Properties.Appearance.Options.UseFont = true; - this.txt_dptName.Size = new System.Drawing.Size(210, 24); + this.txt_dptName.Size = new System.Drawing.Size(264, 24); this.txt_dptName.StyleController = this.layoutMx1; this.txt_dptName.TabIndex = 451; // // txt_caa010 // - this.txt_caa010.Location = new System.Drawing.Point(1061, 12); + this.txt_caa010.Location = new System.Drawing.Point(1188, 12); this.txt_caa010.Name = "txt_caa010"; this.txt_caa010.Properties.Appearance.Options.UseFont = true; - this.txt_caa010.Size = new System.Drawing.Size(210, 24); + this.txt_caa010.Size = new System.Drawing.Size(264, 24); this.txt_caa010.StyleController = this.layoutMx1; this.txt_caa010.TabIndex = 226; // // txt_caa020 // - this.txt_caa020.Location = new System.Drawing.Point(114, 40); + this.txt_caa020.Location = new System.Drawing.Point(105, 40); this.txt_caa020.Name = "txt_caa020"; this.txt_caa020.Properties.Appearance.Options.UseFont = true; - this.txt_caa020.Size = new System.Drawing.Size(209, 24); + this.txt_caa020.Size = new System.Drawing.Size(264, 24); this.txt_caa020.StyleController = this.layoutMx1; this.txt_caa020.TabIndex = 262; // // txt_caa024 // - this.txt_caa024.Location = new System.Drawing.Point(745, 96); + this.txt_caa024.Location = new System.Drawing.Point(827, 96); this.txt_caa024.Name = "txt_caa024"; this.txt_caa024.Properties.Appearance.Options.UseFont = true; - this.txt_caa024.Size = new System.Drawing.Size(210, 24); + this.txt_caa024.Size = new System.Drawing.Size(264, 24); this.txt_caa024.StyleController = this.layoutMx1; this.txt_caa024.TabIndex = 370; // // txt_gdzt // - this.txt_gdzt.Location = new System.Drawing.Point(429, 124); + this.txt_gdzt.Location = new System.Drawing.Point(466, 124); this.txt_gdzt.Name = "txt_gdzt"; this.txt_gdzt.Properties.Appearance.Options.UseFont = true; - this.txt_gdzt.Size = new System.Drawing.Size(210, 24); + this.txt_gdzt.Size = new System.Drawing.Size(264, 24); this.txt_gdzt.StyleController = this.layoutMx1; this.txt_gdzt.TabIndex = 455; // // txt_caa011 // - this.txt_caa011.Location = new System.Drawing.Point(1061, 40); + this.txt_caa011.Location = new System.Drawing.Point(1188, 40); this.txt_caa011.Name = "txt_caa011"; this.txt_caa011.Properties.Appearance.Options.UseFont = true; - this.txt_caa011.Size = new System.Drawing.Size(210, 24); + this.txt_caa011.Size = new System.Drawing.Size(264, 24); this.txt_caa011.StyleController = this.layoutMx1; this.txt_caa011.TabIndex = 228; // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(114, 68); + this.txt_itemNo.Location = new System.Drawing.Point(105, 68); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Options.UseFont = true; - this.txt_itemNo.Size = new System.Drawing.Size(209, 24); + this.txt_itemNo.Size = new System.Drawing.Size(264, 24); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 219; // // txt_saleOrderNo // - this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 180); + this.txt_saleOrderNo.Location = new System.Drawing.Point(105, 180); this.txt_saleOrderNo.Name = "txt_saleOrderNo"; this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true; - this.txt_saleOrderNo.Size = new System.Drawing.Size(209, 24); + this.txt_saleOrderNo.Size = new System.Drawing.Size(264, 24); this.txt_saleOrderNo.StyleController = this.layoutMx1; this.txt_saleOrderNo.TabIndex = 450; // // txt_dwName // - this.txt_dwName.Location = new System.Drawing.Point(429, 96); + this.txt_dwName.Location = new System.Drawing.Point(466, 96); this.txt_dwName.Name = "txt_dwName"; this.txt_dwName.Properties.Appearance.Options.UseFont = true; - this.txt_dwName.Size = new System.Drawing.Size(210, 24); + this.txt_dwName.Size = new System.Drawing.Size(264, 24); this.txt_dwName.StyleController = this.layoutMx1; this.txt_dwName.TabIndex = 222; // // txt_caa005 // - this.txt_caa005.Location = new System.Drawing.Point(1061, 68); + this.txt_caa005.Location = new System.Drawing.Point(1188, 68); this.txt_caa005.Name = "txt_caa005"; this.txt_caa005.Properties.Appearance.Options.UseFont = true; - this.txt_caa005.Size = new System.Drawing.Size(210, 24); + this.txt_caa005.Size = new System.Drawing.Size(264, 24); this.txt_caa005.StyleController = this.layoutMx1; this.txt_caa005.TabIndex = 217; // @@ -1090,33 +1090,33 @@ // // txt_typebTxt // - this.txt_typebTxt.Location = new System.Drawing.Point(745, 40); + this.txt_typebTxt.Location = new System.Drawing.Point(827, 40); this.txt_typebTxt.Name = "txt_typebTxt"; - this.txt_typebTxt.Size = new System.Drawing.Size(210, 24); + this.txt_typebTxt.Size = new System.Drawing.Size(264, 24); this.txt_typebTxt.StyleController = this.layoutMx1; this.txt_typebTxt.TabIndex = 468; // // txt_ypQty // - this.txt_ypQty.Location = new System.Drawing.Point(429, 40); + this.txt_ypQty.Location = new System.Drawing.Point(466, 40); this.txt_ypQty.Name = "txt_ypQty"; - this.txt_ypQty.Size = new System.Drawing.Size(210, 24); + this.txt_ypQty.Size = new System.Drawing.Size(264, 24); this.txt_ypQty.StyleController = this.layoutMx1; this.txt_ypQty.TabIndex = 469; // // txt_kpQty // - this.txt_kpQty.Location = new System.Drawing.Point(429, 68); + this.txt_kpQty.Location = new System.Drawing.Point(466, 68); this.txt_kpQty.Name = "txt_kpQty"; - this.txt_kpQty.Size = new System.Drawing.Size(210, 24); + this.txt_kpQty.Size = new System.Drawing.Size(264, 24); this.txt_kpQty.StyleController = this.layoutMx1; this.txt_kpQty.TabIndex = 470; // // txt_saleOrderEntryseq // - this.txt_saleOrderEntryseq.Location = new System.Drawing.Point(429, 180); + this.txt_saleOrderEntryseq.Location = new System.Drawing.Point(466, 180); this.txt_saleOrderEntryseq.Name = "txt_saleOrderEntryseq"; - this.txt_saleOrderEntryseq.Size = new System.Drawing.Size(210, 24); + this.txt_saleOrderEntryseq.Size = new System.Drawing.Size(264, 24); this.txt_saleOrderEntryseq.StyleController = this.layoutMx1; this.txt_saleOrderEntryseq.TabIndex = 471; // @@ -1130,34 +1130,34 @@ // // textEdit1 // - this.textEdit1.Location = new System.Drawing.Point(745, 152); + this.textEdit1.Location = new System.Drawing.Point(827, 152); this.textEdit1.Name = "textEdit1"; - this.textEdit1.Size = new System.Drawing.Size(210, 24); + this.textEdit1.Size = new System.Drawing.Size(264, 24); this.textEdit1.StyleController = this.layoutMx1; this.textEdit1.TabIndex = 473; // // txt_stockInLimitL // - this.txt_stockInLimitL.Location = new System.Drawing.Point(745, 124); + this.txt_stockInLimitL.Location = new System.Drawing.Point(827, 124); this.txt_stockInLimitL.Name = "txt_stockInLimitL"; - this.txt_stockInLimitL.Size = new System.Drawing.Size(210, 24); + this.txt_stockInLimitL.Size = new System.Drawing.Size(264, 24); this.txt_stockInLimitL.StyleController = this.layoutMx1; this.txt_stockInLimitL.TabIndex = 474; // // txt_jaTime // - this.txt_jaTime.Location = new System.Drawing.Point(1061, 180); + this.txt_jaTime.Location = new System.Drawing.Point(1188, 180); this.txt_jaTime.Name = "txt_jaTime"; - this.txt_jaTime.Size = new System.Drawing.Size(210, 24); + this.txt_jaTime.Size = new System.Drawing.Size(264, 24); this.txt_jaTime.StyleController = this.layoutMx1; this.txt_jaTime.TabIndex = 475; // // txt_jaBs // - this.txt_jaBs.Location = new System.Drawing.Point(959, 152); + this.txt_jaBs.Location = new System.Drawing.Point(1095, 152); this.txt_jaBs.Name = "txt_jaBs"; this.txt_jaBs.Properties.Caption = "缁撴鏍囪瘑"; - this.txt_jaBs.Size = new System.Drawing.Size(312, 24); + this.txt_jaBs.Size = new System.Drawing.Size(357, 24); this.txt_jaBs.StyleController = this.layoutMx1; this.txt_jaBs.TabIndex = 477; // @@ -1195,9 +1195,9 @@ // // txt_caa013 // - this.txt_caa013.Location = new System.Drawing.Point(745, 180); + this.txt_caa013.Location = new System.Drawing.Point(827, 180); this.txt_caa013.Name = "txt_caa013"; - this.txt_caa013.Size = new System.Drawing.Size(210, 24); + this.txt_caa013.Size = new System.Drawing.Size(264, 24); this.txt_caa013.StyleController = this.layoutMx1; this.txt_caa013.TabIndex = 483; // @@ -1254,6 +1254,48 @@ this.layoutControlItem24.Size = new System.Drawing.Size(316, 28); this.layoutControlItem24.Text = "婧愬崟鍒嗗綍琛屽彿"; this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem27 + // + this.layoutControlItem27.Control = this.txt_caa018; + this.layoutControlItem27.Location = new System.Drawing.Point(0, 140); + this.layoutControlItem27.Name = "layoutControlItem27"; + this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem27.Size = new System.Drawing.Size(315, 28); + this.layoutControlItem27.Text = "ErpId"; + this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem28 + // + this.layoutControlItem28.Control = this.txt_caa019; + this.layoutControlItem28.Location = new System.Drawing.Point(315, 140); + this.layoutControlItem28.Name = "layoutControlItem28"; + this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem28.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem28.Text = "Erp搴忓彿"; + this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem29 + // + this.layoutControlItem29.Control = this.txt_mtono; + this.layoutControlItem29.Location = new System.Drawing.Point(0, 196); + this.layoutControlItem29.Name = "layoutControlItem29"; + this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7; + this.layoutControlItem29.Size = new System.Drawing.Size(315, 28); + this.layoutControlItem29.Text = "璁″垝璺熻釜鍙�"; + this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem31 + // + this.layoutControlItem31.Control = this.txt_lot; + this.layoutControlItem31.Location = new System.Drawing.Point(947, 196); + this.layoutControlItem31.Name = "layoutControlItem31"; + this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 7; + this.layoutControlItem31.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem31.Text = "鎵瑰彿"; + this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18); // // Root // @@ -1324,7 +1366,7 @@ rowDefinition5, rowDefinition6, rowDefinition7}); - this.Root.Size = new System.Drawing.Size(1283, 216); + this.Root.Size = new System.Drawing.Size(1464, 216); this.Root.TextVisible = false; // // layoutControlItem1 @@ -1332,40 +1374,40 @@ this.layoutControlItem1.Control = this.txt_caa001; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(315, 28); + this.layoutControlItem1.Size = new System.Drawing.Size(361, 28); this.layoutControlItem1.Text = "鎶曟枡鍗曞彿"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_caa012; - this.layoutControlItem2.Location = new System.Drawing.Point(315, 0); + this.layoutControlItem2.Location = new System.Drawing.Point(361, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem2.Size = new System.Drawing.Size(361, 28); this.layoutControlItem2.Text = "宸ュ崟鏁伴噺"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_dptName; - this.layoutControlItem3.Location = new System.Drawing.Point(631, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(722, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem3.Size = new System.Drawing.Size(361, 28); this.layoutControlItem3.Text = "鐢熶骇杞﹂棿"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem3.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_caa010; this.layoutControlItem4.CustomizationFormText = "Erp棰勮寮�宸�"; - this.layoutControlItem4.Location = new System.Drawing.Point(947, 0); + this.layoutControlItem4.Location = new System.Drawing.Point(1083, 0); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem4.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem4.Size = new System.Drawing.Size(361, 28); this.layoutControlItem4.Text = "Erp棰勮寮�宸�"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem5 // @@ -1373,53 +1415,53 @@ 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(315, 28); + this.layoutControlItem5.Size = new System.Drawing.Size(361, 28); this.layoutControlItem5.Text = "浠诲姟鍗曞彿"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_caa011; - this.layoutControlItem8.Location = new System.Drawing.Point(947, 28); + this.layoutControlItem8.Location = new System.Drawing.Point(1083, 28); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem8.Size = new System.Drawing.Size(361, 28); this.layoutControlItem8.Text = "Erp棰勮瀹屽伐"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem8.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_caa005; - this.layoutControlItem12.Location = new System.Drawing.Point(947, 56); + this.layoutControlItem12.Location = new System.Drawing.Point(1083, 56); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(316, 28); - this.layoutControlItem12.Text = "璁″垝涓嬭揪鏃堕棿"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem12.Size = new System.Drawing.Size(361, 28); + this.layoutControlItem12.Text = "Erp璁″垝涓嬭揪"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_scOrg; - this.layoutControlItem16.Location = new System.Drawing.Point(947, 84); + this.layoutControlItem16.Location = new System.Drawing.Point(1083, 84); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem16.Size = new System.Drawing.Size(361, 28); this.layoutControlItem16.Text = "鐢熶骇缁勭粐"; - this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem16.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_wtOrg; - this.layoutControlItem18.Location = new System.Drawing.Point(947, 112); + this.layoutControlItem18.Location = new System.Drawing.Point(1083, 112); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem18.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem18.Size = new System.Drawing.Size(361, 28); this.layoutControlItem18.Text = "濮旀墭缁勭粐"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem18.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem15 // @@ -1427,128 +1469,97 @@ this.layoutControlItem15.Location = new System.Drawing.Point(0, 112); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem15.Size = new System.Drawing.Size(315, 28); + this.layoutControlItem15.Size = new System.Drawing.Size(361, 28); this.layoutControlItem15.Text = "浜у搧瑙勬牸"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem15.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_dwName; - this.layoutControlItem10.Location = new System.Drawing.Point(315, 84); + this.layoutControlItem10.Location = new System.Drawing.Point(361, 84); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem10.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem10.Size = new System.Drawing.Size(361, 28); this.layoutControlItem10.Text = "鍗曚綅"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem10.TextSize = new System.Drawing.Size(81, 18); // // txt_ypQty1111 // this.txt_ypQty1111.Control = this.txt_ypQty; - this.txt_ypQty1111.Location = new System.Drawing.Point(315, 28); + this.txt_ypQty1111.Location = new System.Drawing.Point(361, 28); this.txt_ypQty1111.Name = "txt_ypQty1111"; this.txt_ypQty1111.OptionsTableLayoutItem.ColumnIndex = 1; this.txt_ypQty1111.OptionsTableLayoutItem.RowIndex = 1; - this.txt_ypQty1111.Size = new System.Drawing.Size(316, 28); + this.txt_ypQty1111.Size = new System.Drawing.Size(361, 28); this.txt_ypQty1111.Text = "宸叉帓鏁伴噺"; - this.txt_ypQty1111.TextSize = new System.Drawing.Size(90, 18); + this.txt_ypQty1111.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem22 // this.layoutControlItem22.Control = this.txt_kpQty; - this.layoutControlItem22.Location = new System.Drawing.Point(315, 56); + this.layoutControlItem22.Location = new System.Drawing.Point(361, 56); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem22.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem22.Size = new System.Drawing.Size(361, 28); this.layoutControlItem22.Text = "鍙帓鏁伴噺"; - this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem22.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem21 // this.layoutControlItem21.Control = this.txt_typebTxt; - this.layoutControlItem21.Location = new System.Drawing.Point(631, 28); + this.layoutControlItem21.Location = new System.Drawing.Point(722, 28); this.layoutControlItem21.Name = "layoutControlItem21"; this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem21.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem21.Size = new System.Drawing.Size(361, 28); this.layoutControlItem21.Text = "鐢ㄦ枡娓呭崟"; - this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem27 - // - this.layoutControlItem27.Control = this.txt_caa018; - this.layoutControlItem27.Location = new System.Drawing.Point(0, 140); - this.layoutControlItem27.Name = "layoutControlItem27"; - this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem27.Size = new System.Drawing.Size(315, 28); - this.layoutControlItem27.Text = "ErpId"; - this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem28 - // - this.layoutControlItem28.Control = this.txt_caa019; - this.layoutControlItem28.Location = new System.Drawing.Point(315, 140); - this.layoutControlItem28.Name = "layoutControlItem28"; - this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem28.Size = new System.Drawing.Size(316, 28); - this.layoutControlItem28.Text = "Erp搴忓彿"; - this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem29 - // - this.layoutControlItem29.Control = this.txt_mtono; - this.layoutControlItem29.Location = new System.Drawing.Point(0, 196); - this.layoutControlItem29.Name = "layoutControlItem29"; - this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7; - this.layoutControlItem29.Size = new System.Drawing.Size(315, 28); - this.layoutControlItem29.Text = "璁″垝璺熻釜鍙�"; - this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem21.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_djlx; - this.layoutControlItem11.Location = new System.Drawing.Point(631, 56); + this.layoutControlItem11.Location = new System.Drawing.Point(722, 56); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem11.Size = new System.Drawing.Size(361, 28); this.layoutControlItem11.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem11.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_caa024; - this.layoutControlItem6.Location = new System.Drawing.Point(631, 84); + this.layoutControlItem6.Location = new System.Drawing.Point(722, 84); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem6.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem6.Size = new System.Drawing.Size(361, 28); this.layoutControlItem6.Text = "鍏ュ簱鏁伴噺"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem6.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_stockInLimitL; - this.layoutControlItem26.Location = new System.Drawing.Point(631, 112); + this.layoutControlItem26.Location = new System.Drawing.Point(722, 112); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem26.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem26.Size = new System.Drawing.Size(361, 28); this.layoutControlItem26.Text = "鍏ュ簱涓嬮檺"; - this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem26.TextSize = new System.Drawing.Size(81, 18); // // txt_stockInLimitH // this.txt_stockInLimitH.Control = this.textEdit1; - this.txt_stockInLimitH.Location = new System.Drawing.Point(631, 140); + this.txt_stockInLimitH.Location = new System.Drawing.Point(722, 140); this.txt_stockInLimitH.Name = "txt_stockInLimitH"; this.txt_stockInLimitH.OptionsTableLayoutItem.ColumnIndex = 2; this.txt_stockInLimitH.OptionsTableLayoutItem.RowIndex = 5; - this.txt_stockInLimitH.Size = new System.Drawing.Size(316, 28); + this.txt_stockInLimitH.Size = new System.Drawing.Size(361, 28); this.txt_stockInLimitH.Text = "鍏ュ簱涓婇檺"; - this.txt_stockInLimitH.TextSize = new System.Drawing.Size(90, 18); + this.txt_stockInLimitH.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem13 // @@ -1556,9 +1567,9 @@ 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(315, 28); + this.layoutControlItem13.Size = new System.Drawing.Size(361, 28); this.layoutControlItem13.Text = "浜у搧缂栫爜"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem13.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem14 // @@ -1566,30 +1577,30 @@ this.layoutControlItem14.Location = new System.Drawing.Point(0, 84); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem14.Size = new System.Drawing.Size(315, 28); + this.layoutControlItem14.Size = new System.Drawing.Size(361, 28); this.layoutControlItem14.Text = "浜у搧鍚嶇О"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem14.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_gdzt; this.layoutControlItem7.CustomizationFormText = "涓氬姟鐘舵��"; - this.layoutControlItem7.Location = new System.Drawing.Point(315, 112); + this.layoutControlItem7.Location = new System.Drawing.Point(361, 112); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem7.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem7.Size = new System.Drawing.Size(361, 28); this.layoutControlItem7.Text = "涓氬姟鐘舵��"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(81, 18); // // txt_jaBs1111 // this.txt_jaBs1111.Control = this.txt_jaBs; - this.txt_jaBs1111.Location = new System.Drawing.Point(947, 140); + this.txt_jaBs1111.Location = new System.Drawing.Point(1083, 140); this.txt_jaBs1111.Name = "txt_jaBs1111"; this.txt_jaBs1111.OptionsTableLayoutItem.ColumnIndex = 3; this.txt_jaBs1111.OptionsTableLayoutItem.RowIndex = 5; - this.txt_jaBs1111.Size = new System.Drawing.Size(316, 28); + this.txt_jaBs1111.Size = new System.Drawing.Size(361, 28); this.txt_jaBs1111.Text = "缁撴缁撹瘑"; this.txt_jaBs1111.TextSize = new System.Drawing.Size(0, 0); this.txt_jaBs1111.TextVisible = false; @@ -1597,35 +1608,56 @@ // layoutControlItem32 // this.layoutControlItem32.Control = this.txt_caa013; - this.layoutControlItem32.Location = new System.Drawing.Point(631, 168); + this.layoutControlItem32.Location = new System.Drawing.Point(722, 168); this.layoutControlItem32.Name = "layoutControlItem32"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem32.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem32.Size = new System.Drawing.Size(361, 28); this.layoutControlItem32.Text = "BOM鐗堟湰"; - this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem32.TextSize = new System.Drawing.Size(81, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_jaTime; - this.layoutControlItem25.Location = new System.Drawing.Point(947, 168); + this.layoutControlItem25.Location = new System.Drawing.Point(1083, 168); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem25.Size = new System.Drawing.Size(316, 28); + this.layoutControlItem25.Size = new System.Drawing.Size(361, 28); this.layoutControlItem25.Text = "缁撴鏃堕棿"; - this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem25.TextSize = new System.Drawing.Size(81, 18); // - // layoutControlItem31 + // layoutControlItem17 // - this.layoutControlItem31.Control = this.txt_lot; - this.layoutControlItem31.Location = new System.Drawing.Point(947, 196); - this.layoutControlItem31.Name = "layoutControlItem31"; - this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 7; - this.layoutControlItem31.Size = new System.Drawing.Size(316, 28); - this.layoutControlItem31.Text = "鎵瑰彿"; - this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem17.Control = this.txt_caa016; + this.layoutControlItem17.Location = new System.Drawing.Point(0, 140); + this.layoutControlItem17.Name = "layoutControlItem17"; + this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem17.Size = new System.Drawing.Size(722, 28); + this.layoutControlItem17.Text = "澶囨敞"; + this.layoutControlItem17.TextSize = new System.Drawing.Size(81, 18); + // + // layoutControlItem9 + // + this.layoutControlItem9.Control = this.txt_saleOrderNo; + this.layoutControlItem9.Location = new System.Drawing.Point(0, 168); + this.layoutControlItem9.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem9.Size = new System.Drawing.Size(361, 28); + this.layoutControlItem9.Text = "閿�鍞崟鍙�"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(81, 18); + // + // layoutControlItem23 + // + this.layoutControlItem23.Control = this.txt_saleOrderEntryseq; + this.layoutControlItem23.Location = new System.Drawing.Point(361, 168); + this.layoutControlItem23.Name = "layoutControlItem23"; + this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 6; + this.layoutControlItem23.Size = new System.Drawing.Size(361, 28); + this.layoutControlItem23.Text = "闇�姹傚崟琛屽彿"; + this.layoutControlItem23.TextSize = new System.Drawing.Size(81, 18); // // tabMx // @@ -1633,7 +1665,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; - this.tabMx.Size = new System.Drawing.Size(1283, 342); + this.tabMx.Size = new System.Drawing.Size(1464, 342); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -1642,7 +1674,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1281, 310); + this.tabMxPage1.Size = new System.Drawing.Size(1462, 310); this.tabMxPage1.Text = "鏄庣粏"; // // gcMx1 @@ -1651,7 +1683,7 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; - this.gcMx1.Size = new System.Drawing.Size(1281, 310); + this.gcMx1.Size = new System.Drawing.Size(1462, 310); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1823,7 +1855,7 @@ this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 11; + this.gridColumn11.VisibleIndex = 20; this.gridColumn11.Width = 94; // // gridColumn12 @@ -1833,7 +1865,7 @@ this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 12; + this.gridColumn12.VisibleIndex = 21; this.gridColumn12.Width = 94; // // gridColumn13 @@ -1843,7 +1875,7 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 13; + this.gridColumn13.VisibleIndex = 22; this.gridColumn13.Width = 94; // // gvMx1mtono @@ -1854,8 +1886,6 @@ this.gvMx1mtono.MinWidth = 50; this.gvMx1mtono.Name = "gvMx1mtono"; this.gvMx1mtono.Tag = "query_a.MTONO"; - this.gvMx1mtono.Visible = true; - this.gvMx1mtono.VisibleIndex = 14; this.gvMx1mtono.Width = 94; // // gvMx1numerator @@ -1867,7 +1897,7 @@ this.gvMx1numerator.Name = "gvMx1numerator"; this.gvMx1numerator.Tag = "query_a.NUMERATOR"; this.gvMx1numerator.Visible = true; - this.gvMx1numerator.VisibleIndex = 15; + this.gvMx1numerator.VisibleIndex = 11; this.gvMx1numerator.Width = 94; // // gvMx1denominator @@ -1879,7 +1909,7 @@ this.gvMx1denominator.Name = "gvMx1denominator"; this.gvMx1denominator.Tag = "query_a.DENOMINATOR"; this.gvMx1denominator.Visible = true; - this.gvMx1denominator.VisibleIndex = 16; + this.gvMx1denominator.VisibleIndex = 12; this.gvMx1denominator.Width = 94; // // gvMx1depotCode @@ -1891,7 +1921,7 @@ this.gvMx1depotCode.Name = "gvMx1depotCode"; this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE"; this.gvMx1depotCode.Visible = true; - this.gvMx1depotCode.VisibleIndex = 17; + this.gvMx1depotCode.VisibleIndex = 13; this.gvMx1depotCode.Width = 94; // // gridColumn15 @@ -1901,7 +1931,7 @@ this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 18; + this.gridColumn15.VisibleIndex = 14; this.gridColumn15.Width = 94; // // gvMx1issueType @@ -1913,7 +1943,7 @@ this.gvMx1issueType.Name = "gvMx1issueType"; this.gvMx1issueType.Tag = "query_a.ISSUE_TYPE"; this.gvMx1issueType.Visible = true; - this.gvMx1issueType.VisibleIndex = 19; + this.gvMx1issueType.VisibleIndex = 15; this.gvMx1issueType.Width = 94; // // gridColumn16 @@ -1923,7 +1953,7 @@ this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 20; + this.gridColumn16.VisibleIndex = 16; this.gridColumn16.Width = 94; // // gvMx1scraprate @@ -1935,7 +1965,7 @@ this.gvMx1scraprate.Name = "gvMx1scraprate"; this.gvMx1scraprate.Tag = "query_a.SCRAPRATE"; this.gvMx1scraprate.Visible = true; - this.gvMx1scraprate.VisibleIndex = 21; + this.gvMx1scraprate.VisibleIndex = 17; this.gvMx1scraprate.Width = 94; // // gvMx1scrapqty @@ -1947,7 +1977,7 @@ this.gvMx1scrapqty.Name = "gvMx1scrapqty"; this.gvMx1scrapqty.Tag = "query_a.SCRAPQTY"; this.gvMx1scrapqty.Visible = true; - this.gvMx1scrapqty.VisibleIndex = 22; + this.gvMx1scrapqty.VisibleIndex = 18; this.gvMx1scrapqty.Width = 94; // // gridColumn17 @@ -1957,7 +1987,7 @@ this.gridColumn17.MinWidth = 25; this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Visible = true; - this.gridColumn17.VisibleIndex = 23; + this.gridColumn17.VisibleIndex = 19; this.gridColumn17.Width = 94; // // gridColumn29 @@ -1967,7 +1997,7 @@ this.gridColumn29.MinWidth = 25; this.gridColumn29.Name = "gridColumn29"; this.gridColumn29.Visible = true; - this.gridColumn29.VisibleIndex = 24; + this.gridColumn29.VisibleIndex = 23; this.gridColumn29.Width = 94; // // gridColumn18 @@ -1980,43 +2010,11 @@ this.gridColumn18.VisibleIndex = 2; this.gridColumn18.Width = 94; // - // layoutControlItem17 - // - this.layoutControlItem17.Control = this.txt_caa016; - this.layoutControlItem17.Location = new System.Drawing.Point(0, 140); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem17.Size = new System.Drawing.Size(631, 28); - this.layoutControlItem17.Text = "澶囨敞"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_saleOrderNo; - this.layoutControlItem9.Location = new System.Drawing.Point(0, 168); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem9.Size = new System.Drawing.Size(315, 28); - this.layoutControlItem9.Text = "闇�姹傚崟鍙�"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem23 - // - this.layoutControlItem23.Control = this.txt_saleOrderEntryseq; - this.layoutControlItem23.Location = new System.Drawing.Point(315, 168); - this.layoutControlItem23.Name = "layoutControlItem23"; - this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem23.Size = new System.Drawing.Size(316, 28); - this.layoutControlItem23.Text = "闇�姹傚崟琛屽彿"; - this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18); - // // Frm_Womcaa // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1285, 682); + this.ClientSize = new System.Drawing.Size(1466, 682); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_Womcaa"; @@ -2078,6 +2076,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); @@ -2093,9 +2095,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_ypQty1111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); @@ -2106,15 +2105,14 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_jaBs1111)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((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.layoutControlItem17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); this.ResumeLayout(false); } diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs index 9f52cfd..1315f80 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs @@ -25,7 +25,7 @@ this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); - Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "fstatus", "", (value) => + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, null, "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); }, tips); @@ -182,7 +182,7 @@ } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -237,11 +237,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -288,9 +288,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -303,10 +303,12 @@ gridView1.FocusedRowHandle = rowHandle; } } + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs index 461f2ba..af35a64 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs @@ -73,32 +73,37 @@ lbGuid, txt_daa001, gridView1); SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鎵樻澘鐮�"); string strCodeList = ""; + string strAction = ""; frm.UpdateParent += (ss, ee) => { strCodeList = ee.StringSingle; + strAction = ee.Data; }; frm.ShowDialog(); if (string.IsNullOrEmpty(strCodeList)) return; - try + if (strAction == "print") { - string rptParameter = "rpt_daa{" - + "100" - + "," + "" - + "," + "" - + "," + "" - + "," + "" - + "," + strCodeList - + "}"; - using (Form rpt = new RptPreview(rowGuid, rptParameter)) + try { - rpt.ShowDialog(); + string rptParameter = "rpt_daa{" + + "100" + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "," + strCodeList + + "}"; + using (Form rpt = new RptPreview(rowGuid, rptParameter)) + { + rpt.ShowDialog(); + } + frm.Close(); } - frm.Close(); - } - catch (Exception ex) - { - MsgHelper.ShowError(ex.Message); + catch (Exception ex) + { + MsgHelper.ShowError(ex.Message); + } } }; //杩欐槸杩芥函鐮� @@ -153,32 +158,37 @@ lbGuid, txt_daa001, gridView1); SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鍚庣洊鐮�"); string strCodeList = ""; + string strAction = ""; frm.UpdateParent += (ss, ee) => { strCodeList = ee.StringSingle; + strAction = ee.Data; }; frm.ShowDialog(); if (string.IsNullOrEmpty(strCodeList)) return; - try + if (strAction == "print") { - string rptParameter = "rpt_hgm{" - + "100" - + "," + "" - + "," + "" - + "," + "" - + "," + "" - + "," + strCodeList - + "}"; - using (Form rpt = new RptPreview(rowGuid, rptParameter)) + try { - rpt.ShowDialog(); + string rptParameter = "rpt_hgm{" + + "100" + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "," + strCodeList + + "}"; + using (Form rpt = new RptPreview(rowGuid, rptParameter)) + { + rpt.ShowDialog(); + } + frm.Close(); } - frm.Close(); - } - catch (Exception ex) - { - MsgHelper.ShowError(ex.Message); + catch (Exception ex) + { + MsgHelper.ShowError(ex.Message); + } } }; //杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃 @@ -211,7 +221,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } }; frm.ShowDialog(); @@ -279,7 +289,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) @@ -297,17 +307,19 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { } else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -736,7 +748,8 @@ case 9: strMsg = "鎵嬪姩瀹屽伐"; break; - }; + } + ; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs index 06c171e..0b06699 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs @@ -30,18 +30,18 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.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.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba)); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -554,29 +554,29 @@ this.layoutControlItem8}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition1.Width = 100D; - columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition2.Width = 100D; - columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition3.Width = 100D; - columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition4.Width = 100D; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition1, - columnDefinition2, - columnDefinition3, - columnDefinition4}); - rowDefinition1.Height = 100D; - rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition2.Height = 100D; - rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition3.Height = 100D; - rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5, + columnDefinition6, + columnDefinition7, + columnDefinition8}); + rowDefinition4.Height = 100D; + rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition5.Height = 100D; + rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition6.Height = 100D; + rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition1, - rowDefinition2, - rowDefinition3}); + rowDefinition4, + rowDefinition5, + rowDefinition6}); this.Root.Size = new System.Drawing.Size(1105, 113); this.Root.TextVisible = false; // @@ -840,7 +840,7 @@ this.gvMx1daa016.AppearanceCell.Options.UseForeColor = true; this.gvMx1daa016.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1daa016.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1daa016.Caption = "棰勮寮�宸ユ棩鏃堕棿"; + this.gvMx1daa016.Caption = "Mes棰勮寮�宸�"; this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2; this.gvMx1daa016.FieldName = "mesStartProd"; this.gvMx1daa016.MinWidth = 50; @@ -857,6 +857,11 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemDateEdit2.DisplayFormat.FormatString = "D"; + this.repositoryItemDateEdit2.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.repositoryItemDateEdit2.EditFormat.FormatString = "D"; + this.repositoryItemDateEdit2.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.repositoryItemDateEdit2.MaskSettings.Set("mask", "D"); this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2"; // // gvMx1daa018 @@ -866,7 +871,7 @@ this.gvMx1daa018.AppearanceCell.Options.UseForeColor = true; this.gvMx1daa018.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1daa018.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1daa018.Caption = "棰勮瀹屽伐鏃堕棿"; + this.gvMx1daa018.Caption = "Mes棰勮瀹屽伐"; this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3; this.gvMx1daa018.FieldName = "mesEndProd"; this.gvMx1daa018.MinWidth = 50; @@ -1178,6 +1183,11 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemDateEdit1.DisplayFormat.FormatString = "D"; + this.repositoryItemDateEdit1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.repositoryItemDateEdit1.EditFormat.FormatString = "D"; + this.repositoryItemDateEdit1.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.repositoryItemDateEdit1.MaskSettings.Set("mask", "D"); this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1"; // // gridColumn3 @@ -1224,10 +1234,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs index eee26ec..c9940e3 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs @@ -99,7 +99,7 @@ } catch (Exception ex) { - MessageBox.Show(ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } }; frm.ShowDialog(); @@ -199,17 +199,19 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { } else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -268,7 +270,7 @@ lbGuid, txt_hNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -282,6 +284,8 @@ gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); } + //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼 + txt_erpSczz.IsReadly = true; } /// <summary> /// 鏂板浜嬩欢 @@ -310,7 +314,7 @@ string workId = txt_pba013.GetId(); if (string.IsNullOrEmpty(workId.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨杞﹂棿锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨杞﹂棿锛�"); txt_pba013.Focus(); return; } @@ -352,36 +356,12 @@ MsgHelper.ShowError("棰勮寮�宸ユ椂闂翠笉鑳戒负绌猴紒"); return; } - //string _prepareTime = row["prepareTime"].ToString(); - //if (string.IsNullOrEmpty(_prepareTime)) - //{ - // MsgHelper.ShowError("棰勮澶囨枡鏃堕棿涓嶈兘涓虹┖锛�"); - // return; - //} - //string _planPersonnel = row["planPersonnel"].ToString(); - //if (string.IsNullOrEmpty(_planPersonnel)) - //{ - // MsgHelper.ShowError("璁″垝浜烘暟锛�"); - // return; - //} - //string _changeLinetime = row["changeLinetime"].ToString(); - //if (string.IsNullOrEmpty(_changeLinetime)) - //{ - // MsgHelper.ShowError("鎹㈢嚎鏃堕棿涓嶈兘涓虹┖锛�"); - // return; - //} string _mesEndProd = row["mesEndProd"].ToString(); if (string.IsNullOrEmpty(_mesEndProd)) { MsgHelper.ShowError("棰勮瀹屽伐鏃堕棿涓嶈兘涓虹┖锛�"); return; } - //string _restTime = row["restTime"].ToString(); - //if (string.IsNullOrEmpty(_prepareTime)) - //{ - // MsgHelper.ShowError("浼戞伅鏃堕棿涓嶈兘涓虹┖锛�"); - // return; - //} _obj.list.Add(new { Guid = _guid, @@ -401,9 +381,9 @@ { string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { + ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); lbGuid.Text = _rtn.rtnData.outGuid; txt_hNo.Text = _rtn.rtnData.outNo; toolBarMenu1.isSetBtn = true; @@ -413,10 +393,12 @@ toolBarMenu1.currentAction = ""; Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } + else + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -427,7 +409,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -460,7 +442,7 @@ } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -471,7 +453,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -512,11 +494,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) @@ -548,13 +530,15 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); + getModel(lbGuid.Text); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } @@ -583,7 +567,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } private void rptJYBZ_SelectedIndexChanged(object sender, EventArgs e) @@ -619,7 +603,8 @@ case 0: strMsg = "鍙嶅鏍�"; break; - }; + } + ; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_hNo, gridView1, "hNo"); @@ -639,9 +624,9 @@ { var strJson = UtilityHelper.HttpPost("", _webServiceName + _mth, JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -650,10 +635,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "fstatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs index c6f0c68..7a3ee4a 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs @@ -30,6 +30,7 @@ { this.gcMain = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -49,7 +50,6 @@ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); - this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit(); @@ -99,6 +99,16 @@ this.gridView1.OptionsView.ShowAutoFilterRow = true; this.gridView1.OptionsView.ShowGroupPanel = false; // + // colChkInt + // + this.colChkInt.Caption = "."; + this.colChkInt.FieldName = "chkInt"; + this.colChkInt.MinWidth = 25; + this.colChkInt.Name = "colChkInt"; + this.colChkInt.Visible = true; + this.colChkInt.VisibleIndex = 0; + this.colChkInt.Width = 94; + // // gv_guid // this.gv_guid.AppearanceCell.Options.UseFont = true; @@ -122,7 +132,7 @@ this.gv_remarks.OptionsColumn.ReadOnly = true; this.gv_remarks.Tag = "query_a.REMARKS"; this.gv_remarks.Visible = true; - this.gv_remarks.VisibleIndex = 13; + this.gv_remarks.VisibleIndex = 14; this.gv_remarks.Width = 100; // // gridColumn4 @@ -133,7 +143,7 @@ this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.ReadOnly = true; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 0; + this.gridColumn4.VisibleIndex = 1; this.gridColumn4.Width = 120; // // gridColumn3 @@ -144,7 +154,7 @@ this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.OptionsColumn.ReadOnly = true; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 1; + this.gridColumn3.VisibleIndex = 2; this.gridColumn3.Width = 125; // // gridColumn12 @@ -155,7 +165,7 @@ this.gridColumn12.MinWidth = 50; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 2; + this.gridColumn12.VisibleIndex = 3; this.gridColumn12.Width = 50; // // gv_billNo @@ -174,7 +184,7 @@ this.gv_billNo.OptionsColumn.ReadOnly = true; this.gv_billNo.Tag = "query_a.BILL_NO"; this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 3; + this.gv_billNo.VisibleIndex = 4; this.gv_billNo.Width = 50; // // gv_supplierItemCode @@ -188,7 +198,7 @@ this.gv_supplierItemCode.OptionsColumn.ReadOnly = true; this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE"; this.gv_supplierItemCode.Visible = true; - this.gv_supplierItemCode.VisibleIndex = 4; + this.gv_supplierItemCode.VisibleIndex = 5; this.gv_supplierItemCode.Width = 100; // // gv_supplierItemName @@ -202,7 +212,7 @@ this.gv_supplierItemName.OptionsColumn.ReadOnly = true; this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME"; this.gv_supplierItemName.Visible = true; - this.gv_supplierItemName.VisibleIndex = 5; + this.gv_supplierItemName.VisibleIndex = 6; this.gv_supplierItemName.Width = 120; // // gridColumn5 @@ -223,7 +233,7 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.OptionsColumn.ReadOnly = true; this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 6; + this.gridColumn6.VisibleIndex = 7; this.gridColumn6.Width = 50; // // gridColumn9 @@ -234,29 +244,29 @@ this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.OptionsColumn.ReadOnly = true; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 7; + this.gridColumn9.VisibleIndex = 8; this.gridColumn9.Width = 100; // // gridColumn8 // - this.gridColumn8.Caption = "棰勮寮�鏃堕棿"; + this.gridColumn8.Caption = "Erp棰勮寮�宸�"; this.gridColumn8.FieldName = "caa010"; this.gridColumn8.MinWidth = 50; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.OptionsColumn.ReadOnly = true; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 8; + this.gridColumn8.VisibleIndex = 9; this.gridColumn8.Width = 100; // // gridColumn7 // - this.gridColumn7.Caption = "棰勮瀹屽伐鏃堕棿"; + this.gridColumn7.Caption = "Erp棰勮瀹屽伐"; this.gridColumn7.FieldName = "caa011"; this.gridColumn7.MinWidth = 50; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.ReadOnly = true; this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 9; + this.gridColumn7.VisibleIndex = 10; this.gridColumn7.Width = 100; // // gv_purchaseUnit @@ -270,13 +280,13 @@ this.gv_purchaseUnit.OptionsColumn.ReadOnly = true; this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT"; this.gv_purchaseUnit.Visible = true; - this.gv_purchaseUnit.VisibleIndex = 10; + this.gv_purchaseUnit.VisibleIndex = 11; this.gv_purchaseUnit.Width = 100; // // gv_inventoryUnit // this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true; - this.gv_inventoryUnit.Caption = "寮�宸ョ姸鎬�"; + this.gv_inventoryUnit.Caption = "鍗曟嵁鐘舵��"; this.gv_inventoryUnit.FieldName = "gdzt"; this.gv_inventoryUnit.MinWidth = 50; this.gv_inventoryUnit.Name = "gv_inventoryUnit"; @@ -284,7 +294,7 @@ this.gv_inventoryUnit.OptionsColumn.ReadOnly = true; this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT"; this.gv_inventoryUnit.Visible = true; - this.gv_inventoryUnit.VisibleIndex = 11; + this.gv_inventoryUnit.VisibleIndex = 12; this.gv_inventoryUnit.Width = 100; // // gridColumn1 @@ -302,7 +312,7 @@ this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 12; + this.gridColumn2.VisibleIndex = 13; this.gridColumn2.Width = 94; // // panelControl1 @@ -326,16 +336,6 @@ this.btnIn.Size = new System.Drawing.Size(94, 39); this.btnIn.TabIndex = 4; this.btnIn.Text = "纭畾瀵煎叆"; - // - // colChkInt - // - this.colChkInt.Caption = "."; - this.colChkInt.FieldName = "chkInt"; - this.colChkInt.MinWidth = 25; - this.colChkInt.Name = "colChkInt"; - this.colChkInt.Visible = true; - this.colChkInt.VisibleIndex = 0; - this.colChkInt.Width = 94; // // SelectWompba // diff --git a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs index 23beeb0..7fb44b1 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectDeleteBar.cs @@ -23,7 +23,7 @@ /// <param name="_aboutGuid">鐖朵翰guid</param> /// <param name="_aboutType">绫诲埆锛堝悗鐩栫爜锛岃拷婧爜锛屽彈鎵樺叆搴撶瓑锛�</param> /// <param name="_qcGuid">qcGuid锛屽湪杩斿伐閲嶆潯鐨勬椂鍊�</param> - public SelectDeleteBar(string _aboutGuid, string _aboutType,string _qcGuid="") + public SelectDeleteBar(string _aboutGuid, string _aboutType, string _qcGuid = "") { InitializeComponent(); this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); }; @@ -37,17 +37,19 @@ this.Text = "鎵归噺鎿嶄綔銆�" + this.aboutType + "銆�,銆�" + this.aboutGuid + "銆�"; switch (aboutType) { - case "閲囪喘鍏ュ簱": + case "鎵樻澘鐮�": btnDelete.Visible = false; + break; + case "杩芥函鐮�": + btnDelete.Visible = false; + colT1.Caption = "绾夸綋缂栧彿"; + colT2.Caption = "绾夸綋鍚嶇О"; break; case "鍚庣洊鐮�": colT1.Caption = "缁戝畾鎵樻澘鐮�"; colT2.Caption = "缁戝畾杩芥函鐮�"; break; - case "杩芥函鐮�": - colT1.Caption = "绾夸綋缂栧彿"; - colT2.Caption = "绾夸綋鍚嶇О"; - break; + default: colT1.Caption = "鍏ュ簱浜�"; colT2.Caption = "鍏ュ簱鏃ユ湡"; @@ -108,7 +110,7 @@ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); return; } - UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = strMsg, Data="delete" }); Close(); + UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = strMsg, Data = "delete" }); Close(); }; btnPrint.Click += (s, e) => { @@ -135,7 +137,7 @@ return; } - UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = sb.ToString() ,Data = "print" }); Close(); + UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = sb.ToString(), Data = "print" }); Close(); }; } diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs index bbc2590..2f42c04 100644 --- a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs +++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs @@ -28,7 +28,7 @@ MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒"); return; } - #region 濡傛灉鏄鎴风殑 + #region 濡傛灉鏄鎴风殑鍚庣洊鐮� if (rptParameter.Contains("rpt_hgm")) { var _obj = new @@ -65,9 +65,7 @@ { } } #endregion - _print(); - }; this.btnAll.Click += (s, e) => { @@ -171,12 +169,10 @@ } catch (Exception) { - } return; } MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒"); } - } } -- Gitblit v1.9.3