From 7136af81cbb280d56a09c673a2bed49a557a4e0d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 24 三月 2025 10:53:12 +0800
Subject: [PATCH] 条码打印
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs | 4
DevApp/Gs.DevApp/Gs.DevApp.csproj | 2
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 1509 ++++++++++++++++++++++++-------------------
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.resx | 319 ++++----
DevApp/Gs.DevApp/Resources/replace_16x161.png | 0
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 8
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 3
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs | 38 -
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 15
DevApp/Gs.DevApp/Properties/Resources.resx | 82 +-
DevApp/Gs.DevApp/Resources/replace_32x32.png | 0
13 files changed, 1,076 insertions(+), 928 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index dfcd2d5..c371e91 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs
index 7376ae2..cae49b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.Designer.cs
@@ -37,11 +37,8 @@
FastReport.ReportSettings reportSettings2 = new FastReport.ReportSettings();
this.designerControl1 = new FastReport.Design.StandardDesigner.DesignerControl();
this.environmentSettings1 = new FastReport.EnvironmentSettings();
- this.sidePanel1 = new DevExpress.XtraEditors.SidePanel();
- this.listBox1 = new System.Windows.Forms.ListBox();
this.sidePanel2 = new DevExpress.XtraEditors.SidePanel();
((System.ComponentModel.ISupportInitialize)(this.designerControl1)).BeginInit();
- this.sidePanel1.SuspendLayout();
this.SuspendLayout();
//
// designerControl1
@@ -76,37 +73,12 @@
this.environmentSettings1.ReportSettings = reportSettings2;
this.environmentSettings1.UIStyle = FastReport.Utils.UIStyle.Office2007Black;
//
- // sidePanel1
- //
- this.sidePanel1.Appearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
- this.sidePanel1.Appearance.Options.UseBorderColor = true;
- this.sidePanel1.Controls.Add(this.listBox1);
- this.sidePanel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.sidePanel1.Location = new System.Drawing.Point(0, 0);
- this.sidePanel1.Name = "sidePanel1";
- this.sidePanel1.Padding = new System.Windows.Forms.Padding(2);
- this.sidePanel1.Size = new System.Drawing.Size(893, 80);
- this.sidePanel1.TabIndex = 0;
- this.sidePanel1.Text = "sidePanel1";
- //
- // listBox1
- //
- this.listBox1.ColumnWidth = 120;
- this.listBox1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.listBox1.FormattingEnabled = true;
- this.listBox1.ItemHeight = 18;
- this.listBox1.Location = new System.Drawing.Point(2, 2);
- this.listBox1.MultiColumn = true;
- this.listBox1.Name = "listBox1";
- this.listBox1.Size = new System.Drawing.Size(889, 75);
- this.listBox1.TabIndex = 0;
- //
// sidePanel2
//
this.sidePanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.sidePanel2.Location = new System.Drawing.Point(0, 80);
+ this.sidePanel2.Location = new System.Drawing.Point(0, 0);
this.sidePanel2.Name = "sidePanel2";
- this.sidePanel2.Size = new System.Drawing.Size(893, 498);
+ this.sidePanel2.Size = new System.Drawing.Size(893, 578);
this.sidePanel2.TabIndex = 1;
this.sidePanel2.Text = "sidePanel2";
//
@@ -116,12 +88,10 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(893, 578);
this.Controls.Add(this.sidePanel2);
- this.Controls.Add(this.sidePanel1);
- this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png;
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.Name = "EasyRptDesign";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
((System.ComponentModel.ISupportInitialize)(this.designerControl1)).EndInit();
- this.sidePanel1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -130,8 +100,6 @@
private FastReport.Design.StandardDesigner.DesignerControl designerControl1;
private FastReport.EnvironmentSettings environmentSettings1;
- private DevExpress.XtraEditors.SidePanel sidePanel1;
private DevExpress.XtraEditors.SidePanel sidePanel2;
- private System.Windows.Forms.ListBox listBox1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
index 7801ac2..f3f4532 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
@@ -19,7 +19,7 @@
_rptGuid = strGuid;
_rptParameter = rptParameter;
InitializeComponent();
- Text = _rptParameter + "鎶ヨ〃璁捐锛氳璁℃椂璇峰弬鑰冨瓧娈佃鏄庯紝寤鸿z寮�澶翠负涓昏〃,m寮�澶翠负鏄庣粏琛�";
+ Text = _rptParameter + "鎶ヨ〃璁捐锛歾b涓轰富琛�,mx1鏄庣粏琛�1,mx2涓烘槑缁嗚〃2";
var report = new FastReport.Report();
var RptRow = new DataTable();
var _obj = new
@@ -43,8 +43,6 @@
{
report.Load(Stream);
}
- var d = dy.reportCol;
- foreach (var a in d) listBox1.Items.Add(a);
}
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.resx b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.resx
index 7cb0e44..8f45db7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.resx
@@ -1,173 +1,154 @@
锘�<?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 xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <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>
- <metadata name="designerControl1.TrayLocation"
- type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
- <data name="designerControl1.LayoutState" xml:space="preserve">
- <value>锘�<?xml version="1.0" encoding="utf-8"?><Config><Designer><DockNew Text="&lt;dotnetbarlayout version=&quot;6&quot; zorder=&quot;3,4,1,2&quot;&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Top&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Bottom&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;0&quot; h=&quot;95&quot;&gt;&lt;bar name=&quot;MessagesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;4&quot; visible=&quot;false&quot;&gt;&lt;items&gt;&lt;item name=&quot;MessagesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; visible=&quot;false&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Left&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;250&quot; dockingside=&quot;Right&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;92&quot;&gt;&lt;bar name=&quot;DictionaryWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot; seldocktab=&quot;0&quot;&gt;&lt;items&gt;&lt;item name=&quot;DictionaryWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;item name=&quot;ReportTreeWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;1&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;4&quot;&gt;&lt;bar name=&quot;PropertiesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;64&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot;&gt;&lt;items&gt;&lt;item name=&quot;PropertiesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;bars&gt;&lt;bar name=&quot;StandardToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;TextToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;BorderToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;280&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;StyleToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;LayoutToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;ObjectsToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;1&quot; visible=&quot;true&quot; /&gt;&lt;/bars&gt;&lt;/dotnetbarlayout&gt;"/></Designer></Config></value>
- </data>
- <metadata name="environmentSettings1.TrayLocation"
- type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>202, 17</value>
- </metadata>
- <assembly alias="System.Drawing"
- name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
- <data name="previewSettings2.Icon"
- type="System.Drawing.Icon, System.Drawing"
- mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
- AAA4ODhhODg45zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4
- OOc4ODhhODg456B3J//CjCH/wowh/8KMIf/CjCH/wowh/8KMIf/CjCH/wowh/8KMIf/CjCH/wowh/8KM
- If+gdyf/ODg45zg4OP/CjCH/wowh/8KMIf/CjCH/wowh/8KMIf/CjCH/wowh/8KMIf/CjSL/zqNO/9Ot
- Yf/CjCH/wowh/zg4OP84ODj/wowh/8KMIf/AiyH/uYUg/72IIP/CjCH/wowh/8KMIf/DjST/3sGH//78
- +v/7+PL/yZk7/8KMIf84ODj/ODg4/8KMIf/CjCH/JhwG/wAAAP8GBAH/tIIf/8KMIf/DjSP/4MWQ//78
- +v/8+vX/27t8/8KMIf/CjCH/ODg4/zg4OP/CjCH/wowh/xQOBP8AAAD/AAAA/6x/Jf/DjiT/4smW//79
- +v/7+fP/17Rv/8KMIf/CjCH/wowh/zg4OP84ODj/wowh/8KMIf8UDgT/AAAA/wAAAP+ugy7//v38////
- /////////fz5/+rWsP/JmDn/wowh/8KMIf84ODj/ODg4/8KMIf/CjCH/FA4E/wAAAP8AAAD/TzsS/3le
- Kf9/Yyz/zbOA//379///////7t/C/8KMIf/CjCH/ODg4/zk5Of/DjiX/yJc2/zYxKP8uLi7/NjY2/zs7
- O/87Ozv/Ozs7/4p6Wv/48eT///////v48v/LnUH/x5Qx/0FBQf+vr6//1a9l/9WvZf9cWFH/Tk5O/05O
- Tv97b1b/koFe/5iFYf/Vw57//fv4///////06db/1a9l/9WvZf+vr6//mJiY/9WvZf/Vr2X/XFhR/05O
- Tv9OTk7/x6lu///+/v////////////7+/f/17Nr/27x9/9WvZf/Vr2X/mJiY/4GBgf/Vr2X/1a9l/11Y
- Uf9OTk7/Tk5O/4J1Wf+fjGf/n4xn/6GOZ//Srmn/1a9l/9WvZf/Vr2X/1a9l/4GBgf9ra2v/1a9l/9Wv
- Zf+Yg1v/WVZQ/05OTv9OTk7/Tk5O/05OTv9SUU//waFi/9WvZf/Vr2X/1a9l/9WvZf9ra2v/SUlJ/9Wv
- Zf/Vr2X/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/SUlJ/zg4
- OOeukVr/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/rpFa/zg4
- OOc4ODhhODg45zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4
- OOc4ODhhAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA
- //8AAP//AAD//w==
- </value>
+ <!--
+ 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>
+ <metadata name="designerControl1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <data name="designerControl1.LayoutState" xml:space="preserve">
+ <value>锘�<?xml version="1.0" encoding="utf-8"?><Config><Designer><DockNew Text="&lt;dotnetbarlayout version=&quot;6&quot; zorder=&quot;3,4,1,2&quot;&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Top&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Bottom&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;0&quot; h=&quot;95&quot;&gt;&lt;bar name=&quot;MessagesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;4&quot; visible=&quot;false&quot;&gt;&lt;items&gt;&lt;item name=&quot;MessagesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; visible=&quot;false&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;docksite size=&quot;0&quot; dockingside=&quot;Left&quot; originaldocksitesize=&quot;0&quot; /&gt;&lt;docksite size=&quot;250&quot; dockingside=&quot;Right&quot; originaldocksitesize=&quot;0&quot;&gt;&lt;dockcontainer orientation=&quot;1&quot; w=&quot;0&quot; h=&quot;0&quot;&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;49&quot;&gt;&lt;bar name=&quot;DictionaryWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot; seldocktab=&quot;0&quot;&gt;&lt;items&gt;&lt;item name=&quot;DictionaryWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;item name=&quot;ReportTreeWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;1&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;barcontainer w=&quot;247&quot; h=&quot;-23&quot;&gt;&lt;bar name=&quot;PropertiesWindowBar&quot; dockline=&quot;0&quot; layout=&quot;2&quot; dockoffset=&quot;64&quot; state=&quot;2&quot; dockside=&quot;2&quot; visible=&quot;true&quot;&gt;&lt;items&gt;&lt;item name=&quot;PropertiesWindow&quot; origBar=&quot;&quot; origPos=&quot;-1&quot; pos=&quot;0&quot; /&gt;&lt;/items&gt;&lt;/bar&gt;&lt;/barcontainer&gt;&lt;/dockcontainer&gt;&lt;/docksite&gt;&lt;bars&gt;&lt;bar name=&quot;StandardToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;TextToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;BorderToolbar&quot; dockline=&quot;1&quot; layout=&quot;0&quot; dockoffset=&quot;280&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;true&quot; /&gt;&lt;bar name=&quot;LayoutToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;StyleToolbar&quot; dockline=&quot;2&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;3&quot; visible=&quot;false&quot; /&gt;&lt;bar name=&quot;ObjectsToolbar&quot; dockline=&quot;0&quot; layout=&quot;0&quot; dockoffset=&quot;0&quot; state=&quot;2&quot; dockside=&quot;1&quot; visible=&quot;true&quot; /&gt;&lt;/bars&gt;&lt;/dotnetbarlayout&gt;"/></Designer></Config></value>
+ </data>
+ <metadata name="environmentSettings1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>202, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="previewSettings2.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
+ AAA4ODhhODg45zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4
+ OOc4ODhhODg456B3J//CjCH/wowh/8KMIf/CjCH/wowh/8KMIf/CjCH/wowh/8KMIf/CjCH/wowh/8KM
+ If+gdyf/ODg45zg4OP/CjCH/wowh/8KMIf/CjCH/wowh/8KMIf/CjCH/wowh/8KMIf/CjSL/zqNO/9Ot
+ Yf/CjCH/wowh/zg4OP84ODj/wowh/8KMIf/AiyH/uYUg/72IIP/CjCH/wowh/8KMIf/DjST/3sGH//78
+ +v/7+PL/yZk7/8KMIf84ODj/ODg4/8KMIf/CjCH/JhwG/wAAAP8GBAH/tIIf/8KMIf/DjSP/4MWQ//78
+ +v/8+vX/27t8/8KMIf/CjCH/ODg4/zg4OP/CjCH/wowh/xQOBP8AAAD/AAAA/6x/Jf/DjiT/4smW//79
+ +v/7+fP/17Rv/8KMIf/CjCH/wowh/zg4OP84ODj/wowh/8KMIf8UDgT/AAAA/wAAAP+ugy7//v38////
+ /////////fz5/+rWsP/JmDn/wowh/8KMIf84ODj/ODg4/8KMIf/CjCH/FA4E/wAAAP8AAAD/TzsS/3le
+ Kf9/Yyz/zbOA//379///////7t/C/8KMIf/CjCH/ODg4/zk5Of/DjiX/yJc2/zYxKP8uLi7/NjY2/zs7
+ O/87Ozv/Ozs7/4p6Wv/48eT///////v48v/LnUH/x5Qx/0FBQf+vr6//1a9l/9WvZf9cWFH/Tk5O/05O
+ Tv97b1b/koFe/5iFYf/Vw57//fv4///////06db/1a9l/9WvZf+vr6//mJiY/9WvZf/Vr2X/XFhR/05O
+ Tv9OTk7/x6lu///+/v////////////7+/f/17Nr/27x9/9WvZf/Vr2X/mJiY/4GBgf/Vr2X/1a9l/11Y
+ Uf9OTk7/Tk5O/4J1Wf+fjGf/n4xn/6GOZ//Srmn/1a9l/9WvZf/Vr2X/1a9l/4GBgf9ra2v/1a9l/9Wv
+ Zf+Yg1v/WVZQ/05OTv9OTk7/Tk5O/05OTv9SUU//waFi/9WvZf/Vr2X/1a9l/9WvZf9ra2v/SUlJ/9Wv
+ Zf/Vr2X/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/SUlJ/zg4
+ OOeukVr/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/1a9l/9WvZf/Vr2X/rpFa/zg4
+ OOc4ODhhODg45zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4OP84ODj/ODg4/zg4
+ OOc4ODhhAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA
+ //8AAP//AAD//w==
+</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index 174e972..380fce2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -29,83 +29,776 @@
/// </summary>
private void InitializeComponent()
{
- this.gvMx1trLotno = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ 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.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
+ this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
+ this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
+ this.txt_suppNo_1 = new Gs.DevApp.UserControl.UcLookSupplier();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+ this.txt_suppId = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createDate1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemUnit = new DevExpress.XtraEditors.TextEdit();
+ this.txt_tc_1 = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_tc_1123 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1trLotno = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_createDate1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_createDate1 = new DevExpress.XtraEditors.TextEdit();
- this.lb_itemUnit = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemUnit = new DevExpress.XtraEditors.TextEdit();
- this.gv_itemUnit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
- this.gv_itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_itemName = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
- this.gv_itemName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.pageBar1 = new UserControls.Data.UcPageBar();
- this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.tabMx = new DevExpress.XtraTab.XtraTabControl();
- this.panel1 = new System.Windows.Forms.Panel();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
- this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
- this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
- this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
- this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
- this.txt_tc_1 = new DevExpress.XtraEditors.CheckEdit();
- this.txt_suppNo_1 = new Gs.DevApp.UserControl.UcLookSupplier();
- this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.txt_suppId = new DevExpress.XtraEditors.TextEdit();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
- this.lbGuid = new System.Windows.Forms.Label();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tabMxPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemUnit.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((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.xtraTabPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
- this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.Panel2.SuspendLayout();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemUnit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1123)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
this.SuspendLayout();
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
+ 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 = "rpt_ItemInv{}";
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ 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, 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,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ 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.Size = new System.Drawing.Size(1126, 570);
+ this.split1.SplitterPosition = 558;
+ this.split1.TabIndex = 0;
+ //
+ // 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, 519);
+ this.gcMain1.TabIndex = 2;
+ 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.gridColumn4,
+ this.gv_id,
+ this.gv_itemNo,
+ this.gv_itemName,
+ this.gv_itemModel,
+ this.gv_itemUnit});
+ 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;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浣跨敤缁勭粐";
+ this.gridColumn4.FieldName = "fSubsidiary";
+ this.gridColumn4.MinWidth = 250;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.Tag = "org.fnumber";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 0;
+ this.gridColumn4.Width = 250;
+ //
+ // gv_id
+ //
+ this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_id.AppearanceCell.Options.UseFont = true;
+ this.gv_id.Caption = "鐗╂枡ID ";
+ this.gv_id.FieldName = "id";
+ this.gv_id.MinWidth = 50;
+ this.gv_id.Name = "gv_id";
+ this.gv_id.OptionsColumn.AllowEdit = false;
+ this.gv_id.Tag = "query_a.id";
+ this.gv_id.Visible = true;
+ this.gv_id.VisibleIndex = 1;
+ this.gv_id.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 = 120;
+ 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 = 120;
+ //
+ // gv_itemName
+ //
+ this.gv_itemName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemName.AppearanceCell.Options.UseFont = true;
+ this.gv_itemName.Caption = "鐗╂枡鍚嶇О";
+ this.gv_itemName.FieldName = "itemName";
+ this.gv_itemName.MinWidth = 150;
+ this.gv_itemName.Name = "gv_itemName";
+ this.gv_itemName.OptionsColumn.AllowEdit = false;
+ this.gv_itemName.Tag = "query_a.item_name";
+ this.gv_itemName.Visible = true;
+ this.gv_itemName.VisibleIndex = 3;
+ this.gv_itemName.Width = 150;
+ //
+ // gv_itemModel
+ //
+ this.gv_itemModel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemModel.AppearanceCell.Options.UseFont = true;
+ this.gv_itemModel.Caption = "瑙勬牸鍨嬪彿";
+ this.gv_itemModel.FieldName = "itemModel";
+ this.gv_itemModel.MinWidth = 250;
+ this.gv_itemModel.Name = "gv_itemModel";
+ this.gv_itemModel.OptionsColumn.AllowEdit = false;
+ this.gv_itemModel.Tag = "query_a.item_model";
+ this.gv_itemModel.Visible = true;
+ this.gv_itemModel.VisibleIndex = 4;
+ this.gv_itemModel.Width = 250;
+ //
+ // gv_itemUnit
+ //
+ this.gv_itemUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_itemUnit.AppearanceCell.Options.UseFont = true;
+ this.gv_itemUnit.Caption = "鐗╂枡鍗曚綅";
+ this.gv_itemUnit.FieldName = "itemUnit";
+ this.gv_itemUnit.MinWidth = 50;
+ this.gv_itemUnit.Name = "gv_itemUnit";
+ this.gv_itemUnit.OptionsColumn.AllowEdit = false;
+ this.gv_itemUnit.Tag = "query_b.fname";
+ this.gv_itemUnit.Visible = true;
+ this.gv_itemUnit.VisibleIndex = 5;
+ this.gv_itemUnit.Width = 94;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ 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 = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ //
+ // splitMx1
+ //
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Name = "splitMx1";
+ //
+ // splitMx1.Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.Panel2
+ //
+ this.splitMx1.Panel2.Controls.Add(this.tabMx);
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.SplitterPosition = 139;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_psnQty_1);
+ this.layoutMx1.Controls.Add(this.ucBtnPrint1);
+ this.layoutMx1.Controls.Add(this.txt_iCount_1);
+ this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
+ this.layoutMx1.Controls.Add(this.txt_suppNo_1);
+ this.layoutMx1.Controls.Add(this.txt_itemNo);
+ this.layoutMx1.Controls.Add(this.txt_itemName);
+ this.layoutMx1.Controls.Add(this.txt_itemModel);
+ this.layoutMx1.Controls.Add(this.txt_suppId);
+ this.layoutMx1.Controls.Add(this.txt_createDate1);
+ this.layoutMx1.Controls.Add(this.txt_itemUnit);
+ this.layoutMx1.Controls.Add(this.txt_tc_1);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem12});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(624, 536, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 139);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.TabIndex = 275;
+ this.lbGuid.Text = "lbGuid";
+ //
+ // txt_psnQty_1
+ //
+ this.txt_psnQty_1.Location = new System.Drawing.Point(656, 76);
+ this.txt_psnQty_1.Name = "txt_psnQty_1";
+ this.txt_psnQty_1.Size = new System.Drawing.Size(165, 24);
+ this.txt_psnQty_1.StyleController = this.layoutMx1;
+ this.txt_psnQty_1.TabIndex = 273;
+ this.txt_psnQty_1.Tag = "readOnly-1";
+ //
+ // ucBtnPrint1
+ //
+ this.ucBtnPrint1.guidKey = null;
+ this.ucBtnPrint1.Location = new System.Drawing.Point(554, 108);
+ this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrint1.Name = "ucBtnPrint1";
+ this.ucBtnPrint1.rptParameter = null;
+ this.ucBtnPrint1.Size = new System.Drawing.Size(196, 28);
+ this.ucBtnPrint1.TabIndex = 266;
+ //
+ // txt_iCount_1
+ //
+ this.txt_iCount_1.Location = new System.Drawing.Point(656, 44);
+ this.txt_iCount_1.Name = "txt_iCount_1";
+ this.txt_iCount_1.Size = new System.Drawing.Size(165, 24);
+ this.txt_iCount_1.StyleController = this.layoutMx1;
+ this.txt_iCount_1.TabIndex = 272;
+ this.txt_iCount_1.Tag = "readOnly-1";
+ //
+ // txt_fSubsidiary
+ //
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(114, 12);
+ this.txt_fSubsidiary.Name = "txt_fSubsidiary";
+ this.txt_fSubsidiary.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fSubsidiary.Properties.Appearance.Options.UseFont = true;
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(165, 28);
+ this.txt_fSubsidiary.StyleController = this.layoutMx1;
+ this.txt_fSubsidiary.TabIndex = 270;
+ this.txt_fSubsidiary.Tag = "";
+ //
+ // txt_suppNo_1
+ //
+ this.txt_suppNo_1.IsReadly = false;
+ this.txt_suppNo_1.Location = new System.Drawing.Point(656, 12);
+ this.txt_suppNo_1.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_suppNo_1.Name = "txt_suppNo_1";
+ this.txt_suppNo_1.Size = new System.Drawing.Size(165, 28);
+ this.txt_suppNo_1.TabIndex = 264;
+ //
+ // txt_itemNo
+ //
+ this.txt_itemNo.Location = new System.Drawing.Point(114, 44);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(165, 28);
+ this.txt_itemNo.StyleController = this.layoutMx1;
+ this.txt_itemNo.TabIndex = 217;
+ this.txt_itemNo.Tag = "";
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(114, 76);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(165, 28);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 219;
+ this.txt_itemName.Tag = "";
+ //
+ // txt_itemModel
+ //
+ this.txt_itemModel.Location = new System.Drawing.Point(114, 108);
+ this.txt_itemModel.Name = "txt_itemModel";
+ this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemModel.Size = new System.Drawing.Size(436, 28);
+ this.txt_itemModel.StyleController = this.layoutMx1;
+ this.txt_itemModel.TabIndex = 226;
+ this.txt_itemModel.Tag = "";
+ //
+ // txt_suppId
+ //
+ this.txt_suppId.Location = new System.Drawing.Point(385, 12);
+ this.txt_suppId.Name = "txt_suppId";
+ this.txt_suppId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_suppId.Properties.Appearance.Options.UseFont = true;
+ this.txt_suppId.Size = new System.Drawing.Size(165, 28);
+ this.txt_suppId.StyleController = this.layoutMx1;
+ this.txt_suppId.TabIndex = 256;
+ this.txt_suppId.Tag = "";
+ //
+ // txt_createDate1
+ //
+ this.txt_createDate1.Location = new System.Drawing.Point(385, 44);
+ this.txt_createDate1.Name = "txt_createDate1";
+ this.txt_createDate1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_createDate1.Properties.Appearance.Options.UseFont = true;
+ this.txt_createDate1.Size = new System.Drawing.Size(165, 28);
+ this.txt_createDate1.StyleController = this.layoutMx1;
+ this.txt_createDate1.TabIndex = 252;
+ this.txt_createDate1.Tag = "";
+ //
+ // txt_itemUnit
+ //
+ this.txt_itemUnit.Location = new System.Drawing.Point(385, 76);
+ this.txt_itemUnit.Name = "txt_itemUnit";
+ this.txt_itemUnit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemUnit.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemUnit.Size = new System.Drawing.Size(165, 28);
+ this.txt_itemUnit.StyleController = this.layoutMx1;
+ this.txt_itemUnit.TabIndex = 231;
+ this.txt_itemUnit.Tag = "";
+ //
+ // txt_tc_1
+ //
+ this.txt_tc_1.Location = new System.Drawing.Point(825, 12);
+ this.txt_tc_1.Name = "txt_tc_1";
+ this.txt_tc_1.Properties.Caption = "鐗归噰鏍囪瘑";
+ this.txt_tc_1.Size = new System.Drawing.Size(268, 24);
+ this.txt_tc_1.StyleController = this.layoutMx1;
+ this.txt_tc_1.TabIndex = 276;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.lbGuid;
+ this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem12.Text = "lbGuid";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem12.TextVisible = false;
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem4,
+ this.layoutControlItem5,
+ this.layoutControlItem6,
+ this.layoutControlItem7,
+ this.layoutControlItem8,
+ this.layoutControlItem9,
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.txt_tc_1123});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
+ this.Root.Size = new System.Drawing.Size(1105, 148);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_fSubsidiary;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem1.Text = "浣跨敤缁勭粐";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_itemNo;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Text = "鐗╂枡缂栫爜";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_itemName;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem3.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_itemModel;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(542, 32);
+ this.layoutControlItem4.Text = "瑙勬牸鍨嬪彿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_suppId;
+ this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鍙�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_createDate1;
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem6.Text = "鍏ュ簱鏃堕棿";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_itemUnit;
+ this.layoutControlItem7.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem7.Text = "鐗╂枡鍗曚綅";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_suppNo_1;
+ this.layoutControlItem8.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem8.Text = "鍏堥�夋嫨渚涘簲鍟�";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_iCount_1;
+ this.layoutControlItem9.Location = new System.Drawing.Point(542, 32);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Text = "鎵撳嵃鏉＄爜寮犳暟";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_psnQty_1;
+ this.layoutControlItem10.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem10.Text = "姣忓紶鏉＄爜鏁伴噺";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.ucBtnPrint1;
+ this.layoutControlItem11.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem11.MaxSize = new System.Drawing.Size(200, 0);
+ this.layoutControlItem11.MinSize = new System.Drawing.Size(5, 5);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem11.Text = "鎵撳嵃鎸夐挳";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
+ //
+ // txt_tc_1123
+ //
+ this.txt_tc_1123.Control = this.txt_tc_1;
+ this.txt_tc_1123.Location = new System.Drawing.Point(813, 0);
+ this.txt_tc_1123.Name = "txt_tc_1123";
+ this.txt_tc_1123.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.txt_tc_1123.Size = new System.Drawing.Size(272, 32);
+ this.txt_tc_1123.Text = "鐗归噰鏍囪瘑";
+ this.txt_tc_1123.TextSize = new System.Drawing.Size(0, 0);
+ this.txt_tc_1123.TextVisible = false;
+ //
+ // tabMx
+ //
+ this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Name = "tabMx";
+ this.tabMx.SelectedTabPage = this.tabMxPage1;
+ this.tabMx.Size = new System.Drawing.Size(1126, 419);
+ this.tabMx.TabIndex = 3;
+ this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.tabMxPage1});
+ //
+ // tabMxPage1
+ //
+ this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Name = "tabMxPage1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 387);
+ this.tabMxPage1.Text = "鏉＄爜鏄庣粏";
+ //
+ // gcMx1
+ //
+ this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.Location = new System.Drawing.Point(0, 0);
+ this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Name = "gcMx1";
+ this.gcMx1.Size = new System.Drawing.Size(1124, 387);
+ this.gcMx1.TabIndex = 0;
+ this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx1});
+ //
+ // gvMx1
+ //
+ this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
+ this.gvMx1.ColumnPanelRowHeight = 50;
+ this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx1guid,
+ this.gridColumn2,
+ this.gvMx1itemBarcode,
+ this.gvMx1quantity,
+ this.gvMx1trLotno,
+ this.gvMx1createBy,
+ this.gridColumn5,
+ this.gridColumn3,
+ this.gridColumn1,
+ this.gridColumn6,
+ this.gridColumn7});
+ this.gvMx1.GridControl = this.gcMx1;
+ this.gvMx1.Name = "gvMx1";
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx1.OptionsView.ShowGroupPanel = false;
+ //
+ // gvMx1guid
+ //
+ this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1guid.AppearanceCell.Options.UseFont = true;
+ this.gvMx1guid.Caption = "guid ";
+ this.gvMx1guid.FieldName = "guid";
+ this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.Name = "gvMx1guid";
+ this.gvMx1guid.Tag = "query_a.guid";
+ this.gvMx1guid.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鍏ュ簱鏍囪";
+ this.gridColumn2.FieldName = "inChk";
+ this.gridColumn2.MaxWidth = 50;
+ this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 0;
+ this.gridColumn2.Width = 50;
+ //
+ // gvMx1itemBarcode
+ //
+ this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
+ this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜 ";
+ this.gvMx1itemBarcode.FieldName = "itemBarcode";
+ this.gvMx1itemBarcode.MinWidth = 50;
+ this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
+ this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
+ this.gvMx1itemBarcode.Visible = true;
+ this.gvMx1itemBarcode.VisibleIndex = 1;
+ this.gvMx1itemBarcode.Width = 300;
+ //
+ // gvMx1quantity
+ //
+ this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
+ this.gvMx1quantity.Caption = "鏁伴噺 ";
+ this.gvMx1quantity.FieldName = "quantity";
+ this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.Name = "gvMx1quantity";
+ this.gvMx1quantity.Tag = "query_a.QUANTITY";
+ this.gvMx1quantity.Visible = true;
+ this.gvMx1quantity.VisibleIndex = 2;
+ this.gvMx1quantity.Width = 94;
//
// gvMx1trLotno
//
@@ -132,84 +825,6 @@
this.gvMx1createBy.Visible = true;
this.gvMx1createBy.VisibleIndex = 4;
this.gvMx1createBy.Width = 94;
- //
- // gvMx1quantity
- //
- this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
- this.gvMx1quantity.Caption = "鏁伴噺 ";
- this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 50;
- this.gvMx1quantity.Name = "gvMx1quantity";
- this.gvMx1quantity.Tag = "query_a.QUANTITY";
- this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 2;
- this.gvMx1quantity.Width = 94;
- //
- // gvMx1itemBarcode
- //
- this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
- this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜 ";
- this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 50;
- this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
- this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
- this.gvMx1itemBarcode.Visible = true;
- this.gvMx1itemBarcode.VisibleIndex = 1;
- this.gvMx1itemBarcode.Width = 300;
- //
- // gvMx1guid
- //
- this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1guid.AppearanceCell.Options.UseFont = true;
- this.gvMx1guid.Caption = "guid ";
- this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
- this.gvMx1guid.Name = "gvMx1guid";
- this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
- //
- // tabMxPage1
- //
- this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 397);
- this.tabMxPage1.Text = "鏉＄爜鏄庣粏";
- //
- // gcMx1
- //
- this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 0);
- this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 397);
- this.gcMx1.TabIndex = 0;
- this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
- //
- // gvMx1
- //
- this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 50;
- this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx1guid,
- this.gridColumn2,
- this.gvMx1itemBarcode,
- this.gvMx1quantity,
- this.gvMx1trLotno,
- this.gvMx1createBy,
- this.gridColumn5,
- this.gridColumn3,
- this.gridColumn1,
- this.gridColumn6,
- this.gridColumn7});
- this.gvMx1.GridControl = this.gcMx1;
- this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gridColumn5
//
@@ -261,468 +876,6 @@
this.gridColumn7.VisibleIndex = 9;
this.gridColumn7.Width = 94;
//
- // lb_createDate1
- //
- this.lb_createDate1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createDate1.Appearance.Options.UseFont = true;
- this.lb_createDate1.Location = new System.Drawing.Point(332, 47);
- this.lb_createDate1.Name = "lb_createDate1";
- this.lb_createDate1.Size = new System.Drawing.Size(68, 21);
- this.lb_createDate1.TabIndex = 252;
- this.lb_createDate1.Text = "鍏ュ簱鏃堕棿";
- //
- // txt_createDate1
- //
- this.txt_createDate1.Location = new System.Drawing.Point(404, 43);
- this.txt_createDate1.Name = "txt_createDate1";
- this.txt_createDate1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createDate1.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate1.Size = new System.Drawing.Size(129, 28);
- this.txt_createDate1.TabIndex = 252;
- this.txt_createDate1.Tag = "";
- //
- // lb_itemUnit
- //
- this.lb_itemUnit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_itemUnit.Appearance.Options.UseFont = true;
- this.lb_itemUnit.Location = new System.Drawing.Point(332, 79);
- this.lb_itemUnit.Name = "lb_itemUnit";
- this.lb_itemUnit.Size = new System.Drawing.Size(68, 21);
- this.lb_itemUnit.TabIndex = 231;
- this.lb_itemUnit.Text = "鐗╂枡鍗曚綅";
- //
- // txt_itemUnit
- //
- this.txt_itemUnit.Location = new System.Drawing.Point(404, 75);
- this.txt_itemUnit.Name = "txt_itemUnit";
- this.txt_itemUnit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemUnit.Properties.Appearance.Options.UseFont = true;
- this.txt_itemUnit.Size = new System.Drawing.Size(129, 28);
- this.txt_itemUnit.TabIndex = 231;
- this.txt_itemUnit.Tag = "";
- //
- // gv_itemUnit
- //
- this.gv_itemUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemUnit.AppearanceCell.Options.UseFont = true;
- this.gv_itemUnit.Caption = "鐗╂枡鍗曚綅";
- this.gv_itemUnit.FieldName = "itemUnit";
- this.gv_itemUnit.MinWidth = 50;
- this.gv_itemUnit.Name = "gv_itemUnit";
- this.gv_itemUnit.OptionsColumn.AllowEdit = false;
- this.gv_itemUnit.Tag = "query_b.fname";
- this.gv_itemUnit.Visible = true;
- this.gv_itemUnit.VisibleIndex = 5;
- this.gv_itemUnit.Width = 94;
- //
- // lb_itemModel
- //
- this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_itemModel.Appearance.Options.UseFont = true;
- this.lb_itemModel.Location = new System.Drawing.Point(13, 112);
- this.lb_itemModel.Name = "lb_itemModel";
- this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
- this.lb_itemModel.TabIndex = 226;
- this.lb_itemModel.Text = "瑙勬牸鍨嬪彿";
- //
- // txt_itemModel
- //
- this.txt_itemModel.Location = new System.Drawing.Point(85, 108);
- this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(449, 28);
- this.txt_itemModel.TabIndex = 226;
- this.txt_itemModel.Tag = "";
- //
- // gv_itemModel
- //
- this.gv_itemModel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemModel.AppearanceCell.Options.UseFont = true;
- this.gv_itemModel.Caption = "瑙勬牸鍨嬪彿";
- this.gv_itemModel.FieldName = "itemModel";
- this.gv_itemModel.MinWidth = 250;
- this.gv_itemModel.Name = "gv_itemModel";
- this.gv_itemModel.OptionsColumn.AllowEdit = false;
- this.gv_itemModel.Tag = "query_a.item_model";
- this.gv_itemModel.Visible = true;
- this.gv_itemModel.VisibleIndex = 4;
- this.gv_itemModel.Width = 250;
- //
- // lb_itemName
- //
- this.lb_itemName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_itemName.Appearance.Options.UseFont = true;
- this.lb_itemName.Location = new System.Drawing.Point(13, 79);
- this.lb_itemName.Name = "lb_itemName";
- this.lb_itemName.Size = new System.Drawing.Size(68, 21);
- this.lb_itemName.TabIndex = 219;
- this.lb_itemName.Text = "鐗╂枡鍚嶇О";
- //
- // txt_itemName
- //
- this.txt_itemName.Location = new System.Drawing.Point(85, 75);
- this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(224, 28);
- this.txt_itemName.TabIndex = 219;
- this.txt_itemName.Tag = "";
- //
- // gv_itemName
- //
- this.gv_itemName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemName.AppearanceCell.Options.UseFont = true;
- this.gv_itemName.Caption = "鐗╂枡鍚嶇О";
- this.gv_itemName.FieldName = "itemName";
- this.gv_itemName.MinWidth = 150;
- this.gv_itemName.Name = "gv_itemName";
- this.gv_itemName.OptionsColumn.AllowEdit = false;
- this.gv_itemName.Tag = "query_a.item_name";
- this.gv_itemName.Visible = true;
- this.gv_itemName.VisibleIndex = 3;
- this.gv_itemName.Width = 150;
- //
- // lb_itemNo
- //
- this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_itemNo.Appearance.Options.UseFont = true;
- this.lb_itemNo.Location = new System.Drawing.Point(13, 47);
- this.lb_itemNo.Name = "lb_itemNo";
- this.lb_itemNo.Size = new System.Drawing.Size(68, 21);
- this.lb_itemNo.TabIndex = 217;
- this.lb_itemNo.Text = "鐗╂枡缂栫爜";
- //
- // txt_itemNo
- //
- this.txt_itemNo.Location = new System.Drawing.Point(85, 43);
- this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(224, 28);
- this.txt_itemNo.TabIndex = 217;
- this.txt_itemNo.Tag = "";
- //
- // 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 = 120;
- 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 = 120;
- //
- // gv_id
- //
- this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "鐗╂枡ID ";
- this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 50;
- this.gv_id.Name = "gv_id";
- this.gv_id.OptionsColumn.AllowEdit = false;
- this.gv_id.Tag = "query_a.id";
- this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 1;
- this.gv_id.Width = 94;
- //
- // toolBarMenu1
- //
- this.toolBarMenu1.chkParameter = null;
- this.toolBarMenu1.currentAction = null;
- 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 = "rpt_ItemInv{}";
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
- this.toolBarMenu1.TabIndex = 0;
- this.toolBarMenu1.xlsInService = null;
- this.toolBarMenu1.xlsOutParameter = null;
- //
- // gcMain
- //
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.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.gridColumn4,
- this.gv_id,
- this.gv_itemNo,
- this.gv_itemName,
- this.gv_itemModel,
- this.gv_itemUnit});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "浣跨敤缁勭粐";
- this.gridColumn4.FieldName = "fSubsidiary";
- this.gridColumn4.MinWidth = 250;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.OptionsColumn.AllowEdit = false;
- this.gridColumn4.Tag = "org.fnumber";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 0;
- this.gridColumn4.Width = 250;
- //
- // 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,
- this.xtraTabPage2});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.gcMain);
- 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;
- //
- // xtraTabPage2
- //
- this.xtraTabPage2.Controls.Add(this.tabMx);
- this.xtraTabPage2.Controls.Add(this.panel1);
- this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
- //
- // tabMx
- //
- this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 141);
- this.tabMx.Name = "tabMx";
- this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 429);
- this.tabMx.TabIndex = 2;
- this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1});
- //
- // panel1
- //
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_psnQty_1);
- this.panel1.Controls.Add(this.txt_iCount_1);
- this.panel1.Controls.Add(this.txt_fSubsidiary);
- this.panel1.Controls.Add(this.labelControl6);
- this.panel1.Controls.Add(this.ucBtnPrint1);
- this.panel1.Controls.Add(this.txt_tc_1);
- this.panel1.Controls.Add(this.txt_suppNo_1);
- this.panel1.Controls.Add(this.labelControl5);
- this.panel1.Controls.Add(this.labelControl4);
- this.panel1.Controls.Add(this.labelControl3);
- this.panel1.Controls.Add(this.labelControl2);
- this.panel1.Controls.Add(this.txt_suppId);
- this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_createDate1);
- this.panel1.Controls.Add(this.txt_createDate1);
- this.panel1.Controls.Add(this.lb_itemUnit);
- this.panel1.Controls.Add(this.txt_itemUnit);
- this.panel1.Controls.Add(this.lb_itemModel);
- this.panel1.Controls.Add(this.txt_itemModel);
- this.panel1.Controls.Add(this.lb_itemName);
- this.panel1.Controls.Add(this.txt_itemName);
- this.panel1.Controls.Add(this.lb_itemNo);
- this.panel1.Controls.Add(this.txt_itemNo);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 141);
- this.panel1.TabIndex = 1;
- //
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(649, 77);
- this.txt_psnQty_1.Name = "txt_psnQty_1";
- this.txt_psnQty_1.Size = new System.Drawing.Size(94, 24);
- this.txt_psnQty_1.TabIndex = 273;
- this.txt_psnQty_1.Tag = "readOnly-1";
- //
- // txt_iCount_1
- //
- this.txt_iCount_1.Location = new System.Drawing.Point(649, 45);
- this.txt_iCount_1.Name = "txt_iCount_1";
- this.txt_iCount_1.Size = new System.Drawing.Size(94, 24);
- this.txt_iCount_1.TabIndex = 272;
- this.txt_iCount_1.Tag = "readOnly-1";
- //
- // txt_fSubsidiary
- //
- this.txt_fSubsidiary.Location = new System.Drawing.Point(85, 11);
- this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fSubsidiary.Properties.Appearance.Options.UseFont = true;
- this.txt_fSubsidiary.Size = new System.Drawing.Size(224, 28);
- this.txt_fSubsidiary.TabIndex = 270;
- this.txt_fSubsidiary.Tag = "";
- //
- // labelControl6
- //
- this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl6.Appearance.Options.UseFont = true;
- this.labelControl6.Location = new System.Drawing.Point(13, 15);
- this.labelControl6.Name = "labelControl6";
- this.labelControl6.Size = new System.Drawing.Size(68, 21);
- this.labelControl6.TabIndex = 269;
- this.labelControl6.Text = "浣跨敤缁勭粐";
- //
- // ucBtnPrint1
- //
- this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(534, 102);
- this.ucBtnPrint1.Name = "ucBtnPrint1";
- this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(214, 36);
- this.ucBtnPrint1.TabIndex = 266;
- //
- // txt_tc_1
- //
- this.txt_tc_1.Location = new System.Drawing.Point(860, 45);
- this.txt_tc_1.Name = "txt_tc_1";
- this.txt_tc_1.Properties.Caption = "";
- this.txt_tc_1.Size = new System.Drawing.Size(24, 24);
- this.txt_tc_1.TabIndex = 265;
- //
- // txt_suppNo_1
- //
- this.txt_suppNo_1.IsReadly = false;
- this.txt_suppNo_1.Location = new System.Drawing.Point(649, 10);
- this.txt_suppNo_1.Margin = new System.Windows.Forms.Padding(0);
- this.txt_suppNo_1.Name = "txt_suppNo_1";
- this.txt_suppNo_1.Size = new System.Drawing.Size(229, 30);
- this.txt_suppNo_1.TabIndex = 264;
- //
- // labelControl5
- //
- this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(542, 47);
- this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(102, 21);
- this.labelControl5.TabIndex = 261;
- this.labelControl5.Text = "鎵撳嵃鏉＄爜寮犳暟";
- //
- // labelControl4
- //
- this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl4.Appearance.Options.UseFont = true;
- this.labelControl4.Location = new System.Drawing.Point(818, 47);
- this.labelControl4.Name = "labelControl4";
- this.labelControl4.Size = new System.Drawing.Size(34, 21);
- this.labelControl4.TabIndex = 259;
- this.labelControl4.Text = "鐗归噰";
- //
- // labelControl3
- //
- this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(542, 79);
- this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(102, 21);
- this.labelControl3.TabIndex = 257;
- this.labelControl3.Text = "姣忓紶鏉＄爜鏁伴噺";
- //
- // labelControl2
- //
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(315, 15);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(85, 21);
- this.labelControl2.TabIndex = 255;
- this.labelControl2.Text = "渚涘簲鍟嗙紪鍙�";
- //
- // txt_suppId
- //
- this.txt_suppId.Location = new System.Drawing.Point(404, 11);
- this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_suppId.Properties.Appearance.Options.UseFont = true;
- this.txt_suppId.Size = new System.Drawing.Size(129, 28);
- this.txt_suppId.TabIndex = 256;
- this.txt_suppId.Tag = "";
- //
- // labelControl1
- //
- this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(542, 15);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(102, 21);
- this.labelControl1.TabIndex = 253;
- this.labelControl1.Text = "鍏堥�夋嫨渚涘簲鍟�";
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(580, 372);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(0, 18);
- this.labelControl11.TabIndex = 130;
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(151, 279);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 1;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "鍏ュ簱鏍囪";
- this.gridColumn2.FieldName = "inChk";
- this.gridColumn2.MaxWidth = 50;
- this.gridColumn2.MinWidth = 50;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 50;
- //
// Frm_InitialBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -732,91 +885,115 @@
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_InitialBarcode";
this.Text = "鏈熷垵鏉＄爜鎵撳嵃";
- this.tabMxPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemUnit.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((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.xtraTabPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ this.splitMx1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemUnit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tc_1123)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
this.ResumeLayout(false);
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
- private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1trLotno;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-
-private DevExpress.XtraEditors.LabelControl lb_createDate1;
-private DevExpress.XtraEditors.TextEdit txt_createDate1;
-
-private DevExpress.XtraEditors.LabelControl lb_itemUnit;
-private DevExpress.XtraEditors.TextEdit txt_itemUnit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemUnit;
-
-private DevExpress.XtraEditors.LabelControl lb_itemModel;
-private DevExpress.XtraEditors.TextEdit txt_itemModel;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemModel;
-
-private DevExpress.XtraEditors.LabelControl lb_itemName;
-private DevExpress.XtraEditors.TextEdit txt_itemName;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemName;
-
-private DevExpress.XtraEditors.LabelControl lb_itemNo;
-private DevExpress.XtraEditors.TextEdit txt_itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
- private DevExpress.XtraEditors.LabelControl labelControl2;
- private DevExpress.XtraEditors.TextEdit txt_suppId;
- private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraEditors.LabelControl labelControl3;
- private DevExpress.XtraEditors.LabelControl labelControl5;
- private DevExpress.XtraEditors.LabelControl labelControl4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private UserControl.UcLookSupplier txt_suppNo_1;
- private DevExpress.XtraEditors.CheckEdit txt_tc_1;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private UserControl.UcBtnPrint ucBtnPrint1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_id;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemModel;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemUnit;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.TextEdit txt_fSubsidiary;
- private DevExpress.XtraEditors.LabelControl labelControl6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraEditors.TextEdit txt_itemModel;
+ private DevExpress.XtraEditors.TextEdit txt_suppId;
+ private DevExpress.XtraEditors.TextEdit txt_createDate1;
+ private DevExpress.XtraEditors.TextEdit txt_itemUnit;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
+ private UserControl.UcBtnPrint ucBtnPrint1;
+ private UserControl.UcLookSupplier txt_suppNo_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1trLotno;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraEditors.CheckEdit txt_tc_1;
+ private DevExpress.XtraLayout.LayoutControlItem txt_tc_1123;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
index bf4b3a2..1aad786 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -20,9 +20,7 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gridView1);
- Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
@@ -46,7 +44,6 @@
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
ucBtnPrint1.rptParameter = "rpt_ItemInv{}";
-
};
this.ucBtnPrint1.btnReportClick += (s, e) =>
{
@@ -163,16 +160,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -218,7 +215,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
//涓昏〃璧嬪��
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy["from"], isEdit, gvList);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy["from"], isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
//鏄庣粏琛ㄨ祴鍊�
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index a356479..f6a9c45 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1756,6 +1756,8 @@
<None Include="Resources\stackedsplinearea_32x32.png" />
<None Include="Resources\boreport2_16x16.png" />
<None Include="Resources\lookup&reference_16x163.png" />
+ <None Include="Resources\replace_32x32.png" />
+ <None Include="Resources\replace_16x161.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index a11042b..b2223f7 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1693,6 +1693,26 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap replace_16x161 {
+ get {
+ object obj = ResourceManager.GetObject("replace_16x161", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap replace_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("replace_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap reset_16x16 {
get {
object obj = ResourceManager.GetObject("reset_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 50d1507..c0582a8 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,6 +124,9 @@
<data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -254,6 +257,11 @@
<data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="richeditcleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\richeditcleartablestyle_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -270,10 +278,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="boreport2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\boreport2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
@@ -286,8 +292,10 @@
<data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -501,9 +509,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -519,11 +524,6 @@
</data>
<data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -560,6 +560,9 @@
<data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -579,9 +582,6 @@
</data>
<data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -650,10 +650,11 @@
<data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
- <data name="employee_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\employee_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="listmultilevel_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\listmultilevel_16x16.png;System.Drawing.Bitmap,
@@ -663,16 +664,19 @@
<data name="printlayoutview_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\printlayoutview_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
@@ -790,8 +794,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
@@ -883,8 +889,10 @@
<data name="convert_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="employee_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\employee_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="down_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\down_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -904,11 +912,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="lookup&reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\lookup&reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="boreport2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\boreport2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -957,10 +965,8 @@
<data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -970,7 +976,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="lookup&reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\lookup&reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="replace_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\replace_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/replace_16x161.png b/DevApp/Gs.DevApp/Resources/replace_16x161.png
new file mode 100644
index 0000000..e004d2a
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/replace_16x161.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/replace_32x32.png b/DevApp/Gs.DevApp/Resources/replace_32x32.png
new file mode 100644
index 0000000..889a254
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/replace_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 77d5dae..0fa741a 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -74,8 +74,6 @@
//
// barManager1
//
- this.barManager1.AllowCustomization = false;
- this.barManager1.AllowMoveBarOnToolbar = false;
this.barManager1.AllowShowToolbarsPopup = false;
this.barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] {
this.bar2});
@@ -160,8 +158,6 @@
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";
@@ -491,7 +487,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 72);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 67);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -520,7 +516,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 72);
+ this.Size = new System.Drawing.Size(1543, 67);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index e05efc3..08e90a8 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -7,6 +7,9 @@
using System.Net;
using System.Text;
using System.Windows.Forms;
+using DevExpress.LookAndFeel;
+using DevExpress.Skins;
+using DevExpress.UserSkins;
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid;
--
Gitblit v1.9.3