| DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -207,7 +207,6 @@ this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage(); this.panel1 = new System.Windows.Forms.Panel(); this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); this.textEdit1 = new DevExpress.XtraEditors.TextEdit(); @@ -218,6 +217,8 @@ this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.txt_sjXt = new Gs.DevApp.UserControl.UcLookWorkline(); this.labelControl2 = new DevExpress.XtraEditors.LabelControl(); this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); @@ -1310,8 +1311,8 @@ // this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Name = "tabMxPage2"; this.tabMxPage2.Size = new System.Drawing.Size(1124, 487); this.tabMxPage2.Text = "产品条码"; this.tabMxPage2.Size = new System.Drawing.Size(1124, 349); this.tabMxPage2.Text = "条码明细"; // // gcMx2 // @@ -1319,7 +1320,7 @@ this.gcMx2.Location = new System.Drawing.Point(0, 0); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; this.gcMx2.Size = new System.Drawing.Size(1124, 487); this.gcMx2.Size = new System.Drawing.Size(1124, 349); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1770,7 +1771,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1124, 487); this.tabMxPage1.Size = new System.Drawing.Size(1124, 349); this.tabMxPage1.Text = "备料单身"; // // gcMx1 @@ -1779,7 +1780,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(1124, 487); this.gcMx1.Size = new System.Drawing.Size(1124, 349); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -2577,25 +2578,20 @@ // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMx.Location = new System.Drawing.Point(0, 189); this.tabMx.Location = new System.Drawing.Point(0, 327); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; this.tabMx.Size = new System.Drawing.Size(1126, 519); this.tabMx.Size = new System.Drawing.Size(1126, 381); this.tabMx.TabIndex = 2; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, this.tabMxPage2, this.xtraTabPage4}); // // xtraTabPage4 // this.xtraTabPage4.Name = "xtraTabPage4"; this.xtraTabPage4.Size = new System.Drawing.Size(1124, 487); this.xtraTabPage4.Text = "报工记录"; this.tabMxPage2}); // // panel1 // this.panel1.BackColor = System.Drawing.Color.White; this.panel1.Controls.Add(this.labelControl2); this.panel1.Controls.Add(this.txt_sjXt); this.panel1.Controls.Add(this.labelControl1); this.panel1.Controls.Add(this.textEdit1); this.panel1.Controls.Add(this.txt_iCount_1); @@ -2636,7 +2632,7 @@ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(1126, 189); this.panel1.Size = new System.Drawing.Size(1126, 327); this.panel1.TabIndex = 1; // // labelControl1 @@ -2721,6 +2717,24 @@ this.picCheckBox.TabIndex = 6; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // txt_sjXt // this.txt_sjXt.IsReadly = false; this.txt_sjXt.Location = new System.Drawing.Point(90, 162); this.txt_sjXt.Name = "txt_sjXt"; this.txt_sjXt.Size = new System.Drawing.Size(278, 35); this.txt_sjXt.TabIndex = 334; // // labelControl2 // this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl2.Appearance.Options.UseFont = true; this.labelControl2.Location = new System.Drawing.Point(14, 162); this.labelControl2.Name = "labelControl2"; this.labelControl2.Size = new System.Drawing.Size(68, 21); this.labelControl2.TabIndex = 335; this.labelControl2.Text = "实际线体"; // // Frm_Womdaa // @@ -2971,8 +2985,9 @@ private DevExpress.XtraEditors.LabelControl labelControl12; private DevExpress.XtraEditors.LabelControl labelControl1; private DevExpress.XtraEditors.TextEdit textEdit1; private DevExpress.XtraTab.XtraTabPage xtraTabPage4; private DevExpress.XtraGrid.Columns.GridColumn gvMx1Guid; private System.Windows.Forms.PictureBox picCheckBox; private DevExpress.XtraEditors.LabelControl labelControl2; private UserControl.UcLookWorkline txt_sjXt; } } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -18,18 +18,27 @@ public Frm_Womdaa() { 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; this.toolBarMenu1.btnZhongTaiClick += ToolBarMenu1_btnZhongTaiClick; this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick; this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick; this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick; Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); }); Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => { getModel(value); }, (value) => { getPageList(this.pageBar1.CurrentPage); }); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; } @@ -40,17 +49,7 @@ 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> @@ -126,42 +125,6 @@ } /// <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_billNo, 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> @@ -169,7 +132,7 @@ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); getModel(lbGuid.Text.Trim()); else { _filterList.Clear(); @@ -190,28 +153,18 @@ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) { string rowGuid = "", rowName = ""; // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1); if (string.IsNullOrEmpty(rowGuid)) { ToolBox.MsgHelper.Warning("请先选择你要操作的行！"); return; } getModel(rowGuid, true, 1); Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(panel1.Controls, true); } /// <summary> /// 新增事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 1); lbGuid.Text = ""; List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gridViews.Add(gvMx1); UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } /// <summary> /// 保存事件 /// </summary> @@ -220,15 +173,11 @@ 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()), //主建 sjxt = txt_sjXt.GetCode(), //实际线体 bz = txt_daa009.Text.Trim()//备注 }; try { @@ -290,14 +239,19 @@ } } private void getModel(string strGuid, bool isEdit, int tabIdx) private void getModel(string strGuid) { bool isEdit = false; if (toolBarMenu1.currentAction == "add") { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); return; }; if (string.IsNullOrEmpty(strGuid)) { ToolBox.MsgHelper.Warning("请先选择你要操作的行！"); return; } UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); var _obj = new { guid = strGuid,//主建 @@ -404,16 +358,15 @@ if (_rtn.rtnCode > 0) { if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); getModel(lbGuid.Text.Trim()); else getPageList(1); getPageList(this.pageBar1.CurrentPage); } } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); } } } } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -195,7 +195,6 @@ else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); } MsgHelper.Warning("提示：" + _rtn.rtnMsg); } catch (Exception ex)
