From f2728c4e25fdac9ba068ce50c20a6ce38c053a96 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 13 十二月 2025 14:36:55 +0800
Subject: [PATCH] 物料单位换算信息前端显示
---
DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.cs | 132 ++++++++++++
DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.Designer.cs | 391 +++++++++++++++++++++++++++++++++++
DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.resx | 120 ++++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
4 files changed, 652 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.Designer.cs
new file mode 100644
index 0000000..ea3ec86
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.Designer.cs
@@ -0,0 +1,391 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm
+{
+ partial class UnitMatrixing
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tiemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.convmol = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.convden = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.altUnits = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.valStates = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.remark1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.remark2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.remark3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.remark4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.remark5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.fumbrella = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.fsubsidiary = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.cjName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.syName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = "鏌ヨ";
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+ this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = null;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4);
+ this.split1.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Size = new System.Drawing.Size(1408, 698);
+ this.split1.SplitterPosition = 0;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.guid,
+ this.tiemNo,
+ this.convmol,
+ this.convden,
+ this.altUnits,
+ this.valStates,
+ this.remark1,
+ this.remark2,
+ this.remark3,
+ this.remark4,
+ this.remark5,
+ this.fumbrella,
+ this.fsubsidiary,
+ this.cjName,
+ this.syName});
+ this.gridView1.DetailHeight = 428;
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.IndicatorWidth = 62;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // guid
+ //
+ this.guid.Caption = "guid";
+ this.guid.FieldName = "guid";
+ this.guid.MinWidth = 30;
+ this.guid.Name = "guid";
+ this.guid.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Max, "AboutGuid", "MAX={0}")});
+ this.guid.Tag = "guid";
+ this.guid.Width = 112;
+ //
+ // tiemNo
+ //
+ this.tiemNo.Caption = "鐗╂枡缂栫爜";
+ this.tiemNo.FieldName = "tiemNo";
+ this.tiemNo.MinWidth = 30;
+ this.tiemNo.Name = "tiemNo";
+ this.tiemNo.Tag = "tiemNo";
+ this.tiemNo.Visible = true;
+ this.tiemNo.VisibleIndex = 0;
+ this.tiemNo.Width = 94;
+ //
+ // convmol
+ //
+ this.convmol.Caption = "鎹㈢畻鍒嗗瓙";
+ this.convmol.FieldName = "convmol";
+ this.convmol.MinWidth = 30;
+ this.convmol.Name = "convmol";
+ this.convmol.Tag = "convmol";
+ this.convmol.Visible = true;
+ this.convmol.VisibleIndex = 1;
+ this.convmol.Width = 112;
+ //
+ // convden
+ //
+ this.convden.Caption = "鎹㈢畻鍒嗘瘝";
+ this.convden.FieldName = "convden";
+ this.convden.MinWidth = 30;
+ this.convden.Name = "convden";
+ this.convden.Tag = "convden";
+ this.convden.Visible = true;
+ this.convden.VisibleIndex = 2;
+ this.convden.Width = 112;
+ //
+ // altUnits
+ //
+ this.altUnits.Caption = "鎹㈢畻鍗曚綅";
+ this.altUnits.FieldName = "altUnits";
+ this.altUnits.MinWidth = 30;
+ this.altUnits.Name = "altUnits";
+ this.altUnits.Tag = "altUnits";
+ this.altUnits.Visible = true;
+ this.altUnits.VisibleIndex = 3;
+ this.altUnits.Width = 112;
+ //
+ // valStates
+ //
+ this.valStates.Caption = "鏈夋晥鐮�";
+ this.valStates.FieldName = "valStates";
+ this.valStates.MinWidth = 30;
+ this.valStates.Name = "valStates";
+ this.valStates.Tag = "valStates";
+ this.valStates.Visible = true;
+ this.valStates.VisibleIndex = 4;
+ this.valStates.Width = 112;
+ //
+ // remark1
+ //
+ this.remark1.Caption = "remark1";
+ this.remark1.FieldName = "remark1";
+ this.remark1.MinWidth = 30;
+ this.remark1.Name = "remark1";
+ this.remark1.Tag = "remark1";
+ this.remark1.Visible = true;
+ this.remark1.VisibleIndex = 5;
+ this.remark1.Width = 112;
+ //
+ // remark2
+ //
+ this.remark2.Caption = "remark2";
+ this.remark2.FieldName = "remark2";
+ this.remark2.MinWidth = 30;
+ this.remark2.Name = "remark2";
+ this.remark2.Tag = "remark2";
+ this.remark2.Visible = true;
+ this.remark2.VisibleIndex = 6;
+ this.remark2.Width = 112;
+ //
+ // remark3
+ //
+ this.remark3.Caption = "remark3";
+ this.remark3.FieldName = "remark3";
+ this.remark3.MinWidth = 30;
+ this.remark3.Name = "remark3";
+ this.remark3.Tag = "remark3";
+ this.remark3.Visible = true;
+ this.remark3.VisibleIndex = 7;
+ this.remark3.Width = 112;
+ //
+ // remark4
+ //
+ this.remark4.Caption = "remark4";
+ this.remark4.FieldName = "remark4";
+ this.remark4.MinWidth = 30;
+ this.remark4.Name = "remark4";
+ this.remark4.Tag = "remark4";
+ this.remark4.Visible = true;
+ this.remark4.VisibleIndex = 8;
+ this.remark4.Width = 112;
+ //
+ // remark5
+ //
+ this.remark5.Caption = "remark5";
+ this.remark5.FieldName = "remark5";
+ this.remark5.MinWidth = 30;
+ this.remark5.Name = "remark5";
+ this.remark5.Tag = "remark5";
+ this.remark5.Visible = true;
+ this.remark5.VisibleIndex = 9;
+ this.remark5.Width = 112;
+ //
+ // fumbrella
+ //
+ this.fumbrella.Caption = "鍒涘缓缁勭粐缂栫爜";
+ this.fumbrella.FieldName = "fumbrella";
+ this.fumbrella.MinWidth = 30;
+ this.fumbrella.Name = "fumbrella";
+ this.fumbrella.Tag = "fumbrella";
+ this.fumbrella.Visible = true;
+ this.fumbrella.VisibleIndex = 10;
+ this.fumbrella.Width = 112;
+ //
+ // fsubsidiary
+ //
+ this.fsubsidiary.Caption = "浣跨敤缁勭粐缂栫爜";
+ this.fsubsidiary.FieldName = "fsubsidiary";
+ this.fsubsidiary.MinWidth = 30;
+ this.fsubsidiary.Name = "fsubsidiary";
+ this.fsubsidiary.Tag = "fsubsidiary";
+ this.fsubsidiary.Visible = true;
+ this.fsubsidiary.VisibleIndex = 11;
+ this.fsubsidiary.Width = 112;
+ //
+ // cjName
+ //
+ this.cjName.Caption = "鍒涘缓缁勭粐";
+ this.cjName.FieldName = "cjName";
+ this.cjName.MinWidth = 30;
+ this.cjName.Name = "cjName";
+ this.cjName.Tag = "cjName";
+ this.cjName.Visible = true;
+ this.cjName.VisibleIndex = 12;
+ this.cjName.Width = 112;
+ //
+ // syName
+ //
+ this.syName.Caption = "浣跨敤缁勭粐";
+ this.syName.FieldName = "syName";
+ this.syName.MinWidth = 30;
+ this.syName.Name = "syName";
+ this.syName.Tag = "syName";
+ this.syName.Visible = true;
+ this.syName.VisibleIndex = 13;
+ this.syName.Width = 112;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // UnitMatrixing
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Margin = new System.Windows.Forms.Padding(4);
+ this.Name = "UnitMatrixing";
+ this.Text = "鐗╂枡鍗曚綅鎹㈢畻淇℃伅";
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private UserControl.UcToolBarMenu toolBarMenu1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraGrid.Columns.GridColumn guid;
+ private DevExpress.XtraGrid.Columns.GridColumn tiemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn convmol;
+ private DevExpress.XtraGrid.Columns.GridColumn convden;
+ private DevExpress.XtraGrid.Columns.GridColumn altUnits;
+ private DevExpress.XtraGrid.Columns.GridColumn valStates;
+ private DevExpress.XtraGrid.Columns.GridColumn remark1;
+ private DevExpress.XtraGrid.Columns.GridColumn remark2;
+ private DevExpress.XtraGrid.Columns.GridColumn remark3;
+ private DevExpress.XtraGrid.Columns.GridColumn remark4;
+ private DevExpress.XtraGrid.Columns.GridColumn remark5;
+ private DevExpress.XtraGrid.Columns.GridColumn fumbrella;
+ private DevExpress.XtraGrid.Columns.GridColumn fsubsidiary;
+ private DevExpress.XtraGrid.Columns.GridColumn cjName;
+ private DevExpress.XtraGrid.Columns.GridColumn syName;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.cs
new file mode 100644
index 0000000..9c57cf1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.cs
@@ -0,0 +1,132 @@
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm
+{
+ public partial class UnitMatrixing : DevExpress.XtraEditors.XtraForm
+ {
+ //鐗╂枡鍗曚綅鎹㈢畻淇℃伅
+ string _webServiceName = "UnitMatrixing/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+ public UnitMatrixing()
+ {
+ InitializeComponent();
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
+ {
+
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ }
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ await Task.Delay(100);
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain1.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.resx
new file mode 100644
index 0000000..d58980a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/UnitMatrixing.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 2ce27a1..19c2ae9 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -257,6 +257,12 @@
<Compile Include="DevFrm\BasicData\Frm_SupplierSrm.Designer.cs">
<DependentUpon>Frm_SupplierSrm.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\BasicData\UnitMatrixing.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\BasicData\UnitMatrixing.Designer.cs">
+ <DependentUpon>UnitMatrixing.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Ck\Frm_MesCgthSq.cs">
<SubType>Form</SubType>
</Compile>
@@ -1777,6 +1783,9 @@
<EmbeddedResource Include="DevFrm\BasicData\Frm_SupplierSrm.resx">
<DependentUpon>Frm_SupplierSrm.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\BasicData\UnitMatrixing.resx">
+ <DependentUpon>UnitMatrixing.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Ck\Frm_MesCgthSq.resx">
<DependentUpon>Frm_MesCgthSq.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3