| DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/Program.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/XtraForm1.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -93,6 +93,7 @@ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -121,7 +122,6 @@ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -174,6 +174,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -182,7 +183,6 @@ this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -859,6 +859,18 @@ this.layoutControlItem16.Text = "违规类别"; this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.ucBtnPrint98; this.layoutControlItem13.Location = new System.Drawing.Point(990, 99); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(332, 33); this.layoutControlItem13.Text = "确定打印"; this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem13.TextVisible = false; // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -984,7 +996,7 @@ // this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Name = "tabMxPage2"; this.tabMxPage2.Size = new System.Drawing.Size(1361, 332); this.tabMxPage2.Size = new System.Drawing.Size(1361, 376); this.tabMxPage2.Text = "追溯码明细"; // // gcMx2 @@ -993,7 +1005,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(1361, 332); this.gcMx2.Size = new System.Drawing.Size(1361, 376); this.gcMx2.TabIndex = 2; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1100,7 +1112,7 @@ // gridColumn12 // this.gridColumn12.Caption = "绑定时间"; this.gridColumn12.FieldName = "dhdh"; this.gridColumn12.FieldName = "bdDateTime"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; @@ -1110,7 +1122,7 @@ // gridColumn5 // this.gridColumn5.Caption = "绑定人"; this.gridColumn5.FieldName = "bdDateTime"; this.gridColumn5.FieldName = "bdUserBy"; this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; @@ -1156,18 +1168,6 @@ this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 11; this.gridColumn9.Width = 94; // // layoutControlItem13 // this.layoutControlItem13.Control = this.ucBtnPrint98; this.layoutControlItem13.Location = new System.Drawing.Point(990, 99); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(332, 33); this.layoutControlItem13.Text = "确定打印"; this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem13.TextVisible = false; // // Frm_WomFanGong // @@ -1230,6 +1230,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1238,7 +1239,6 @@ this.tabMxPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); this.ResumeLayout(false); } DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
@@ -1,6 +1,7 @@ using DevExpress.Utils.MVVM.Services; using DevExpress.XtraGrid.Views.Grid; using DevExpress.XtraLayout.Customization; using DevExpress.XtraRichEdit.Model; using Gs.DevApp.DevFrm.Rpt; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; @@ -41,7 +42,7 @@ }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; //解绑追溯码 //确定反工 btnZsm.Click += (s, e) => { if (!MsgHelper.AskQuestion("确定生成新的追溯码吗？")) @@ -70,8 +71,8 @@ } }; //这是打印，这和其它页面是不一样的，不能复制这里 this.ucBtnPrint98.SetPlButton(false); this.ucBtnPrint98.btnPrintClick += (s, e) => this.ucBtnPrint98.SetPrintButton(false); this.ucBtnPrint98.btnAllClick += (s, e) => { string rowGuid = txt_aboutGuid.Text.Trim(); if (rowGuid.Length < 36) @@ -82,13 +83,17 @@ } SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "追溯码", lbGuid.Text.Trim()); string strCodeList = ""; string strAction = ""; frm.UpdateParent += (ss, ee) => { strCodeList = ee.StringSingle; strAction = ee.Data; }; frm.ShowDialog(); if (string.IsNullOrEmpty(strCodeList)) return; if (strAction == "print") { try { string rptParameter = "rpt_trace{" @@ -109,6 +114,8 @@ { MsgHelper.ShowError(ex.Message); } } }; }
@@ -256,6 +256,9 @@ gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); } //2025/07/12加上修改状态下不能修改 txt_orgId.IsReadly = true; txt_aboutGuid.IsReadly = true; } /// <summary> /// 新增事件 @@ -270,6 +273,9 @@ gridViews.Add(gvMx1); UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); //增加时，默认组织 string deftOrg = UtilityHelper.GetFirstOrg(txt_orgId); } /// <summary> DevApp/Gs.DevApp/Program.cs
@@ -40,8 +40,8 @@ /// </summary> private static void _startLogin() { Application.Run(new Gs.DevApp.XtraForm1()); return; //Application.Run(new Gs.DevApp.XtraForm1()); //return; CefSettings settings = new CefSettings(); settings.Locale = "zh-CN"; Cef.Initialize(settings); DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -596,7 +596,7 @@ // this.barDockControlBottom.CausesValidation = false; this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; this.barDockControlBottom.Location = new System.Drawing.Point(0, 265); this.barDockControlBottom.Location = new System.Drawing.Point(0, 69); this.barDockControlBottom.Manager = this.barManager1; this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0); // @@ -606,7 +606,7 @@ this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left; this.barDockControlLeft.Location = new System.Drawing.Point(0, 142); this.barDockControlLeft.Manager = this.barManager1; this.barDockControlLeft.Size = new System.Drawing.Size(0, 123); this.barDockControlLeft.Size = new System.Drawing.Size(0, 0); // // barDockControlRight // @@ -614,7 +614,7 @@ this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; this.barDockControlRight.Location = new System.Drawing.Point(1543, 142); this.barDockControlRight.Manager = this.barManager1; this.barDockControlRight.Size = new System.Drawing.Size(0, 123); this.barDockControlRight.Size = new System.Drawing.Size(0, 0); // // UcToolBarMenu // @@ -625,7 +625,7 @@ this.Controls.Add(this.barDockControlBottom); this.Controls.Add(this.barDockControlTop); this.Name = "UcToolBarMenu"; this.Size = new System.Drawing.Size(1543, 265); this.Size = new System.Drawing.Size(1543, 69); ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); DevApp/Gs.DevApp/XtraForm1.cs
@@ -23,7 +23,6 @@ public XtraForm1() { InitializeComponent(); } private void simpleButton2_Click(object sender, EventArgs e) @@ -172,7 +171,9 @@ private void simpleButton1_Click(object sender, EventArgs e) { DataTable dataTable1 = this.GetDataTable($"select MIG004,MIG005 from BASMIG(nolock) where MIG001='ShuiJianZhanWei01' and MIG003='{((BaseEdit)this.txtGWM).EditValue.ToString()}'", "tmpBASMIG2"); System.Text.StringBuilder sbSql1 = new StringBuilder(); sbSql1.Append($"select MIG004,MIG005 from BASMIG(nolock) where MIG001='ShuiJianZhanWei01' and MIG003='{((BaseEdit)this.txtGWM).EditValue.ToString()}'"); DataTable dataTable1 = this.GetDataTable(sbSql1.ToString(), "tmpBASMIG2"); if (dataTable1 == null || dataTable1.Rows.Count <= 0) { MessageBox.Show("该水检站位码不存在，请确认！"); @@ -183,7 +184,9 @@ ModbusFactory modbusFactory = new ModbusFactory(); byte num1 = byte.Parse("1"); ushort num2 = ushort.Parse("1"); DataTable dataTable2 = GetDataTable(string.Format($"select case when MIG006='D' then MIG003+{dataTable1.Rows[0][0]} else MIG003+{dataTable1.Rows[0][1]} end MIG003,MIG004 from BASMIG(nolock) where MIG001 = 'ShuiJianAddress01' order by MIG005"), "tmpBASMIG3"); System.Text.StringBuilder sbSql2 = new StringBuilder(); sbSql2.Append(string.Format($"select case when MIG006='D' then MIG003+{dataTable1.Rows[0][0]} else MIG003+{dataTable1.Rows[0][1]} end MIG003,MIG004 from BASMIG(nolock) where MIG001 = 'ShuiJianAddress01' order by MIG005")); DataTable dataTable2 = GetDataTable(sbSql2.ToString(), "tmpBASMIG3"); if (dataTable2 == null || dataTable2.Rows.Count <= 0) { MessageBox.Show("水检地址不存在，请确认！"); @@ -251,7 +254,6 @@ { throw new Exception(ex.Message); } return ds.Tables[0]; } }
