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

2021-03-02 13:09:57 +09:00
parent c5f6947344
commit 5ad9c18abf
52 changed files with 9483 additions and 3075 deletions
--- a/SubProject/FPJ0000/FPJ0000.csproj
+++ b/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">
--- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs
+++ b/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("자료가 없습니다");
            }
        }

--- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx
+++ b/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
-        zVTMvM0pmtrQhUG2mIvMS2iiAwtRCl9UqJVObd7mnNtwRuYyNa/zAl6Wuss5ujP99pyzpQZCP/jwvHjO
-        98P5fc/hsRP8SJ1wtViviijR/w6R6ily0hyl7GmgI4p1dNhzremCRFPuG/nuEBfaP6FP+zTLVnrVZDK5
-        LPZNWGx7rFpZaPxctCL/kxkxJaMOQabSyxN1T3ihdpkN62acMMwyMJgZ6GcYaKe3oP61ibYROzYZoHmU
-        Qn7TLJJfmqh/JCHSNmrDsYXBORe+zjHkZDDASbbQO7GJLyMOItjG4KILhgUn5EozAh921XPh6NKAqdvS
-        yB1R1U0kV95CZXsdChpKESj1QwBBID+PYNkZlDWXcavYaAZLaw4Ex/cynCCqOPBD13ALWsZfo1Kfy0ni
-        K8KQ+zYOWXUxECquIUmRhOahJbSYbPj8fQPrpKcQWR/NCQTlAi9fabZLP9aDN8MyFKkzOUlCVTgJX0da
-        dSo0E3Zulc5xCirSw5rdiZCCfreAndDCXlpckwjjhBYKwwM868hBdOllJFREwjjjgJEUyxasmXR3YiGC
-        YNk+wcXHUufZvGOIKxdgcFIHeU86ZEoxYl4EoU79Ed/mGRhJsbppJ/oJy1YnAp94BKck3iK+5CiyamNx
-        pyoUsWVXOIlYGQdJQyp5kyCw94NmFwbYT0ywkiL9s7VuAV9yeJ4vOUIe8gY/1xs3ioKQ8SoRmhEV5Ko8
-        pL9PhLAqCkYiMJB/Q08EtHObCNR7K1zK7qMX12kMzbs4escWcL8mDSkkKFLEIKf23u4di2PLRQSNewLW
-        NmfZE/wPO7tC6j7BOXG3o7q+aeeghw+iu7t7+0R8s80TJ0WmdUzNbjis7MXUCoWpZQoTHlZsTg62eRvt
-        DlMUte5zt/WHJ87jnU5rz/AXtnWcFKks/qJGepcUN35/ETbSPsLWteNJrZ1+icpkHo/H+wMUXJ4nAsHB
-        vwAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF+VSmxrY
+        zVTMdDqnaGpDFwbZYhqZl9BEpQuidHlRoV10avM253TDGZnL1Ob9Ak6Xuss5bmf67TlnyxkI/eDD8+I5
+        3w/n9z2Hx07IXVXihRKtMrJU+ztUpqXISXOUsaeOjizpp8MfaQynpeoKv6i3e7jQzgl70Ks2WegVg8Hg
+        Mts2YLZ6WbGw0Pi5aEH+p1nElo7aBZmKvZ6oeyKKNCY23D/thG6GgW6WgXaagWbKAdWvDbSO2LDBAE2j
+        FPI/zCD5iYH6RxIqa6XW7Q4MzrnwdY4hJ4MBTuJAj3EDX0bsRLCJwUUXdAtOFCpmwb/T+YYLx5QFTV6T
+        RW2Jq68gueoqqtrqUdBQBr7MH0EEQeEphMiPo7ypnFvFSjNYWrUjJKGH4QTRJfz3ncPNaB5/gSptLidJ
+        qAxH7qt4ZNXHQlRzEUk1SWgaWkKzwYrP39exRnoKlffSnEBQIdjrJ8t2ace68XJYjmJVJidJrI4g4UtI
+        e5YKtdHGrdIxTkFJeli1ORFa0OcWsBNW1ENLaoXQGzWo0d3Gw/YcxJSdQ2JlFPTTduhJsWzB6gl3J2Yi
+        CJHvEJy5J3OeyDuI+AoBBif6UdidDrlCgtjHwahXfcS3eQZ6Umz/lBN9BJPFCf59j+Co1EccKD2ArLo4
+        XK8OQ1z5eU4iUcRD2pBK3iQY7P3grAsD7CcmWEiRAdkatyBQum8+ULqfPOSDwFwfXC4ORsZzIdQjShQq
+        85D+TghRdTT0RKAj/4aWCGjnJhGovCucze6lF9doDM27OHrGFnCrNg0pJCiuiUVO3c3tOxa7w0UEjV4B
+        a5szewX/w8aukLpDcFLSZX/6unFrt4d3o6ura/NwQpPVEydFprVPzqzbLezF5DKFSRMFo4dlq5ODbd5K
+        u8MURa353mj54YnzeMfS2jICRK3tR8RKc4C4kd4mxY3/X0SNtK+oZfVQUkuHv1CRzOPxeH8AEjGeJMnL
+        9/8AAAAASUVORK5CYII=
 </value>
  </data>
  <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs
+++ b/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);
            // 
--- a/SubProject/FPJ0000/Project/fProjectSchedule.cs
+++ b/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("저장된 자료가 없습니다");
--- a/SubProject/FPJ0000/app.config
+++ b/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!"
-      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="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" />
+    <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"/>
+    <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="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">
--- a/SubProject/FPJ0000/packages.config
+++ b/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" />