From 03f58ebd3b16db1a1bfcb69f7557e3a9b39ba521 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 22 八月 2025 15:24:55 +0800
Subject: [PATCH] 数据过滤
---
DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.Designer.cs | 44 +------
DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.cs | 12 -
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs | 94 ++++++++-------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 3
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx | 21 +++
DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.resx | 120 ++++++++++++++++++++
DevApp/Gs.DevApp/Program.cs | 4
8 files changed, 210 insertions(+), 92 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index c3e7bad..ef10272 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -36,9 +36,9 @@
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://localhost:5263/" />
<!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
index 5204eaf..f985c23 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
@@ -52,6 +52,11 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -60,11 +65,6 @@
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -75,6 +75,11 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -98,6 +103,8 @@
this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -149,8 +156,6 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptDel3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -165,6 +170,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -207,7 +213,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptDel3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).BeginInit();
this.SuspendLayout();
//
// isLocked
@@ -236,7 +241,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = "rpt_User{}";
- this.toolBarMenu1.Size = new System.Drawing.Size(1004, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1137, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -247,7 +252,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1004, 681);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1137, 681);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -257,7 +262,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1002, 649);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1135, 649);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -278,7 +283,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1002, 649);
+ this.split1.Size = new System.Drawing.Size(1135, 649);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -294,7 +299,7 @@
this.repositoryItemButtonEdit4,
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit5});
- this.gcMain1.Size = new System.Drawing.Size(1002, 598);
+ this.gcMain1.Size = new System.Drawing.Size(1135, 598);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -522,6 +527,27 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "缁戝畾缁勭粐";
+ this.gridColumn15.ColumnEdit = this.repositoryItemButtonEdit5;
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 13;
+ this.gridColumn15.Width = 94;
+ //
+ // repositoryItemButtonEdit5
+ //
+ this.repositoryItemButtonEdit5.AutoHeight = false;
+ editorButtonImageOptions5.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions5.Image")));
+ editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "缁戝畾缁勭粐", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit5.Name = "repositoryItemButtonEdit5";
+ this.repositoryItemButtonEdit5.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit5.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit5_ButtonClick);
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -530,7 +556,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1002, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1135, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -919,10 +945,10 @@
// rptDel1
//
this.rptDel1.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptDel1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDel1.Name = "rptDel1";
this.rptDel1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptDel1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel1_ButtonClick);
@@ -993,10 +1019,10 @@
// rptDel2
//
this.rptDel2.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptDel2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDel2.Name = "rptDel2";
this.rptDel2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptDel2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel2_ButtonClick);
@@ -1085,37 +1111,19 @@
// rptDel3
//
this.rptDel3.AutoHeight = false;
- editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptDel3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDel3.Name = "rptDel3";
this.rptDel3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptDel3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel3_ButtonClick);
- //
- // gridColumn15
- //
- this.gridColumn15.Caption = "缁戝畾缁勭粐";
- this.gridColumn15.ColumnEdit = this.repositoryItemButtonEdit5;
- this.gridColumn15.MinWidth = 25;
- this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 13;
- this.gridColumn15.Width = 94;
- //
- // repositoryItemButtonEdit5
- //
- this.repositoryItemButtonEdit5.AutoHeight = false;
- this.repositoryItemButtonEdit5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton()});
- this.repositoryItemButtonEdit5.Name = "repositoryItemButtonEdit5";
- this.repositoryItemButtonEdit5.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit5_ButtonClick);
//
// Frm_UserBind
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1004, 761);
+ this.ClientSize = new System.Drawing.Size(1137, 761);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_UserBind";
@@ -1134,6 +1142,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -1176,7 +1185,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptDel3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx
index 2f358ef..c1ded0f 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx
@@ -134,6 +134,27 @@
MEydvcbteFa99V+ABXdQSCohcca8C6Wy1PuwVPonaP4C++yEHJDPge4AAAAASUVORK5CYII=
</value>
</data>
+ <data name="editorButtonImageOptions5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAARdEVYdFRpdGxlAERlcGFydG1lbnQ7lyqdwQAAA2ZJ
+ REFUOE91km9Mk1cUh69zS+YnE/fHGQeIEdFhdZU6pFjbWjqBQoVSi7YzQLW2iC+MwguFqlQDCE4+KBZT
+ QLBoJUGMUDZxMeIG0sqsNUBiGgRaB8uymGxOZ6Yj9rdrsxG2bCd5zqd7nnN+ySUAiNeRRO6cSxR9c0Zk
+ +/qLhED3sbjApTKurSWfIzqVEx1683+EmvucRDTWWzY+PdKD509+xG8/3cKDnlxcrVg3fjxzpejfQ/MJ
+ tdu2bc6xL0vh6cxH38lEdB2Ow9VDH+ESEwmjZFkfIWQ5ZRVlBeVdytuUBXOCO62Jv8/cz8YvAS3+eKzB
+ y0dyzPQL8FXdWny+PWy2Ometq1Ef8+SkOurnIuny61kfv6OhgkWvJSGB58KnwvbSTbPui3r0VAlwkY2F
+ 7QAPxrTIV302w7PJ4St49ngIv/qPw9PChzU3cka5ZnEGFSycy2KSRfWPDFzDdH8lHnYXoJmVoImNfT7S
+ XYLhjjw4awToKNuAy6XRsOvCoI9dcoMK3iSfFdeT3YW1xCiLYZsqcuBymHG9bgdY+RoM2ra9mr5Ho/lz
+ aTQ1Xgbk+OGWALcbYlDEf/8FFbxBHvqnSRZTrd7DHHu6V50Nk2pLsFQZH9yRnA5VZtKLtmJecMiuwxVL
+ AtoKuWhleChPjpjNi39PSgWE7C6oNVQ1ODDmm0Q22wy3ZxT9Q8MQqI6iscUOQ/IGzI/mrEnDQVH4AB1d
+ EBIcONQwSq+AbzKAzLzT+O7+GL513wUvrRxN5x0wandifrRazXrohStMcrmcpKSkEMJUnsH41Peoszmx
+ z9SEXQWnkaqtwVZFCRSaPBQVMrAkRKFCxQ+alHFBdmM4dqmUT2Uymbqrq4uQvWw9fBMB6MqbUdXmgblx
+ APsrO5BrKIbVaoXP50M1ZxU8Hg8GBwfBrvwQTqcTDMNAKpUaSLruyE1ZTjm2KA8jLr0CXBkLrmQfzGYz
+ /H4/JiYmcCQ6Al6vFy6XCwVhS9Hb24vOzk5kZGSMzv2Dv6H1llAoTLdYLJiamoIzX4d20Wa0JsTCumkd
+ TnCicCJJAofDAYVC8c/hvwQL+Xx+vMlkCm1vF8fDq9NgIEuOnu1b0bqZCyO9wm63IzU19T8Fr2uxVqt1
+ U+hmHs5+wkE9ZzWOro5ASfgH0C9dArFYTBHf/BPybEZrsHkQGgAAAABJRU5ErkJggg==
+</value>
+ </data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.Designer.cs
index 6a1a841..857acf9 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.Designer.cs
@@ -34,8 +34,6 @@
this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_depotCode = 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.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
@@ -76,9 +74,7 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.colChkInt,
this.gv_depotCode,
- this.gv_depottype,
- this.gv_createBy,
- this.gv_isNg});
+ this.gv_depottype});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -99,8 +95,8 @@
// gv_depotCode
//
this.gv_depotCode.AppearanceCell.Options.UseFont = true;
- this.gv_depotCode.Caption = "绾夸綋缂栧彿";
- this.gv_depotCode.FieldName = "lineNo";
+ this.gv_depotCode.Caption = "缁勭粐缂栧彿";
+ this.gv_depotCode.FieldName = "fNumber";
this.gv_depotCode.MinWidth = 50;
this.gv_depotCode.Name = "gv_depotCode";
this.gv_depotCode.OptionsColumn.AllowEdit = false;
@@ -112,7 +108,7 @@
// gv_depottype
//
this.gv_depottype.AppearanceCell.Options.UseFont = true;
- this.gv_depottype.Caption = "绾夸綋鍚嶇О";
+ this.gv_depottype.Caption = "缁勭粐鍚嶇О";
this.gv_depottype.FieldName = "name";
this.gv_depottype.MinWidth = 50;
this.gv_depottype.Name = "gv_depottype";
@@ -121,32 +117,6 @@
this.gv_depottype.Visible = true;
this.gv_depottype.VisibleIndex = 2;
this.gv_depottype.Width = 80;
- //
- // gv_createBy
- //
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "绾夸綋澶囨敞";
- this.gv_createBy.FieldName = "remark";
- 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 = 3;
- this.gv_createBy.Width = 71;
- //
- // gv_isNg
- //
- this.gv_isNg.AppearanceCell.Options.UseFont = true;
- this.gv_isNg.Caption = "鎵撳嵃鏈哄娉�";
- this.gv_isNg.FieldName = "remark";
- 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 = 4;
- this.gv_isNg.Width = 100;
//
// panelControl1
//
@@ -171,7 +141,7 @@
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾淇濆瓨";
//
- // SelectLine
+ // SelectZZ
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -180,7 +150,7 @@
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "SelectLine";
+ this.Name = "SelectZZ";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "閫夋嫨绾夸綋";
this.TopMost = true;
@@ -201,8 +171,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
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 colChkInt;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.cs
index 2e07e23..7a52b8b 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.cs
@@ -16,14 +16,12 @@
{
public partial class SelectZZ : DevExpress.XtraEditors.XtraForm
{
- private readonly string _webServiceName = "MesWorkshopLineManager/";
+ private readonly string _webServiceName = "Organization/";
private string userGuid = "";
/// <summary>
///
/// </summary>
- /// <param name="_suppId">渚涘簲鍟�</param>
- /// <param name="_receiveOrgId">鏀舵枡缁勭粐</param>
- /// <param name="_isWw">鏄惁濮斿</param>
+ /// <param name="_userGuid"></param>
public SelectZZ(string _userGuid)
{
InitializeComponent();
@@ -46,7 +44,7 @@
foreach (DataRow dr in dt.Rows)
{
string checkBox = dr["chkInt"].ToString();
- string _guid = dr["guid"].ToString();
+ string _guid = dr["fid"].ToString();
if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
{
if (sbList.Length > 0)
@@ -59,7 +57,7 @@
{
userGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(userGuid),
bindGuidslist = sbList.ToString(),
- fType = "杩囩珯鏃剁粦瀹氱嚎浣�",
+ fType = "缁勭粐",
};
try
{
@@ -90,7 +88,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = "";
- var pgq = new PageQueryModel(curPage, 999999, "a.line_no", "asc", "", _sbSqlWhere.ToString(), userGuid);
+ var pgq = new PageQueryModel(curPage, 999999, "a.FNumber", "asc", "", _sbSqlWhere.ToString(), userGuid);
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.resx b/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectZZ.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 59816a1..75e413e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1726,6 +1726,9 @@
<EmbeddedResource Include="DevFrm\PDA\SelectUser.resx">
<DependentUpon>SelectUser.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\PDA\SelectZZ.resx">
+ <DependentUpon>SelectZZ.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\DefectCode.resx">
<DependentUpon>DefectCode.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 32c3409..213b64e 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -51,8 +51,8 @@
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
{
- Application.Run(new DevFrm.User.SysMenu());
- return;
+ //Application.Run(new DevFrm.User.SysMenu());
+ //return;
Application.Run(new FrmMain());
}
}
--
Gitblit v1.9.3