From 35fde503a1a23dc990efc54a9eb6ddd5e8c133d6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 07 四月 2025 09:44:01 +0800
Subject: [PATCH] pda绑定
---
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs | 3 -
DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs | 8 ---
DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs | 17 ++------
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs | 6 +--
DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.Designer.cs | 16 ++-----
DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs | 7 +--
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs | 6 +-
7 files changed, 19 insertions(+), 44 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
index 8ba3409..e810bbd 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
+++ b/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";
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
index dab3da3..7cf4434 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
@@ -1,6 +1,4 @@
-锘縰sing DevExpress.Utils.DirectXPaint;
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraGrid.Views.Base.ViewInfo;
+锘縰sing 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);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs
index 24b4159..666df3d 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.Designer.cs
+++ b/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;
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs
index a0d1a81..ef22dc4 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs
+++ b/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);
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
index 27053e0..c1b4e37 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs
@@ -1,9 +1,7 @@
-锘縰sing DevExpress.XtraGrid.Views.Base;
-using Gs.DevApp.Entity;
+锘縰sing 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);
}
}
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.Designer.cs
index 4e2a650..29d34da 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.Designer.cs
+++ b/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 = "鎵撳嵃鏈篒P";
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;
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs
index f8194ef..c924be3 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs
+++ b/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)
{
--
Gitblit v1.9.3