From 547f1c097f5dca21eb248854f229c9a520ce8ba2 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期五, 29 十一月 2024 12:37:26 +0800 Subject: [PATCH] 备单领料 --- DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs | 6 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs | 358 +++++++++++++++++++++++++ DevApp/Gs.DevApp/Gs.DevApp.csproj | 9 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs | 313 ++++++++++++++++++++++ DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.resx | 120 ++++++++ 5 files changed, 803 insertions(+), 3 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs new file mode 100644 index 0000000..a08cf9f --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs @@ -0,0 +1,358 @@ +/* Create By GS EasyCode */ +namespace Gs.DevApp.DevFrm +{ + partial class Frm_MesDaaDirectOut + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + //BQSetControlObject +this.lb_itemId = new DevExpress.XtraEditors.LabelControl(); +this.txt_itemId = new DevExpress.XtraEditors.TextEdit(); +this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn(); + +this.lb_workshop = new DevExpress.XtraEditors.LabelControl(); +this.txt_workshop = new DevExpress.XtraEditors.TextEdit(); +this.gv_workshop = new DevExpress.XtraGrid.Columns.GridColumn(); + +this.lb_id = new DevExpress.XtraEditors.LabelControl(); +this.txt_id = new DevExpress.XtraEditors.TextEdit(); +this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn(); + +this.lb_guid = new DevExpress.XtraEditors.LabelControl(); +this.txt_guid = new DevExpress.XtraEditors.TextEdit(); +this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); + + //BQSetControlInfo +// +//lb_itemId +// +this.lb_itemId.Location = new System.Drawing.Point(770, 20); +this.lb_itemId.Name = "lb_itemId"; +this.lb_itemId.Size = new System.Drawing.Size(150,21); +this.lb_itemId.TabIndex = 216; +this.lb_itemId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); +this.lb_itemId.Text = "鐗╂枡ID "; +// +//txt_itemId +// +this.txt_itemId.Location = new System.Drawing.Point(830, 20); +this.txt_itemId.Name = "txt_itemId"; +this.txt_itemId.Size = new System.Drawing.Size(150,21); +this.txt_itemId.TabIndex = 216; +this.txt_itemId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); +// +//gv_itemId +// +this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); +this.gv_itemId.AppearanceCell.Options.UseFont = true; +this.gv_itemId.FieldName = "itemId"; +this.gv_itemId.Caption = "鐗╂枡ID "; +this.gv_itemId.Tag = "query_a.item_id"; +this.gv_itemId.MinWidth =50; +this.gv_itemId.Visible = true; +this.gv_itemId.Width =94; +this.gv_itemId.OptionsColumn.AllowEdit = false; +this.gv_itemId.VisibleIndex = 0; + +// +//lb_workshop +// +this.lb_workshop.Location = new System.Drawing.Point(520, 20); +this.lb_workshop.Name = "lb_workshop"; +this.lb_workshop.Size = new System.Drawing.Size(150,21); +this.lb_workshop.TabIndex = 213; +this.lb_workshop.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); +this.lb_workshop.Text = "杞﹂棿ID "; +// +//txt_workshop +// +this.txt_workshop.Location = new System.Drawing.Point(580, 20); +this.txt_workshop.Name = "txt_workshop"; +this.txt_workshop.Size = new System.Drawing.Size(150,21); +this.txt_workshop.TabIndex = 213; +this.txt_workshop.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); +// +//gv_workshop +// +this.gv_workshop.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); +this.gv_workshop.AppearanceCell.Options.UseFont = true; +this.gv_workshop.FieldName = "workshop"; +this.gv_workshop.Caption = "杞﹂棿ID "; +this.gv_workshop.Tag = "query_a.workshop"; +this.gv_workshop.MinWidth =50; +this.gv_workshop.Visible = true; +this.gv_workshop.Width =94; +this.gv_workshop.OptionsColumn.AllowEdit = false; +this.gv_workshop.VisibleIndex = 0; + +// +//lb_id +// +this.lb_id.Location = new System.Drawing.Point(270, 20); +this.lb_id.Name = "lb_id"; +this.lb_id.Size = new System.Drawing.Size(150,21); +this.lb_id.TabIndex = 211; +this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); +this.lb_id.Text = "id "; +// +//txt_id +// +this.txt_id.Location = new System.Drawing.Point(330, 20); +this.txt_id.Name = "txt_id"; +this.txt_id.Size = new System.Drawing.Size(150,21); +this.txt_id.TabIndex = 211; +this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); +// +//gv_id +// +this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); +this.gv_id.AppearanceCell.Options.UseFont = true; +this.gv_id.FieldName = "id"; +this.gv_id.Caption = "id "; +this.gv_id.Tag = "query_a.id"; +this.gv_id.MinWidth =50; +this.gv_id.Visible = true; +this.gv_id.Width =94; +this.gv_id.OptionsColumn.AllowEdit = false; +this.gv_id.VisibleIndex = 0; + +// +//lb_guid +// +this.lb_guid.Location = new System.Drawing.Point(20, 20); +this.lb_guid.Name = "lb_guid"; +this.lb_guid.Size = new System.Drawing.Size(150,21); +this.lb_guid.TabIndex = 210; +this.lb_guid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); +this.lb_guid.Text = "guid "; +// +//txt_guid +// +this.txt_guid.Location = new System.Drawing.Point(80, 20); +this.txt_guid.Name = "txt_guid"; +this.txt_guid.Size = new System.Drawing.Size(150,21); +this.txt_guid.TabIndex = 210; +this.txt_guid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); +// +//gv_guid +// +this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); +this.gv_guid.AppearanceCell.Options.UseFont = true; +this.gv_guid.FieldName = "guid"; +this.gv_guid.Caption = "guid "; +this.gv_guid.Tag = "query_a.guid"; +this.gv_guid.MinWidth =50; +this.gv_guid.Visible = true; +this.gv_guid.Width =94; +this.gv_guid.OptionsColumn.AllowEdit = false; +this.gv_guid.VisibleIndex = 0; + + this.toolBarMenu1 = new UserControl.UcToolBarMenu(); + this.gcMain = new DevExpress.XtraGrid.GridControl(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); + this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.pageBar1 = new UserControls.Data.UcPageBar(); + this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); + this.lbGuid = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); + this.xtraTabControl1.SuspendLayout(); + this.xtraTabPage1.SuspendLayout(); + this.xtraTabPage2.SuspendLayout(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // toolBarMenu1 + // + + this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; + this.toolBarMenu1.isSetBtn = false; + this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); + this.toolBarMenu1.Name = "toolBarMenu1"; + this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80); + this.toolBarMenu1.TabIndex = 0; + // + // gcMain + // + this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F); + this.gcMain.Location = new System.Drawing.Point(0, 0); + this.gcMain.MainView = this.gridView1; + this.gcMain.Name = "gcMain"; + this.gcMain.Size = new System.Drawing.Size(1126, 531); + this.gcMain.TabIndex = 1; + this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gridView1.Appearance.Row.Options.UseFont = true; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gv_guid,this.gv_id,this.gv_workshop,this.gv_itemId}); + this.gridView1.GridControl = this.gcMain; + this.gridView1.IndicatorWidth = 50; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsFind.ShowSearchNavButtons = false; + this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // xtraTabControl1 + // + this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + 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(1128, 602); + this.xtraTabControl1.TabIndex = 3; + this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.xtraTabPage1, + this.xtraTabPage2}); + // + // xtraTabPage1 + // + this.xtraTabPage1.Controls.Add(this.gcMain); + this.xtraTabPage1.Controls.Add(this.pageBar1); + this.xtraTabPage1.Name = "xtraTabPage1"; + this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage1.Text = "鏁版嵁鏌ヨ"; + // + // pageBar1 + // + this.pageBar1.CurrentPage = 1; + this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pageBar1.Location = new System.Drawing.Point(0, 531); + this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.pageBar1.Name = "pageBar1"; + this.pageBar1.RecordCount = 0; + this.pageBar1.RowsCount = 50; + this.pageBar1.Size = new System.Drawing.Size(1126, 39); + this.pageBar1.TabIndex = 3; + this.pageBar1.TotalPages = 0; + // + // xtraTabPage2 + // + this.xtraTabPage2.Controls.Add(this.panel1); + this.xtraTabPage2.Name = "xtraTabPage2"; + this.xtraTabPage2.PageEnabled = false; + this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage2.Text = "鏁版嵁缂栬緫"; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.labelControl11); + this.panel1.Controls.Add(this.lbGuid); + this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); + this.panel1.Location = new System.Drawing.Point(76, 20); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(585, 426); + this.panel1.TabIndex = 1; + // + // labelControl11 + // + this.labelControl11.Location = new System.Drawing.Point(61, 388); + this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl11.Name = "labelControl11"; + this.labelControl11.Size = new System.Drawing.Size(45, 18); + this.labelControl11.TabIndex = 130; + this.labelControl11.Text = "涓婚敭锛�"; + // + // lbGuid + // + this.lbGuid.AutoSize = true; + this.lbGuid.Location = new System.Drawing.Point(112, 388); + this.lbGuid.Name = "lbGuid"; + this.lbGuid.Size = new System.Drawing.Size(0, 21); + this.lbGuid.TabIndex = 1; + // + // category1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1128, 682); + this.Controls.Add(this.xtraTabControl1); + this.Controls.Add(this.toolBarMenu1); + //BQAddControltoMContainer + this.panel1.Controls.Add(this.lb_itemId); + this.panel1.Controls.Add(this.txt_itemId); + + this.panel1.Controls.Add(this.lb_workshop); + this.panel1.Controls.Add(this.txt_workshop); + + this.panel1.Controls.Add(this.lb_id); + this.panel1.Controls.Add(this.txt_id); + + this.panel1.Controls.Add(this.lb_guid); + this.panel1.Controls.Add(this.txt_guid); + + this.Name = "category1"; + this.Text = ""; + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); + this.xtraTabControl1.ResumeLayout(false); + this.xtraTabPage1.ResumeLayout(false); + this.xtraTabPage2.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + } + #endregion + private UserControl.UcToolBarMenu toolBarMenu1; + private DevExpress.XtraGrid.GridControl gcMain; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraTab.XtraTabControl xtraTabControl1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage2; + private UserControls.Data.UcPageBar pageBar1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label lbGuid; + private DevExpress.XtraEditors.LabelControl labelControl11; + //BQCreateConrolObejct +private DevExpress.XtraEditors.LabelControl lb_itemId; +private DevExpress.XtraEditors.TextEdit txt_itemId; + private DevExpress.XtraGrid.Columns.GridColumn gv_itemId; + +private DevExpress.XtraEditors.LabelControl lb_workshop; +private DevExpress.XtraEditors.TextEdit txt_workshop; + private DevExpress.XtraGrid.Columns.GridColumn gv_workshop; + +private DevExpress.XtraEditors.LabelControl lb_id; +private DevExpress.XtraEditors.TextEdit txt_id; + private DevExpress.XtraGrid.Columns.GridColumn gv_id; + +private DevExpress.XtraEditors.LabelControl lb_guid; +private DevExpress.XtraEditors.TextEdit txt_guid; + private DevExpress.XtraGrid.Columns.GridColumn gv_guid; + + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs new file mode 100644 index 0000000..efdc99b --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs @@ -0,0 +1,313 @@ +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Gs.DevApp.UserControl; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Data; +using System.Drawing; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.DevFrm +{ + public partial class Frm_MesDaaDirectOut : DevExpress.XtraEditors.XtraForm + { + string _webServiceName = "MesDaaDirectOutManager/"; + List<FilterEntity> _filterList = new List<FilterEntity>(); + public Frm_MesDaaDirectOut() + { + InitializeComponent(); + this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; + this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; + this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; + this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; + this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; + this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; + this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; + getPageList(1); + pageBar1.PagerEvent += PageBar1_PagerEvent; + Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); + gridView1.CustomDrawRowIndicator += (s, e) => + { + if (e.Info.IsRowIndicator && e.RowHandle >= 0) + { + e.Info.DisplayText = (e.RowHandle + 1).ToString(); + } + }; + gridView1.CustomDrawEmptyForeground += (s, e) => + { + string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!"; + Font f = new Font("寰蒋闆呴粦", 16); + Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); + e.Graphics.DrawString(str, f, Brushes.Gray, r); + }; + } + private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) + { + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); + await Task.Delay(100); + getPageList(1); + } + /// <summary> + /// 鍙屽嚮浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e) + { + string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid"); + if (!string.IsNullOrEmpty(rowGuid)) + getModel(rowGuid, false, 999); + } + /// <summary> + /// 鍒嗛〉浜嬩欢 + /// </summary> + /// <param name="curPage"></param> + /// <param name="pageSize"></param> + private void PageBar1_PagerEvent(int curPage, int pageSize) + { + getPageList(curPage); + } + /// <summary> + /// 鏌ヨ浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + var frm = new ShowFilter(gridView1.Columns, _filterList); + frm.UpdateParent += Frm_UpdateParent; + frm.ShowDialog(); + } + /// <summary> + /// 鏌ヨ鍥炶皟 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) + { + _filterList = e.FilterList; + getPageList(1); + } + + /// <summary> + /// 鍙栨秷浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) + { + UtilityHelper.JumpToTab(xtraTabControl1, 0); + } + + /// <summary> + /// 鍒犻櫎浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) + { + string rowGuid = "", rowName = ""; + // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_userName, gridView1); + if (string.IsNullOrEmpty(rowGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) + return; + List<dynamic> lst = new List<dynamic>(); + lst.Add(rowGuid); + var _obj = lst; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + UtilityHelper.JumpToTab(xtraTabControl1, 0); + getPageList(1); + } + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// 鍒锋柊浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) + { + if (xtraTabControl1.SelectedTabPageIndex == 1) + getModel(lbGuid.Text.Trim(), false, 999); + else + { + _filterList.Clear(); + if (gridView1.ActiveFilter.Count > 0) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + } + getPageList(1); + } + } + /// <summary> + /// 淇敼浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) + { + string rowGuid = "", rowName = ""; + // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_userName, gridView1); + if (string.IsNullOrEmpty(rowGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + getModel(rowGuid, true, 1); + } + /// <summary> + /// 鏂板浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) + { + UtilityHelper.JumpToTab(xtraTabControl1, 1); + lbGuid.Text = ""; + UtilityHelper.CleanValueByControl(this.panel1.Controls, true); + + } + /// <summary> + /// 淇濆瓨浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) + { + toolBarMenu1.isSetBtn = false; + //if (string.IsNullOrEmpty(txt_account.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�"); + // txt_account.Focus(); + return; + } + var _obj = new + { + guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 + + }; + try + { + 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) + { + lbGuid.Text = _rtn.rtnData; + toolBarMenu1.isSetBtn = true; + UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false); + } + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private async void getPageList(int curPage) + { + UcLoading _loading = new UcLoading(); + var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "b.item_no", + "asc", "", _sbSqlWhere.ToString()); + var json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = await UtilityHelper.HttpPostAsync("", + _webServiceName + "GetListPage", json); + var dd = UtilityHelper.ReturnToTablePage(strReturn); + if (dd.rtnCode > 0) + { + DataTable dt = dd.rtnData.list; + gcMain.BindingContext = new BindingContext(); + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + if (dt.Rows.Count > 0) + { + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + } + else + UtilityHelper.SetDefaultTable(gcMain, gridView1); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 + pageBar1.CurrentPage = curPage;//褰撳墠椤� + pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟 + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + _loading.Stop(); + } + /// <summary> + /// + /// </summary> + /// <param name="strGuid">涓婚敭</param> + /// <param name="isEdit">鏄惁鍙紪杈�</param> + /// <param name="tabIdx">閫夐」鍗″簭鍙�</param> + private void getModel(string strGuid, bool isEdit, int tabIdx) + { + if (string.IsNullOrEmpty(strGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); + var _obj = new + { + guid = strGuid,//涓诲缓 + }; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + dynamic dy = _rtn.rtnData; + lbGuid.Text = strGuid; + UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit); + + } + else + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.resx @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs index fd2785d..d66af7f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs @@ -257,7 +257,7 @@ /// </summary> private void getTree() { - var pgq = new PageQueryModel(1, 999999, "idx"); + var pgq = new PageQueryModel(1, 999999, "a.idx"); var json = JsonConvert.SerializeObject(pgq); try { @@ -321,8 +321,8 @@ /// </summary> private void getDownList() { - var pgq = new PageQueryModel(1, 999999, "idx", "asc", "", - " and category=1"); + var pgq = new PageQueryModel(1, 999999, "a.idx", "asc", "", + " and a.category=1"); var json = JsonConvert.SerializeObject(pgq); try { diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index f5a22dc..b050879 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -193,6 +193,12 @@ <Compile Include="DevFrm\BasicData\Frm_Holidy.Designer.cs"> <DependentUpon>Frm_Holidy.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\BasicData\Frm_MesDaaDirectOut.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\BasicData\Frm_MesDaaDirectOut.Designer.cs"> + <DependentUpon>Frm_MesDaaDirectOut.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\BasicData\Frm_MesItems.cs"> <SubType>Form</SubType> </Compile> @@ -615,6 +621,9 @@ <EmbeddedResource Include="DevFrm\BasicData\Frm_Holidy.resx"> <DependentUpon>Frm_Holidy.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\BasicData\Frm_MesDaaDirectOut.resx"> + <DependentUpon>Frm_MesDaaDirectOut.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx"> <DependentUpon>Frm_MesItems.cs</DependentUpon> </EmbeddedResource> -- Gitblit v1.9.3