lu
2025-09-11 0c249ab28b9eddccb2a7c0e413086931cb2346f1
print
已修改7个文件
69 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/User/User.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectHz.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectOrg.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -1,5 +1,6 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Base.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -25,6 +26,7 @@
            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
            {
@@ -40,6 +42,29 @@
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
        }
        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
        {
            //guidKey, rptParameter
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_userName, gridView1, "userName");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            this.toolBarMenu1.rptParameter = "rpt_User{}";
            this.toolBarMenu1.guidKey = rowGuid;
            //this.ucBtnPrint101.rptParameter = "rpt_cktm{"
            //       + ""
            //       + "," + ""
            //       + "," + ""
            //       + "," + ""
            //       + "," + ""
            //       + "}";
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -1599,36 +1599,37 @@
            this.gridColumn2.Caption = "物料ID";
            this.gridColumn2.FieldName = "id";
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 0;
            this.gridColumn2.Width = 41;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "物料编号";
            this.gridColumn3.FieldName = "itemNo";
            this.gridColumn3.MinWidth = 50;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 1;
            this.gridColumn3.Width = 41;
            this.gridColumn3.VisibleIndex = 0;
            this.gridColumn3.Width = 54;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "物料名称";
            this.gridColumn4.FieldName = "itemName";
            this.gridColumn4.MinWidth = 50;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.Width = 91;
            this.gridColumn4.VisibleIndex = 1;
            this.gridColumn4.Width = 99;
            // 
            // gridColumn5
            // 
            this.gridColumn5.Caption = "物料规格";
            this.gridColumn5.FieldName = "itemModel";
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 3;
            this.gridColumn5.Width = 100;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.Width = 109;
            // 
            // gridColumn7
            // 
@@ -1636,8 +1637,8 @@
            this.gridColumn7.FieldName = "dwName";
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 4;
            this.gridColumn7.Width = 56;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.Width = 20;
            // 
            // gridColumn6
            // 
@@ -1645,8 +1646,8 @@
            this.gridColumn6.FieldName = "fSubsidiary";
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 43;
            this.gridColumn6.VisibleIndex = 4;
            this.gridColumn6.Width = 90;
            // 
            // gvMx1bld002
            // 
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -714,6 +714,7 @@
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
            gvMx1.BestFitColumns();
        }
        /// <summary>
@@ -796,19 +797,21 @@
                return;
            var dr = gvMx1.GetDataRow(rowhandle);
            var strOrgGuid = dr["dcOrgGuid"].ToString();
            var strItemId = dr["itemId"].ToString();
            if (string.IsNullOrEmpty(strOrgGuid))
            {
                MsgHelper.ShowError("提示:请先选择调出组织!");
                return;
            }
            ;
            SelectCk frm = new SelectCk(strOrgGuid);
            SelectCk frm = new SelectCk(strOrgGuid, strItemId);
            frm.UpdateParent += (ss, ee) =>
            {
                var lst = new List<dynamic>();
                lst = ee.DynamicList;
                gvMx1.SetFocusedRowCellValue("dcCk", lst[0].name);
                gvMx1.SetFocusedRowCellValue("dcCkGuid", lst[0].guid);
                gvMx1.BestFitColumns();
            };
            frm.ShowDialog();
        }
@@ -879,19 +882,21 @@
                return;
            var dr = gvMx1.GetDataRow(rowhandle);
            var strOrgGuid = dr["drOrgGuid"].ToString();
            var strItemId = dr["itemId"].ToString();
            if (string.IsNullOrEmpty(strOrgGuid))
            {
                MsgHelper.ShowError("提示:请先选择调入组织!");
                return;
            }
            ;
            SelectCk frm = new SelectCk(strOrgGuid);
            SelectCk frm = new SelectCk(strOrgGuid, strItemId);
            frm.UpdateParent += (ss, ee) =>
            {
                var lst = new List<dynamic>();
                lst = ee.DynamicList;
                gvMx1.SetFocusedRowCellValue("drCk", lst[0].name);
                gvMx1.SetFocusedRowCellValue("drCkGuid", lst[0].guid);
                gvMx1.BestFitColumns();
            };
            frm.ShowDialog();
        }
DevApp/Gs.DevApp/UserControl/SelectHz.cs
@@ -46,7 +46,7 @@
        private void getPageList(int curPage)
        {
            gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString());
            var pgq = new PageQueryModel(curPage, 999999, "FNumber", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
DevApp/Gs.DevApp/UserControl/SelectOrg.cs
@@ -44,7 +44,7 @@
        private void getPageList(int curPage)
        {
            gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString());
            var pgq = new PageQueryModel(curPage, 999999, "FNumber", "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -645,7 +645,7 @@
            // 
            this.barDockControlBottom.CausesValidation = false;
            this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 70);
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 190);
            this.barDockControlBottom.Manager = this.barManager1;
            this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
            // 
@@ -674,7 +674,7 @@
            this.Controls.Add(this.barDockControlBottom);
            this.Controls.Add(this.barDockControlTop);
            this.Name = "UcToolBarMenu";
            this.Size = new System.Drawing.Size(1543, 70);
            this.Size = new System.Drawing.Size(1543, 190);
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -336,7 +336,6 @@
                frm.ShowDialog();
                return;
            }
            MsgHelper.ShowError("没有设计模板,请先设计模板!");
        }
@@ -376,7 +375,6 @@
            if (btnAllClick != null)
                btnAllClick(this, e);
        }
        private void BtnLianBan_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnLianBanClick != null)