lu
2025-04-07 35fde503a1a23dc990efc54a9eb6ddd5e8c133d6
pda绑定
已修改7个文件
63 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.Designer.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
@@ -163,7 +163,7 @@
            // 
            this.account.AppearanceCell.Options.UseFont = true;
            this.account.Caption = "用户账号";
            this.account.FieldName = "accout";
            this.account.FieldName = "account";
            this.account.MinWidth = 50;
            this.account.Name = "account";
            this.account.OptionsColumn.AllowEdit = false;
@@ -207,7 +207,7 @@
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "建立者";
            this.gridColumn2.Caption = "绑定者";
            this.gridColumn2.FieldName = "createBy";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
@@ -217,7 +217,7 @@
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "建立时间";
            this.gridColumn4.Caption = "绑定时间";
            this.gridColumn4.FieldName = "createDate";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
@@ -1,6 +1,4 @@
using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Base.ViewInfo;
using DevExpress.XtraEditors.Controls;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -38,7 +36,7 @@
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            getPageList(1);
        }
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs
@@ -55,17 +55,16 @@
            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(855, 691);
            this.panelControl2.TabIndex = 4;
            // 
            // gcMain
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            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(851, 644);
            this.gcMain.TabIndex = 6;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -74,7 +73,6 @@
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 60;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -96,7 +94,6 @@
            // 
            // gv_depotCode
            // 
            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotCode.Caption = "仓库编码";
            this.gv_depotCode.FieldName = "depotCode";
@@ -110,7 +107,6 @@
            // 
            // gv_depotName
            // 
            this.gv_depotName.AppearanceCell.Options.UseFont = true;
            this.gv_depotName.Caption = "仓库名称";
            this.gv_depotName.FieldName = "depotName";
@@ -124,7 +120,6 @@
            // 
            // gv_depottype
            // 
            this.gv_depottype.AppearanceCell.Options.UseFont = true;
            this.gv_depottype.Caption = "仓库类型";
            this.gv_depottype.FieldName = "depottype";
@@ -138,7 +133,6 @@
            // 
            // gv_createBy
            // 
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "仓库负责人";
            this.gv_createBy.FieldName = "createBy";
@@ -152,7 +146,6 @@
            // 
            // gv_isNg
            // 
            this.gv_isNg.AppearanceCell.Options.UseFont = true;
            this.gv_isNg.Caption = "不良品仓";
            this.gv_isNg.FieldName = "isNg";
@@ -195,7 +188,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(851, 43);
            this.panelControl1.TabIndex = 5;
            // 
            // btnIn
@@ -206,7 +199,7 @@
            this.btnIn.AppearancePressed.Options.UseBackColor = true;
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.boreport2_16x16;
            this.btnIn.Location = new System.Drawing.Point(920, 2);
            this.btnIn.Location = new System.Drawing.Point(755, 2);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(94, 39);
            this.btnIn.TabIndex = 4;
@@ -216,7 +209,7 @@
            // 
            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(855, 691);
            this.Controls.Add(this.panelControl2);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs
@@ -11,7 +11,6 @@
{
    public partial class SelectCk : DevExpress.XtraEditors.XtraForm
    {
        private readonly List<FilterEntity> _filterList = new List<FilterEntity>();
        private readonly string _webServiceName = "MesDepotsManager/";
        private string userGuid = "";
        /// <summary>
@@ -72,7 +71,7 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var _sbSqlWhere ="";
            var pgq = new PageQueryModel(curPage,999999, "org.FNumber asc ,a.depot_code", "asc",
                "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
@@ -1,9 +1,7 @@
using DevExpress.XtraGrid.Views.Base;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
@@ -88,9 +86,6 @@
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -105,6 +100,5 @@
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.Designer.cs
@@ -52,17 +52,16 @@
            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(704, 691);
            this.panelControl2.Size = new System.Drawing.Size(645, 691);
            this.panelControl2.TabIndex = 4;
            // 
            // gcMain
            // 
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            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(700, 644);
            this.gcMain.Size = new System.Drawing.Size(641, 644);
            this.gcMain.TabIndex = 6;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -71,7 +70,6 @@
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 60;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -90,7 +88,6 @@
            // 
            // gv_depotCode
            // 
            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotCode.Caption = "打印机编号";
            this.gv_depotCode.FieldName = "printNo";
@@ -104,7 +101,6 @@
            // 
            // gv_depottype
            // 
            this.gv_depottype.AppearanceCell.Options.UseFont = true;
            this.gv_depottype.Caption = "打印机IP";
            this.gv_depottype.FieldName = "ip";
@@ -118,7 +114,6 @@
            // 
            // gv_createBy
            // 
            this.gv_createBy.AppearanceCell.Options.UseFont = true;
            this.gv_createBy.Caption = "打印机端口";
            this.gv_createBy.FieldName = "port";
@@ -132,7 +127,6 @@
            // 
            // gv_isNg
            // 
            this.gv_isNg.AppearanceCell.Options.UseFont = true;
            this.gv_isNg.Caption = "打印机备注";
            this.gv_isNg.FieldName = "remark";
@@ -150,7 +144,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(700, 43);
            this.panelControl1.Size = new System.Drawing.Size(641, 43);
            this.panelControl1.TabIndex = 5;
            // 
            // btnIn
@@ -161,7 +155,7 @@
            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(604, 2);
            this.btnIn.Location = new System.Drawing.Point(545, 2);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(94, 39);
            this.btnIn.TabIndex = 4;
@@ -171,7 +165,7 @@
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(704, 691);
            this.ClientSize = new System.Drawing.Size(645, 691);
            this.Controls.Add(this.panelControl2);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs
@@ -2,7 +2,6 @@
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
@@ -10,7 +9,6 @@
{
    public partial class SelectPrint : DevExpress.XtraEditors.XtraForm
    {
        private readonly List<FilterEntity> _filterList = new List<FilterEntity>();
        private readonly string _webServiceName = "PrintInfoManager/";
        private string userGuid = "";
        /// <summary>
@@ -71,14 +69,13 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var _sbSqlWhere = "";
            var pgq = new PageQueryModel(curPage, 999999, "a.print_no", "asc",
                "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    _webServiceName + "GetListPage", json);
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {