From 014916bf6294dff044014cb7de4f0a334478cf72 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 25 八月 2025 11:00:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.resx | 120 +++++++
DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs | 5
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs | 555 ++++++++++++++++++++++++++++++++++
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs | 236 ++++++++++++++
5 files changed, 913 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
new file mode 100644
index 0000000..aa6267a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
@@ -0,0 +1,555 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm.Rpt
+{
+ partial class CPMX
+ {
+ /// <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.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.itemNo1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.itemName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridControl1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = 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.splitContainerControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+ this.splitContainerControl1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+ this.splitContainerControl1.Panel2.SuspendLayout();
+ this.splitContainerControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).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.splitContainerControl1);
+ 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;
+ //
+ // splitContainerControl1
+ //
+ this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainerControl1.Horizontal = false;
+ this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainerControl1.Name = "splitContainerControl1";
+ //
+ // splitContainerControl1.Panel1
+ //
+ this.splitContainerControl1.Panel1.Controls.Add(this.gcMain1);
+ this.splitContainerControl1.Panel1.Text = "Panel1";
+ //
+ // splitContainerControl1.Panel2
+ //
+ this.splitContainerControl1.Panel2.Controls.Add(this.gridControl1);
+ this.splitContainerControl1.Panel2.Text = "Panel2";
+ this.splitContainerControl1.Size = new System.Drawing.Size(1408, 635);
+ this.splitContainerControl1.SplitterPosition = 365;
+ this.splitContainerControl1.TabIndex = 5;
+ //
+ // 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, 365);
+ this.gcMain1.TabIndex = 3;
+ 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.gridColumn8,
+ this.itemNo1,
+ this.itemName,
+ this.itemModel,
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn6,
+ this.gridColumn7});
+ 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;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "宸ュ崟鍗曞彿";
+ this.gridColumn8.FieldName = "daa001";
+ this.gridColumn8.MinWidth = 30;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Tag = "daa001";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 0;
+ this.gridColumn8.Width = 112;
+ //
+ // itemNo1
+ //
+ this.itemNo1.Caption = "鐗╂枡缂栫爜";
+ this.itemNo1.FieldName = "itemNo";
+ this.itemNo1.MinWidth = 30;
+ this.itemNo1.Name = "itemNo1";
+ this.itemNo1.Tag = "itemNo";
+ this.itemNo1.Visible = true;
+ this.itemNo1.VisibleIndex = 1;
+ this.itemNo1.Width = 112;
+ //
+ // itemName
+ //
+ this.itemName.Caption = "鐗╂枡鍚嶇О";
+ this.itemName.FieldName = "itemName";
+ this.itemName.MinWidth = 30;
+ this.itemName.Name = "itemName";
+ this.itemName.Tag = "itemName";
+ this.itemName.Visible = true;
+ this.itemName.VisibleIndex = 2;
+ this.itemName.Width = 112;
+ //
+ // itemModel
+ //
+ this.itemModel.Caption = "瑙勬牸鍨嬪彿";
+ this.itemModel.FieldName = "itemModel";
+ this.itemModel.MinWidth = 30;
+ this.itemModel.Name = "itemModel";
+ this.itemModel.Tag = "itemModel";
+ this.itemModel.Visible = true;
+ this.itemModel.VisibleIndex = 3;
+ this.itemModel.Width = 112;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "瀹為檯寮�宸ユ棩鏈�";
+ this.gridColumn1.FieldName = "daa016";
+ this.gridColumn1.MinWidth = 30;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.Width = 112;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "瀹為檯瀹屽伐鏃ユ湡";
+ this.gridColumn2.FieldName = "daa017";
+ this.gridColumn2.MinWidth = 30;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 5;
+ this.gridColumn2.Width = 112;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "宸ュ崟鏁伴噺";
+ this.gridColumn3.FieldName = "daa008";
+ this.gridColumn3.MinWidth = 30;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.Width = 112;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "宸茬敓浜ф暟";
+ this.gridColumn4.FieldName = "quantity1";
+ this.gridColumn4.MinWidth = 30;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 7;
+ this.gridColumn4.Width = 112;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "绾垮埆";
+ this.gridColumn5.FieldName = "lineName";
+ this.gridColumn5.MinWidth = 30;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 8;
+ this.gridColumn5.Width = 112;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鍏ュ簱鏁伴噺";
+ this.gridColumn6.FieldName = "quantity2";
+ this.gridColumn6.MinWidth = 30;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.Width = 112;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鍏ュ簱杩涘害";
+ this.gridColumn7.FieldName = "quantity3";
+ this.gridColumn7.MinWidth = 30;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 10;
+ this.gridColumn7.Width = 112;
+ //
+ // gridControl1
+ //
+ this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+ this.gridControl1.Location = new System.Drawing.Point(0, 0);
+ this.gridControl1.MainView = this.gridView2;
+ this.gridControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.gridControl1.Name = "gridControl1";
+ this.gridControl1.Size = new System.Drawing.Size(1408, 255);
+ this.gridControl1.TabIndex = 4;
+ this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView2});
+ //
+ // gridView2
+ //
+ this.gridView2.Appearance.Row.Options.UseFont = true;
+ this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn9,
+ this.gridColumn20,
+ this.gridColumn21,
+ this.gridColumn22,
+ this.gridColumn10,
+ this.gridColumn11,
+ this.gridColumn12,
+ this.gridColumn13,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn16,
+ this.gridColumn17});
+ this.gridView2.DetailHeight = 428;
+ this.gridView2.GridControl = this.gridControl1;
+ this.gridView2.IndicatorWidth = 62;
+ this.gridView2.Name = "gridView2";
+ this.gridView2.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView2.OptionsView.ShowAutoFilterRow = true;
+ this.gridView2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "浜у搧鏉＄爜";
+ this.gridColumn9.FieldName = "itemBarcode";
+ this.gridColumn9.MinWidth = 30;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Tag = "daa001";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 0;
+ this.gridColumn9.Width = 112;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "浠撳簱缂栧彿";
+ this.gridColumn20.FieldName = "depotCode";
+ this.gridColumn20.MinWidth = 30;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 1;
+ this.gridColumn20.Width = 112;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "搴撲綅缂栧彿";
+ this.gridColumn21.FieldName = "depotSectionCode";
+ this.gridColumn21.MinWidth = 30;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 2;
+ this.gridColumn21.Width = 112;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "鏁伴噺";
+ this.gridColumn22.FieldName = "quantity";
+ this.gridColumn22.MinWidth = 30;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 3;
+ this.gridColumn22.Width = 112;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn10.FieldName = "itemNo";
+ this.gridColumn10.MinWidth = 30;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Tag = "itemNo";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 4;
+ this.gridColumn10.Width = 112;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn11.FieldName = "itemName";
+ this.gridColumn11.MinWidth = 30;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Tag = "itemName";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 5;
+ this.gridColumn11.Width = 112;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn12.FieldName = "itemModel";
+ this.gridColumn12.MinWidth = 30;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Tag = "itemModel";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 6;
+ this.gridColumn12.Width = 112;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鍏ュ簱鏃堕棿";
+ this.gridColumn13.FieldName = "rkDate";
+ this.gridColumn13.MinWidth = 30;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 7;
+ this.gridColumn13.Width = 112;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "妫�楠屾椂闂�";
+ this.gridColumn14.FieldName = "fcheckDate";
+ this.gridColumn14.MinWidth = 30;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 8;
+ this.gridColumn14.Width = 112;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鍏ュ簱鏃跺樊";
+ this.gridColumn15.FieldName = "diff1";
+ this.gridColumn15.MinWidth = 30;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 9;
+ this.gridColumn15.Width = 112;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "閫佹鏃堕棿";
+ this.gridColumn16.FieldName = "sjDate";
+ this.gridColumn16.MinWidth = 30;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 10;
+ this.gridColumn16.Width = 112;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "妫�楠屾椂宸�";
+ this.gridColumn17.FieldName = "diff2";
+ this.gridColumn17.MinWidth = 30;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 11;
+ this.gridColumn17.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;
+ //
+ // CPMX
+ //
+ 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 = "CPMX";
+ 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.splitContainerControl1.Panel1)).EndInit();
+ this.splitContainerControl1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+ this.splitContainerControl1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
+ this.splitContainerControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).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 UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn itemNo1;
+ private DevExpress.XtraGrid.Columns.GridColumn itemName;
+ private DevExpress.XtraGrid.Columns.GridColumn itemModel;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.GridControl gridControl1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
new file mode 100644
index 0000000..044a7df
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
@@ -0,0 +1,236 @@
+using DevExpress.Pdf.Native.BouncyCastle.Utilities.Collections;
+using DevExpress.Utils.DirectXPaint;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlTypes;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Rpt
+{
+ public partial class CPMX : DevExpress.XtraEditors.XtraForm
+ {
+ //鏉＄爜浜ゆ槗鏄庣粏
+ string _webServiceName = "FqcItemsManager/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+ public CPMX()
+ {
+ InitializeComponent();
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.getXmlConfig();
+
+ // 璁剧疆gridView1鍙傛暟锛屽苟娣诲姞琛岄�夋嫨浜嬩欢澶勭悊
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", null);
+
+ // 娣诲姞gridView1鐨勮閫夋嫨鍙樺寲浜嬩欢
+ gridView1.FocusedRowChanged += GridView1_FocusedRowChanged;
+
+ // 璁剧疆gridView2鍙傛暟
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
+
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ }
+
+ /// <summary>
+ /// gridView1琛岄�夋嫨鍙樺寲浜嬩欢澶勭悊
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void GridView1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
+ {
+ if (e.FocusedRowHandle >= 0)
+ {
+ // 鑾峰彇閫変腑琛岀殑宸ュ崟鍗曞彿
+ var dr = gridView1.GetDataRow(e.FocusedRowHandle);
+ if (dr != null)
+ {
+ string workOrderNo = dr["daa001"].ToString();
+ if (!string.IsNullOrEmpty(workOrderNo))
+ {
+ // 鏍规嵁宸ュ崟鍗曞彿鑾峰彇鏄庣粏鏁版嵁
+ getCPMXDetail(workOrderNo);
+ }
+ }
+ }
+ else
+ {
+ // 濡傛灉娌℃湁閫変腑琛岋紝娓呯┖gridView2
+ clearGridView2();
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁宸ュ崟鍗曞彿鑾峰彇鏄庣粏鏁版嵁
+ /// </summary>
+ /// <param name="workOrderNo">宸ュ崟鍗曞彿</param>
+ private void getCPMXDetail(string workOrderNo)
+ {
+ try
+ {
+ // 鏋勯�犺姹傚弬鏁�
+ var requestObj = new
+ {
+ daa001 = workOrderNo
+ };
+
+ string json = JsonConvert.SerializeObject(requestObj);
+
+ // 璋冪敤鍚庡彴鎺ュ彛鑾峰彇鏄庣粏鏁版嵁
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetCPMXDetail", json);
+ ReturnModel<dynamic> _rtn = UtilityHelper.ReturnToDynamic(strReturn);
+
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ JObject _job = JObject.Parse(strReturn);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gridControl1.BindingContext = new BindingContext();
+ gridControl1.DataSource = dt;
+ gridControl1.ForceInitialize();
+ gridView2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl1, gridView2);
+ }
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鑾峰彇鏄庣粏鏁版嵁澶辫触锛�" + _rtn.rtnMsg);
+ clearGridView2();
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鑾峰彇鏄庣粏鏁版嵁寮傚父锛�" + ex.Message);
+ clearGridView2();
+ }
+ }
+
+ /// <summary>
+ /// 娓呯┖gridView2
+ /// </summary>
+ private void clearGridView2()
+ {
+ gridControl1.DataSource = null;
+ UtilityHelper.SetDefaultTable(gridControl1, gridView2);
+ }
+
+ 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 + "GetCPMX", 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/Rpt/CPMX.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.resx
new file mode 100644
index 0000000..d58980a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.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/DevFrm/Rpt/ItemQL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
index 602f3a7..483bb3d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
@@ -286,7 +286,7 @@
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "ItemQL";
- this.Text = "鏉＄爜浜ゆ槗鏄庣粏";
+ this.Text = "鐗╂枡娆犳枡鎶ヨ〃";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
index c6b2a25..1df1b0d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.cs
@@ -21,10 +21,7 @@
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.SetGridViewParameter(gridView1, null, this, "", "", null);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
}, (value) =>
--
Gitblit v1.9.3