dev前台代码
上一版本: 05654db0 | 补丁 | 提交 | 忽略空白
lu
2025-03-18 998adc64af7d3d458848b8c9035e7a1e4399d48b 
pda绑定
已修改3个文件
129 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.Designer.cs 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs


@@ -24,7 +24,6 @@


        {


            InitializeComponent();


            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;


           


            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;


            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();


            gvList.Add(gridView1);


@@ -202,14 +201,14 @@


        private void repositoryItemButtonEdit2_ButtonClick(object sender,


            ButtonPressedEventArgs e)


        {


            //if (e.Button.Index == 0)


            //{


            //    var rowhandle = gridView1.FocusedRowHandle;


            //    var dr = gridView1.GetDataRow(rowhandle);


            //    var userGuid = dr["guid"].ToString();


            //    var frm = new SelectCk(userGuid);


            //    frm.ShowDialog();


            //}


            if (e.Button.Index == 0)


            {


                var rowhandle = gridView1.FocusedRowHandle;


                var dr = gridView1.GetDataRow(rowhandle);


                var userGuid = dr["guid"].ToString();


                var frm = new SelectPage(userGuid);


                frm.ShowDialog();


            }


        }


        /// <summary>


        /// 仓库




 DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.Designer.cs


@@ -33,11 +33,7 @@


            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();


            this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_depotName = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();


            this.btnIn = new DevExpress.XtraEditors.SimpleButton();


            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();


@@ -55,7 +51,7 @@


            this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;


            this.panelControl2.Location = new System.Drawing.Point(0, 0);


            this.panelControl2.Name = "panelControl2";


            this.panelControl2.Size = new System.Drawing.Size(1020, 691);


            this.panelControl2.Size = new System.Drawing.Size(551, 691);


            this.panelControl2.TabIndex = 4;


            // 


            // gcMain


@@ -65,7 +61,7 @@


            this.gcMain.Location = new System.Drawing.Point(2, 2);


            this.gcMain.MainView = this.gridView1;


            this.gcMain.Name = "gcMain";


            this.gcMain.Size = new System.Drawing.Size(1016, 644);


            this.gcMain.Size = new System.Drawing.Size(547, 644);


            this.gcMain.TabIndex = 6;


            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gridView1});


@@ -80,11 +76,7 @@


            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {


            this.gv_depotCode,


            this.gv_depotName,


            this.gv_depottype,


            this.gv_createBy,


            this.gv_isNg,


            this.gridColumn2,


            this.gridColumn1});


            this.gridColumn2});


            this.gridView1.GridControl = this.gcMain;


            this.gridView1.IndicatorWidth = 50;


            this.gridView1.Name = "gridView1";


@@ -98,8 +90,8 @@


            // 


            this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);


            this.gv_depotCode.AppearanceCell.Options.UseFont = true;


            this.gv_depotCode.Caption = "仓库编码";


            this.gv_depotCode.FieldName = "depotCode";


            this.gv_depotCode.Caption = "页面名称";


            this.gv_depotCode.FieldName = "pageView";


            this.gv_depotCode.MinWidth = 50;


            this.gv_depotCode.Name = "gv_depotCode";


            this.gv_depotCode.OptionsColumn.AllowEdit = false;


@@ -112,8 +104,8 @@


            // 


            this.gv_depotName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);


            this.gv_depotName.AppearanceCell.Options.UseFont = true;


            this.gv_depotName.Caption = "仓库名称";


            this.gv_depotName.FieldName = "depotName";


            this.gv_depotName.Caption = "页面分组";


            this.gv_depotName.FieldName = "pageGroup";


            this.gv_depotName.MinWidth = 50;


            this.gv_depotName.Name = "gv_depotName";


            this.gv_depotName.OptionsColumn.AllowEdit = false;


@@ -122,72 +114,17 @@


            this.gv_depotName.VisibleIndex = 2;


            this.gv_depotName.Width = 150;


            // 


            // gv_depottype


            // 


            this.gv_depottype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);


            this.gv_depottype.AppearanceCell.Options.UseFont = true;


            this.gv_depottype.Caption = "仓库类型";


            this.gv_depottype.FieldName = "depottype";


            this.gv_depottype.MinWidth = 50;


            this.gv_depottype.Name = "gv_depottype";


            this.gv_depottype.OptionsColumn.AllowEdit = false;


            this.gv_depottype.Tag = "query_a.depottype";


            this.gv_depottype.Visible = true;


            this.gv_depottype.VisibleIndex = 3;


            this.gv_depottype.Width = 80;


            // 


            // gv_createBy


            // 


            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);


            this.gv_createBy.AppearanceCell.Options.UseFont = true;


            this.gv_createBy.Caption = "仓库负责人";


            this.gv_createBy.FieldName = "createBy";


            this.gv_createBy.MinWidth = 50;


            this.gv_createBy.Name = "gv_createBy";


            this.gv_createBy.OptionsColumn.AllowEdit = false;


            this.gv_createBy.Tag = "query_a.create_by";


            this.gv_createBy.Visible = true;


            this.gv_createBy.VisibleIndex = 4;


            this.gv_createBy.Width = 71;


            // 


            // gv_isNg


            // 


            this.gv_isNg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);


            this.gv_isNg.AppearanceCell.Options.UseFont = true;


            this.gv_isNg.Caption = "不良品仓";


            this.gv_isNg.FieldName = "isNg";


            this.gv_isNg.MaxWidth = 50;


            this.gv_isNg.MinWidth = 50;


            this.gv_isNg.Name = "gv_isNg";


            this.gv_isNg.OptionsColumn.AllowEdit = false;


            this.gv_isNg.Tag = "query_a.is_ng";


            this.gv_isNg.Visible = true;


            this.gv_isNg.VisibleIndex = 5;


            this.gv_isNg.Width = 50;


            // 


            // gridColumn2


            // 


            this.gridColumn2.Caption = "禁用状态";


            this.gridColumn2.FieldName = "isNg";


            this.gridColumn2.FieldName = "pageStatus";


            this.gridColumn2.MaxWidth = 50;


            this.gridColumn2.MinWidth = 50;


            this.gridColumn2.Name = "gridColumn2";


            this.gridColumn2.Tag = "query_a.zuid";


            this.gridColumn2.Visible = true;


            this.gridColumn2.VisibleIndex = 6;


            this.gridColumn2.VisibleIndex = 3;


            this.gridColumn2.Width = 50;


            // 


            // gridColumn1


            // 


            this.gridColumn1.Caption = "使用组织";


            this.gridColumn1.FieldName = "fSubsidiary";


            this.gridColumn1.MinWidth = 50;


            this.gridColumn1.Name = "gridColumn1";


            this.gridColumn1.OptionsColumn.AllowEdit = false;


            this.gridColumn1.Tag = "org.FNumber";


            this.gridColumn1.Visible = true;


            this.gridColumn1.VisibleIndex = 7;


            this.gridColumn1.Width = 250;


            // 


            // panelControl1


            // 


@@ -195,7 +132,7 @@


            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;


            this.panelControl1.Location = new System.Drawing.Point(2, 646);


            this.panelControl1.Name = "panelControl1";


            this.panelControl1.Size = new System.Drawing.Size(1016, 43);


            this.panelControl1.Size = new System.Drawing.Size(547, 43);


            this.panelControl1.TabIndex = 5;


            // 


            // btnIn


@@ -206,24 +143,24 @@


            this.btnIn.AppearancePressed.Options.UseBackColor = true;


            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;


            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.selectvaluespivottable_16x16;


            this.btnIn.Location = new System.Drawing.Point(920, 2);


            this.btnIn.Location = new System.Drawing.Point(451, 2);


            this.btnIn.Name = "btnIn";


            this.btnIn.Size = new System.Drawing.Size(94, 39);


            this.btnIn.TabIndex = 4;


            this.btnIn.Text = "确定保存";


            // 


            // SelectCk


            // SelectPage


            // 


            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);


            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;


            this.ClientSize = new System.Drawing.Size(1020, 691);


            this.ClientSize = new System.Drawing.Size(551, 691);


            this.Controls.Add(this.panelControl2);


            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;


            this.MaximizeBox = false;


            this.MinimizeBox = false;


            this.Name = "SelectCk";


            this.Name = "SelectPage";


            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;


            this.Text = "选择仓库";


            this.Text = "选择PDA页面";


            this.TopMost = true;


            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();


            this.panelControl2.ResumeLayout(false);


@@ -240,12 +177,8 @@


        private DevExpress.XtraEditors.SimpleButton btnIn;


        private DevExpress.XtraGrid.GridControl gcMain;


        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;


        private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;


        private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;


        private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;


        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;


        private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;


    }


}




 DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs


@@ -1,17 +1,10 @@


using DevExpress.XtraEditors;


using Gs.DevApp.Entity;


using Gs.DevApp.Entity;


using Gs.DevApp.ToolBox;


using Newtonsoft.Json;


using System;


using System.Collections.Generic;


using System.ComponentModel;


using System.Data;


using System.Drawing;


using System.Linq;


using System.Text;


using System.Threading.Tasks;


using System.Windows.Forms;


using static DevExpress.Data.Mask.Internal.RegExMaskMath.DraftFiniteAutomaton<T>;




namespace Gs.DevApp.DevFrm.PDA


{


@@ -19,7 +12,7 @@


    {


        private readonly List<FilterEntity> _filterList = new List<FilterEntity>();




        private readonly string _webServiceName = "MesDepotsManager/";


        private readonly string _webServiceName = "MesSysPageviewManager/";


        private string userGuid = "";


        /// <summary>


        /// 


@@ -52,7 +45,7 @@


                {


                    userGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(userGuid),


                    bindGuidslist = sbList.ToString(),


                    fType = "仓库",


                    fType = "PDA页面",


                };


                try


                {


@@ -81,7 +74,7 @@


        private void getPageList(int curPage)


        {


            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);


            var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc",


            var pgq = new PageQueryModel(curPage, 999999, "a.PAGE_GROUP", "asc",


                "", _sbSqlWhere.ToString());


            var json = JsonConvert.SerializeObject(pgq);


            try