From a92916c2c69e95bb8da9c9a0f6f3e124c0e76f48 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 17 三月 2025 13:42:06 +0800
Subject: [PATCH] 报表
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 24
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 15
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.resx | 120 ++++++
DevApp/Gs.DevApp/DevFrm/Rpt/CK.cs | 33 +
DevApp/Gs.DevApp/DevFrm/Rpt/CK.resx | 120 ++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 13
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs | 130 +++++++
DevApp/Gs.DevApp/Program.cs | 2
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs | 569 +++++++++++++++++++++++++++++++
DevApp/Gs.DevApp/Properties/licenses.licx | 5
DevApp/Gs.DevApp/DevFrm/Rpt/CK.Designer.cs | 5
11 files changed, 1,023 insertions(+), 13 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CK.Designer.cs
index d1d2681..0ce6aec 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CK.Designer.cs
@@ -46,12 +46,12 @@
this.splitMx1.Location = new System.Drawing.Point(0, 0);
this.splitMx1.Name = "splitMx1";
//
- // splitMx1.splitMx1_Panel1
+ // splitMx1.Panel1
//
this.splitMx1.Panel1.Controls.Add(this.flowLayoutPanel1);
this.splitMx1.Panel1.Text = "Panel1";
//
- // splitMx1.splitMx1_Panel2
+ // splitMx1.Panel2
//
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(924, 567);
@@ -78,6 +78,7 @@
this.simpleButton2.Size = new System.Drawing.Size(145, 128);
this.simpleButton2.TabIndex = 1;
this.simpleButton2.Text = "鏉＄爜搴撳瓨鏄庣粏琛�";
+ this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
//
// CK
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CK.cs
index ac3f283..329e59d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CK.cs
@@ -1,10 +1,12 @@
锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
+using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -17,5 +19,36 @@
{
InitializeComponent();
}
+
+ private void simpleButton2_Click(object sender, EventArgs e)
+ {
+ openFrm("CKTmkc", "Gs.DevApp.DevFrm.CKTmkc");
+ }
+
+ /// <summary>
+ /// 鎵撳紑绐椾綋
+ /// </summary>
+ /// <param name="frmName"></param>
+ /// <param name="asm"></param>
+ private void openFrm(string frmName, string asm)
+ {
+ Form _frm = Application.OpenForms[frmName]; //鏌ユ壘鏄惁鎵撳紑杩囩獥浣�
+ if ((_frm == null) || (_frm.IsDisposed)) //濡傛灉娌℃湁鎵撳紑杩�
+ {
+ var newForm = (Form)Assembly.GetExecutingAssembly()
+ .CreateInstance(asm);
+ if (newForm == null)
+ {
+ MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
+ return;
+ }
+ newForm.Show();
+ }
+ else
+ {
+ _frm.Activate();
+ _frm.WindowState = FormWindowState.Normal;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CK.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/CK.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CK.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/CKTmkc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
new file mode 100644
index 0000000..5dc1a1c
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
@@ -0,0 +1,569 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm
+{
+ partial class CKTmkc
+ {
+ /// <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.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_stockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_iqcStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemType = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotSectionsId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotsId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // gv_indepUserCode
+ //
+ this.gv_indepUserCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
+ this.gv_indepUserCode.Caption = "鍏ュ簱浜虹紪鐮� ";
+ this.gv_indepUserCode.FieldName = "indepUserCode";
+ this.gv_indepUserCode.MinWidth = 50;
+ this.gv_indepUserCode.Name = "gv_indepUserCode";
+ this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
+ this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
+ this.gv_indepUserCode.Visible = true;
+ this.gv_indepUserCode.VisibleIndex = 36;
+ this.gv_indepUserCode.Width = 94;
+ //
+ // gv_stockOrgId
+ //
+ this.gv_stockOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_stockOrgId.AppearanceCell.Options.UseFont = true;
+ this.gv_stockOrgId.Caption = "搴撳瓨缁勭粐id ";
+ this.gv_stockOrgId.FieldName = "stockOrgId";
+ this.gv_stockOrgId.MinWidth = 50;
+ this.gv_stockOrgId.Name = "gv_stockOrgId";
+ this.gv_stockOrgId.OptionsColumn.AllowEdit = false;
+ this.gv_stockOrgId.Tag = "query_a.Stock_Org_Id";
+ this.gv_stockOrgId.Visible = true;
+ this.gv_stockOrgId.VisibleIndex = 35;
+ this.gv_stockOrgId.Width = 94;
+ //
+ // gv_ownerType
+ //
+ this.gv_ownerType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_ownerType.AppearanceCell.Options.UseFont = true;
+ this.gv_ownerType.Caption = "璐т富绫诲瀷(BD_OwnerOrg 缁勭粐,BD_Supplier 渚涘簲鍟�,BD_Customer 瀹㈡埛) ";
+ this.gv_ownerType.FieldName = "ownerType";
+ this.gv_ownerType.MinWidth = 50;
+ this.gv_ownerType.Name = "gv_ownerType";
+ this.gv_ownerType.OptionsColumn.AllowEdit = false;
+ this.gv_ownerType.Tag = "query_a.Owner_Type";
+ this.gv_ownerType.Visible = true;
+ this.gv_ownerType.VisibleIndex = 34;
+ this.gv_ownerType.Width = 94;
+ //
+ // gv_ownerId
+ //
+ this.gv_ownerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_ownerId.AppearanceCell.Options.UseFont = true;
+ this.gv_ownerId.Caption = "璐т富id ";
+ this.gv_ownerId.FieldName = "ownerId";
+ this.gv_ownerId.MinWidth = 50;
+ this.gv_ownerId.Name = "gv_ownerId";
+ this.gv_ownerId.OptionsColumn.AllowEdit = false;
+ this.gv_ownerId.Tag = "query_a.Owner_Id";
+ this.gv_ownerId.Visible = true;
+ this.gv_ownerId.VisibleIndex = 33;
+ this.gv_ownerId.Width = 94;
+ //
+ // gv_depotId
+ //
+ this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotId.AppearanceCell.Options.UseFont = true;
+ this.gv_depotId.Caption = "浠撳簱ID ";
+ this.gv_depotId.FieldName = "depotId";
+ this.gv_depotId.MinWidth = 50;
+ this.gv_depotId.Name = "gv_depotId";
+ this.gv_depotId.OptionsColumn.AllowEdit = false;
+ this.gv_depotId.Tag = "query_a.DEPOT_ID";
+ this.gv_depotId.Visible = true;
+ this.gv_depotId.VisibleIndex = 32;
+ this.gv_depotId.Width = 94;
+ //
+ // gv_suppId
+ //
+ this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_suppId.AppearanceCell.Options.UseFont = true;
+ this.gv_suppId.Caption = "渚涘簲鍟唅d ";
+ this.gv_suppId.FieldName = "suppId";
+ this.gv_suppId.MinWidth = 50;
+ this.gv_suppId.Name = "gv_suppId";
+ this.gv_suppId.OptionsColumn.AllowEdit = false;
+ this.gv_suppId.Tag = "query_a.SUPP_ID";
+ this.gv_suppId.Visible = true;
+ this.gv_suppId.VisibleIndex = 31;
+ this.gv_suppId.Width = 94;
+ //
+ // gv_itemId
+ //
+ this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemId.AppearanceCell.Options.UseFont = true;
+ this.gv_itemId.Caption = "鐗╂枡ID ";
+ this.gv_itemId.FieldName = "itemId";
+ this.gv_itemId.MinWidth = 50;
+ this.gv_itemId.Name = "gv_itemId";
+ this.gv_itemId.OptionsColumn.AllowEdit = false;
+ this.gv_itemId.Tag = "query_a.ITEM_ID";
+ this.gv_itemId.Visible = true;
+ this.gv_itemId.VisibleIndex = 30;
+ this.gv_itemId.Width = 94;
+ //
+ // gv_lineK3id
+ //
+ this.gv_lineK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lineK3id.AppearanceCell.Options.UseFont = true;
+ this.gv_lineK3id.Caption = "琛孠3ID ";
+ this.gv_lineK3id.FieldName = "lineK3id";
+ this.gv_lineK3id.MinWidth = 50;
+ this.gv_lineK3id.Name = "gv_lineK3id";
+ this.gv_lineK3id.OptionsColumn.AllowEdit = false;
+ this.gv_lineK3id.Tag = "query_a.LINE_K3ID";
+ this.gv_lineK3id.Visible = true;
+ this.gv_lineK3id.VisibleIndex = 29;
+ this.gv_lineK3id.Width = 94;
+ //
+ // gv_ebelnK3id
+ //
+ this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
+ this.gv_ebelnK3id.Caption = "K3ID ";
+ this.gv_ebelnK3id.FieldName = "ebelnK3id";
+ this.gv_ebelnK3id.MinWidth = 50;
+ this.gv_ebelnK3id.Name = "gv_ebelnK3id";
+ this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
+ this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
+ this.gv_ebelnK3id.Visible = true;
+ this.gv_ebelnK3id.VisibleIndex = 28;
+ this.gv_ebelnK3id.Width = 94;
+ //
+ // gv_billNo
+ //
+ this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_billNo.AppearanceCell.Options.UseFont = true;
+ this.gv_billNo.Caption = "鍗曟嵁缂栧彿 ";
+ this.gv_billNo.FieldName = "billNo";
+ this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.Name = "gv_billNo";
+ this.gv_billNo.OptionsColumn.AllowEdit = false;
+ this.gv_billNo.Tag = "query_a.BILL_NO";
+ this.gv_billNo.Visible = true;
+ this.gv_billNo.VisibleIndex = 27;
+ this.gv_billNo.Width = 94;
+ //
+ // gv_lineNo
+ //
+ this.gv_lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lineNo.AppearanceCell.Options.UseFont = true;
+ this.gv_lineNo.Caption = "琛屽彿 ";
+ this.gv_lineNo.FieldName = "lineNo";
+ this.gv_lineNo.MinWidth = 50;
+ this.gv_lineNo.Name = "gv_lineNo";
+ this.gv_lineNo.OptionsColumn.AllowEdit = false;
+ this.gv_lineNo.Tag = "query_a.LINE_NO";
+ this.gv_lineNo.Visible = true;
+ this.gv_lineNo.VisibleIndex = 26;
+ this.gv_lineNo.Width = 94;
+ //
+ // gv_suppNo
+ //
+ this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_suppNo.AppearanceCell.Options.UseFont = true;
+ this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮� ";
+ this.gv_suppNo.FieldName = "suppNo";
+ this.gv_suppNo.MinWidth = 50;
+ this.gv_suppNo.Name = "gv_suppNo";
+ this.gv_suppNo.OptionsColumn.AllowEdit = false;
+ this.gv_suppNo.Tag = "query_a.SUPP_NO";
+ this.gv_suppNo.Visible = true;
+ this.gv_suppNo.VisibleIndex = 25;
+ this.gv_suppNo.Width = 94;
+ //
+ // gv_iqcStatus
+ //
+ this.gv_iqcStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_iqcStatus.AppearanceCell.Options.UseFont = true;
+ this.gv_iqcStatus.Caption = "璐ㄩ噺鐘舵�� ";
+ this.gv_iqcStatus.FieldName = "iqcStatus";
+ this.gv_iqcStatus.MinWidth = 50;
+ this.gv_iqcStatus.Name = "gv_iqcStatus";
+ this.gv_iqcStatus.OptionsColumn.AllowEdit = false;
+ this.gv_iqcStatus.Tag = "query_a.IQC_STATUS";
+ this.gv_iqcStatus.Visible = true;
+ this.gv_iqcStatus.VisibleIndex = 17;
+ this.gv_iqcStatus.Width = 94;
+ //
+ // gv_indepDate
+ //
+ this.gv_indepDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_indepDate.AppearanceCell.Options.UseFont = true;
+ this.gv_indepDate.Caption = "鍏ュ簱鏃ユ湡 ";
+ this.gv_indepDate.FieldName = "indepDate";
+ this.gv_indepDate.MinWidth = 50;
+ this.gv_indepDate.Name = "gv_indepDate";
+ this.gv_indepDate.OptionsColumn.AllowEdit = false;
+ this.gv_indepDate.Tag = "query_a.INDEP_DATE";
+ this.gv_indepDate.Visible = true;
+ this.gv_indepDate.VisibleIndex = 14;
+ this.gv_indepDate.Width = 94;
+ //
+ // gv_itemType
+ //
+ this.gv_itemType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemType.AppearanceCell.Options.UseFont = true;
+ this.gv_itemType.Caption = "0 鐗╂枡 1 鍗婃垚鍝� 2 鎴愬搧 ";
+ this.gv_itemType.FieldName = "itemType";
+ this.gv_itemType.MinWidth = 50;
+ this.gv_itemType.Name = "gv_itemType";
+ this.gv_itemType.OptionsColumn.AllowEdit = false;
+ this.gv_itemType.Tag = "query_a.ITEM_TYPE";
+ this.gv_itemType.Visible = true;
+ this.gv_itemType.VisibleIndex = 13;
+ this.gv_itemType.Width = 94;
+ //
+ // gv_checkDate
+ //
+ this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+ this.gv_checkDate.Caption = "妫�楠屾棩鏈� ";
+ this.gv_checkDate.FieldName = "checkDate";
+ this.gv_checkDate.MinWidth = 50;
+ this.gv_checkDate.Name = "gv_checkDate";
+ this.gv_checkDate.OptionsColumn.AllowEdit = false;
+ this.gv_checkDate.Tag = "query_a.CHECK_DATE";
+ this.gv_checkDate.Visible = true;
+ this.gv_checkDate.VisibleIndex = 12;
+ this.gv_checkDate.Width = 94;
+ //
+ // gv_depotSectionsCode
+ //
+ this.gv_depotSectionsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
+ this.gv_depotSectionsCode.Caption = "璐т綅CODE ";
+ this.gv_depotSectionsCode.FieldName = "depotSectionsCode";
+ this.gv_depotSectionsCode.MinWidth = 50;
+ this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
+ this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
+ this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
+ this.gv_depotSectionsCode.Visible = true;
+ this.gv_depotSectionsCode.VisibleIndex = 11;
+ this.gv_depotSectionsCode.Width = 94;
+ //
+ // gv_depotsCode
+ //
+ this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
+ this.gv_depotsCode.Caption = "瀛愬簱CODE ";
+ this.gv_depotsCode.FieldName = "depotsCode";
+ this.gv_depotsCode.MinWidth = 50;
+ this.gv_depotsCode.Name = "gv_depotsCode";
+ this.gv_depotsCode.OptionsColumn.AllowEdit = false;
+ this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE";
+ this.gv_depotsCode.Visible = true;
+ this.gv_depotsCode.VisibleIndex = 10;
+ this.gv_depotsCode.Width = 94;
+ //
+ // gv_quantity
+ //
+ this.gv_quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_quantity.AppearanceCell.Options.UseFont = true;
+ this.gv_quantity.Caption = "鏁伴噺 ";
+ this.gv_quantity.FieldName = "quantity";
+ this.gv_quantity.MinWidth = 50;
+ this.gv_quantity.Name = "gv_quantity";
+ this.gv_quantity.OptionsColumn.AllowEdit = false;
+ this.gv_quantity.Tag = "query_a.QUANTITY";
+ this.gv_quantity.Visible = true;
+ this.gv_quantity.VisibleIndex = 6;
+ this.gv_quantity.Width = 94;
+ //
+ // gv_lotNo
+ //
+ this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lotNo.AppearanceCell.Options.UseFont = true;
+ this.gv_lotNo.Caption = "鍘傚鎵规 ";
+ this.gv_lotNo.FieldName = "lotNo";
+ this.gv_lotNo.MinWidth = 50;
+ this.gv_lotNo.Name = "gv_lotNo";
+ this.gv_lotNo.OptionsColumn.AllowEdit = false;
+ this.gv_lotNo.Tag = "query_a.LOT_NO";
+ this.gv_lotNo.Visible = true;
+ this.gv_lotNo.VisibleIndex = 5;
+ this.gv_lotNo.Width = 94;
+ //
+ // gv_depotSectionsId
+ //
+ this.gv_depotSectionsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotSectionsId.AppearanceCell.Options.UseFont = true;
+ this.gv_depotSectionsId.Caption = "璐т綅id ";
+ this.gv_depotSectionsId.FieldName = "depotSectionsId";
+ this.gv_depotSectionsId.MinWidth = 50;
+ this.gv_depotSectionsId.Name = "gv_depotSectionsId";
+ this.gv_depotSectionsId.OptionsColumn.AllowEdit = false;
+ this.gv_depotSectionsId.Tag = "query_a.DEPOT_SECTIONS_ID";
+ this.gv_depotSectionsId.Visible = true;
+ this.gv_depotSectionsId.VisibleIndex = 4;
+ this.gv_depotSectionsId.Width = 94;
+ //
+ // gv_depotsId
+ //
+ this.gv_depotsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_depotsId.AppearanceCell.Options.UseFont = true;
+ this.gv_depotsId.Caption = "瀛愬簱id(涓�鑸笉瀛樻暟鎹�) ";
+ this.gv_depotsId.FieldName = "depotsId";
+ this.gv_depotsId.MinWidth = 50;
+ this.gv_depotsId.Name = "gv_depotsId";
+ this.gv_depotsId.OptionsColumn.AllowEdit = false;
+ this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
+ this.gv_depotsId.Visible = true;
+ this.gv_depotsId.VisibleIndex = 3;
+ this.gv_depotsId.Width = 94;
+ //
+ // gv_itemNo
+ //
+ this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemNo.AppearanceCell.Options.UseFont = true;
+ this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
+ this.gv_itemNo.FieldName = "itemNo";
+ this.gv_itemNo.MinWidth = 50;
+ this.gv_itemNo.Name = "gv_itemNo";
+ this.gv_itemNo.OptionsColumn.AllowEdit = false;
+ this.gv_itemNo.Tag = "query_a.ITEM_NO";
+ this.gv_itemNo.Visible = true;
+ this.gv_itemNo.VisibleIndex = 2;
+ this.gv_itemNo.Width = 94;
+ //
+ // gv_itemBarcode
+ //
+ this.gv_itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemBarcode.AppearanceCell.Options.UseFont = true;
+ this.gv_itemBarcode.Caption = "鐗╂枡鏉＄爜";
+ this.gv_itemBarcode.FieldName = "itemBarcode";
+ this.gv_itemBarcode.MinWidth = 50;
+ this.gv_itemBarcode.Name = "gv_itemBarcode";
+ this.gv_itemBarcode.OptionsColumn.AllowEdit = false;
+ this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE";
+ this.gv_itemBarcode.Visible = true;
+ this.gv_itemBarcode.VisibleIndex = 1;
+ this.gv_itemBarcode.Width = 94;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭GUID";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Visible = true;
+ this.gv_guid.VisibleIndex = 0;
+ this.gv_guid.Width = 94;
+ //
+ // 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.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = null;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1126, 531);
+ this.gcMain1.TabIndex = 1;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_guid,
+ this.gv_itemBarcode,
+ this.gv_itemNo,
+ this.gv_depotsId,
+ this.gv_depotSectionsId,
+ this.gv_lotNo,
+ this.gv_quantity,
+ this.gv_depotsCode,
+ this.gv_depotSectionsCode,
+ this.gv_checkDate,
+ this.gv_itemType,
+ this.gv_indepDate,
+ this.gv_iqcStatus,
+ this.gv_suppNo,
+ this.gv_lineNo,
+ this.gv_billNo,
+ this.gv_ebelnK3id,
+ this.gv_lineK3id,
+ this.gv_itemId,
+ this.gv_suppId,
+ this.gv_depotId,
+ this.gv_ownerId,
+ this.gv_ownerType,
+ this.gv_stockOrgId,
+ this.gv_indepUserCode});
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ 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(1128, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.gcMain1);
+ this.xtraTabPage1.Controls.Add(this.pageBar1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 531);
+ 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(1126, 39);
+ this.pageBar1.TabIndex = 3;
+ this.pageBar1.TotalPages = 0;
+ //
+ // CKTmkc
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Name = "CKTmkc";
+ this.Text = "鏉＄爜搴撳瓨";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private UserControl.UcToolBarMenu toolBarMenu1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_stockOrgId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lineK3id;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_iqcStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemType;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotsId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemBarcode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
new file mode 100644
index 0000000..af7e808
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
@@ -0,0 +1,130 @@
+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 CKTmkc : DevExpress.XtraEditors.XtraForm
+ {
+ string _webServiceName = "Ck/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+ public CKTmkc()
+ {
+ 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.JumpTab(xtraTabControl1, 0);
+ });
+ 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)
+ {
+ 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);
+ 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)
+ {
+ 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();
+ }
+ 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/CKTmkc.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.resx
new file mode 100644
index 0000000..d58980a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.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 7822526..104bbf5 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -391,6 +391,12 @@
<Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.Designer.cs">
<DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rpt\CKTmkc.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\CKTmkc.Designer.cs">
+ <DependentUpon>CKTmkc.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs">
<SubType>Form</SubType>
</Compile>
@@ -1147,6 +1153,12 @@
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrkDj.resx">
<DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\CK.resx">
+ <DependentUpon>CK.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx">
+ <DependentUpon>CKTmkc.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx">
<DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
</EmbeddedResource>
@@ -1319,6 +1331,7 @@
<EmbeddedResource Include="DevFrm\XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index b7d8c08..b316432 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -38,7 +38,7 @@
/// </summary>
private static void _startLogin()
{
- //Application.Run(new Gs.DevApp.TestForm.test());
+ //Application.Run(RibbonForm1());
//return;
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx
new file mode 100644
index 0000000..95f0ee7
--- /dev/null
+++ b/DevApp/Gs.DevApp/Properties/licenses.licx
@@ -0,0 +1,5 @@
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 377fe4c..77d5dae 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -62,9 +62,9 @@
this.btnZhongTai = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnOa = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnOa = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -74,6 +74,8 @@
//
// barManager1
//
+ this.barManager1.AllowCustomization = false;
+ this.barManager1.AllowMoveBarOnToolbar = false;
this.barManager1.AllowShowToolbarsPopup = false;
this.barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] {
this.bar2});
@@ -158,6 +160,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout),
new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
this.bar2.OptionsBar.AllowQuickCustomization = false;
+ this.bar2.OptionsBar.DrawBorder = false;
+ this.bar2.OptionsBar.DrawDragBorder = false;
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
this.bar2.Text = "Main menu";
@@ -448,6 +452,15 @@
this.btnFjieAn.Name = "btnFjieAn";
this.btnFjieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnOa
+ //
+ this.btnOa.Caption = "鎻愪氦OA";
+ this.btnOa.Id = 54;
+ this.btnOa.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.meeting_16x16;
+ this.btnOa.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.meeting_32x321;
+ this.btnOa.Name = "btnOa";
+ this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// btnLayout
//
this.btnLayout.Caption = "淇濆瓨鐗堥潰";
@@ -465,15 +478,6 @@
this.btnHelp.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
this.btnHelp.Name = "btnHelp";
- //
- // btnOa
- //
- this.btnOa.Caption = "鎻愪氦OA";
- this.btnOa.Id = 54;
- this.btnOa.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.meeting_16x16;
- this.btnOa.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.meeting_32x321;
- this.btnOa.Name = "btnOa";
- this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// barDockControlTop
//
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index a108e5e..df538cf 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -714,6 +714,19 @@
JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
+
+ if (!string.IsNullOrEmpty(defaultActions) && defaultActions.Contains("鏌ヨ")) {
+ if (dt == null || dt.Rows.Count <= 0)
+ {
+ dt.Columns.Add("guid", typeof(string));
+ dt.Columns.Add("name", typeof(string));
+ }
+ DataRow newRow = dt.NewRow();
+ newRow["guid"] = Guid.NewGuid().ToString();
+ newRow["name"] = "鏌ヨ";
+ dt.Rows.Add(newRow);
+ }
+
var _enabledList = new List<string>();
foreach (BarItem item in barManager1.Items)
{
@@ -1032,6 +1045,8 @@
/// 褰撳墠鐘舵��
/// </summary>
public string currentAction { get; set; }
+
+ public string defaultActions { get; set; }
#endregion
--
Gitblit v1.9.3