잉여장비목록 화면 추가(최효준s)

OwinProject/Class1.cs

@@ -0,0 +1,19 @@
+using Microsoft.Owin.Hosting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OwinProject
+{
+    public static class OwinServer
+    {
+        public static void Run()
+        {
+            // Start OWIN host
+            WebApp.Start<OWIN.Startup>(url: "http://127.0.0.1:9000");
+            Console.WriteLine("start webapp");
+        }
+    }
+}

OwinProject/OWIN/Startup.cs

@@ -0,0 +1,76 @@
+using Microsoft.Owin;
+using Owin;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web.Http;
+using System.Web.Http.Routing;
+
+namespace OwinProject.OWIN
+{
+    public class Startup
+    {
+        public void Configuration(IAppBuilder appBuilder)
+        {
+            // Configure Web API for Self-Host
+            HttpConfiguration config = new HttpConfiguration();
+            config.MapHttpAttributeRoutes();
+
+            //메인파일 처리 방법
+            IHttpRoute defaultRoute =
+                config.Routes.CreateRoute("{controller}/{action}/{id}",
+                new { controller = "home", action = "index", id = RouteParameter.Optional },
+                null);
+
+            //기타파일들 처리 방법
+            IHttpRoute cssRoute =
+              config.Routes.CreateRoute("{path}/{subdir}/{resource}.{ext}",
+              new { controller = "resource", action = "file", id = RouteParameter.Optional },
+              null);
+
+            IHttpRoute mifRoute =
+               config.Routes.CreateRoute("{path}/{resource}.{ext}",
+               new { controller = "resource", action = "file", id = RouteParameter.Optional },
+               null);
+
+            IHttpRoute icoRoute =
+              config.Routes.CreateRoute("{resource}.{ext}",
+              new { controller = "resource", action = "file", id = RouteParameter.Optional },
+              null);
+
+            config.Routes.Add("mifRoute", mifRoute);
+            config.Routes.Add("icoRoute", icoRoute);
+            config.Routes.Add("cssRoute", cssRoute);
+            config.Routes.Add("defaultRoute", defaultRoute);
+            appBuilder.UseWebApi(config);
+
+
+            //appBuilder.UseFileServer(new FileServerOptions
+            //{
+            //    RequestPath = new PathString(string.Empty),
+            //    FileSystem = new PhysicalFileSystem("./MySubFolder"),
+            //    EnableDirectoryBrowsing = true,
+            //});
+
+            //appBuilder.UseStageMarker(PipelineStage.MapHandler);
+
+
+            //config.Routes.MapHttpRoute(
+            //    name: "ignore",
+            //    routeTemplate: @".*\.(css|js|gif|jpg)(/.*)?",
+            //    defaults: new
+            //    {
+            //        controller = "file",
+            //        action = "readtext",
+            //        id = RouteParameter.Optional
+            //    }
+            // );
+
+
+
+        }
+
+    }
+}

OwinProject/OWIN/StartupSSE.cs

@@ -0,0 +1,101 @@
+using Microsoft.Owin;
+using Owin;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web.Http;
+
+namespace OwinProject.OWIN
+{
+    public class StartupSSE
+    {
+
+
+        public void Configuration(IAppBuilder app)
+        {
+            var api = new Api();
+            app.Run(context => api.Invoke(context));
+        }
+
+        public class Subscriber
+        {
+            private StreamWriter _writer;
+            private TaskCompletionSource<bool> _tcs;
+            public Subscriber(Stream body, TaskCompletionSource<bool> tcs)
+            {
+                this._writer = new StreamWriter(body);
+                this._tcs = tcs;
+            }
+
+            public async void WriteAsync(string message)
+            {
+                try
+                {
+                    _writer.Write(message);
+                    _writer.Flush();
+                }
+                catch (Exception e)
+                {
+                    if (e.HResult == -2146232800) // non-existent connection
+                        _tcs.SetResult(true);
+                    else
+                        _tcs.SetException(e);
+                }
+            }
+        }
+
+        public class Api
+        {
+            System.Timers.Timer _timer = new System.Timers.Timer(500);
+            List<Subscriber> _subscribers = new List<Subscriber>();
+            public Api()
+            {
+                _timer.Elapsed += _timer_Elapsed;
+            }
+
+            void _timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+            {
+                UpdateSubscribers();
+            }
+
+            public void UpdateSubscribers()
+            {
+                Console.WriteLine("updating {0} subscribers", _subscribers.Count);
+                var subscribersCopy = _subscribers.ToList<Subscriber>();
+                var msg = String.Format("Hello async at {0}\n", DateTime.Now);
+                subscribersCopy.ForEach(w => w.WriteAsync(msg));
+                _timer.Start();
+            }
+
+
+            public Task Invoke(IOwinContext context)
+            {
+                SetEventHeaders(context);
+                System.IO.Stream responseStream = context.Environment["owin.ResponseBody"] as Stream;
+                var tcs = new TaskCompletionSource<bool>();
+                var s = CreateSubscriber(responseStream, tcs);
+                tcs.Task.ContinueWith(_ => _subscribers.Remove(s));
+                Console.WriteLine("Add subscriber. Now have {0}", _subscribers.Count);
+                s.WriteAsync("Registered\n");
+                _timer.Start();
+                return tcs.Task;
+            }
+
+            private Subscriber CreateSubscriber(System.IO.Stream responseStream, TaskCompletionSource<bool> tcs)
+            {
+                var s = new Subscriber(responseStream, tcs);
+                _subscribers.Add(s);
+                return s;
+            }
+
+            private static void SetEventHeaders(IOwinContext context)
+            {
+                context.Response.ContentType = "text/eventstream";
+                context.Response.Headers["Transfer-Encoding"] = "chunked";
+                context.Response.Headers["cache-control"] = "no-cache";
+            }
+        }
+    }
+}

OwinProject/OwinProject.csproj

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{0C3DC465-73BB-4086-BED4-5EAA100F082A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>OwinProject</RootNamespace>
+    <AssemblyName>OwinProject</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Owin, Version=4.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.HttpListener.4.1.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Hosting, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http.Owin, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.7\lib\net45\System.Web.Http.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Class1.cs" />
+    <Compile Include="OWIN\Startup.cs" />
+    <Compile Include="OWIN\StartupSSE.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

OwinProject/OwinProject.csproj.user

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ProjectFiles</ProjectView>
+  </PropertyGroup>
+</Project>

OwinProject/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 
+// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면
+// 이러한 특성 값을 변경하세요.
+[assembly: AssemblyTitle("OwinProject")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("OwinProject")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 
+// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면
+// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요.
+[assembly: ComVisible(false)]
+
+// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다.
+[assembly: Guid("0c3dc465-73bb-4086-bed4-5eaa100f082a")]
+
+// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다.
+//
+//      주 버전
+//      부 버전 
+//      빌드 번호
+//      수정 버전
+//
+// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
+// 기본값으로 할 수 있습니다.
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

OwinProject/app.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

OwinProject/packages.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="4.1.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="4.1.1" targetFramework="net452" />
+  <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
+  <package id="Owin" version="1.0" targetFramework="net452" />
+</packages>

Project/BaseController.cs

@@ -0,0 +1,286 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Web.Http;
+using agi = HtmlAgilityPack;
+
+
+namespace Project
+{
+    public struct MethodResult : IEquatable<MethodResult>
+    {
+        public string Content;
+        public byte[] Contentb;
+        public string Redirecturl;
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is MethodResult))
+                return false;
+
+            return Equals((MethodResult)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            if (Contentb == null)
+                return Content.GetHashCode() ^ Redirecturl.GetHashCode();
+            else
+                return Content.GetHashCode() ^ Redirecturl.GetHashCode() ^ Contentb.GetHexString().GetHashCode();
+
+        }
+
+        public bool Equals(MethodResult other)
+        {
+            if (Content != other.Content)
+                return false;
+
+            if (Redirecturl != other.Redirecturl)
+                return false;
+
+            return Contentb == other.Contentb;
+        }
+
+
+        public static bool operator ==(MethodResult point1, MethodResult point2)
+        {
+            return point1.Equals(point2);
+        }
+
+        public static bool operator !=(MethodResult point1, MethodResult point2)
+        {
+            return !point1.Equals(point2);
+        }
+    }
+
+    sealed class PostRequest : Attribute
+    {
+
+    }
+
+    public class BaseController : ApiController
+    {
+        public string QueryString { get; set; }
+        public string PostData { get; set; }
+        public string ParamData { get; set; }
+
+        protected string Trig_Ctrl { get; set; }
+        protected string Trig_func { get; set; }
+
+        public PageModel GetGlobalModel()
+        {
+            var config = RequestContext.Configuration;
+            var routeData = config.Routes.GetRouteData(Request).Values.ToList();
+            var name_ctrl = routeData[0].Value.ToString();
+            var name_action = routeData[1].Value.ToString();
+
+
+            return new PageModel
+            {
+                RouteData = routeData,
+                urlcontrol = name_ctrl,
+                urlaction = name_action
+            };
+        }
+
+
+        public MethodResult View()
+        {
+            var config = RequestContext.Configuration;
+            if (config != null)
+            {
+                var routeData = config.Routes.GetRouteData(Request).Values.ToList();
+                var name_ctrl = routeData[0].Value.ToString();
+                var name_action = routeData[1].Value.ToString();
+                return View(name_ctrl, name_action);
+            }
+            else
+            {
+                return View(Trig_Ctrl + "/" + Trig_func);
+            }
+
+        }
+
+        public static void ApplyCommonValue(ref string contents)
+        {
+            //메뉴 푸터 - 개발자 정보
+
+        }
+
+        public MethodResult View(string Controller, string Action, Boolean applydefaultview = true)
+        {
+            var retval = new MethodResult();
+
+            if (Action.IndexOf(".") == -1)
+                Action += ".html"; //기본값 html 을 넣는다
+
+            var file = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", Controller, Action);
+
+            var contents = string.Empty;
+
+            if (System.IO.File.Exists(file) == false)
+            {
+                //error 폴더의 404.html 파일을 찾는다.
+                var file404 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Error", "404.html");
+                if (System.IO.File.Exists(file404))
+                {
+                    contents = System.IO.File.ReadAllText(file404, System.Text.Encoding.UTF8);
+                    contents = contents.Replace("{errorfilename}", file);
+                }
+
+                else
+                    contents = "ERROR CODE - 404 (NOT FOUND) <br />" + file;
+
+                Console.WriteLine("view File not found : " + file);
+            }
+            else
+            {
+                //디폴트뷰의 내용을 가져온다 (있다면 적용한다)
+                if (applydefaultview)
+                {
+                    //뷰파일이 있다면 그것을 적용한다
+                    var laytoutfile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Layout", "default.html");
+                    if (System.IO.File.Exists(laytoutfile))
+                        contents = System.IO.File.ReadAllText(laytoutfile, System.Text.Encoding.UTF8);
+
+                    var fileContents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
+                    if (String.IsNullOrEmpty(contents)) contents = fileContents;
+                    else contents = contents.Replace("{contents}", fileContents);
+                }
+                else
+                {
+                    //해당 뷰를 가져와서 반환한다
+                    contents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
+                }
+            }
+
+            agi.HtmlDocument doc = new agi.HtmlDocument();
+            doc.LoadHtml(contents);
+
+            //파일참조 태그를 모두 가져옴
+            var tags_include = doc.QuerySelectorAll("include");
+            foreach (var item in tags_include)
+            {
+                var filename = item.InnerText;
+
+                var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\"));
+                load_file = load_file.Replace("\\\\", "\\");
+                String fileContents;// = String.Empty;
+
+                Console.WriteLine("## " + item.OuterHtml);
+                if (System.IO.File.Exists(load_file))
+                {
+                    fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8);
+                }
+                else
+                {
+                    fileContents = string.Format("<div class=\"fg-red\">#include Error:nofile:{0}</div>",
+                        filename);    //파일이없다면 해당 부분은 오류 처리한다.
+                }
+                contents = contents.Replace(item.OuterHtml, fileContents);
+            }
+
+            //콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여,  그냥 처리해본다
+
+
+            //시스템변수 replace
+            contents = contents.Replace("{param_control}", Trig_Ctrl);
+            contents = contents.Replace("{param_function}", Trig_func);
+
+            retval.Content = contents;
+            return retval;
+        }
+        public MethodResult View(string viewfilename, Boolean applydefaultview = true)
+        {
+            var retval = new MethodResult();
+
+            if (viewfilename.IndexOf(".") == -1)
+                viewfilename += ".html"; //기본값 html 을 넣는다
+
+            var file = AppDomain.CurrentDomain.BaseDirectory + "View" + viewfilename.Replace("/", "\\");
+
+            var contents = string.Empty;
+
+            if (System.IO.File.Exists(file) == false)
+            {
+                //error 폴더의 404.html 파일을 찾는다.
+                var file404 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Error", "404.html");
+                if (System.IO.File.Exists(file404))
+                {
+                    contents = System.IO.File.ReadAllText(file404, System.Text.Encoding.UTF8);
+                    contents = contents.Replace("{errorfilename}", file);
+                }
+
+                else
+                    contents = "ERROR CODE - 404 (NOT FOUND) <br />" + file;
+
+                Console.WriteLine("view File not found : " + file);
+            }
+            else
+            {
+                //디폴트뷰의 내용을 가져온다 (있다면 적용한다)
+                if (applydefaultview)
+                {
+                    //뷰파일이 있다면 그것을 적용한다
+                    var laytoutfile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Layout", "default.html");
+                    if (System.IO.File.Exists(laytoutfile))
+                        contents = System.IO.File.ReadAllText(laytoutfile, System.Text.Encoding.UTF8);
+
+                    var fileContents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
+                    if (String.IsNullOrEmpty(contents)) contents = fileContents;
+                    else contents = contents.Replace("{contents}", fileContents);
+                }
+                else
+                {
+                    //해당 뷰를 가져와서 반환한다
+                    contents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
+                }
+            }
+
+            //콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여,  그냥 처리해본다
+            while (true)
+            {
+                var fileindexS = contents.IndexOf("{file:");
+                if (fileindexS == -1) break;
+                var fileindexE = contents.IndexOf("}", fileindexS);
+                if (fileindexE == -1) break;
+                if (fileindexE <= fileindexS + 5) break;
+                var inlinestr = contents.Substring(fileindexS, fileindexE - fileindexS + 1);
+                var filename = contents.Substring(fileindexS + 7, fileindexE - fileindexS - 8);
+                var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", "\\", filename.Replace("/", "\\"));
+                load_file = load_file.Replace("\\\\", "\\");
+                String fileContents;// = String.Empty;
+
+                Console.WriteLine("file impot : " + load_file);
+                if (System.IO.File.Exists(load_file))
+                {
+                    fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8);
+                }
+                else
+                {
+                    fileContents = "{FileNotFound:" + filename + "}";    //파일이없다면 해당 부분은 오류 처리한다.
+                }
+                contents = contents.Replace(inlinestr, fileContents);
+            }
+
+            //시스템변수 replace
+            contents = contents.Replace("{param_control}", Trig_Ctrl);
+            contents = contents.Replace("{param_function}", Trig_func);
+
+            retval.Content = contents;
+            return retval;
+        }
+        protected class Parameter
+        {
+            public string Key { get; set; }
+            public string Value { get; set; }
+            public Parameter(string key_, string value_)
+            {
+                Key = key_;
+                Value = value_;
+            }
+        }
+
+    }
+}

Project/Controller/HomeController.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace Project
+{
+    public class HomeController : BaseController
+    {
+        [HttpPost]
+        public void Index([FromBody]string value)
+        {
+
+        }
+
+        // PUT api/values/5
+        public void Put(int id, [FromBody]string value)
+        {
+        }
+
+        // DELETE api/values/5
+        public void Delete(int id)
+        {
+        }
+
+        [HttpGet]
+        public string Test()
+        {
+            return "test";
+        }
+
+        [HttpGet]
+        public HttpResponseMessage Login()
+        {
+            //로그인이 되어있지않다면 로그인을 가져온다
+            MethodResult result;
+            result = View();
+
+            var model = GetGlobalModel();
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            //기본값을 찾아서 없애줘야한다
+            var contents = result.Content;
+
+            //공용값 적용
+            ApplyCommonValue(ref contents);
+
+            //최종문자 적용
+            result.Content = contents;
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+              result.Content,
+              System.Text.Encoding.UTF8,
+              "text/html")
+            };
+
+            return resp;
+        }
+
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            //로그인이 되어있지않다면 로그인을 가져온다
+            MethodResult result;
+            result = View();
+
+            var model = GetGlobalModel();
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            //기본값을 찾아서 없애줘야한다
+            var contents = result.Content;
+
+            //공용값 적용
+            ApplyCommonValue(ref contents);
+
+            //최종문자 적용
+            result.Content = contents;
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+              result.Content,
+              System.Text.Encoding.UTF8,
+              "text/html")
+            };
+
+            return resp;
+        }
+      
+    }
+}

Project/Controller/IoController.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace Project
+{
+    public class IoController : BaseController
+    {
+        [HttpPost]
+        public void Index([FromBody] string value)
+        {
+
+        }
+
+        // PUT api/values/5
+        public void Put(int id, [FromBody] string value)
+        {
+        }
+
+        // DELETE api/values/5
+        public void Delete(int id)
+        {
+        }
+
+        [HttpGet]
+        public string Test()
+        {
+            return "test";
+        }
+
+
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            //로그인이 되어있지않다면 로그인을 가져온다
+            MethodResult result;
+            result = View();
+
+            var model = GetGlobalModel();
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+
+
+            //기본값을 찾아서 없애줘야한다
+            var contents = result.Content;
+
+            //공용값 적용
+            ApplyCommonValue(ref contents);
+
+            var tabledata = string.Empty;
+            for(int r = 0;r < 8; r++)
+            {
+                tabledata += "<tr>";
+                for (int i = 0; i < 8; i++)
+                {
+                    tabledata += $"<td>";
+                    tabledata += $"<div class=\"card text-white bg-secondary mb-1\" onclick=\"click_input({r},{i},this);\" id=\"di{r}{i}\">";
+                    tabledata += $"<div class=\"card-body\">";
+                    tabledata += $"<h5 class=\"card-title\">X{i.ToString("00")}</h5>";
+                    tabledata += $"<p class=\"card-text\">Start button</p>";
+                    tabledata += $"</div>"; ;
+                    tabledata += $"</div>";
+                    tabledata += $"</td>";
+                }
+                tabledata += "</tr>";
+            }
+        
+            contents = contents.Replace("{list}", tabledata);
+
+            //최종문자 적용
+            result.Content = contents;
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+              result.Content,
+              System.Text.Encoding.UTF8,
+              "text/html")
+            };
+
+            return resp;
+        }
+
+    }
+}

Project/Controller/MotionController.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace Project
+{
+    public class MotionController : BaseController
+    {
+        [HttpPost]
+        public void Index([FromBody]string value)
+        {
+
+        }
+
+        // PUT api/values/5
+        public void Put(int id, [FromBody]string value)
+        {
+        }
+
+        // DELETE api/values/5
+        public void Delete(int id)
+        {
+        }
+
+        [HttpGet]
+        public string Test()
+        {
+            return "test";
+        }
+        
+        
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            //로그인이 되어있지않다면 로그인을 가져온다
+            MethodResult result;
+            result = View();
+
+            var model = GetGlobalModel();
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            //기본값을 찾아서 없애줘야한다
+            var contents = result.Content;
+
+            //공용값 적용
+            ApplyCommonValue(ref contents);
+
+            //최종문자 적용
+            result.Content = contents;
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+              result.Content,
+              System.Text.Encoding.UTF8,
+              "text/html")
+            };
+
+            return resp;
+        }
+      
+    }
+}

Project/Controller/OperationController.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace Project
+{
+    public class OperationController : BaseController
+    {
+        [HttpPost]
+        public void Index([FromBody]string value)
+        {
+
+        }
+
+        // PUT api/values/5
+        public void Put(int id, [FromBody]string value)
+        {
+        }
+
+        // DELETE api/values/5
+        public void Delete(int id)
+        {
+        }
+
+        [HttpGet]
+        public string Test()
+        {
+            return "test";
+        }
+        
+        
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            //로그인이 되어있지않다면 로그인을 가져온다
+            MethodResult result;
+            result = View();
+
+            var model = GetGlobalModel();
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            //기본값을 찾아서 없애줘야한다
+            var contents = result.Content;
+
+            //공용값 적용
+            ApplyCommonValue(ref contents);
+
+            //최종문자 적용
+            result.Content = contents;
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+              result.Content,
+              System.Text.Encoding.UTF8,
+              "text/html")
+            };
+
+            return resp;
+        }
+      
+    }
+}

Project/Controller/ResourceController.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Http;
+namespace Project
+{
+    public class ResourceController : BaseController
+    {
+        [HttpGet]
+        public HttpResponseMessage file()
+        {
+            var config = RequestContext.Configuration;
+            var routeData = config.Routes.GetRouteData(Request).Values.ToList();
+
+            var p_resource = routeData.Where(t => t.Key == "resource").FirstOrDefault();
+            var p_path = routeData.Where(t => t.Key == "path").FirstOrDefault();
+            var p_ext = routeData.Where(t => t.Key == "ext").FirstOrDefault();
+            var p_subdir = routeData.Where(t => t.Key == "subdir").FirstOrDefault();
+
+            var v_resource = string.Empty;
+            var v_path = string.Empty;
+            var v_ext = string.Empty;
+            var v_subdir = string.Empty;
+
+            if (p_resource.Key == "resource") v_resource = p_resource.Value.ToString();
+            if (p_path.Key == "path") v_path = p_path.Value.ToString();
+            if (p_ext.Key == "ext") v_ext = p_ext.Value.ToString();
+            if (p_subdir.Key == "subdir") v_subdir = p_subdir.Value.ToString();
+
+            //var file_ext = routeData[0].Value.ToString();
+            //var name_resource = routeData[1].Value.ToString() + "." + file_ext;
+            //var name_action = routeData[3].Value.ToString();
+
+            Boolean isBinary = true;
+
+
+            string content_type = "text/plain";
+
+            if (v_ext == "json")
+            {
+                isBinary = false;
+                content_type = "application/json";
+            }
+            else if (v_ext == "js")
+            {
+                isBinary = false;
+                content_type = "application/js";
+            }
+            else if (v_ext == "css")
+            {
+                isBinary = false;
+                content_type = "text/css";
+            }
+            else if (v_ext == "csv")
+            {
+                isBinary = false;
+                content_type = "text/csv";
+            }
+            else if (v_ext == "ico")
+            {
+                isBinary = true;
+                content_type = "image/x-icon";
+            }
+            else if(v_ext == "ttf" || v_ext == "otf")
+            {
+                isBinary = true;
+                content_type = "application/octet-stream";
+            }
+
+            HttpContent resultContent = null;
+            var file = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", v_path, v_subdir, v_resource + "." + v_ext);
+
+            if (isBinary)
+            {
+
+                if (System.IO.File.Exists(file))
+                {
+                    var buffer = System.IO.File.ReadAllBytes(file);
+                    resultContent = new ByteArrayContent(buffer);
+                    Console.WriteLine(">>File(B) : " + file);
+                }
+                else Console.WriteLine("no resouoir file  " + file);
+
+            }
+            else
+            {
+                if (System.IO.File.Exists(file))
+                {
+
+                    var buffer = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
+                    resultContent = new StringContent(buffer, System.Text.Encoding.UTF8, content_type);
+                    Console.WriteLine(">>File(S) : " + file);
+                }
+                else Console.WriteLine("no resouoir file  " + file);
+            }
+
+
+            return new HttpResponseMessage()
+            {
+                Content = resultContent
+            };
+
+        }
+    }
+}

Project/Controller/ResultController.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace Project
+{
+    public class ResultController : BaseController
+    {
+        [HttpPost]
+        public void Index([FromBody]string value)
+        {
+
+        }
+
+        // PUT api/values/5
+        public void Put(int id, [FromBody]string value)
+        {
+        }
+
+        // DELETE api/values/5
+        public void Delete(int id)
+        {
+        }
+
+        [HttpGet]
+        public string Test()
+        {
+            return "test";
+        }
+        
+        
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            //로그인이 되어있지않다면 로그인을 가져온다
+            MethodResult result;
+            result = View();
+
+            var model = GetGlobalModel();
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            //기본값을 찾아서 없애줘야한다
+            var contents = result.Content;
+
+            //공용값 적용
+            ApplyCommonValue(ref contents);
+
+            //최종문자 적용
+            result.Content = contents;
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+              result.Content,
+              System.Text.Encoding.UTF8,
+              "text/html")
+            };
+
+            return resp;
+        }
+      
+    }
+}

Project/Controller/SettingController.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace Project
+{
+    public class SettingController : BaseController
+    {
+        [HttpPost]
+        public void Index([FromBody]string value)
+        {
+
+        }
+
+        // PUT api/values/5
+        public void Put(int id, [FromBody]string value)
+        {
+        }
+
+        // DELETE api/values/5
+        public void Delete(int id)
+        {
+        }
+
+        [HttpGet]
+        public string Test()
+        {
+            return "test";
+        }
+
+        [HttpGet]
+        public HttpResponseMessage Index()
+        {
+            //로그인이 되어있지않다면 로그인을 가져온다
+            MethodResult result;
+            result = View();
+
+            var model = GetGlobalModel();
+            var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
+
+            //기본값을 찾아서 없애줘야한다
+            var contents = result.Content;
+
+            //공용값 적용
+            ApplyCommonValue(ref contents);
+
+            //최종문자 적용
+            result.Content = contents;
+
+            var resp = new HttpResponseMessage()
+            {
+                Content = new StringContent(
+              result.Content,
+              System.Text.Encoding.UTF8,
+              "text/html")
+            };
+
+            return resp;
+        }
+      
+    }
+}

Project/EETGW.csproj

@@ -191,6 +191,9 @@
     <Reference Include="Microsoft.SqlServer.Types, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.SqlServer.Types.11.0.1\lib\net20\Microsoft.SqlServer.Types.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
@@ -202,10 +205,20 @@
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Management" />
     <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Http.Owin, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.7\lib\net45\System.Web.Http.Owin.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -236,6 +249,14 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>AdoNetEFMain.edmx</DependentUpon>
     </Compile>
+    <Compile Include="BaseController.cs" />
+    <Compile Include="Controller\HomeController.cs" />
+    <Compile Include="Controller\IoController.cs" />
+    <Compile Include="Controller\MotionController.cs" />
+    <Compile Include="Controller\OperationController.cs" />
+    <Compile Include="Controller\ResourceController.cs" />
+    <Compile Include="Controller\ResultController.cs" />
+    <Compile Include="Controller\SettingController.cs" />
     <Compile Include="CResult.cs" />
     <Compile Include="DataSet1.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -346,6 +367,9 @@
     <Compile Include="Manager\ModelManager.cs" />
     <Compile Include="MessageWindow.cs" />
     <Compile Include="MethodExtentions.cs" />
+    <Compile Include="Model\PageModel.cs" />
+    <Compile Include="OWIN\Startup.cs" />
+    <Compile Include="OWIN\StartupSSE.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="SqlServerTypes\Loader.cs" />
     <Compile Include="UserGroup.cs">

Project/EETGW.csproj.user

@@ -9,6 +9,7 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>ko-KR</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>

Project/Model/PageModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Project
+{
+    public class PageModel
+    {
+        public List<KeyValuePair<string, object>> RouteData { get; set; }
+     
+
+        public string urlcontrol { get; set; }
+        public string urlaction { get; set; }
+
+    }
+}

Project/OWIN/Startup.cs

@@ -0,0 +1,76 @@
+using Microsoft.Owin;
+using Owin;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web.Http;
+using System.Web.Http.Routing;
+
+namespace Project.OWIN
+{
+    public class Startup
+    {
+        public void Configuration(IAppBuilder appBuilder)
+        {
+            // Configure Web API for Self-Host
+            HttpConfiguration config = new HttpConfiguration();
+            config.MapHttpAttributeRoutes();
+
+            //메인파일 처리 방법
+            IHttpRoute defaultRoute =
+                config.Routes.CreateRoute("{controller}/{action}/{id}",
+                new { controller = "home", action = "index", id = RouteParameter.Optional },
+                null);
+
+            //기타파일들 처리 방법
+            IHttpRoute cssRoute =
+              config.Routes.CreateRoute("{path}/{subdir}/{resource}.{ext}",
+              new { controller = "resource", action = "file", id = RouteParameter.Optional },
+              null);
+
+            IHttpRoute mifRoute =
+               config.Routes.CreateRoute("{path}/{resource}.{ext}",
+               new { controller = "resource", action = "file", id = RouteParameter.Optional },
+               null);
+
+            IHttpRoute icoRoute =
+              config.Routes.CreateRoute("{resource}.{ext}",
+              new { controller = "resource", action = "file", id = RouteParameter.Optional },
+              null);
+
+            config.Routes.Add("mifRoute", mifRoute);
+            config.Routes.Add("icoRoute", icoRoute);
+            config.Routes.Add("cssRoute", cssRoute);
+            config.Routes.Add("defaultRoute", defaultRoute);
+            appBuilder.UseWebApi(config);
+
+
+            //appBuilder.UseFileServer(new FileServerOptions
+            //{
+            //    RequestPath = new PathString(string.Empty),
+            //    FileSystem = new PhysicalFileSystem("./MySubFolder"),
+            //    EnableDirectoryBrowsing = true,
+            //});
+
+            //appBuilder.UseStageMarker(PipelineStage.MapHandler);
+
+
+            //config.Routes.MapHttpRoute(
+            //    name: "ignore",
+            //    routeTemplate: @".*\.(css|js|gif|jpg)(/.*)?",
+            //    defaults: new
+            //    {
+            //        controller = "file",
+            //        action = "readtext",
+            //        id = RouteParameter.Optional
+            //    }
+            // );
+
+
+
+        }
+
+    }
+}

Project/OWIN/StartupSSE.cs

@@ -0,0 +1,101 @@
+using Microsoft.Owin;
+using Owin;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Web.Http;
+
+namespace Project.OWIN
+{
+    public class StartupSSE
+    {
+
+
+        public void Configuration(IAppBuilder app)
+        {
+            var api = new Api();
+            app.Run(context => api.Invoke(context));
+        }
+
+        public class Subscriber
+        {
+            private StreamWriter _writer;
+            private TaskCompletionSource<bool> _tcs;
+            public Subscriber(Stream body, TaskCompletionSource<bool> tcs)
+            {
+                this._writer = new StreamWriter(body);
+                this._tcs = tcs;
+            }
+
+            public async void WriteAsync(string message)
+            {
+                try
+                {
+                    _writer.Write(message);
+                    _writer.Flush();
+                }
+                catch (Exception e)
+                {
+                    if (e.HResult == -2146232800) // non-existent connection
+                        _tcs.SetResult(true);
+                    else
+                        _tcs.SetException(e);
+                }
+            }
+        }
+
+        public class Api
+        {
+            System.Timers.Timer _timer = new System.Timers.Timer(500);
+            List<Subscriber> _subscribers = new List<Subscriber>();
+            public Api()
+            {
+                _timer.Elapsed += _timer_Elapsed;
+            }
+
+            void _timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+            {
+                UpdateSubscribers();
+            }
+
+            public void UpdateSubscribers()
+            {
+                Console.WriteLine("updating {0} subscribers", _subscribers.Count);
+                var subscribersCopy = _subscribers.ToList<Subscriber>();
+                var msg = String.Format("Hello async at {0}\n", DateTime.Now);
+                subscribersCopy.ForEach(w => w.WriteAsync(msg));
+                _timer.Start();
+            }
+
+
+            public Task Invoke(IOwinContext context)
+            {
+                SetEventHeaders(context);
+                System.IO.Stream responseStream = context.Environment["owin.ResponseBody"] as Stream;
+                var tcs = new TaskCompletionSource<bool>();
+                var s = CreateSubscriber(responseStream, tcs);
+                tcs.Task.ContinueWith(_ => _subscribers.Remove(s));
+                Console.WriteLine("Add subscriber. Now have {0}", _subscribers.Count);
+                s.WriteAsync("Registered\n");
+                _timer.Start();
+                return tcs.Task;
+            }
+
+            private Subscriber CreateSubscriber(System.IO.Stream responseStream, TaskCompletionSource<bool> tcs)
+            {
+                var s = new Subscriber(responseStream, tcs);
+                _subscribers.Add(s);
+                return s;
+            }
+
+            private static void SetEventHeaders(IOwinContext context)
+            {
+                context.Response.ContentType = "text/eventstream";
+                context.Response.Headers["Transfer-Encoding"] = "chunked";
+                context.Response.Headers["cache-control"] = "no-cache";
+            }
+        }
+    }
+}

Project/Program.cs

@@ -1,46 +1,46 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Windows.Forms;
+using System.Windows.Forms;
-
+
-namespace Project
+namespace Project
-{
+{
-    static class Program
+    static class Program
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// 해당 응용 프로그램의 주 진입점입니다.
+        /// 해당 응용 프로그램의 주 진입점입니다.
-        /// </summary>
+        /// </summary>
-        [STAThread]
+        [STAThread]
-        static void Main()
+        static void Main()
-        {
+        {
-            Application.EnableVisualStyles();
+            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
+            Application.SetCompatibleTextRenderingDefault(false);
             SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
             // Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
             // AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
-            Application.Run(new fMain());
+            Application.Run(new fMain());
-        }
+        }
-
+
-        static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
-        {
+        {
-            string emsg = "Fatal Error(UHE)\n\n" + e.ExceptionObject.ToString();
+            string emsg = "Fatal Error(UHE)\n\n" + e.ExceptionObject.ToString();
-            Pub.log.AddE(emsg);
+            Pub.log.AddE(emsg);
-            Pub.log.Flush();
+            Pub.log.Flush();
-            Util.SaveBugReport(emsg);
+            Util.SaveBugReport(emsg);
-            var f = new fErrorException(emsg);
+            var f = new fErrorException(emsg);
-            f.ShowDialog();
+            f.ShowDialog();
-            Application.ExitThread();
+            Application.ExitThread();
-        }
+        }
-
+
-        static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
+        static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
-        {
+        {
-            string emsg = "Fatal Error(ATE)\n\n" + e.Exception.ToString();
+            string emsg = "Fatal Error(ATE)\n\n" + e.Exception.ToString();
-            Pub.log.AddE(emsg);
+            Pub.log.AddE(emsg);
-            Pub.log.Flush();
+            Pub.log.Flush();
-            Util.SaveBugReport(emsg);
+            Util.SaveBugReport(emsg);
-            var f = new fErrorException(emsg);
+            var f = new fErrorException(emsg);
-            f.ShowDialog();
+            f.ShowDialog();
-            Application.ExitThread();
+            Application.ExitThread();
-        }
+        }
-    }
+    }
-}
+}

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("21.02.23.1350")]
+[assembly: AssemblyVersion("21.03.02.1257")]
-[assembly: AssemblyFileVersion("21.02.23.1350")]
+[assembly: AssemblyFileVersion("21.03.02.1257")]

Project/fMain.Designer.cs

@@ -91,6 +91,8 @@
             this.todoListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
+            this.기타ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.행복나래ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.즐겨찾기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.btDev = new System.Windows.Forms.ToolStripMenuItem();
             this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -116,8 +118,7 @@
             this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
-            this.기타ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.잉여장비ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.행복나래ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.cmTab.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
@@ -238,14 +239,14 @@
             // 
             this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image")));
             this.codesToolStripMenuItem.Name = "codesToolStripMenuItem";
-            this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
             this.codesToolStripMenuItem.Text = "공용코드";
             this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click);
             // 
             // itemsToolStripMenuItem
             // 
             this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem";
-            this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
             this.itemsToolStripMenuItem.Text = "품목정보";
             this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click);
             // 
@@ -256,7 +257,7 @@
             this.myAccouserToolStripMenuItem,
             this.권한설정ToolStripMenuItem});
             this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem";
-            this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
             this.userInfoToolStripMenuItem.Text = "사용자";
             // 
             // userAccountToolStripMenuItem
@@ -283,14 +284,14 @@
             // customerToolStripMenuItem
             // 
             this.customerToolStripMenuItem.Name = "customerToolStripMenuItem";
-            this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
             this.customerToolStripMenuItem.Text = "업체정보";
             this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click);
             // 
             // mn_kuntae
             // 
             this.mn_kuntae.Name = "mn_kuntae";
-            this.mn_kuntae.Size = new System.Drawing.Size(180, 24);
+            this.mn_kuntae.Size = new System.Drawing.Size(153, 24);
             this.mn_kuntae.Text = "월별 근무표";
             this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click);
             // 
@@ -298,7 +299,7 @@
             // 
             this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image")));
             this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem";
-            this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
+            this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
             this.메일양식ToolStripMenuItem.Text = "메일 양식";
             this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click);
             // 
@@ -433,6 +434,7 @@
             this.dataFOLToolStripMenuItem,
             this.dataMoldEOLToolStripMenuItem,
             this.dataToolStripMenuItem,
+            this.잉여장비ToolStripMenuItem,
             this.toolStripMenuItem2,
             this.라인코드관리ToolStripMenuItem});
             this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image")));
@@ -443,33 +445,33 @@
             // dataFOLToolStripMenuItem
             // 
             this.dataFOLToolStripMenuItem.Name = "dataFOLToolStripMenuItem";
-            this.dataFOLToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.dataFOLToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.dataFOLToolStripMenuItem.Text = "FOL";
             this.dataFOLToolStripMenuItem.Click += new System.EventHandler(this.dataFOLToolStripMenuItem_Click);
             // 
             // dataMoldEOLToolStripMenuItem
             // 
             this.dataMoldEOLToolStripMenuItem.Name = "dataMoldEOLToolStripMenuItem";
-            this.dataMoldEOLToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.dataMoldEOLToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.dataMoldEOLToolStripMenuItem.Text = "MOLD & EOL";
             this.dataMoldEOLToolStripMenuItem.Click += new System.EventHandler(this.dataMoldEOLToolStripMenuItem_Click);
             // 
             // dataToolStripMenuItem
             // 
             this.dataToolStripMenuItem.Name = "dataToolStripMenuItem";
-            this.dataToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.dataToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.dataToolStripMenuItem.Text = "BUMP";
             this.dataToolStripMenuItem.Click += new System.EventHandler(this.dataToolStripMenuItem_Click);
             // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(159, 6);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6);
             // 
             // 라인코드관리ToolStripMenuItem
             // 
             this.라인코드관리ToolStripMenuItem.Name = "라인코드관리ToolStripMenuItem";
-            this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(162, 24);
+            this.라인코드관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
             this.라인코드관리ToolStripMenuItem.Text = "라인코드관리";
             this.라인코드관리ToolStripMenuItem.Click += new System.EventHandler(this.라인코드관리ToolStripMenuItem_Click);
             // 
@@ -629,6 +631,20 @@
             this.toolStripMenuItem5.Text = "(test)휴가등록";
             this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
             // 
+            // 기타ToolStripMenuItem
+            // 
+            this.기타ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.행복나래ToolStripMenuItem});
+            this.기타ToolStripMenuItem.Name = "기타ToolStripMenuItem";
+            this.기타ToolStripMenuItem.Size = new System.Drawing.Size(49, 23);
+            this.기타ToolStripMenuItem.Text = "기타";
+            // 
+            // 행복나래ToolStripMenuItem
+            // 
+            this.행복나래ToolStripMenuItem.Name = "행복나래ToolStripMenuItem";
+            this.행복나래ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
+            this.행복나래ToolStripMenuItem.Text = "행복나래";
+            // 
             // 즐겨찾기ToolStripMenuItem
             // 
             this.즐겨찾기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("즐겨찾기ToolStripMenuItem.Image")));
@@ -860,19 +876,12 @@
             this.toolStripButton2.Text = "품목정보";
             this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
             // 
-            // 기타ToolStripMenuItem
+            // 잉여장비ToolStripMenuItem
             // 
-            this.기타ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.잉여장비ToolStripMenuItem.Name = "잉여장비ToolStripMenuItem";
-            this.행복나래ToolStripMenuItem});
+            this.잉여장비ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
-            this.기타ToolStripMenuItem.Name = "기타ToolStripMenuItem";
+            this.잉여장비ToolStripMenuItem.Text = "잉여장비";
-            this.기타ToolStripMenuItem.Size = new System.Drawing.Size(49, 23);
+            this.잉여장비ToolStripMenuItem.Click += new System.EventHandler(this.잉여장비ToolStripMenuItem_Click);
-            this.기타ToolStripMenuItem.Text = "기타";
-            // 
-            // 행복나래ToolStripMenuItem
-            // 
-            this.행복나래ToolStripMenuItem.Name = "행복나래ToolStripMenuItem";
-            this.행복나래ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
-            this.행복나래ToolStripMenuItem.Text = "행복나래";
             // 
             // fMain
             // 
@@ -994,6 +1003,7 @@
         private System.Windows.Forms.ToolStripMenuItem 업무현황전자실ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 기타ToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem 행복나래ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem 잉여장비ToolStripMenuItem;
     }
 }
 

Project/fMain.cs

@@ -1,4 +1,5 @@
 using arTCPService.Server;
+using Microsoft.Owin.Hosting;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -130,9 +131,11 @@ namespace Project
             //사용기록추적
             Pub.CheckNRegister3(Application.ProductName, "chi", Application.ProductVersion);
 
+            // Start OWIN host
+            WebApp.Start<OWIN.Startup>(url: "http://127.0.0.1:9000");
+            Console.WriteLine("start webapp");
+
 
-           
-                
             //서버ON
             try
             {
@@ -1120,5 +1123,12 @@ namespace Project
             //업무현황 전자실
             menu_work_eboard();
         }
+
+        private void 잉여장비ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            string formkey = "INGYEQ";
+            if (!ShowForm(formkey))
+                AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.ING), "잉여장비");
+        }
     }
 }

Project/fMain.resx

@@ -153,26 +153,6 @@
         Mi4wAwEBAAAh+QQBAAAXACwAAAAAEAAQAAAIggAvCBwo0IJBCwQTFqwAAQEDhAoXTpgoYQDEhBYqTKDA
         kYKEBRclciRAoMEDCREuZtw40oKCCihVauxIIYEBmCkJruxYoWfMggYPsOyJU+WAABMqCJDgM+eFg0iV
         Aigg4WfBo0kFADAYwWnBABSkQjSIcYDYiAMtBHCwFW3ag24HBgQAOw==
-</value>
-  </data>
-  <data name="codesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQAAHan1azQ4ldvj9vp9HSQruTr80lVa+vx9pu811SRuXifuj13uYyz2VFhe4Gt2UNL
-        XPL1+Orv+ufu9YOqxYyzzNHW3SkxQz5FVWag2T6CuZe3y5G0t+Do7+r0/77a9f///yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIrwA/CBxIsKDAAQESIkBAYYICBQQICCAgMMAACQMyaswo
-        oUKDih0SZMiwoKTJBQcEVDyAoEMHDy5hdnAg4eMHBBIQeNjJcyeDAjYRRNAQs+hMoAIpRNjQs6eDAgYE
-        TshpVCYAqAIV5GzKU0GBB1klMKjqEgMHsB8IiOW60+wFgQQgIGDgoC4AABgwADjw9oOAChAkSChAmIPh
-        AxUswBXAuEEDAwYePLhwwYJNg5gFBgQAOw==
-</value>
-  </data>
-  <data name="메일양식ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        R0lGODlhEAAQAIQfAHWSrbTY+6nU/I+74/r8/drj7FlxkUlVa9Xp/eLs9cvT2oWpxG+bwqPQ+57N++v1
-        /lJgeabK7JnB5kNLXJG0z5nA1oyw0SkxQz5FVb7e/aC91tHl8qXB2n2gu////////yH/C05FVFNDQVBF
-        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpAA/CBxIsKDBgwQ9KFzIsKHCDRUqUFhAsQOAiwAMQFBY
-        gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi
-        SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG
-        CyQdKlaIsLHjggEBADs=
 </value>
   </data>
   <data name="commonToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -325,6 +305,26 @@
         JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
         jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
         Ow==
+</value>
+  </data>
+  <data name="codesToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQAAHan1azQ4ldvj9vp9HSQruTr80lVa+vx9pu811SRuXifuj13uYyz2VFhe4Gt2UNL
+        XPL1+Orv+ufu9YOqxYyzzNHW3SkxQz5FVWag2T6CuZe3y5G0t+Do7+r0/77a9f///yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIrwA/CBxIsKDAAQESIkBAYYICBQQICCAgMMAACQMyaswo
+        oUKDih0SZMiwoKTJBQcEVDyAoEMHDy5hdnAg4eMHBBIQeNjJcyeDAjYRRNAQs+hMoAIpRNjQs6eDAgYE
+        TshpVCYAqAIV5GzKU0GBB1klMKjqEgMHsB8IiOW60+wFgQQgIGDgoC4AABgwADjw9oOAChAkSChAmIPh
+        AxUswBXAuEEDAwYePLhwwYJNg5gFBgQAOw==
+</value>
+  </data>
+  <data name="메일양식ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIQfAHWSrbTY+6nU/I+74/r8/drj7FlxkUlVa9Xp/eLs9cvT2oWpxG+bwqPQ+57N++v1
+        /lJgeabK7JnB5kNLXJG0z5nA1oyw0SkxQz5FVb7e/aC91tHl8qXB2n2gu////////yH/C05FVFNDQVBF
+        Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpAA/CBxIsKDBgwQ9KFzIsKHCDRUqUFhAsQOAiwAMQFBY
+        gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi
+        SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG
+        CyQdKlaIsLHjggEBADs=
 </value>
   </data>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -375,52 +375,52 @@
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJFSURBVDhPjVPtS1NxGP1B3r+gj/0PfUhXQgQJYWUqRFFB
-        QwoXhVCNrK1o6oJog+iDkJrIvjRlkJQUgTkGI4Teo4g1o31bEGzqiG3e3bteTs/53StLVOiByz7ce55z
+        QwoXhVCNrK1o6oJog+iDkJrIvjRlkJQUgTYGI4Teo4g1o31bEGzqiG3e3bteTs/53StLVOiByz7ce55z
         nnPO1P9OzlC+r4aal9+iPHbaUL/nDPXHfb35yMdjWUMVCCj0HsNi8ByWBi9gOeyHvIP72foRNu9Ck8rn
         W7djMXAWpZt+lEcCKIf2YCXSip+zA6gFN1mQ26JiGUOZhTMnUIr048e1dphRD+yRXaiPOc+v1CDs6xss
-        yDWpaZFWXxo4j/LdAKrhHai7QHtqL6y5LtReHYedH0XlbfPaBWQmeHnoIioTQVh3PA4w0Yba8yMwMz0w
+        yDWpaZFWXxo4j/LdAKrhHai7QHtqL6xnXai9Og47P4rK2+a1C8hM8PLQRVQmgrDueBxgog2150dgZnpg
-        v5zWj/19HJX3nsYC3kzZZCbYHt6pwdbTDpgfvRr0LePFw5fdCKXaMPphCNti/5xAw3gzZa8yW8lumNlT
+        fjmtH/v7OCrvPY0FvJmyyUywPbxTg62nHTA/ejXoW8aLhy+7EUq1YfTDELbF/jmBhvFmyl5ltpLdMLOn
-        WBHw9Isu+GZ3o+NJC/Y/bkb0XQhbJ9wFjIqZlm5dQvVGS4NZwMXPPbid3odOF3gyHkDfeALx5CccujLj
+        sCLg6Rdd8M3uRseTFux/3IzouxC2TrgLGBUzLd26hOqNlgazgIufe3A7vQ+dLvBkPIC+8QTiyU84dGXG
-        LGDOjKoau6oN482UTWaCDwjw8IOj6LuXwGQyi6nkAu4/yzoLhN3HkjBnRkV2bZgrm8wEh+MpDYxOvkFv
+        WcCcGVU1dlUbxpspm8wEHxDg4QdH0XcvgclkFlPJBdyfyzoLhN3HkjBnRkV2bZgrm8wEh+MpDYxOvkFv
         JCnguHWwf+Y1zZtnw1gS5syo6DYN482UTWaC/cNpDey8/KhdS+eIgiLryYbp2yVnstNtGsabKZvMBLuw
         xsgCm91mPbV8KQkXMCrNLoaRnbLXMK8O7+cfg93W9ZSGsSTMmVHRbcewDdg5jE9U6D8Gu816smEsCXOm
-        03y0YetGqb+SV/RuxcFpvwAAAABJRU5ErkJggg==
+        03y0YetGqb+MRfRr+7WMzwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKVSURBVDhPlVJRSFNRGL5PEVE91Us99ZTWQ0R0i6iHEqye
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKUSURBVDhPlVJRSFNRGL5PEVE91Us99ZQWBBHdIgoiwXyL
-        oocQKhoMtoZT2nSK4uZcuDWnY3e6ueV0cplXajObDkJlD246p9NCdKBMMEXfehIGIVt9nXO8iVJRfXC4
+        HkKoaDDaGk5p0ymKm3Ph1pyO3enmltPJZV6pzWw6CJU9uOlcTgvRgTLBFH3rSRiEbPV1zvEmSkX1weHC
-        8J37/f/3/f/h/oQX0i1oQ9fwJFCK+75z32T636Hqv1SIfurG24yA2+6z/1/guXgF7z56IM06UeY6DZnm
+        d+73/9/3/4f7E55Lt6ANXcOjQCkqfOe+yfS/4+nApUL0Uw/eZATcdp/9/wLPxCt4+9ED6YMTZa7TkGku
-        QqEQgsEgenp64PV6n3KpVAr0TE1NYXJyEnrpDirFmzC+f4Q38wKCKTue9d/AVdtJXGw5wf4tFArY3t6G
+        FAohGAyit7cXXq/3MZdKpUDP9PQ0pqamoJfuoEq8CeO7B3g9LyCYsuPJwA1ctZ3ExdYT7N9CoYDt7W0I
-        IAhZbnp6GsViEbu7u+yo+i/DEnuM8LwbQtwA64dKdCdaoBDLcMF8qrizs4PV1VW0t7d/bmtrq+SSySQj
+        gpDlZmZmUCwWsbu7y45q4DIssYcIz7shxA2wvq9CT6IVCrEMF8ynijs7O1hdXUVHR8fn9vb2Ki6ZTDJi
-        tra2kE6nsbm5iQp/CQyRBxDTDviSL6EMlRNXFRgaGkI2m0UkEgERl8mpOC4ej2NmZgaxWIxPJBIYHh7m
+        a2sL6XQam5ubqPSXwBC5BzHtgC/5AspQOXFVieHhYWSzWUQiERBxmZyK4+LxOGZnZxGLxfhEIoGRkRH+
-        7wpnoJHKoZbuodR0LEXFnZ2dvCRJLL/Vai2R5Rw3NjaGpaUlNoP19XVMTEwgt5YD/+ooHnqv73ceGBjA
+        rnAGGqkcaqkCpaZjKSru6uriJUli+a1Wa4ks57jx8XEsLS2xGayvr2NychK5tRz4l0dx33t9v/Pg4CAW
-        4uIi7Q6z2Xxclu8hGo0in89jfHwcpAs/OjqKQCDAU7tOp5OnYrvdzvf29qK5uXl/K/sIh8PGTCaDXC4H
+        Fxdpd5jN5uOyfA/RaBT5fB4TExMgXfixsTEEAgGe2nU6nTwV2+12vq+vDy0tLftb2Uc4HDZmMhnkcjlQ
-        Kl5ZWQHhsLy8DLo62pkUxMLCAhoaGr7LssMQRRF9fX3w+/3o6uqCy+WCw+GgeWGxWKhtjIyMwGAw/L7A
+        8crKCgiH5eVl0NXRzqQgFhYW0NjY+F2WHYYoiujv74ff70d3dzdcLhccDgfNC4vFQm1jdHQUBoPh9wX+
-        30AKHKmtrUVVVdUXmdoDyXX+NYHP56OTpplpXrS2trKuTU1NqK+vR01NDcuu0WjyTPgTZC1G+nW73bqO
+        BlLgSF1dHaqrq7/I1B5IrvOvCHw+H500zUzzoq2tjXVtbm5GQ0MDamtrWXaNRpNnwp8gazHSr9vt1nV2
-        jo4NItaxiwPQ6/W66urqDa1Wq1Or1V9leg8ej8dIniVb19zcHAYHB9mkGxsbUVdXByIGMcieMXn/UCgU
+        dm4QsY5dHIBer9fV1NRsaLVanVqt/irTe/B4PEbyLNm65ubmMDQ0xCbd1NSE+vp6EDGIQfaMyfuHQqFY
-        a7L0MGw2GxuWyWT6xQGxrVOpVFAqlQdWyHE/AIbUwk2mSfQcAAAAAElFTkSuQmCC
+        k6WHYbPZ2LBMJtMvDohtnUqlglKpPLBCjvsBd9XCSVklPrUAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMUSURBVDhPfZNdTJtlGIZ7amI8wLDKRn82PUBQk0WXMKMH
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMUSURBVDhPfZNdTJNnGIZ7umTZAQvrmPRHtwMGzsRsJmxx
-        agYkwjawQ35Gtw8GpeVHZycdFpFutLSFFig/BcqWoaXIVtbMyegUh2QzJrolujDrUp3rgtNiMJ6RkLlr
+        B3MRSQQVrciPVD8QSsvP5uqorIzRSUtbaIHyU6BoZCtlaFmzKVI3JhJdlmyabAbXmW7OGnQrBrMzEuJ2
-        5V2XbMR4J/fJk+e+vud93veTDVWpWW9vpZoBSUXffiW9WiXdFQpc5ek4SzdhL9mEtXgjRzRptBU9hQD8
+        rbzWRMmyO7lPnjz39T3v876fbKBCzWp7y9X0SSp6Dirp1irpLFPgKk3HWbwGe9EarIUv8LEmjZbdzyMA
-        9Y37v32xi6X5TuIXnPz5hZ3b52z8fvYoiyELt0610looF4DFyOlDxOetxCaL73tiDzf9b3HjRCG/+nYS
+        9751/7cvdbAw2078gpM/v7Jz95yNO2eOMR+ycPt0M80FcgGYj3x+hPisldh44UOP7eWWfw83Txbwm28H
-        HXiT6z15RJw7uNb+Gj+7NPzmN9OSK7+TAKjKpm254ovh5m1MH34JU34qwYNbmWjcypjhBUZqnhc1tzYT
+        0b7t3OjKJeLcyvXWt/jFpeF3v5mmHPmDBEBVMmnbJr4YbtzE5NHXMOWlEjy8kbH6jYwYNjBU9YqoubWZ
-        e2kGP/qaCDbl8MHODYOyNXkl9eUrYzUsnHyfqYZnRPPHui2MVm1mcJ+anr0qUWvXKPnEspdLzv2JcMrS
+        2Isz+MnXQLAhhw92PNcvW5FXUl+5OlLF3Kn3mah7STR/olvHcMVa+g+o6dqvErVWjZJPLfu57DyYCKcs
-        wZwnUgSgX1K8MmHK5vaXHYSat4vm4crN9FWo6CpVYStWilqbZgvfD7zHMX02TflPlonwA/VqFeMXXHv4
+        HM55JkUAeiXF5jFTNne/biPU+LpoHixfS0+Zio5iFbZCpai1aNbxQ997HNdn05D3bIkIP1K3VjF6wbWX
-        1mdgbqiBGY+Bz3r0hNx6TnXW8qlDx7SrjjPN+ZgKUr9Oxu6r35D5+KCkDHVUKO50FaX/u/6q1rbdsku+
+        73wGZgbqmPIY+LJLT8it53R7NZ85dEy6aviiMQ9TfurFZOyheg2ZT/dLypCtTPGgoyD979VXtbLtpp3y
-        dmYOF6TetRSluZNRmcxXlZ4yJKn/Dra8zrxX94jnBnXMDug431fDud5qznZXM+WU6K9/mbZC+VEBGNqn
+        lTNzND/1H8vuNHcyKpP5KtJTBiT1/WDTFma9uic8069juk/H+Z4qznVXcqazkgmnRG/tG7QUyI8JwMAB
-        ik617uDiSB3BQ9uYbHyOiYYs/PVZnDBkMarLxHvgWTxSBi5tBiPGXMZtEt212YmJ5CFZT0XaPwtBE0Hj
+        VXSieSuXhmoIHtnEeP16xuqy8NdmcdKQxbAuE++hl/FIGbi0GQwZtzFqk+iszk5MJA/JusrS/poLmgga
-        i4zXPi2W9X9u2aXAbXiDk5114kgCcGvOTuzzZm5Mvcsvk/VEAzqujx3gp1EtC94yrnqK+cG1myv2Ai63
+        X2W0+kWxrP9z004FbsPbnGqvEUcSgNszdmJnG7k58S6/jtcSDei4MXKIn4e1zHlLuOYp5EfXLq7a87nS
-        5/GdJfGgRk1r+0gCvupIhMqJHN/N8T4bHo9HeNbxNpcsOXz0oRmj0Yher2cpWi58zWcSEwnAzfNWFmcd
+        msv3lsSDGjat7CMJ+KYtESolcmIXJ3pseDwe4WnHPi5bcvjoQzNGoxG9Xs9CtFT4us8kJhKAW+etzE87
-        xMIdBHzdxGIxIpEIfr8fh8NBOBxmZWWF6qpKrg43ifAjgIf/OFdjHjMzM8TjcVZXV4WXl5cJBALoNK+K
+        iIXbCPg6icViRCIR/H4/DoeDcDjM0tISlRXlXBtsEOEnAI//ca76XKampojH4ywvLwsvLi4SCATQad4U
-        sR/eibiJ9bJare+Yzebog7ElSfqjpKRkWKPRPJZsSUomuwfmMDVwKo3V+wAAAABJRU5ErkJggg==
+        Yz++E3ETq2W1Wt8xm83RR2NLkvRHUVHRoEajeSrZkpRM9i/ebTVtphOuywAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

Project/packages.config

@@ -8,10 +8,15 @@
   <package id="EntityFramework.ko" version="6.2.0" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net452" />
   <package id="HtmlAgilityPack.CssSelectors" version="1.0.2" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.7" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.7" targetFramework="net452" />
   <package id="Microsoft.Owin" version="4.1.1" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="4.1.1" targetFramework="net452" />
   <package id="Microsoft.Owin.Hosting" version="4.1.1" targetFramework="net452" />
   <package id="Microsoft.ReportViewer" version="11.0.3366.16" targetFramework="net452" />
   <package id="Microsoft.SqlServer.Types" version="11.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net452" />
 </packages>

SubProject/FEQ0000/Equipment/EQFilterApply.cs

@@ -1,109 +1,113 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
-using System.Data;
+using System.Data;
-using System.Drawing;
+using System.Drawing;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using System.Windows.Forms;
+using System.Windows.Forms;
-
+
-namespace FEQ0000
+namespace FEQ0000
-{
+{
-    public partial class EQFilterApply : Form
+    public partial class EQFilterApply : Form
-    {
+    {
-     
+
-        fEquipment.eTabletype divtype;
+        //fEquipment.eTabletype divtype;
-        public EQFilterApply(fEquipment.eTabletype type_)
+        string eqfiletertype = "E";
-        {
+        public EQFilterApply(string  type_)
-            InitializeComponent();
+        {
-            divtype = type_;
+            InitializeComponent();
-            this.FormClosed += __Closed;
+            this.eqfiletertype = type_;
-        }
+            this.FormClosed += __Closed;
-
+        }
-        void __Closed(object sender, FormClosedEventArgs e)
+
-        {
+        void __Closed(object sender, FormClosedEventArgs e)
-           
+        {
-        }
+           
-
+        }
-        private void __Load(object sender, EventArgs e)
+
-        {
+        private void __Load(object sender, EventArgs e)
-            
+        {
-            try
+            
-            {
+            try
-                ta.Fill(this.dsEQ.EquipmentFilter);
+            {
-
+                ta.Fill(this.dsEQ.EquipmentFilter, eqfiletertype);
-                //필터목록을 미리 가져온다.
+
-                arUtil.XMLHelper xml = new arUtil.XMLHelper(FCOMMON.info.Path.MakeFilePath("Setting", "eqfilter.xml"));
+                //필터목록을 미리 가져온다.
-                if (!xml.Exist()) xml.CreateFile();
+                var fn = "eqfilter.xml";
-                List<string> filterList = new List<string>();
+                if (eqfiletertype != "E") fn = "eqfilterIng.xml";
-                int filterCnt = int.Parse(xml.get_Data("filter", "count", "0"));
+                arUtil.XMLHelper xml = new arUtil.XMLHelper(FCOMMON.info.Path.MakeFilePath("Setting", "eqfilter.xml"));
-                for (int i = 0; i < filterCnt; i++)
+                if (!xml.Exist()) xml.CreateFile();
-                {
+                List<string> filterList = new List<string>();
-                  var data=  xml.get_Data("filter", "item" + (i + 1).ToString());
+                int filterCnt = int.Parse(xml.get_Data("filter", "count", "0"));
-                  if (data=="") continue;
+                for (int i = 0; i < filterCnt; i++)
-                  filterList.Add(data);
+                {
-                }
+                  var data=  xml.get_Data("filter", "item" + (i + 1).ToString());
-
+                  if (data=="") continue;
-                foreach (dsEQ.EquipmentFilterRow item in this.dsEQ.EquipmentFilter.Select("", "Title"))
+                  filterList.Add(data);
-                {
+                }
-                    string title = item.Title;
+
-                    if (title=="") continue;
+                foreach (dsEQ.EquipmentFilterRow item in this.dsEQ.EquipmentFilter.Select("", "Title"))
-
+                {
-                    var chk = filterList.IndexOf(title) != -1;
+                    string title = item.Title;
-                    var lvitem = this.listView1.Items.Add(item.Title);
+                    if (title=="") continue;
-                    lvitem.Checked = chk;
+
-                    lvitem.SubItems.Add(item.memo);
+                    var chk = filterList.IndexOf(title) != -1;
-                    lvitem.SubItems.Add(item.Filter);
+                    var lvitem = this.listView1.Items.Add(item.Title);
-                    lvitem.SubItems.Add(item.Apply);
+                    lvitem.Checked = chk;
-                }
+                    lvitem.SubItems.Add(item.memo);
-            }
+                    lvitem.SubItems.Add(item.Filter);
-            catch (Exception ex)
+                    lvitem.SubItems.Add(item.Apply);
-            {
+                }
-                FCOMMON.Util.MsgE(ex.Message);
+            }
-            }
+            catch (Exception ex)
-        }
+            {
-
+                FCOMMON.Util.MsgE(ex.Message);
-        private void toolStripButton1_Click(object sender, EventArgs e)
+            }
-        {
+        }
-            this.Invalidate();
+
-            this.bs.EndEdit();
+        private void toolStripButton1_Click(object sender, EventArgs e)
-            try
+        {
-            {
+            this.Invalidate();
-                var cnt = ta.Update(this.dsEQ.EquipmentFilter);
+            this.bs.EndEdit();
-                FCOMMON.Util.MsgI("update : " + cnt.ToString());
+            try
-
+            {
-            }
+                var cnt = ta.Update(this.dsEQ.EquipmentFilter);
-            catch (Exception ex)
+                FCOMMON.Util.MsgI("update : " + cnt.ToString());
-            {
+
-                FCOMMON.Util.MsgE(ex.Message);
+            }
-            }
+            catch (Exception ex)
-        }
+            {
-
+                FCOMMON.Util.MsgE(ex.Message);
-        public string filter = string.Empty;
+            }
-        public string apply = string.Empty;
+        }
-
+
-
+        public string filter = string.Empty;
-        private void button1_Click_1(object sender, EventArgs e)
+        public string apply = string.Empty;
-        {
+
-            //다음에 체크한것을 복원하기 위해 값을 기록한다.
+
-            List<string> filterList = new List<string>();
+        private void button1_Click_1(object sender, EventArgs e)
-            foreach (ListViewItem item in this.listView1.CheckedItems)
+        {
-            {
+            //다음에 체크한것을 복원하기 위해 값을 기록한다.
-                string title = item.SubItems[0].Text.Trim();
+            List<string> filterList = new List<string>();
-                if (title=="") continue;
+            foreach (ListViewItem item in this.listView1.CheckedItems)
-                filterList.Add(title);
+            {
-            }
+                string title = item.SubItems[0].Text.Trim();
-
+                if (title=="") continue;
-            arUtil.XMLHelper xml = new arUtil.XMLHelper(FCOMMON.info.Path.MakeFilePath( "Setting", "eqfilter.xml"));
+                filterList.Add(title);
-            if (!xml.Exist()) xml.CreateFile();
+            }
-            xml.set_Data("filter", "count", filterList.Count.ToString());
+            var fn = this.eqfiletertype == "E" ? "eqfilter.xml" : "eqfilterIng.xml";
-            for (int i = 0; i < filterList.Count; i++)
+
-            {
+            arUtil.XMLHelper xml = new arUtil.XMLHelper(FCOMMON.info.Path.MakeFilePath( "Setting", fn));
-                xml.set_Data("filter", "item" + (i + 1).ToString(), filterList[i]);
+            if (!xml.Exist()) xml.CreateFile();
-            }
+            xml.set_Data("filter", "count", filterList.Count.ToString());
-            xml.Save();
+            for (int i = 0; i < filterList.Count; i++)
-
+            {
-            DialogResult = System.Windows.Forms.DialogResult.OK;
+                xml.set_Data("filter", "item" + (i + 1).ToString(), filterList[i]);
-        }
+            }
-    }
+            xml.Save();
-}
+
+            DialogResult = System.Windows.Forms.DialogResult.OK;
+        }
+    }
+}

SubProject/FEQ0000/Equipment/EQfilterManager.cs

@@ -1,79 +1,71 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
-using System.Data;
+using System.Data;
-using System.Drawing;
+using System.Drawing;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using System.Windows.Forms;
+using System.Windows.Forms;
-
+
-namespace FEQ0000
+namespace FEQ0000
-{
+{
-    public partial class EQfilterManager : Form
+    public partial class EQfilterManager : Form
-    {
+    {
-        string divtype = string.Empty;
+        string divtype = string.Empty;
-        public EQfilterManager(string type_)
+        public EQfilterManager(string type_)
-        {
+        {
-            InitializeComponent();
+            InitializeComponent();
-            switch(type_.ToUpper())
+            divtype = type_;
-            {
+            this.dsEQ.EquipmentFilter.TableNewRow += EquipmentFilter_TableNewRow;
-                case "EUQIPMENTB":
+        }
-                    divtype = "B";
+
-                    break;
+        void EquipmentFilter_TableNewRow(object sender, DataTableNewRowEventArgs e)
-                case "EUQIPMENTF":
+        {
-                    divtype = "F";
+            e.Row["type"] = this.divtype;
-                    break;
+            e.Row["wuid"] = FCOMMON.info.Login.no;
-                default:
+            e.Row["wdate"] = DateTime.Now;
-                    divtype = "E";
+        }
-                    break;
+
-            }
+        private void EQfilter_Load(object sender, EventArgs e)
-            this.dsEQ.EquipmentFilter.TableNewRow += EquipmentFilter_TableNewRow;
+        {
-        }
+            try
-
+            {
-        void EquipmentFilter_TableNewRow(object sender, DataTableNewRowEventArgs e)
+                ta.Fill(this.dsEQ.EquipmentFilter, divtype);
-        {
+            }
-            e.Row["type"] = this.divtype;
+            catch (Exception ex)
-            e.Row["wuid"] = FCOMMON.info.Login.no;
+            {
-            e.Row["wdate"] = DateTime.Now;
+                FCOMMON.Util.MsgE(ex.Message);
-        }
+            }
-
+        }
-        private void EQfilter_Load(object sender, EventArgs e)
+
-        {
+        private void toolStripButton1_Click(object sender, EventArgs e)
-            try {
+        {
-                ta.Fill(this.dsEQ.EquipmentFilter);
+            this.Invalidate();
-            }catch (Exception ex)
+            this.bs.EndEdit();
-            {
+            try
-                FCOMMON.Util.MsgE(ex.Message);
+            {
-            }
+                var cnt = ta.Update(this.dsEQ.EquipmentFilter);
-        }
+                FCOMMON.Util.MsgI("update : " + cnt.ToString());
-
+
-        private void toolStripButton1_Click(object sender, EventArgs e)
+            }
-        {
+            catch (Exception ex)
-            this.Invalidate();
+            {
-            this.bs.EndEdit();
+                FCOMMON.Util.MsgE(ex.Message);
-            try
+            }
-            {
+        }
-                var cnt = ta.Update(this.dsEQ.EquipmentFilter);
+
-                FCOMMON.Util.MsgI("update : " + cnt.ToString());
+        public string filter = string.Empty;
-                
+        public string apply = string.Empty;
-            }catch(Exception ex)
+        private void button1_Click(object sender, EventArgs e)
-            {
+        {
-                FCOMMON.Util.MsgE(ex.Message);
+
-            }
+        }
-        }
+
-
+        private void toolStripButton2_Click(object sender, EventArgs e)
-        public string filter = string.Empty;
+        {
-        public string apply = string.Empty;
+            filter = textBox1.Text.Trim();
-        private void button1_Click(object sender, EventArgs e)
+            apply = textBox2.Text.Trim();
-        {
+            DialogResult = System.Windows.Forms.DialogResult.OK;
-            
+        }
-        }
+    }
-
+}
-        private void toolStripButton2_Click(object sender, EventArgs e)
-        {
-            filter = textBox1.Text.Trim();
-            apply = textBox2.Text.Trim();
-            DialogResult = System.Windows.Forms.DialogResult.OK;
-        }
-    }
-}

SubProject/FEQ0000/Equipment/fEquipment.cs

@@ -1,432 +1,448 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.ComponentModel;
+using System.ComponentModel;
-using System.Data;
+using System.Data;
-using System.Drawing;
+using System.Drawing;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using System.Windows.Forms;
+using System.Windows.Forms;
-using System.CodeDom.Compiler;
+using System.CodeDom.Compiler;
-using System.Reflection;
+using System.Reflection;
-using Microsoft.CSharp;
+using Microsoft.CSharp;
-
+
-namespace FEQ0000
+namespace FEQ0000
-{
+{
-    public partial class fEquipment : Form
+    public partial class fEquipment : Form
-    {
+    {
-        public enum eTabletype
+        public enum eTabletype
-        {
+        {
-            MOLD,
+            MOLD,
-            FOL,
+            FOL,
-            BUMP
+            BUMP,
-        }
+            ING
-        string tableName = string.Empty;
+        }
-        eTabletype dataType = eTabletype.FOL;
+        string tableName = string.Empty;
-
+        eTabletype dataType = eTabletype.FOL;
-        public fEquipment(eTabletype type_)
+
-        {
+        public fEquipment(eTabletype type_)
-            InitializeComponent();
+        {
-            dataType = type_;
+            InitializeComponent();
-            if (dataType == eTabletype.MOLD)
+            dataType = type_;
-            {
+            if (dataType == eTabletype.MOLD)
-
+            {
-                tableName = "EquipmentME";
+
-                this.dsEQ.EquipmentME.TableNewRow += Equipment_TableNewRow;
+                tableName = "EquipmentME";
-                dvc_param.Visible = false;
+                this.dsEQ.EquipmentME.TableNewRow += Equipment_TableNewRow;
-            }
+                dvc_param.Visible = false;
-            else if (dataType == eTabletype.FOL)
+            }
-            {
+            else if (dataType == eTabletype.FOL)
-
+            {
-                tableName = "EquipmentF";
+
-                this.dsEQ.EquipmentF.TableNewRow += Equipment_TableNewRow;
+                tableName = "EquipmentF";
-                dvc_param.Visible = false;
+                this.dsEQ.EquipmentF.TableNewRow += Equipment_TableNewRow;
-            }
+                dvc_param.Visible = false;
-            else
+            }
-            {
+            else
-
+            {
-                tableName = "EquipmentB";
+
-                this.dsEQ.EquipmentB.TableNewRow += Equipment_TableNewRow;
+                tableName = "EquipmentB";
-                dvc_param.Visible = true;
+                this.dsEQ.EquipmentB.TableNewRow += Equipment_TableNewRow;
-            }
+                dvc_param.Visible = true;
-            this.FormClosed += fEquipment_FormClosed;
+            }
-        }
+            this.FormClosed += fEquipment_FormClosed;
-
+        }
-        void fEquipment_FormClosed(object sender, FormClosedEventArgs e)
+
-        {
+        void fEquipment_FormClosed(object sender, FormClosedEventArgs e)
-            var form = this as Form;
+        {
-            FCOMMON.Util.SetFormStatus(ref form, this.Name + this.tableName, false);
+            var form = this as Form;
-        }
+            FCOMMON.Util.SetFormStatus(ref form, this.Name + this.tableName, false);
-
+        }
-        void RefreshDate()
+
-        {
+        void RefreshDate()
-            //등록된 날짜 목록을 가져온다.
+        {
-            var taDateList = new dsEQTableAdapters.EqDateListTableAdapter();
+            //등록된 날짜 목록을 가져온다.
-            DataTable dtList = null;
+            var taDateList = new dsEQTableAdapters.EqDateListTableAdapter();
-
+            DataTable dtList = null;
-            if (dataType == eTabletype.BUMP) dtList = taDateList.GetDateListB();
+
-            else if (dataType == eTabletype.FOL) dtList = taDateList.GetDateListF();
+            if (dataType == eTabletype.BUMP) dtList = taDateList.GetDateListB();
-            else dtList = taDateList.GetDateListME();
+            else if (dataType == eTabletype.FOL) dtList = taDateList.GetDateListF();
-
+            else if (dataType == eTabletype.ING) dtList = taDateList.GetDateListIng();
-            this.cmbDate.Items.Clear();
+            else dtList = taDateList.GetDateListME();
-            if (dtList != null)
+
-            {
+            this.cmbDate.Items.Clear();
-                foreach (DataRow dr in dtList.Rows)
+            if (dtList != null)
-                {
+            {
-                    this.cmbDate.Items.Add(dr["pdate"].ToString());
+                foreach (DataRow dr in dtList.Rows)
-                }
+                {
-            }
+                    this.cmbDate.Items.Add(dr["pdate"].ToString());
-            if (this.cmbDate.Items.Count > 0) this.cmbDate.SelectedIndex = 0;
+                }
-        }
+            }
-        private void __Load(object sender, EventArgs e)
+            if (this.cmbDate.Items.Count > 0) this.cmbDate.SelectedIndex = 0;
-        {
+        }
-            this.Text = string.Format("Equipment List({0})", this.dataType);
+        private void __Load(object sender, EventArgs e)
-            var form = this as Form;
+        {
-            FCOMMON.Util.SetFormStatus(ref form, this.Name + this.tableName, true);
+            this.Text = string.Format("Equipment List({0})", this.dataType);
-            this.Show();
+            var form = this as Form;
-            Application.DoEvents();
+            FCOMMON.Util.SetFormStatus(ref form, this.Name + this.tableName, true);
-
+            this.Show();
-            RefreshDate();
+            Application.DoEvents();
-
+
-            //목록을 가져온다.
+            RefreshDate();
-            var grpList = DatabaseManager.getEQGroupLiist("grp", this.tableName);
+
-            var lcList = DatabaseManager.getEQGroupLiist("linecode", this.tableName);
+            //목록을 가져온다.
-            var manuList = DatabaseManager.getEQGroupLiist("manu", this.tableName);
+            var grpList = DatabaseManager.getEQGroupLiist("grp", this.tableName);
-            var typeList = DatabaseManager.getEQGroupLiist("type", this.tableName);
+            var lcList = DatabaseManager.getEQGroupLiist("linecode", this.tableName);
-
+            var manuList = DatabaseManager.getEQGroupLiist("manu", this.tableName);
-            cmbGrp.Items.Add("-- All --");
+            var typeList = DatabaseManager.getEQGroupLiist("type", this.tableName);
-            cmbLine.Items.Add("-- All --");
+
-            cmbManu.Items.Add("-- All --");
+            cmbGrp.Items.Add("-- All --");
-            cmbType.Items.Add("-- All --");
+            cmbLine.Items.Add("-- All --");
-
+            cmbManu.Items.Add("-- All --");
-            foreach (var item in grpList) this.cmbGrp.Items.Add(item);
+            cmbType.Items.Add("-- All --");
-            foreach (var item in lcList) this.cmbLine.Items.Add(item);
+
-            foreach (var item in manuList) this.cmbManu.Items.Add(item);
+            foreach (var item in grpList) this.cmbGrp.Items.Add(item);
-            foreach (var item in typeList) this.cmbType.Items.Add(item);
+            foreach (var item in lcList) this.cmbLine.Items.Add(item);
-
+            foreach (var item in manuList) this.cmbManu.Items.Add(item);
-            if (this.cmbGrp.Items.Count > 0) cmbGrp.SelectedIndex = 0;
+            foreach (var item in typeList) this.cmbType.Items.Add(item);
-            if (this.cmbLine.Items.Count > 0) cmbLine.SelectedIndex = 0;
+
-            if (this.cmbManu.Items.Count > 0) cmbManu.SelectedIndex = 0;
+            if (this.cmbGrp.Items.Count > 0) cmbGrp.SelectedIndex = 0;
-            if (this.cmbType.Items.Count > 0) cmbType.SelectedIndex = 0;
+            if (this.cmbLine.Items.Count > 0) cmbLine.SelectedIndex = 0;
-
+            if (this.cmbManu.Items.Count > 0) cmbManu.SelectedIndex = 0;
-        }
+            if (this.cmbType.Items.Count > 0) cmbType.SelectedIndex = 0;
-
+
-        private void equipmentBindingNavigatorSaveItem_Click(object sender, EventArgs e)
+        }
-        {
+
-            this.Validate();
+        private void equipmentBindingNavigatorSaveItem_Click(object sender, EventArgs e)
-            this.bsB.EndEdit();
+        {
-            this.bsF.EndEdit();
+            this.Validate();
-            this.bsME.EndEdit();
+            this.bsB.EndEdit();
-            try
+            this.bsF.EndEdit();
-            {
+            this.bsME.EndEdit();
-                if (dataType == eTabletype.BUMP)
+            try
-                {
+            {
-                    this.taB.Update(this.dsEQ.EquipmentB);
+                if (dataType == eTabletype.BUMP)
-                }
+                {
-                else if (dataType == eTabletype.MOLD)
+                    this.taB.Update(this.dsEQ.EquipmentB);
-                {
+                }
-                    this.taME.Update(this.dsEQ.EquipmentME);
+                else if (dataType == eTabletype.MOLD)
-                }
+                {
-                else
+                    this.taME.Update(this.dsEQ.EquipmentME);
-                {
+                }
-                    this.taF.Update(this.dsEQ.EquipmentF);
+                else
-                }
+                {
-                this.dsEQ.AcceptChanges();
+                    this.taF.Update(this.dsEQ.EquipmentF);
-            }
+                }
-            catch (Exception ex)
+                this.dsEQ.AcceptChanges();
-            {
+            }
-                FCOMMON.Util.MsgE(ex.Message);
+            catch (Exception ex)
-            }
+            {
-        }
+                FCOMMON.Util.MsgE(ex.Message);
-
+            }
-
+        }
-        void Equipment_TableNewRow(object sender, DataTableNewRowEventArgs e)
+
-        {
+
-            e.Row["wuid"] = FCOMMON.info.Login.no;
+        void Equipment_TableNewRow(object sender, DataTableNewRowEventArgs e)
-            e.Row["wdate"] = DateTime.Now;
+        {
-        }
+            e.Row["wuid"] = FCOMMON.info.Login.no;
-
+            e.Row["wdate"] = DateTime.Now;
-
+        }
-        private int applyFilter(string filter, string apply)
+
-        {
+
-            if (filter.isEmpty() || apply.isEmpty()) return -1;
+        private int applyFilter(string filter, string apply)
-
+        {
-            try
+            if (filter.isEmpty() || apply.isEmpty()) return -1;
-            {
+
-                DataRow[] dRows = null;
+            try
-                if (dataType == eTabletype.BUMP) dRows = this.dsEQ.EquipmentB.Select(filter);
+            {
-                else if (dataType == eTabletype.MOLD) dRows = this.dsEQ.EquipmentME.Select(filter);
+                DataRow[] dRows = null;
-                else dRows = this.dsEQ.EquipmentF.Select(filter);
+                if (dataType == eTabletype.BUMP) dRows = this.dsEQ.EquipmentB.Select(filter);
-
+                else if (dataType == eTabletype.MOLD) dRows = this.dsEQ.EquipmentME.Select(filter);
-                int cnt = 0;
+                else if (dataType == eTabletype.ING) dRows = this.dsEQ.EETGW_EquipmentIng.Select(filter);
-                foreach (DataRow dr in dRows)
+                else dRows = this.dsEQ.EquipmentF.Select(filter);
-                {
+
-                    var appList = apply.Split(';');
+                int cnt = 0;
-                    foreach (var item in appList)
+                foreach (DataRow dr in dRows)
-                    {
+                {
-                        if (item.isEmpty()) continue;
+                    var appList = apply.Split(';');
-                        var field = item.Split('=')[0].Trim();
+                    foreach (var item in appList)
-                        var value = item.Split('=')[1].Trim();
+                    {
-                        dr[field] = value;
+                        if (item.isEmpty()) continue;
-                    }
+                        var field = item.Split('=')[0].Trim();
-                    cnt += 1;
+                        var value = item.Split('=')[1].Trim();
-                }
+                        dr[field] = value;
-                //this.bsB.Filter = filter;
+                    }
-                //Util.MsgI(string.Format("{0} 건의 자료가 업데이트 되었습니다.",cnt));
+                    cnt += 1;
-                return cnt;
+                }
-            }
+                //this.bsB.Filter = filter;
-            catch (Exception ex)
+                //Util.MsgI(string.Format("{0} 건의 자료가 업데이트 되었습니다.",cnt));
-            {
+                return cnt;
-                FCOMMON.Util.MsgE(ex.Message);
+            }
-                return -1;
+            catch (Exception ex)
-            }
+            {
-        }
+                FCOMMON.Util.MsgE(ex.Message);
-
+                return -1;
-        private void toolStripButton1_Click(object sender, EventArgs e)
+            }
-        {
+        }
-            try
+
-            {
+        private void toolStripButton1_Click(object sender, EventArgs e)
-                string key = tbFilter.Text.Trim();
+        {
-                string filter = "";
+            try
-                if (!key.isEmpty())
+            {
-                {
+                string key = tbFilter.Text.Trim();
-                    filter = "asset like @ or type like @ or manu like @ or model like @ or linecode like @  or serial like @";
+                string filter = "";
-                    filter = filter.Replace("@", "'%" + key.Replace("'", "''") + "%'");
+                if (!key.isEmpty())
-                }
+                {
-                try
+                    filter = "asset like @ or type like @ or manu like @ or model like @ or linecode like @  or serial like @";
-                {
+                    filter = filter.Replace("@", "'%" + key.Replace("'", "''") + "%'");
-                    if (dataType == eTabletype.MOLD) this.bsME.Filter = filter;
+                }
-                    else if (dataType == eTabletype.BUMP) this.bsB.Filter = filter;
+                try
-                    else this.bsF.Filter = filter;
+                {
-
+                    if (dataType == eTabletype.MOLD) this.bsME.Filter = filter;
-                    if (key.isEmpty()) this.tbFilter.BackColor = Color.White;
+                    else if (dataType == eTabletype.BUMP) this.bsB.Filter = filter;
-                    else this.tbFilter.BackColor = Color.Lime;
+                    else if (dataType == eTabletype.ING) this.bsIng.Filter = filter;
-                }
+                    else this.bsF.Filter = filter;
-                catch (Exception ex)
+
-                {
+                    if (key.isEmpty()) this.tbFilter.BackColor = Color.White;
-                    tbFilter.BackColor = Color.HotPink;
+                    else this.tbFilter.BackColor = Color.Lime;
-                    FCOMMON.Util.MsgE("filter error\n" + ex.Message);
+                }
-                }
+                catch (Exception ex)
-                tbFilter.Focus();
+                {
-                tbFilter.SelectAll();
+                    tbFilter.BackColor = Color.HotPink;
-            }
+                    FCOMMON.Util.MsgE("filter error\n" + ex.Message);
-            catch (Exception ex)
+                }
-            {
+                tbFilter.Focus();
-                FCOMMON.Util.MsgE(ex.Message);
+                tbFilter.SelectAll();
-            }
+            }
-
+            catch (Exception ex)
-        }
+            {
-
+                FCOMMON.Util.MsgE(ex.Message);
-
+            }
-        private void toolStripButton4_Click(object sender, EventArgs e)
+
-        {
+        }
-            var f = new rpt_equipmentB(dataType, this.cmbDate.Text);
+
-            f.Show();
+
-        }
+        private void toolStripButton4_Click(object sender, EventArgs e)
-
+        {
-        private void toolStripButton3_Click(object sender, EventArgs e)
+            var f = new rpt_equipmentB(dataType, this.cmbDate.Text);
-        {
+            f.Show();
-
+        }
-        }
+
-
+        private void toolStripButton3_Click(object sender, EventArgs e)
-        private void toolStripButton2_Click(object sender, EventArgs e)
+        {
-        {
+
-
+        }
-        }
+
-
+        private void toolStripButton2_Click(object sender, EventArgs e)
-        private void toolStripButton5_Click(object sender, EventArgs e)
+        {
-        {
+
-            var f = new fImpEquipment(dataType);
+        }
-            f.ShowDialog();
+
-            RefreshDate();
+        private void toolStripButton5_Click(object sender, EventArgs e)
-        }
+        {
-
+            var f = new fImpEquipment(dataType);
-        private void toolStripButton6_Click(object sender, EventArgs e)
+            f.ShowDialog();
-        {
+            RefreshDate();
-            if (cmbDate.SelectedIndex < 0)
+        }
-            {
+
-                FCOMMON.Util.MsgE("No Date");
+        private void toolStripButton6_Click(object sender, EventArgs e)
-                return;
+        {
-            }
+            if (cmbDate.SelectedIndex < 0)
-
+            {
-
+                FCOMMON.Util.MsgE("No Date");
-
+                return;
-            //select query
+            }
-            string newSQL = "select * from {0}";
+
-            string newWhere = string.Empty;
+
-            if (cmbGrp.SelectedIndex != 0 && !cmbGrp.Text.isEmpty())
+
-            {
+            //select query
-                if (!newWhere.isEmpty()) newWhere += " and ";
+            string newSQL = "select * from {0}";
-                newWhere += "grp='" + cmbGrp.Text + "'";
+            string newWhere = string.Empty;
-            }
+            if (cmbGrp.SelectedIndex != 0 && !cmbGrp.Text.isEmpty())
-            if (this.cmbManu.SelectedIndex != 0 && !cmbManu.Text.isEmpty())
+            {
-            {
+                if (!newWhere.isEmpty()) newWhere += " and ";
-                if (!newWhere.isEmpty()) newWhere += " and ";
+                newWhere += "grp='" + cmbGrp.Text + "'";
-                newWhere += "manu='" + cmbManu.Text + "'";
+            }
-            }
+            if (this.cmbManu.SelectedIndex != 0 && !cmbManu.Text.isEmpty())
-            if (this.cmbLine.SelectedIndex != 0 && !cmbLine.Text.isEmpty())
+            {
-            {
+                if (!newWhere.isEmpty()) newWhere += " and ";
-                if (!newWhere.isEmpty()) newWhere += " and ";
+                newWhere += "manu='" + cmbManu.Text + "'";
-                newWhere += "linecode='" + cmbLine.Text + "'";
+            }
-            }
+            if (this.cmbLine.SelectedIndex != 0 && !cmbLine.Text.isEmpty())
-            if (this.cmbType.SelectedIndex != 0 && !cmbType.Text.isEmpty())
+            {
-            {
+                if (!newWhere.isEmpty()) newWhere += " and ";
-                if (!newWhere.isEmpty()) newWhere += " and ";
+                newWhere += "linecode='" + cmbLine.Text + "'";
-                newWhere += "[type]='" + cmbType.Text + "'";
+            }
-            }
+            if (this.cmbType.SelectedIndex != 0 && !cmbType.Text.isEmpty())
-            if (!this.tbSearch.Text.isEmpty())
+            {
-            {
+                if (!newWhere.isEmpty()) newWhere += " and ";
-                if (!newWhere.isEmpty()) newWhere += " and ";
+                newWhere += "[type]='" + cmbType.Text + "'";
-                newWhere += string.Format("(asset like '%{0}%' or model like '%{0}%' or serial like '%{0}%')", tbSearch.Text);
+            }
-            }
+            if (!this.tbSearch.Text.isEmpty())
-            if (radexpn.Checked)
+            {
-            {
+                if (!newWhere.isEmpty()) newWhere += " and ";
-                if (!newWhere.isEmpty()) newWhere += " and ";
+                newWhere += string.Format("(asset like '%{0}%' or model like '%{0}%' or serial like '%{0}%')", tbSearch.Text);
-                newWhere += string.Format("isnull([except],0) = 0");
+            }
-            }
+            if (radexpn.Checked)
-            if (radexpy.Checked)
+            {
-            {
+                if (!newWhere.isEmpty()) newWhere += " and ";
-                if (!newWhere.isEmpty()) newWhere += " and ";
+                newWhere += string.Format("isnull([except],0) = 0");
-                newWhere += string.Format("isnull([except],0) = 1");
+            }
-            }
+            if (radexpy.Checked)
-
+            {
-
+                if (!newWhere.isEmpty()) newWhere += " and ";
-            string CommandText = newSQL;
+                newWhere += string.Format("isnull([except],0) = 1");
-            if (!newWhere.isEmpty()) CommandText += " where " + newWhere;
+            }
-
+
-            switch (dataType)
+
-            {
+            string CommandText = newSQL;
-                case eTabletype.MOLD:
+            if (!newWhere.isEmpty()) CommandText += " where " + newWhere;
-                    //select command
+
-                    if (this.taME.Adapter.SelectCommand == null)
+            switch (dataType)
-                        this.taME.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
+            {
-                    this.taME.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentME");
+                case eTabletype.MOLD:
-                    this.dsEQ.EquipmentME.Clear();
+                    //select command
-                    taME.Fill(this.dsEQ.EquipmentME, this.cmbDate.Text);
+                    if (this.taME.Adapter.SelectCommand == null)
-                    this.dsEQ.EquipmentME.AcceptChanges();
+                        this.taME.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
-                    dv.DataSource = bsME;
+                    this.taME.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentME");
-                    bn.BindingSource = bsME;
+                    this.dsEQ.EquipmentME.Clear();
-                    break;
+                    taME.Fill(this.dsEQ.EquipmentME, this.cmbDate.Text);
-                case eTabletype.BUMP:
+                    this.dsEQ.EquipmentME.AcceptChanges();
-                    //select command
+                    dv.DataSource = bsME;
-                    if (this.taB.Adapter.SelectCommand == null)
+                    bn.BindingSource = bsME;
-                        this.taB.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
+                    break;
-                    this.taB.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentB");
+                case eTabletype.BUMP:
-                    this.dsEQ.EquipmentB.Clear();
+                    //select command
-                    taB.Fill(this.dsEQ.EquipmentB, this.cmbDate.Text);
+                    if (this.taB.Adapter.SelectCommand == null)
-                    this.dsEQ.EquipmentB.AcceptChanges();
+                        this.taB.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
-                    dv.DataSource = bsB;
+                    this.taB.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentB");
-                    bn.BindingSource = bsB;
+                    this.dsEQ.EquipmentB.Clear();
-                    break;
+                    taB.Fill(this.dsEQ.EquipmentB, this.cmbDate.Text);
-                case eTabletype.FOL:
+                    this.dsEQ.EquipmentB.AcceptChanges();
-                    //select command
+                    dv.DataSource = bsB;
-                    if (this.taF.Adapter.SelectCommand == null)
+                    bn.BindingSource = bsB;
-                        this.taF.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
+                    break;
-                    this.taF.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentF");
+                case eTabletype.FOL:
-                    this.dsEQ.EquipmentF.Clear();
+                    //select command
-                    taF.Fill(this.dsEQ.EquipmentF, this.cmbDate.Text);
+                    if (this.taF.Adapter.SelectCommand == null)
-                    this.dsEQ.EquipmentF.AcceptChanges();
+                        this.taF.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
-                    dv.DataSource = bsF;
+                    this.taF.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentF");
-                    bn.BindingSource = bsF;
+                    this.dsEQ.EquipmentF.Clear();
-                    break;
+                    taF.Fill(this.dsEQ.EquipmentF, this.cmbDate.Text);
-            }
+                    this.dsEQ.EquipmentF.AcceptChanges();
-
+                    dv.DataSource = bsF;
-        }
+                    bn.BindingSource = bsF;
-
+                    break;
-        private void toolStripDropDownButton1_Click(object sender, EventArgs e)
+                case eTabletype.ING:
-        {
+                    //select command
-            panel1.Visible = !panel1.Visible;
+                    if (this.taIng.Adapter.SelectCommand == null)
-        }
+                        this.taIng.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
-
+                    this.taIng.Adapter.SelectCommand.CommandText = string.Format(CommandText, "EETGW_EquipmentIng");
-        private void autosizeColumnsToolStripMenuItem_Click(object sender, EventArgs e)
+                    this.dsEQ.EETGW_EquipmentIng.Clear();
-        {
+                    taIng.Fill(this.dsEQ.EETGW_EquipmentIng, this.cmbDate.Text);
-            this.dv.AutoResizeColumns();
+                    this.dsEQ.EETGW_EquipmentIng.AcceptChanges();
-        }
+                    dv.DataSource = bsIng;
-
+                    bn.BindingSource = bsIng;
-        private void applyToolStripMenuItem_Click(object sender, EventArgs e)
+                    break;
-        {
+            }
-            var f = new EQFilterApply(dataType);
+
-            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+        }
-            {
+
-                var dlg = FCOMMON.Util.MsgQ("매크로를 적용 하시겠습니까?");
+        private void toolStripDropDownButton1_Click(object sender, EventArgs e)
-                if (dlg != System.Windows.Forms.DialogResult.Yes) return;
+        {
-
+            panel1.Visible = !panel1.Visible;
-                int cnt = 0;
+        }
-                foreach (ListViewItem lvitem in f.listView1.CheckedItems)
+
-                {
+        private void autosizeColumnsToolStripMenuItem_Click(object sender, EventArgs e)
-                    //filter =2 , apply=3l
+        {
-                    var filter = lvitem.SubItems[2].Text;
+            this.dv.AutoResizeColumns();
-                    var apply = lvitem.SubItems[3].Text;
+        }
-
+
-                    cnt += applyFilter(filter, apply);
+        private void applyToolStripMenuItem_Click(object sender, EventArgs e)
-                }
+        {
-
+            var f = new EQFilterApply( this.dataType == eTabletype.ING ? "I" : "E");
-                FCOMMON.Util.MsgI(string.Format("{0}건의 매크로를 적용했습니다", cnt));
+            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-            }
+            {
-        }
+                var dlg = FCOMMON.Util.MsgQ("매크로를 적용 하시겠습니까?");
-
+                if (dlg != System.Windows.Forms.DialogResult.Yes) return;
-        private void toolStripButton7_Click(object sender, EventArgs e)
+
-        {
+                int cnt = 0;
-            var f = new EQfilterManager(this.tableName);
+                foreach (ListViewItem lvitem in f.listView1.CheckedItems)
-            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                {
-            {
+                    //filter =2 , apply=3l
-                var filter = f.filter;
+                    var filter = lvitem.SubItems[2].Text;
-                var apply = f.apply;
+                    var apply = lvitem.SubItems[3].Text;
-                if (filter.isEmpty() || apply.isEmpty())
+
-                {
+                    cnt += applyFilter(filter, apply);
-                    FCOMMON.Util.MsgE("no data");
+                }
-                    return;
+
-                }
+                FCOMMON.Util.MsgI(string.Format("{0}건의 매크로를 적용했습니다", cnt));
-
+            }
-                var dlg = FCOMMON.Util.MsgQ("다음 매크로를 적용 하시겠습니까?\nFilter:" + filter + "\n" +
+        }
-                    "apply : " + apply);
+
-                if (dlg != System.Windows.Forms.DialogResult.Yes) return;
+        private void toolStripButton7_Click(object sender, EventArgs e)
-
+        {
-                var cnt = applyFilter(filter, apply);
+            var eqdiv = this.dataType == eTabletype.ING ? "I" : "E";
-                if (cnt == -1) FCOMMON.Util.MsgE("오류로 인해 실행되지 않았습니다.");
+            var f = new EQfilterManager(eqdiv);
-                else FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 변경되었습니다.");
+            if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-            }
+            {
-        }
+                var filter = f.filter;
-
+                var apply = f.apply;
-        private void tbFilter_KeyDown(object sender, KeyEventArgs e)
+                if (filter.isEmpty() || apply.isEmpty())
-        {
+                {
-            if (e.KeyCode == Keys.Enter) btFind.PerformClick();
+                    FCOMMON.Util.MsgE("no data");
-        }
+                    return;
-
+                }
-        private void 장비모델생성공통07ToolStripMenuItem_Click(object sender, EventArgs e)
+
-        {
+                var dlg = FCOMMON.Util.MsgQ("다음 매크로를 적용 하시겠습니까?\nFilter:" + filter + "\n" +
-            var cn1 = FCOMMON.DBM.getCn();
+                    "apply : " + apply);
-            var cn2 = FCOMMON.DBM.getCn();
+                if (dlg != System.Windows.Forms.DialogResult.Yes) return;
-            cn1.Open();
+
-            cn2.Open();
+                var cnt = applyFilter(filter, apply);
-
+                if (cnt == -1) FCOMMON.Util.MsgE("오류로 인해 실행되지 않았습니다.");
-            System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand("", cn1);
+                else FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 변경되었습니다.");
-            System.Data.SqlClient.SqlCommand cmd2 = new System.Data.SqlClient.SqlCommand("", cn2);
+            }
-
+        }
-
+
-            cmd.CommandText = "select * from common where grp ='07' and svalue <> '' and isnull(code,'') = ''";
+        private void tbFilter_KeyDown(object sender, KeyEventArgs e)
-            var rdr = cmd.ExecuteReader();
+        {
-            while(rdr.Read())
+            if (e.KeyCode == Keys.Enter) btFind.PerformClick();
-            {
+        }
-                string manu = rdr["svalue"].ToString();
+
-                cmd2.CommandText = "select code from common where grp ='06' and memo='"+manu+"'";
+        private void 장비모델생성공통07ToolStripMenuItem_Click(object sender, EventArgs e)
-                var manu_data = cmd2.ExecuteScalar();
+        {
-                if (manu_data == null) continue;
+            var cn1 = FCOMMON.DBM.getCn();
-
+            var cn2 = FCOMMON.DBM.getCn();
-                var manu_code = manu_data.ToString();
+            cn1.Open();
-
+            cn2.Open();
-                cmd2.CommandText = "update common set code = '"+manu_code+"'  where grp = '07' and isnull(code,'') = '' and svalue = '"+manu+"'";
+
-                cmd2.ExecuteNonQuery();
+            System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand("", cn1);
-            }
+            System.Data.SqlClient.SqlCommand cmd2 = new System.Data.SqlClient.SqlCommand("", cn2);
-
+
-           
+
-            cmd.Dispose();
+            cmd.CommandText = "select * from common where grp ='07' and svalue <> '' and isnull(code,'') = ''";
-            cn1.Close();
+            var rdr = cmd.ExecuteReader();
-            cn2.Close();
+            while(rdr.Read())
-            cn1.Dispose();
+            {
-            cn2.Dispose();
+                string manu = rdr["svalue"].ToString();
-
+                cmd2.CommandText = "select code from common where grp ='06' and memo='"+manu+"'";
-            FCOMMON.Util.MsgI("ok");
+                var manu_data = cmd2.ExecuteScalar();
-        }
+                if (manu_data == null) continue;
-    }
+
-}
+                var manu_code = manu_data.ToString();
-
+
+                cmd2.CommandText = "update common set code = '"+manu_code+"'  where grp = '07' and isnull(code,'') = '' and svalue = '"+manu+"'";
+                cmd2.ExecuteNonQuery();
+            }
+
+           
+            cmd.Dispose();
+            cn1.Close();
+            cn2.Close();
+            cn1.Dispose();
+            cn2.Dispose();
+
+            FCOMMON.Util.MsgI("ok");
+        }
+    }
+}
+

SubProject/FEQ0000/Equipment/fEquipment.resx

@@ -1,348 +1,354 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
-  <!-- 
+  <!-- 
-    Microsoft ResX Schema 
+    Microsoft ResX Schema 
-    
+    
-    Version 2.0
+    Version 2.0
-    
+    
-    The primary goals of this format is to allow a simple XML format 
+    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
+    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+    various data types are done through the TypeConverter classes 
-    associated with the data types.
+    associated with the data types.
-    
+    
-    Example:
+    Example:
-    
+    
-    ... ado.net/XML headers & schema ...
+    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
+    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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="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="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
+    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <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>
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
+        <comment>This is a comment</comment>
-    </data>
+    </data>
-                
+                
-    There are any number of "resheader" rows that contain simple 
+    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
+    name/value pairs.
-    
+    
-    Each data row contains a name, and value. The row also contains a 
+    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
+    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
+    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+    Classes that don't support this are serialized and stored with the 
-    mimetype set.
+    mimetype set.
-    
+    
-    The mimetype is used for serialized objects, and tells the 
+    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
+    extensible. For a given mimetype the value must be set accordingly:
-    
+    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
+    read any of the formats listed below.
-    
+    
-    mimetype: application/x-microsoft.net.object.binary.base64
+    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-    
+    
-    mimetype: application/x-microsoft.net.object.soap.base64
+    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-
+
-    mimetype: application/x-microsoft.net.object.bytearray.base64
+    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
+            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
+            : 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: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:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
+    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
+      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
+        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
+          <xsd:element name="metadata">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="assembly">
+          <xsd:element name="assembly">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="data">
+          <xsd:element name="data">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <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:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <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="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="resheader">
+          <xsd:element name="resheader">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-        </xsd:choice>
+        </xsd:choice>
-      </xsd:complexType>
+      </xsd:complexType>
-    </xsd:element>
+    </xsd:element>
-  </xsd:schema>
+  </xsd:schema>
-  <resheader name="resmimetype">
+  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
+    <value>text/microsoft-resx</value>
-  </resheader>
+  </resheader>
-  <resheader name="version">
+  <resheader name="version">
-    <value>2.0</value>
+    <value>2.0</value>
-  </resheader>
+  </resheader>
-  <resheader name="reader">
+  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+  </resheader>
-  <resheader name="writer">
+  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+  </resheader>
-  <metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>81, 17</value>
+    <value>81, 17</value>
-  </metadata>
+  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="bindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
-        pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
+        pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
-        Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
+        Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
-        /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
+        /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
-        zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
+        zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
-        IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
+        IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
-        rkJggg==
+        rkJggg==
-</value>
+</value>
-  </data>
+  </data>
-  <metadata name="bsB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="bsB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>17, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>147, 17</value>
+    <value>147, 17</value>
-  </metadata>
+  </metadata>
-  <data name="bindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
-        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
+        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
-        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
+        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
-        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
+        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
-        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
+        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
-        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
+        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
-        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
+        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
-</value>
+</value>
-  </data>
+  </data>
-  <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
-        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
-        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
-        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
-        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
-        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
-</value>
+</value>
-  </data>
+  </data>
-  <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
-        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
+        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
-        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
+        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
-        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
+        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
-</value>
+</value>
-  </data>
+  </data>
-  <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
-        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
-        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
-        oAc0QjgAAAAASUVORK5CYII=
+        oAc0QjgAAAAASUVORK5CYII=
-</value>
+</value>
-  </data>
+  </data>
-  <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
-        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
+        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
-        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
+        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
-        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
+        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
-        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
+        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
-        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-</value>
+</value>
-  </data>
+  </data>
-  <data name="equipmentBindingNavigatorSaveItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="equipmentBindingNavigatorSaveItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
+        wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
-        dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
+        dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
-</value>
+</value>
-  </data>
+  </data>
-  <data name="btFind.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btFind.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
+</value>
-  </data>
+  </data>
-  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>147, 17</value>
+    <value>147, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
+    <value>True</value>
-  </metadata>
+  </metadata>
-  <metadata name="lineT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="lineT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
+    <value>True</value>
-  </metadata>
+  </metadata>
-  <metadata name="lineP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="lineP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
+    <value>True</value>
-  </metadata>
+  </metadata>
-  <metadata name="dvc_param.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dvc_param.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
+    <value>True</value>
-  </metadata>
+  </metadata>
-  <metadata name="primary.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="primary.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
+    <value>True</value>
-  </metadata>
+  </metadata>
-  <metadata name="except.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="except.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
+    <value>True</value>
-  </metadata>
+  </metadata>
-  <metadata name="memo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="memo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
+    <value>True</value>
-  </metadata>
+  </metadata>
-  <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>17, 56</value>
-  </metadata>
+  </metadata>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>662, 17</value>
+    <value>662, 17</value>
-  </metadata>
+  </metadata>
-  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC7SURBVDhPY8AFvCu2KMV3H9sMwiA2VJh4EFCxxbh+1ZP/
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC7SURBVDhPY8AFvCu2KMV3H9sMwiA2VJh4EFCxxbh+1ZP/
-        IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXPtZcmCGy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d
+        IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXPtZcmCGy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d
-        2z+AMYgNEgPJQZXhB6Hlu/mToYaANfefPAQSg0oTBwIq1gmnTjyzP3XCyf0h9TuEoMKkAZBGgpqj2vb7
+        2z+AMYgNEgPJQZXhB6Hlu/mToYaANfefPAQSg0oTBwIq1gmnTjyzP3XCyf0h9TuEoMKkAZBGgpqj2vb7
-        xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAHNTC7nWY2FZAAAAAElFTkSuQmCC
+        xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAHNTC7nWY2FZAAAAAElFTkSuQmCC
-</value>
+</value>
-  </data>
+  </data>
-  <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHGSURBVDhPYyAVhNavYovtOtwX03m0F8SGCqOC0s45vGU9
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHGSURBVDhPYyAVhNavYovtOtwX03m0F8SGCqOC0s45vGU9
-        s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6
+        s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6
-        Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef
+        Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef
-        /oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjlx//ByEtxy+GcQQ23N4YufW
+        /oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjlx//ByEtxy+GcQQ23N4YufW
-        d/+7t3/4X7/u8Z+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
+        d/+7t3/4X7/u4Z+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
-        IC+0zli9rr6+ngksiQVEdxwNKZh/42nx7CtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb
+        IC+0zli9rr6+ngksiQVEdxwNKZh/42nx7CtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb
-        qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv
+        qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv
-        O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY
+        O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY
-        ACkDLyHGjRGgAAAAAElFTkSuQmCC
+        ACCdLx2YNUwMAAAAAElFTkSuQmCC
-</value>
+</value>
-  </data>
+  </data>
-  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
+    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFbSURBVDhPYyAVxC0olI6fXWEcO7tMEypEGkhaVi9VtqHj
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE5SURBVDhPnZLNSsNAFEajz9kWk6ztXlMMpC7qKm0Rd1a0
-        UdOWSaegQoRB7NwSl9Ap9Tzx8+s54uaU5kfNLfbMWta4HiqNG4A0AZ1aHT+rzCJ+dmla7NyygqQ5pbwg
+        0lSQqJOCulNXrWnyAmIXcZ905w+FMd84UxozjcEPLlzm3nOGgVHWhVJlY3xZMcdudQ89Py4XAOFId+IX
-        Ofv6ehawImSQNrOeK25OWUnc7LJEkCaQZpAhUGn8IG5GiTLQeTUgG8A2A50NlUIB8TMrNRq3TThdvq5z
+        e4EKR6pTWmKa5mZAti7mr50FjfsUhR5nmPE1eRjsZeFVie+pw7USDMIbbTifdXOwKEiwk3sOezPRnSJY
-        NVSIgSFmTmkA0LYoKBcvAMXAikvr/3fumHYYKsTAkDi3QgnKxAAVazuPgjCUi90AGAA5D6QAFBZQIYaJ
+        FHamRBssJWimnjYoA4tikpRhkolbNZKo/SWGT/cHdL9ZZ32/Z9Dzkwbrm1adzcReEh1+Pl/VdhX/Oit4
-        ++c8BOGSte259VsmLMleVl+A0wCQ32adWPIfZAhUCG4ASPOuB3v/FyxvnotiAMg2kAaQ7SBBkGTmovoZ
+        uG1RiwtOjw161vsRWNY2fbxrZQVubYc9IyCanbzZ72L4V2EXDINFAqK34+joQwaslhQWCTytUyTBDBfx
-        IE2la9uWEjQApBlkK8h2mAHZSxvmghSDNBFlAExgiBoQO7NcrmZT76rSdZ3dIAxiZy6tSwRpAEUdKCBB
+        dXkgSSQSBqczvlac3xL0pWGRkKhdgP+CEXySiVtp+Ok/Wf66XBTlGzBQ6rRmWjSIAAAAAElFTkSuQmCC
-        GBaNWcvqk2DqGRgYGADjf2uwh5UJoAAAAABJRU5ErkJggg==
+</value>
-</value>
+  </data>
-  </data>
+  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-  <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
-    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFbSURBVDhPYyAVxC0olI6fXWEcO7tMEypEGkhaVi9VtqHj
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNdS8JQHIdXVET0ehP0CaKrvkLfJYhuuoro
+        UdOWSaegQoRB7NwSl9Ap9Tzx8+s54uaU5kfNLfbMWta4HiqNG4A0AZ1aHT+rzCJ+dmla7NyygqQ5pbwg
-        rgNSmNUyp22taStnac1WW8tMUzE0jSw07E7wIih6J4go0k5bnLDVSHvgd3N+/+dwDoeDlcPIbvQQnl2S
+        Ofv6ehawImSQNrOeK25OWUnc7LJEkCaQZpAhUGn8IG5GiTLQeTUgG8A2A50NlUIB8TMrNRq3TThdvq5z
-        4HZcxIofN5Gbnaj6GyO53GbzhnyB7NVz5g5CNenbdyge5+6UjRgAQA0a/Y1SVlN8MHRyXfgUfyaWfyzO
+        NVSIgSFmTmkA0LYoKBcvAMXAikvr/3fumHYYKsTAkDi3QgnKxAAVazuPgjCUi90AGAA5D6QAFBZQIYaJ
-        rOyQaPw30y6p/yD/8KYnf0U+zt8YGHcXUrQwYkzQk74nfVOE5mXfFFK0LPoPI3rSz5DrIRYpWhzSgawn
+        ++c8BOGSte259VsmLMleVl+A0wCQ32adWPIfZAhUCG4ASPOuB3v/FyxvnotiAMg2kAaQ7SBBkGTmovoZ
-        fE9aCeEJ2JCiBXf6DEcXL7riV4Jn509Giu9BipYBC9fMrIfv9UQ16uvMeoICGtcCAFs/yQrbS4FEgdrc
+        IE2la9uWEjQApBlkK8h2mAHZSxvmghSDNBFlAExgiBoQO7NcrmZT76rSdZ3dIAxiZy6tSwRpAEUdKCBB
-        f0hdvmrkeO6+MLu6tzc8TrcgpQSw2RrxJTHKh1PvE3ae76PpBqvbP2KX49sOKZaYE6MC7vL1YhBWIaUE
+        GBaNWcvqk2DqGRgYGADjf2uwh5UJoAAAAABJRU5ErkJggg==
-        MLOtZqcUFmMZOLng3VLkWlSVZ5B0tls4KSnFT+EUKwQBWKtDVXlGp7kOK7d1IieyUDl+ZMhkb0JVZZgY
+</value>
-        77ycPIPqCdQPhJYrx0A5u8doD61eAy39Awz7AAP4l8pjlte4AAAAAElFTkSuQmCC
+  </data>
-</value>
+  <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-  </data>
+    <value>
-  <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-    <value>
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZPLSwJBHMctKiJ6XoL+gujUv+D/EkSXThHd
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        GpDCzFearW1rbbm+StvcdTPzURSa9kRDL0VIl6KHeYkoUqfdmLDVJe0D38t8f59hhmFktVCSW3Kjaxcz
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADkSURBVDhPY6ivn8lV0TPbmFi8ODEzBoaXphWJMIAEz1+7
+        Ujs2oyOgVWHeflT9jRKz95g8EX8g/fCWykEoJPlcgsz5dY7fiAAANKHRaviy0ewORS4eC99iZQ5v8sU5
-        8//Ji9f/bz98DqZB+NbDZ1jZdwoK/r+rr///rKTkP8gQsAEgCRB48e4TmAYBXOxHNTX/v/f3gw2BGwCy
+        xw6GxqvR2diRo2zuU0r+CXeefVIQzgGkiCGYKC0l/U7yqQj1dr8GKWJWA8f7UlJlsM0IiRQxy+wRJyX8
-        GaTo1pNXYBof+2pi4v9HQNvvZGb+XxmTmEkdF1BsACiQQIqI8cK1lJT/94uK/t8CemFFQmr6EPTC1aTk
+        TpKP0RU0IUWM1upXnN69S4o/CWVuX5VmtxwpYkYNVCfhCb9IiUKE11lwhWg0LgYAslVN0ttkMF4wew/z
-        /3fz8v7fTM8YTF4glJAWrN91dvqyTa0gfKCs4vT+vKIjILwwJVuNKBes3LJ/CQMuADKAUGZaumnvKqhy
+        Z/cfIjl29VxYWA+HJ2bwLqSUASZTu3aNOVgPn5RmLW73MI63zTsDkxYutr3MRuOLzAGttfmHZBA2IKUM
-        TEBMdi7vmCkHVY4GGBgAs3D6mrdshJUAAAAASUVORK5CYII=
+        0JPdeiu7x0RTUL3i8fFyM6pqM4ZZew0Um2Bjl1BD0iEANlpQVZspHdU3T/kuuHga8sffH1dZOlBVHyrC
-</value>
+        s8QlMlA4gfCB0HL9KMzWwWnchQvXQEv/QCb7AsJLl64HI/ycAAAAAElFTkSuQmCC
-  </data>
+</value>
-  <data name="toolStripDropDownButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  </data>
-    <value>
+  <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+    <value>
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADkSURBVDhPY6ivn8lV0TPbmFi8ODEzBoaXphWJMIAEz1+7
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        8//Ji9f/bz98DqZB+NbDZ1jZdwoK/r+rr///rKTkP8gQsAEgCRB48e4TmAYBXOxHNTX/v/f3gw2BGwCy
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        GaTo1pNXYBof+2pi4v9HQNvvZGb+XxmTmEkdF1BsACiQQIqI8cK1lJT/94uK/t8CemFFQmr6EPTC1aTk
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        /3fz8v7fTM8YTF4glJAWrN91dvqyTa0gfKCs4vT+vKIjILwwJVuNKBes3LJ/CQMuADKAUGZaumnvKqhy
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        TEBMdi7vmCkHVY4GGBgAs3D6mrdshJUAAAAASUVORK5CYII=
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+</value>
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+  </data>
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+  <data name="toolStripDropDownButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+    <value>
-</value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-  </data>
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-    <value>
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE5SURBVDhPnZLNSsNAFEZHn7MtZrK2e00xkLqoK00t7qxo
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        pakgUScFdaeuWtPkDUSJe0m68YfCmG/MlMakMfjBhcvce84wMGRZOCcro/OKPrKrW+iT43IB4A9VK3wy
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Zyh/qFilJbqur3ps7Wz6vD/jbz2OQo8zzJK1/AjYScOLEtdRBkslGPhXdDB96WRgWZBgJ/Mc8WamWkWw
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        LOxMGO3PJWgmDu2XgWUJScwIydiualHQ/pLDh9sdvt2si77X1fjpUUP0TaMuZnIvCjqfjxe1TeJepgV3
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        1y1uJILjQ42fdH8EhrHO729aaYFd2xDP8BjdDV/Ndzn8q7ALRsAyHlP3wuDgIw9YrFxYxnOoWSTBDBcl
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        6/mBJMqRCDieJWvF+S1BXxqW8ZnSBvgvGMEnGduVhhv/k/mvy4SQb0HS6yNWXkMAAAAAAElFTkSuQmCC
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
-</value>
+</value>
-  </data>
+  </data>
-  <metadata name="taB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="taB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>227, 17</value>
+    <value>227, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="bsF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="bsF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>289, 17</value>
+    <value>289, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="taF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="taF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>359, 17</value>
+    <value>359, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>427, 17</value>
+    <value>427, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="taME.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="taME.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>582, 17</value>
+    <value>582, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="bsME.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="bsME.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>500, 17</value>
+    <value>500, 17</value>
-  </metadata>
+  </metadata>
+  <metadata name="bsIng.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>92, 56</value>
+  </metadata>
+  <metadata name="taIng.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>231, 56</value>
+  </metadata>
 </root>

SubProject/FEQ0000/Equipment/fImpEquipment.cs

@@ -31,6 +31,9 @@ namespace FEQ0000
                 case fEquipment.eTabletype.BUMP:
                     dt = new dsEQ.EquipmentBDataTable();
                     break;
+                case fEquipment.eTabletype.ING:
+                    dt = new dsEQ.EETGW_EquipmentIngDataTable();
+                    break;
 
             }
         }
@@ -236,17 +239,21 @@ namespace FEQ0000
                 return;
             }
 
+
+
             System.Text.StringBuilder sb = new StringBuilder();
             sb.AppendLine("다음 자료를 추가하시겠습니까?");
             sb.AppendLine();
             sb.AppendLine("등록일 : " + dateTimePicker1.Value.ToShortDateString());
-            sb.AppendLine();
+            sb.AppendLine();            
-            sb.AppendLine("해당 일자에 등록된 자료가 있다면 삭제 됩니다.");
             sb.AppendLine("'저장 완료' 메세지가 나올때 까지 기다려 주세요.");
             sb.AppendLine();
             sb.AppendLine("실행 하려면 '예' 를 누르세요");
             var dlg = FCOMMON.Util.MsgQ(sb.ToString());
             if (dlg != System.Windows.Forms.DialogResult.Yes) return;
+
+          
+
             
             //라인코드를 읽어서 값을 기록해준다.
             var taLine = new  dsEQTableAdapters.LineCodeTableAdapter();
@@ -260,6 +267,31 @@ namespace FEQ0000
             this.progressBar1.Value = 0;
             this.progressBar1.Maximum = dtExcel.Rows.Count;
 
+            //기존자료삭제코드
+            dlg = FCOMMON.Util.MsgQ("기존에 등록된 자료를 삭제할까요?\n자료를 추가하려면 아니오를 클릭하세요");
+            if (dlg == DialogResult.Yes)
+            {
+                switch (imptype)
+                {
+                    case fEquipment.eTabletype.MOLD:
+                        var taE = new dsEQTableAdapters.EquipmentMETableAdapter();
+                        taE.DeleteData(dateStr);
+                        break;
+                    case fEquipment.eTabletype.BUMP:
+                        var taB = new dsEQTableAdapters.EquipmentBTableAdapter();
+                        taB.DeleteData(dateStr);
+                        break;
+                    case fEquipment.eTabletype.FOL:
+                        var taF = new dsEQTableAdapters.EquipmentFTableAdapter();
+                        taF.DeleteData(dateStr);
+                        break;
+                    case fEquipment.eTabletype.ING:
+                        var taI = new dsEQTableAdapters.EETGW_EquipmentIngTableAdapter();
+                        taI.DeleteData(dateStr);
+                        break;
+                }
+            }
+
             //12,13
             foreach (DataRow dr in dtExcel.Rows)
             {
@@ -269,6 +301,8 @@ namespace FEQ0000
                 var linedesc = dr[13].ToString();
                 var lineT = string.Empty;
                 var lineP = string.Empty;
+                var rcsflag = dr[1].ToString();
+                if (rcsflag != "M") continue;
 
                 //없는 라인코드는 추가
                 var lineDrows = lineTd.Select("code='" + linecode + "'");
@@ -333,19 +367,24 @@ namespace FEQ0000
             {
                 case fEquipment.eTabletype.MOLD:
                     var taE = new dsEQTableAdapters.EquipmentMETableAdapter();
-                    taE.DeleteData(dateStr);
+                    //taE.DeleteData(dateStr);
                     taE.Update((dsEQ.EquipmentMEDataTable)dt);
                     break;
                 case fEquipment.eTabletype.BUMP:
                     var taB = new dsEQTableAdapters.EquipmentBTableAdapter();
-                    taB.DeleteData(dateStr);
+                    //taB.DeleteData(dateStr);
                     taB.Update((dsEQ.EquipmentBDataTable)dt);
                     break;
                 case fEquipment.eTabletype.FOL:
                     var taF = new dsEQTableAdapters.EquipmentFTableAdapter();
-                    taF.DeleteData(dateStr);
+                    //taF.DeleteData(dateStr);
                     taF.Update((dsEQ.EquipmentFDataTable)dt);
                     break;
+                case fEquipment.eTabletype.ING:
+                    var taI = new dsEQTableAdapters.EETGW_EquipmentIngTableAdapter();
+                    //taI.DeleteData(dateStr);
+                    taI.Update((dsEQ.EETGW_EquipmentIngDataTable)dt);
+                    break;
             }
             dt.AcceptChanges();
             FCOMMON.Util.MsgI("Save OK");

SubProject/FEQ0000/Equipment/rpt_equipmentB.Designer.cs

@@ -1,91 +1,97 @@
-namespace FEQ0000
+namespace FEQ0000
-{
+{
-    partial class rpt_equipmentB
+    partial class rpt_equipmentB
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// Required designer variable.
+        /// Required designer variable.
-        /// </summary>
+        /// </summary>
-        private System.ComponentModel.IContainer components = null;
+        private System.ComponentModel.IContainer components = null;
-
+
-        /// <summary>
+        /// <summary>
-        /// Clean up any resources being used.
+        /// Clean up any resources being used.
-        /// </summary>
+        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
+        protected override void Dispose(bool disposing)
-        {
+        {
-            if (disposing && (components != null))
+            if (disposing && (components != null))
-            {
+            {
-                components.Dispose();
+                components.Dispose();
-            }
+            }
-            base.Dispose(disposing);
+            base.Dispose(disposing);
-        }
+        }
-
+
-        #region Windows Form Designer generated code
+        #region Windows Form Designer generated code
-
+
-        /// <summary>
+        /// <summary>
-        /// Required method for Designer support - do not modify
+        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
+        /// the contents of this method with the code editor.
-        /// </summary>
+        /// </summary>
-        private void InitializeComponent()
+        private void InitializeComponent()
-        {
+        {
-            this.components = new System.ComponentModel.Container();
+            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
-            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            this.dsEQ = new FEQ0000.dsEQ();
-            this.dsEQ = new FEQ0000.dsEQ();
+            this.rpv1 = new Microsoft.Reporting.WinForms.ReportViewer();
-            this.rpv1 = new Microsoft.Reporting.WinForms.ReportViewer();
+            this.taB = new FEQ0000.dsEQTableAdapters.vEquStockBTableAdapter();
-            this.taB = new FEQ0000.dsEQTableAdapters.vEquStockBTableAdapter();
+            this.taF = new FEQ0000.dsEQTableAdapters.vEquStockFTableAdapter();
-            this.taF = new FEQ0000.dsEQTableAdapters.vEquStockFTableAdapter();
+            this.taE = new FEQ0000.dsEQTableAdapters.vEquStockMETableAdapter();
-            this.taE = new FEQ0000.dsEQTableAdapters.vEquStockMETableAdapter();
+            this.taI = new FEQ0000.dsEQTableAdapters.vEquStockIngTableAdapter();
-            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).BeginInit();
-            this.SuspendLayout();
+            this.SuspendLayout();
-            // 
+            // 
-            // dsEQ
+            // dsEQ
-            // 
+            // 
-            this.dsEQ.DataSetName = "dsEQ";
+            this.dsEQ.DataSetName = "dsEQ";
-            this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
+            // 
-            // rpv1
+            // rpv1
-            // 
+            // 
-            this.rpv1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.rpv1.Dock = System.Windows.Forms.DockStyle.Fill;
-            reportDataSource1.Name = "DataSet1";
+            reportDataSource1.Name = "DataSet1";
-            this.rpv1.LocalReport.DataSources.Add(reportDataSource1);
+            reportDataSource1.Value = null;
-            this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportB.rdlc";
+            this.rpv1.LocalReport.DataSources.Add(reportDataSource1);
-            this.rpv1.Location = new System.Drawing.Point(0, 0);
+            this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportB.rdlc";
-            this.rpv1.Name = "rpv1";
+            this.rpv1.Location = new System.Drawing.Point(0, 0);
-            this.rpv1.Size = new System.Drawing.Size(676, 487);
+            this.rpv1.Name = "rpv1";
-            this.rpv1.TabIndex = 0;
+            this.rpv1.Size = new System.Drawing.Size(676, 487);
-            // 
+            this.rpv1.TabIndex = 0;
-            // taB
+            // 
-            // 
+            // taB
-            this.taB.ClearBeforeFill = true;
+            // 
-            // 
+            this.taB.ClearBeforeFill = true;
-            // taF
+            // 
-            // 
+            // taF
-            this.taF.ClearBeforeFill = true;
+            // 
-            // 
+            this.taF.ClearBeforeFill = true;
-            // taE
+            // 
-            // 
+            // taE
-            this.taE.ClearBeforeFill = true;
+            // 
-            // 
+            this.taE.ClearBeforeFill = true;
-            // rpt_equipmentB
+            // 
-            // 
+            // taI
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            // 
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.taI.ClearBeforeFill = true;
-            this.ClientSize = new System.Drawing.Size(676, 487);
+            // 
-            this.Controls.Add(this.rpv1);
+            // rpt_equipmentB
-            this.Name = "rpt_equipmentB";
+            // 
-            this.Text = "Equipment Report (Bump)";
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
-            this.Load += new System.EventHandler(this.rpt_equipment_Load);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit();
+            this.ClientSize = new System.Drawing.Size(676, 487);
-            this.ResumeLayout(false);
+            this.Controls.Add(this.rpv1);
-
+            this.Name = "rpt_equipmentB";
-        }
+            this.Text = "Equipment Report (Bump)";
-
+            this.Load += new System.EventHandler(this.rpt_equipment_Load);
-        #endregion
+            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit();
-
+            this.ResumeLayout(false);
-        private Microsoft.Reporting.WinForms.ReportViewer rpv1;
+
-        private dsEQ dsEQ;
+        }
-        private dsEQTableAdapters.vEquStockBTableAdapter taB;
+
-        private dsEQTableAdapters.vEquStockFTableAdapter taF;
+        #endregion
-        private dsEQTableAdapters.vEquStockMETableAdapter taE;
+
-    }
+        private Microsoft.Reporting.WinForms.ReportViewer rpv1;
+        private dsEQ dsEQ;
+        private dsEQTableAdapters.vEquStockBTableAdapter taB;
+        private dsEQTableAdapters.vEquStockFTableAdapter taF;
+        private dsEQTableAdapters.vEquStockMETableAdapter taE;
+        private dsEQTableAdapters.vEquStockIngTableAdapter taI;
+    }
 }

SubProject/FEQ0000/Equipment/rpt_equipmentB.cs

@@ -51,6 +51,11 @@ namespace FEQ0000
                     taE.Fill(this.dsEQ.vEquStockME, this.pdate);
                     DsEQ.Value = this.dsEQ.vEquStockME;
                     break;
+                case fEquipment.eTabletype.ING:
+                    this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportI.rdlc";
+                    taI.Fill(this.dsEQ.vEquStockIng, this.pdate);
+                    DsEQ.Value = this.dsEQ.vEquStockIng;
+                    break;
             }
 
             this.rpv1.LocalReport.DataSources.Add(DsEQ);

SubProject/FEQ0000/Equipment/rpt_equipmentB.resx

@@ -1,132 +1,135 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<root>
+<root>
-  <!-- 
+  <!-- 
-    Microsoft ResX Schema 
+    Microsoft ResX Schema 
-    
+    
-    Version 2.0
+    Version 2.0
-    
+    
-    The primary goals of this format is to allow a simple XML format 
+    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
+    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+    various data types are done through the TypeConverter classes 
-    associated with the data types.
+    associated with the data types.
-    
+    
-    Example:
+    Example:
-    
+    
-    ... ado.net/XML headers & schema ...
+    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
+    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, 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="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="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
+    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <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>
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
+        <comment>This is a comment</comment>
-    </data>
+    </data>
-                
+                
-    There are any number of "resheader" rows that contain simple 
+    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
+    name/value pairs.
-    
+    
-    Each data row contains a name, and value. The row also contains a 
+    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
+    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
+    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+    Classes that don't support this are serialized and stored with the 
-    mimetype set.
+    mimetype set.
-    
+    
-    The mimetype is used for serialized objects, and tells the 
+    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
+    extensible. For a given mimetype the value must be set accordingly:
-    
+    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
+    read any of the formats listed below.
-    
+    
-    mimetype: application/x-microsoft.net.object.binary.base64
+    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-    
+    
-    mimetype: application/x-microsoft.net.object.soap.base64
+    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
+            : and then encoded with base64 encoding.
-
+
-    mimetype: application/x-microsoft.net.object.bytearray.base64
+    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
+            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
+            : 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: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:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
+    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
+      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
+        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
+          <xsd:element name="metadata">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="assembly">
+          <xsd:element name="assembly">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="data">
+          <xsd:element name="data">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <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:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <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="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-          <xsd:element name="resheader">
+          <xsd:element name="resheader">
-            <xsd:complexType>
+            <xsd:complexType>
-              <xsd:sequence>
+              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
+              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
+            </xsd:complexType>
-          </xsd:element>
+          </xsd:element>
-        </xsd:choice>
+        </xsd:choice>
-      </xsd:complexType>
+      </xsd:complexType>
-    </xsd:element>
+    </xsd:element>
-  </xsd:schema>
+  </xsd:schema>
-  <resheader name="resmimetype">
+  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
+    <value>text/microsoft-resx</value>
-  </resheader>
+  </resheader>
-  <resheader name="version">
+  <resheader name="version">
-    <value>2.0</value>
+    <value>2.0</value>
-  </resheader>
+  </resheader>
-  <resheader name="reader">
+  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+  </resheader>
-  <resheader name="writer">
+  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+  </resheader>
-  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>17, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="taB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="taB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>97, 17</value>
+    <value>97, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="taF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="taF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>166, 17</value>
+    <value>166, 17</value>
-  </metadata>
+  </metadata>
-  <metadata name="taE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="taE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>234, 17</value>
+    <value>234, 17</value>
-  </metadata>
+  </metadata>
+  <metadata name="taI.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>303, 17</value>
+  </metadata>
 </root>

SubProject/FEQ0000/Equipment/rpt_equipmentIng.Designer.cs

@@ -0,0 +1,91 @@
+namespace FEQ0000
+{
+    partial class rpt_equipmentIng
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            this.dsEQ = new FEQ0000.dsEQ();
+            this.rpv1 = new Microsoft.Reporting.WinForms.ReportViewer();
+            this.taB = new FEQ0000.dsEQTableAdapters.vEquStockBTableAdapter();
+            this.taF = new FEQ0000.dsEQTableAdapters.vEquStockFTableAdapter();
+            this.taE = new FEQ0000.dsEQTableAdapters.vEquStockMETableAdapter();
+            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // dsEQ
+            // 
+            this.dsEQ.DataSetName = "dsEQ";
+            this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // rpv1
+            // 
+            this.rpv1.Dock = System.Windows.Forms.DockStyle.Fill;
+            reportDataSource1.Name = "DataSet1";
+            this.rpv1.LocalReport.DataSources.Add(reportDataSource1);
+            this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportB.rdlc";
+            this.rpv1.Location = new System.Drawing.Point(0, 0);
+            this.rpv1.Name = "rpv1";
+            this.rpv1.Size = new System.Drawing.Size(676, 487);
+            this.rpv1.TabIndex = 0;
+            // 
+            // taB
+            // 
+            this.taB.ClearBeforeFill = true;
+            // 
+            // taF
+            // 
+            this.taF.ClearBeforeFill = true;
+            // 
+            // taE
+            // 
+            this.taE.ClearBeforeFill = true;
+            // 
+            // rpt_equipmentB
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(676, 487);
+            this.Controls.Add(this.rpv1);
+            this.Name = "rpt_equipmentB";
+            this.Text = "Equipment Report (Bump)";
+            this.Load += new System.EventHandler(this.rpt_equipment_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Microsoft.Reporting.WinForms.ReportViewer rpv1;
+        private dsEQ dsEQ;
+        private dsEQTableAdapters.vEquStockBTableAdapter taB;
+        private dsEQTableAdapters.vEquStockFTableAdapter taF;
+        private dsEQTableAdapters.vEquStockMETableAdapter taE;
+    }
+}

SubProject/FEQ0000/Equipment/rpt_equipmentIng.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace FEQ0000
+{
+    public partial class rpt_equipmentIng : Form
+    {
+      
+        string pdate = string.Empty;
+        public rpt_equipmentIng(string dateStr)
+        {
+            //SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
+            InitializeComponent();
+            pdate = dateStr;
+        }
+
+        private void rpt_equipment_Load(object sender, EventArgs e)
+        {
+            this.Text = string.Format("Data Report({0})","잉여장비");
+            this.Show();
+            Application.DoEvents();
+
+            this.rpv1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;
+            this.rpv1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
+
+            //Set DataSource
+            Microsoft.Reporting.WinForms.ReportDataSource DsEQ = new Microsoft.Reporting.WinForms.ReportDataSource();
+            DsEQ.Name = "DataSet1";
+
+            this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportF.rdlc";
+            taF.Fill(this.dsEQ.vEquStockF, this.pdate);
+            DsEQ.Value = this.dsEQ.vEquStockF;
+
+            this.rpv1.LocalReport.DataSources.Add(DsEQ);
+            this.rpv1.RefreshReport();
+        }
+    }
+}

SubProject/FEQ0000/Equipment/rpt_equipmentIng.resx

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="taB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>97, 17</value>
+  </metadata>
+  <metadata name="taF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>166, 17</value>
+  </metadata>
+  <metadata name="taE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>234, 17</value>
+  </metadata>
+</root>

SubProject/FEQ0000/FEQ0000.csproj

@@ -168,6 +168,12 @@
     <Compile Include="Equipment\fImpEquipment.Designer.cs">
       <DependentUpon>fImpEquipment.cs</DependentUpon>
     </Compile>
+    <Compile Include="Equipment\rpt_equipmentIng.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Equipment\rpt_equipmentIng.Designer.cs">
+      <DependentUpon>rpt_equipmentIng.cs</DependentUpon>
+    </Compile>
     <Compile Include="MethodExtentions.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -256,6 +262,10 @@
     <EmbeddedResource Include="Equipment\fImpEquipment.resx">
       <DependentUpon>fImpEquipment.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Equipment\ReportI.rdlc" />
+    <EmbeddedResource Include="Equipment\rpt_equipmentIng.resx">
+      <DependentUpon>rpt_equipmentIng.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

SubProject/FEQ0000/dsEQ.xsc

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<!--<autogenerated>
+<!--<autogenerated>
-     This code was generated by a tool.
+     This code was generated by a tool.
-     Changes to this file may cause incorrect behavior and will be lost if
+     Changes to this file may cause incorrect behavior and will be lost if
-     the code is regenerated.
+     the code is regenerated.
-</autogenerated>-->
+</autogenerated>-->
-<DataSetUISetting Version="1.00" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+<DataSetUISetting Version="1.00" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-  <TableUISettings />
+  <TableUISettings />
 </DataSetUISetting>

SubProject/FEQ0000/dsEQ.xsd

@@ -49,6 +49,17 @@ ORDER BY pdate DESC</CommandText>
                     <CommandText>SELECT  pdate
 FROM     EquipmentF
 GROUP BY pdate
+ORDER BY pdate DESC</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_EquipmentIng" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="true" GeneratorGetMethodName="GetDateListIng" GetMethodModifier="Public" GetMethodName="GetDateListIng" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDateListIng" UserSourceName="GetDateListIng">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT  pdate
+FROM     EETGW_EquipmentIng
+GROUP BY pdate
 ORDER BY pdate DESC</CommandText>
                     <Parameters />
                   </DbCommand>
@@ -648,7 +659,7 @@ WHERE  (pdate = @pdate)</CommandText>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="EquipmentFilterTableAdapter" GeneratorDataComponentClassName="EquipmentFilterTableAdapter" Name="EquipmentFilter" UserDataComponentName="EquipmentFilterTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.EquipmentFilter" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EquipmentFilter" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>DELETE FROM [EquipmentFilter] WHERE (([idx] = @Original_idx) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_Title = 1 AND [Title] IS NULL) OR ([Title] = @Original_Title)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_wuid = 1 AND [wuid] IS NULL) OR ([wuid] = @Original_wuid)) AND ((@IsNull_wdate = 1 AND [wdate] IS NULL) OR ([wdate] = @Original_wdate)))</CommandText>
@@ -663,7 +674,7 @@ WHERE  (pdate = @pdate)</CommandText>
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_wuid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_wdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
@@ -678,7 +689,7 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Apply" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Apply" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
@@ -686,8 +697,11 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>SELECT  idx, type, Title, Filter, Apply, memo, wuid, wdate
 FROM     EquipmentFilter
+WHERE  (type = @type)
 ORDER BY Title</CommandText>
-                    <Parameters />
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="type" ColumnName="type" DataSourceName="EE.dbo.EquipmentFilter" DataTypeServer="varchar(1)" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="1" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
@@ -701,7 +715,7 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Apply" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="Apply" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -712,8 +726,8 @@ SELECT idx, type, Title, Filter, Apply, memo, wuid, wdate FROM EquipmentFilter W
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_wuid" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="true" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_wdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EquipmentFilter" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -819,6 +833,199 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
             </Mappings>
             <Sources />
           </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="EETGW_EquipmentIngTableAdapter" GeneratorDataComponentClassName="EETGW_EquipmentIngTableAdapter" Name="EETGW_EquipmentIng" UserDataComponentName="EETGW_EquipmentIngTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_EquipmentIng" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>DELETE FROM [EETGW_EquipmentIng] WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_lineT = 1 AND [lineT] IS NULL) OR ([lineT] = @Original_lineT)) AND ((@IsNull_lineP = 1 AND [lineP] IS NULL) OR ([lineP] = @Original_lineP)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_param1 = 1 AND [param1] IS NULL) OR ([param1] = @Original_param1)) AND ((@IsNull_primary = 1 AND [primary] IS NULL) OR ([primary] = @Original_primary)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_asset" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_asset" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_grp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_grp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_model" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="model" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_model" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_linecode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="linecode" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_linecode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="linecode" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_lineT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="lineT" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_lineT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="lineT" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_lineP" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="lineP" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_lineP" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="lineP" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_serial" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="serial" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_serial" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_manu" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="manu" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_manu" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="manu" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_param1" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="param1" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_param1" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="param1" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_primary" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="primary" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_primary" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="primary" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_except" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="except" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_except" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="except" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_memo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+                <InsertCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>INSERT INTO [EETGW_EquipmentIng] ([pdate], [asset], [grp], [type], [model], [linecode], [lineT], [lineP], [serial], [manu], [param1], [primary], [except], [memo], [wuid], [wdate]) VALUES (@pdate, @asset, @grp, @type, @model, @linecode, @lineT, @lineP, @serial, @manu, @param1, @primary, @except, @memo, @wuid, @wdate);
+SELECT idx, pdate, asset, grp, type, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate FROM EETGW_EquipmentIng WHERE (idx = SCOPE_IDENTITY())</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@asset" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@grp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@model" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@linecode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="linecode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@lineT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="lineT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@lineP" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="lineP" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@manu" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="manu" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@param1" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="param1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@primary" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="primary" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@except" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="except" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </InsertCommand>
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT  idx, pdate, asset, grp, type, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate
+FROM     EETGW_EquipmentIng
+WHERE  (pdate = @pdate)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.EETGW_EquipmentIng" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>UPDATE [EETGW_EquipmentIng] SET [pdate] = @pdate, [asset] = @asset, [grp] = @grp, [type] = @type, [model] = @model, [linecode] = @linecode, [lineT] = @lineT, [lineP] = @lineP, [serial] = @serial, [manu] = @manu, [param1] = @param1, [primary] = @primary, [except] = @except, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_asset = 1 AND [asset] IS NULL) OR ([asset] = @Original_asset)) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_type = 1 AND [type] IS NULL) OR ([type] = @Original_type)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_linecode = 1 AND [linecode] IS NULL) OR ([linecode] = @Original_linecode)) AND ((@IsNull_lineT = 1 AND [lineT] IS NULL) OR ([lineT] = @Original_lineT)) AND ((@IsNull_lineP = 1 AND [lineP] IS NULL) OR ([lineP] = @Original_lineP)) AND ((@IsNull_serial = 1 AND [serial] IS NULL) OR ([serial] = @Original_serial)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_param1 = 1 AND [param1] IS NULL) OR ([param1] = @Original_param1)) AND ((@IsNull_primary = 1 AND [primary] IS NULL) OR ([primary] = @Original_primary)) AND ((@IsNull_except = 1 AND [except] IS NULL) OR ([except] = @Original_except)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));
+SELECT idx, pdate, asset, grp, type, model, linecode, lineT, lineP, serial, manu, param1, [primary], [except], memo, wuid, wdate FROM EETGW_EquipmentIng WHERE (idx = @idx)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@asset" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@grp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@model" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@linecode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="linecode" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@lineT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="lineT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@lineP" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="lineP" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@serial" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@manu" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="manu" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@param1" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="param1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@primary" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="primary" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@except" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="except" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_asset" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_asset" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="asset" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_grp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_grp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_type" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_type" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="type" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_model" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="model" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_model" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="model" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_linecode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="linecode" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_linecode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="linecode" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_lineT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="lineT" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_lineT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="lineT" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_lineP" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="lineP" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_lineP" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="lineP" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_serial" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="serial" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_serial" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="serial" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_manu" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="manu" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_manu" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="manu" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_param1" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="param1" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_param1" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="param1" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_primary" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="primary" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_primary" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="primary" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_except" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="except" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_except" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="except" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_memo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="true" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.EETGW_EquipmentIng" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="idx" DataSetColumn="idx" />
+              <Mapping SourceColumn="pdate" DataSetColumn="pdate" />
+              <Mapping SourceColumn="asset" DataSetColumn="asset" />
+              <Mapping SourceColumn="grp" DataSetColumn="grp" />
+              <Mapping SourceColumn="type" DataSetColumn="type" />
+              <Mapping SourceColumn="model" DataSetColumn="model" />
+              <Mapping SourceColumn="linecode" DataSetColumn="linecode" />
+              <Mapping SourceColumn="lineT" DataSetColumn="lineT" />
+              <Mapping SourceColumn="lineP" DataSetColumn="lineP" />
+              <Mapping SourceColumn="serial" DataSetColumn="serial" />
+              <Mapping SourceColumn="manu" DataSetColumn="manu" />
+              <Mapping SourceColumn="param1" DataSetColumn="param1" />
+              <Mapping SourceColumn="primary" DataSetColumn="primary" />
+              <Mapping SourceColumn="except" DataSetColumn="except" />
+              <Mapping SourceColumn="memo" DataSetColumn="memo" />
+              <Mapping SourceColumn="wuid" DataSetColumn="wuid" />
+              <Mapping SourceColumn="wdate" DataSetColumn="wdate" />
+            </Mappings>
+            <Sources>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteData" Modifier="Public" Name="DeleteData" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteData">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>DELETE FROM [EETGW_EquipmentIng] where pdate =@pdate</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.EETGW_EquipmentIng" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+              </DbSource>
+            </Sources>
+          </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="vEquStockIngTableAdapter" GeneratorDataComponentClassName="vEquStockIngTableAdapter" Name="vEquStockIng" UserDataComponentName="vEquStockIngTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vEquStockIng" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT  pdate, grp, manu, model, linecode, lineT, lineP, cnt, Remark
+FROM     vEquStockIng
+WHERE  (pdate = @pdate)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.vEquStockIng" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
+                    </Parameters>
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="pdate" DataSetColumn="pdate" />
+              <Mapping SourceColumn="grp" DataSetColumn="grp" />
+              <Mapping SourceColumn="manu" DataSetColumn="manu" />
+              <Mapping SourceColumn="model" DataSetColumn="model" />
+              <Mapping SourceColumn="linecode" DataSetColumn="linecode" />
+              <Mapping SourceColumn="lineT" DataSetColumn="lineT" />
+              <Mapping SourceColumn="lineP" DataSetColumn="lineP" />
+              <Mapping SourceColumn="cnt" DataSetColumn="cnt" />
+              <Mapping SourceColumn="Remark" DataSetColumn="Remark" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
         </Tables>
         <Sources />
       </DataSource>
@@ -1426,6 +1633,170 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="EETGW_EquipmentIng" msprop:Generator_TableClassName="EETGW_EquipmentIngDataTable" msprop:Generator_TableVarName="tableEETGW_EquipmentIng" msprop:Generator_TablePropName="EETGW_EquipmentIng" msprop:Generator_RowDeletingName="EETGW_EquipmentIngRowDeleting" msprop:Generator_RowChangingName="EETGW_EquipmentIngRowChanging" msprop:Generator_RowEvHandlerName="EETGW_EquipmentIngRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_EquipmentIngRowDeleted" msprop:Generator_UserTableName="EETGW_EquipmentIng" msprop:Generator_RowChangedName="EETGW_EquipmentIngRowChanged" msprop:Generator_RowEvArgName="EETGW_EquipmentIngRowChangeEvent" msprop:Generator_RowClassName="EETGW_EquipmentIngRow">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
+              <xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="asset" msprop:Generator_ColumnVarNameInTable="columnasset" msprop:Generator_ColumnPropNameInRow="asset" msprop:Generator_ColumnPropNameInTable="assetColumn" msprop:Generator_UserColumnName="asset" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="grp" msprop:Generator_ColumnVarNameInTable="columngrp" msprop:Generator_ColumnPropNameInRow="grp" msprop:Generator_ColumnPropNameInTable="grpColumn" msprop:Generator_UserColumnName="grp" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="type" msprop:Generator_ColumnVarNameInTable="columntype" msprop:Generator_ColumnPropNameInRow="type" msprop:Generator_ColumnPropNameInTable="typeColumn" msprop:Generator_UserColumnName="type" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="model" msprop:Generator_ColumnVarNameInTable="columnmodel" msprop:Generator_ColumnPropNameInRow="model" msprop:Generator_ColumnPropNameInTable="modelColumn" msprop:Generator_UserColumnName="model" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="linecode" msprop:Generator_ColumnVarNameInTable="columnlinecode" msprop:Generator_ColumnPropNameInRow="linecode" msprop:Generator_ColumnPropNameInTable="linecodeColumn" msprop:Generator_UserColumnName="linecode" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="lineT" msprop:Generator_ColumnVarNameInTable="columnlineT" msprop:Generator_ColumnPropNameInRow="lineT" msprop:Generator_ColumnPropNameInTable="lineTColumn" msprop:Generator_UserColumnName="lineT" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="lineP" msprop:Generator_ColumnVarNameInTable="columnlineP" msprop:Generator_ColumnPropNameInRow="lineP" msprop:Generator_ColumnPropNameInTable="linePColumn" msprop:Generator_UserColumnName="lineP" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="serial" msprop:Generator_ColumnVarNameInTable="columnserial" msprop:Generator_ColumnPropNameInRow="serial" msprop:Generator_ColumnPropNameInTable="serialColumn" msprop:Generator_UserColumnName="serial" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="manu" msprop:Generator_ColumnVarNameInTable="columnmanu" msprop:Generator_ColumnPropNameInRow="manu" msprop:Generator_ColumnPropNameInTable="manuColumn" msprop:Generator_UserColumnName="manu" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="param1" msprop:Generator_ColumnVarNameInTable="columnparam1" msprop:Generator_ColumnPropNameInRow="param1" msprop:Generator_ColumnPropNameInTable="param1Column" msprop:Generator_UserColumnName="param1" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="primary" msprop:Generator_ColumnVarNameInTable="columnprimary" msprop:Generator_ColumnPropNameInRow="primary" msprop:Generator_ColumnPropNameInTable="primaryColumn" msprop:Generator_UserColumnName="primary" type="xs:boolean" minOccurs="0" />
+              <xs:element name="except" msprop:Generator_ColumnVarNameInTable="columnexcept" msprop:Generator_ColumnPropNameInRow="except" msprop:Generator_ColumnPropNameInTable="exceptColumn" msprop:Generator_UserColumnName="except" type="xs:boolean" minOccurs="0" />
+              <xs:element name="memo" msprop:Generator_ColumnVarNameInTable="columnmemo" msprop:Generator_ColumnPropNameInRow="memo" msprop:Generator_ColumnPropNameInTable="memoColumn" msprop:Generator_UserColumnName="memo" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="255" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_UserColumnName="wuid">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_UserColumnName="wdate" type="xs:dateTime" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="vEquStockIng" msprop:Generator_TableClassName="vEquStockIngDataTable" msprop:Generator_TableVarName="tablevEquStockIng" msprop:Generator_TablePropName="vEquStockIng" msprop:Generator_RowDeletingName="vEquStockIngRowDeleting" msprop:Generator_RowChangingName="vEquStockIngRowChanging" msprop:Generator_RowEvHandlerName="vEquStockIngRowChangeEventHandler" msprop:Generator_RowDeletedName="vEquStockIngRowDeleted" msprop:Generator_UserTableName="vEquStockIng" msprop:Generator_RowChangedName="vEquStockIngRowChanged" msprop:Generator_RowEvArgName="vEquStockIngRowChangeEvent" msprop:Generator_RowClassName="vEquStockIngRow">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="grp" msprop:Generator_ColumnVarNameInTable="columngrp" msprop:Generator_ColumnPropNameInRow="grp" msprop:Generator_ColumnPropNameInTable="grpColumn" msprop:Generator_UserColumnName="grp" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="manu" msprop:Generator_ColumnVarNameInTable="columnmanu" msprop:Generator_ColumnPropNameInRow="manu" msprop:Generator_ColumnPropNameInTable="manuColumn" msprop:Generator_UserColumnName="manu" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="model" msprop:Generator_ColumnVarNameInTable="columnmodel" msprop:Generator_ColumnPropNameInRow="model" msprop:Generator_ColumnPropNameInTable="modelColumn" msprop:Generator_UserColumnName="model" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="linecode" msprop:Generator_ColumnVarNameInTable="columnlinecode" msprop:Generator_ColumnPropNameInRow="linecode" msprop:Generator_ColumnPropNameInTable="linecodeColumn" msprop:Generator_UserColumnName="linecode" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="lineT" msprop:Generator_ColumnVarNameInTable="columnlineT" msprop:Generator_ColumnPropNameInRow="lineT" msprop:Generator_ColumnPropNameInTable="lineTColumn" msprop:Generator_UserColumnName="lineT" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="lineP" msprop:Generator_ColumnVarNameInTable="columnlineP" msprop:Generator_ColumnPropNameInRow="lineP" msprop:Generator_ColumnPropNameInTable="linePColumn" msprop:Generator_UserColumnName="lineP" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="cnt" msprop:Generator_ColumnVarNameInTable="columncnt" msprop:Generator_ColumnPropNameInRow="cnt" msprop:Generator_ColumnPropNameInTable="cntColumn" msprop:Generator_UserColumnName="cnt" type="xs:int" minOccurs="0" />
+              <xs:element name="Remark" msprop:Generator_ColumnVarNameInTable="columnRemark" msprop:Generator_ColumnPropNameInRow="Remark" msprop:Generator_ColumnPropNameInTable="RemarkColumn" msprop:Generator_UserColumnName="Remark" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="255" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:choice>
     </xs:complexType>
     <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -1452,5 +1823,9 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i
       <xs:selector xpath=".//mstns:LineCode" />
       <xs:field xpath="mstns:idx" />
     </xs:unique>
+    <xs:unique name="EETGW_EquipmentIng_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:EETGW_EquipmentIng" />
+      <xs:field xpath="mstns:idx" />
+    </xs:unique>
   </xs:element>
 </xs:schema>

SubProject/FEQ0000/dsEQ.xss

@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<!--<autogenerated>
+<!--<autogenerated>
-     This code was generated by a tool to store the dataset designer's layout information.
+     This code was generated by a tool to store the dataset designer's layout information.
-     Changes to this file may cause incorrect behavior and will be lost if
+     Changes to this file may cause incorrect behavior and will be lost if
-     the code is regenerated.
+     the code is regenerated.
-</autogenerated>-->
+</autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="1156" ViewPortY="26" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
-  <Shapes>
+  <Shapes>
-    <Shape ID="DesignTable:EqDateList" ZOrder="9" X="70" Y="70" Height="153" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+    <Shape ID="DesignTable:EqDateList" ZOrder="11" X="70" Y="70" Height="173" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
-    <Shape ID="DesignTable:EquipmentF" ZOrder="8" X="347" Y="70" Height="324" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EquipmentF" ZOrder="10" X="347" Y="70" Height="324" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EquipmentB" ZOrder="7" X="632" Y="70" Height="324" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EquipmentB" ZOrder="9" X="632" Y="70" Height="324" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:EquipmentME" ZOrder="6" X="918" Y="70" Height="324" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EquipmentME" ZOrder="8" X="918" Y="70" Height="324" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vEquStockB" ZOrder="5" X="1215" Y="70" Height="248" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:vEquStockB" ZOrder="7" X="1215" Y="70" Height="248" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:vEquStockF" ZOrder="4" X="1498" Y="70" Height="248" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:vEquStockF" ZOrder="6" X="1498" Y="70" Height="248" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:vEquStockME" ZOrder="3" X="1780" Y="70" Height="248" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:vEquStockME" ZOrder="5" X="1780" Y="70" Height="248" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:EquipmentFilter" ZOrder="2" X="2074" Y="70" Height="229" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:EquipmentFilter" ZOrder="4" X="2074" Y="70" Height="229" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:LineCode" ZOrder="1" X="1623" Y="364" Height="229" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:LineCode" ZOrder="3" X="1623" Y="364" Height="229" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-  </Shapes>
+    <Shape ID="DesignTable:EETGW_EquipmentIng" ZOrder="2" X="476" Y="456" Height="324" Width="274" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-  <Connectors />
+    <Shape ID="DesignTable:vEquStockIng" ZOrder="1" X="1865" Y="364" Height="248" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+  </Shapes>
+  <Connectors />
 </DiagramLayout>

SubProject/FPJ0000/FPJ0000.csproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.props" Condition="Exists('..\..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.props')" />
+  <Import Project="..\..\packages\cef.redist.x86.87.1.13\build\cef.redist.x86.props" Condition="Exists('..\..\packages\cef.redist.x86.87.1.13\build\cef.redist.x86.props')" />
+  <Import Project="..\..\packages\cef.redist.x64.87.1.13\build\cef.redist.x64.props" Condition="Exists('..\..\packages\cef.redist.x64.87.1.13\build\cef.redist.x64.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,9 +12,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FPJ0000</RootNamespace>
     <AssemblyName>FPJ0000</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -38,6 +43,15 @@
     <Reference Include="ArSetting.Net4">
       <HintPath>..\..\DLL\ArSetting.Net4.dll</HintPath>
     </Reference>
+    <Reference Include="CefSharp, Version=87.1.132.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CefSharp.Common.87.1.132\lib\net452\CefSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="CefSharp.Core, Version=87.1.132.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CefSharp.Common.87.1.132\lib\net452\CefSharp.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="CefSharp.WinForms, Version=87.1.132.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CefSharp.WinForms.87.1.132\lib\net452\CefSharp.WinForms.dll</HintPath>
+    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\..\packages\EntityFramework.6.2.0\lib\net40\EntityFramework.dll</HintPath>
     </Reference>
@@ -826,6 +840,16 @@
     <Content Include="SqlServerTypes\readme.htm" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\cef.redist.x64.87.1.13\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x64.87.1.13\build\cef.redist.x64.props'))" />
+    <Error Condition="!Exists('..\..\packages\cef.redist.x86.87.1.13\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x86.87.1.13\build\cef.redist.x86.props'))" />
+    <Error Condition="!Exists('..\..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('..\..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.targets" Condition="Exists('..\..\packages\CefSharp.Common.87.1.132\build\CefSharp.Common.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

SubProject/FPJ0000/Project/fPartBuyStatus.cs

@@ -538,7 +538,8 @@ namespace FPJ0000
                 FormattingData();
                 this.tbFind.SelectAll();
                 this.tbFind.Focus();
-
+                if (this.bsPart.Count > 0) this.bsPart.Position = 0;
+                else util.MsgE("자료가 없습니다");
             }
         }
 

SubProject/FPJ0000/Project/fPartBuyStatus.resx

@@ -331,20 +331,20 @@
   <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSalFRL0pTmxrY
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF+VSmxrY
-        zVTMvM0pmtrQhUG2mIvMS2iiAwtRCl9UqJVObd7mnNtwRuYyNa/zAl6Wuss5ujP99pyzpQZCP/jwvHjO
+        zVTMdDqnaGpDFwbZYhqZl9BEpQuidHlRoV10avM253TDGZnL1Ob9Ak6Xuss5bmf67TlnyxkI/eDD8+I5
-        98P5fc/hsRP8SJ1wtViviijR/w6R6ily0hyl7GmgI4p1dNhzremCRFPuG/nuEBfaP6FP+zTLVnrVZDK5
+        3w/n9z2Hx07IXVXihRKtMrJU+ztUpqXISXOUsaeOjizpp8MfaQynpeoKv6i3e7jQzgl70Ks2WegVg8Hg
-        LPZNWGx7rFpZaPxctCL/kxkxJaMOQabSyxN1T3ihdpkN62acMMwyMJgZ6GcYaKe3oP61ibYROzYZoHmU
+        Mts2YLZ6WbGw0Pi5aEH+p1nElo7aBZmKvZ6oeyKKNCY23D/thG6GgW6WgXaagWbKAdWvDbSO2LDBAE2j
-        Qn7TLJJfmqh/JCHSNmrDsYXBORe+zjHkZDDASbbQO7GJLyMOItjG4KILhgUn5EozAh921XPh6NKAqdvS
+        FPI/zCD5iYH6RxIqa6XW7Q4MzrnwdY4hJ4MBTuJAj3EDX0bsRLCJwUUXdAtOFCpmwb/T+YYLx5QFTV6T
-        yB1R1U0kV95CZXsdChpKESj1QwBBID+PYNkZlDWXcavYaAZLaw4Ex/cynCCqOPBD13ALWsZfo1Kfy0ni
+        RW2Jq68gueoqqtrqUdBQBr7MH0EEQeEphMiPo7ypnFvFSjNYWrUjJKGH4QTRJfz3ncPNaB5/gSptLidJ
-        K8KQ+zYOWXUxECquIUmRhOahJbSYbPj8fQPrpKcQWR/NCQTlAi9fabZLP9aDN8MyFKkzOUlCVTgJX0da
+        qAxH7qt4ZNXHQlRzEUk1SWgaWkKzwYrP39exRnoKlffSnEBQIdjrJ8t2ace68XJYjmJVJidJrI4g4UtI
-        dSo0E3Zulc5xCirSw5rdiZCCfreAndDCXlpckwjjhBYKwwM868hBdOllJFREwjjjgJEUyxasmXR3YiGC
+        e5YKtdHGrdIxTkFJeli1ORFa0OcWsBNW1ENLaoXQGzWo0d3Gw/YcxJSdQ2JlFPTTduhJsWzB6gl3J2Yi
-        YNk+wcXHUufZvGOIKxdgcFIHeU86ZEoxYl4EoU79Ed/mGRhJsbppJ/oJy1YnAp94BKck3iK+5CiyamNx
+        CJHvEJy5J3OeyDuI+AoBBif6UdidDrlCgtjHwahXfcS3eQZ6Umz/lBN9BJPFCf59j+Co1EccKD2ArLo4
-        pyoUsWVXOIlYGQdJQyp5kyCw94NmFwbYT0ywkiL9s7VuAV9yeJ4vOUIe8gY/1xs3ioKQ8SoRmhEV5Ko8
+        XK8OQ1z5eU4iUcRD2pBK3iQY7P3grAsD7CcmWEiRAdkatyBQum8+ULqfPOSDwFwfXC4ORsZzIdQjShQq
-        pL9PhLAqCkYiMJB/Q08EtHObCNR7K1zK7qMX12kMzbs4escWcL8mDSkkKFLEIKf23u4di2PLRQSNewLW
+        85D+TghRdTT0RKAj/4aWCGjnJhGovCucze6lF9doDM27OHrGFnCrNg0pJCiuiUVO3c3tOxa7w0UEjV4B
-        NmfZE/wPO7tC6j7BOXG3o7q+aeeghw+iu7t7+0R8s80TJ0WmdUzNbjis7MXUCoWpZQoTHlZsTg62eRvt
+        a5szewX/w8aukLpDcFLSZX/6unFrt4d3o6ura/NwQpPVEydFprVPzqzbLezF5DKFSRMFo4dlq5ODbd5K
-        DlMUte5zt/WHJ87jnU5rz/AXtnWcFKks/qJGepcUN35/ETbSPsLWteNJrZ1+icpkHo/H+wMUXJ4nAsHB
+        u8MURa353mj54YnzeMfS2jICRK3tR8RKc4C4kd4mxY3/X0SNtK+oZfVQUkuHv1CRzOPxeH8AEjGeJMnL
-        vwAAAABJRU5ErkJggg==
+        9/8AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs

@@ -220,6 +220,7 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -668,6 +669,7 @@
             // 
             this.toolStripTextBox1.AccessibleName = "위치";
             this.toolStripTextBox1.AutoSize = false;
+            this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.toolStripTextBox1.Name = "toolStripTextBox1";
             this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23);
             this.toolStripTextBox1.Text = "0";
@@ -749,7 +751,7 @@
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(1137, 38);
             this.button1.TabIndex = 5;
-            this.button1.Text = "저장";
+            this.button1.Text = "저장(&S)";
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 

SubProject/FPJ0000/Project/fProjectSchedule.cs

@@ -28,6 +28,10 @@ namespace FPJ0000
 
         private void FProjectSchedule_FormClosing(object sender, FormClosingEventArgs e)
         {
+            this.Validate();
+            this.bs.EndEdit();
+            this.bsTodo.EndEdit();
+            
             if (dsPRJ.HasChanges())
             {
                 var dlg = FCOMMON.Util.MsgQ("변경된 자료가 있습니다. 지금 화면을 닫으면 해당 자료는 손실됩니다\n화면을 닫을까요?");
@@ -65,7 +69,7 @@ namespace FPJ0000
             cmd.Connection.Open();
             var wccstr = cmd.ExecuteScalar();
             CWW = int.Parse(wccstr.ToString());
-            cmd.Connection.Dispose();
+            cmd.Connection.Close();
             cmd.Dispose();
 
         }
@@ -248,7 +252,9 @@ namespace FPJ0000
             }
             else
             {
-                var cnt = this.tam.UpdateAll(this.dsPRJ);
+                var cnt1 = this.ta.Update(this.dsPRJ.EETGW_ProjectsSchedule);
+                var cnt2 = this.taTodo.Update(this.dsPRJ.EETGW_ProjectToDo);
+                var cnt = cnt1 + cnt2;// this.tam.UpdateAll(this.dsPRJ);
                 if (cnt == 0)
                 {
                     FCOMMON.Util.MsgE("저장된 자료가 없습니다");

SubProject/FPJ0000/app.config

@@ -8,17 +8,13 @@
     </sectionGroup>
                                                                                                                       </configSections>
   <connectionStrings>
-    <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.32.29;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!"
+    <add name="FEQ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.32.29;Initial Catalog=GroupWare;Persist Security Info=True;User ID=gw;Password=Amkor123!" providerName="System.Data.SqlClient"/>
-      providerName="System.Data.SqlClient" />
+    <add name="FPJ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!" providerName="System.Data.SqlClient"/>
-    <add name="FPJ0000.Properties.Settings.gwcs" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
+    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
-      providerName="System.Data.SqlClient" />
+    <add name="FPJ0000.Properties.Settings.EEEntities" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!" providerName="System.Data.SqlClient"/>
-    <add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.131.15.18;initial catalog=EE;persist security info=True;user id=eeuser;password=Amkor123!;MultipleActiveResultSets=True;App=EntityFramework&quot;"
-      providerName="System.Data.EntityClient" />
-    <add name="FPJ0000.Properties.Settings.EEEntities" connectionString="Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"
-      providerName="System.Data.SqlClient" />
   </connectionStrings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
   </startup>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

SubProject/FPJ0000/packages.config

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="cef.redist.x64" version="87.1.13" targetFramework="net452" />
+  <package id="cef.redist.x86" version="87.1.13" targetFramework="net452" />
+  <package id="CefSharp.Common" version="87.1.132" targetFramework="net452" />
+  <package id="CefSharp.WinForms" version="87.1.132" targetFramework="net452" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net40" requireReinstallation="true" />
   <package id="EntityFramework.ko" version="6.2.0" targetFramework="net40" requireReinstallation="true" />
   <package id="Microsoft.ReportViewer" version="11.0.3366.16" targetFramework="net45" />