Skip to content

Commit 924de71

Browse files
YesNoLeeYesNoLee
authored
Merge branch 'EMAXHITECH:MES-EMAX' into MES-EMAX
2 parents a6b7834 + e5ad9e4 commit 924de71

File tree

432 files changed

+39517
-38
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

432 files changed

+39517
-38
lines changed

‎EMAX_KISOK/KISOK_EMAX.sln

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28307.1433
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KISOK_EMAX", "KISOK_EMAX\KISOK_EMAX.csproj", "{6E55B975-9594-4D8F-959A-D7CF04DDAC71}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{6E55B975-9594-4D8F-959A-D7CF04DDAC71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{6E55B975-9594-4D8F-959A-D7CF04DDAC71}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{6E55B975-9594-4D8F-959A-D7CF04DDAC71}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{6E55B975-9594-4D8F-959A-D7CF04DDAC71}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {32C4C964-64BD-49DE-89D1-8A8A8D7399DA}
24+
EndGlobalSection
25+
EndGlobal

‎EMAX_KISOK/KISOK_EMAX/App.config

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<configSections>
4+
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
5+
<section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6+
</sectionGroup>
7+
</configSections>
8+
<applicationSettings>
9+
<DevExpress.LookAndFeel.Design.AppSettings>
10+
<setting name="DPIAwarenessMode" serializeAs="String">
11+
<value>System</value>
12+
</setting>
13+
<setting name="RegisterBonusSkins" serializeAs="String">
14+
<value>True</value>
15+
</setting>
16+
<setting name="DefaultAppSkin" serializeAs="String">
17+
<value>Skin/The Bezier</value>
18+
</setting>
19+
<setting name="DefaultPalette" serializeAs="String">
20+
<value>VS Blue</value>
21+
</setting>
22+
<setting name="TouchUI" serializeAs="String">
23+
<value></value>
24+
</setting>
25+
<setting name="CompactUI" serializeAs="String">
26+
<value></value>
27+
</setting>
28+
<setting name="TouchScaleFactor" serializeAs="String">
29+
<value></value>
30+
</setting>
31+
<setting name="DirectX" serializeAs="String">
32+
<value></value>
33+
</setting>
34+
<setting name="RegisterUserSkins" serializeAs="String">
35+
<value></value>
36+
</setting>
37+
<setting name="FontBehavior" serializeAs="String">
38+
<value></value>
39+
</setting>
40+
<setting name="DefaultAppFont" serializeAs="String">
41+
<value>맑은 고딕;14.25</value>
42+
</setting>
43+
<setting name="CustomPaletteCollection" serializeAs="Xml">
44+
<value />
45+
</setting>
46+
</DevExpress.LookAndFeel.Design.AppSettings>
47+
</applicationSettings>
48+
<startup>
49+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
50+
</startup>
51+
<appSettings>
52+
<!--add key="DBConnstring" value="Server=192.168.0.60,1433;Integrated Security=false;Initial Catalog=sERP_HANGIL;User ID=sa;Password=Root1234" /-->
53+
<add key="DBConnstring" value=""/>
54+
</appSettings>
55+
</configuration>

‎EMAX_KISOK/KISOK_EMAX/BaseWaitForm.Designer.cs

+92
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EMAX_KISOK/KISOK_EMAX/BaseWaitForm.cs

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Data;
5+
using System.Drawing;
6+
using System.Text;
7+
using System.Windows.Forms;
8+
using DevExpress.XtraWaitForm;
9+
10+
namespace KISOK_EMAX
11+
{
12+
public partial class BaseWaitForm : WaitForm
13+
{
14+
public BaseWaitForm()
15+
{
16+
InitializeComponent();
17+
this.progressPanel1.AutoHeight = true;
18+
}
19+
20+
#region Overrides
21+
22+
public override void SetCaption(string caption)
23+
{
24+
base.SetCaption(caption);
25+
this.progressPanel1.Caption = caption;
26+
}
27+
public override void SetDescription(string description)
28+
{
29+
base.SetDescription(description);
30+
this.progressPanel1.Description = description;
31+
}
32+
public override void ProcessCommand(Enum cmd, object arg)
33+
{
34+
base.ProcessCommand(cmd, arg);
35+
}
36+
37+
#endregion
38+
39+
public enum WaitFormCommand
40+
{
41+
}
42+
}
43+
}

‎EMAX_KISOK/KISOK_EMAX/BaseWaitForm.resx

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"></xsd:import>
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0"></xsd:element>
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string"></xsd:attribute>
73+
<xsd:attribute name="type" type="xsd:string"></xsd:attribute>
74+
<xsd:attribute name="mimetype" type="xsd:string"></xsd:attribute>
75+
<xsd:attribute ref="xml:space"></xsd:attribute>
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string"></xsd:attribute>
81+
<xsd:attribute name="name" type="xsd:string"></xsd:attribute>
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"></xsd:element>
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"></xsd:element>
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"></xsd:attribute>
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"></xsd:attribute>
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"></xsd:attribute>
93+
<xsd:attribute ref="xml:space"></xsd:attribute>
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"></xsd:element>
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

0 commit comments

Comments
 (0)