diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo
index 6f9bee8..a6d04bd 100644
Binary files a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo and b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo differ
diff --git a/ISBN_Check_test/Yes24.cs b/ISBN_Check_test/Yes24.cs
index 800ac4d..3efa992 100644
--- a/ISBN_Check_test/Yes24.cs
+++ b/ISBN_Check_test/Yes24.cs
@@ -132,7 +132,6 @@ namespace ISBN_Check_test
Excel._Worksheet ws = (Excel._Worksheet)application.ActiveSheet; // 시트 가져옴
Excel.Range rng = null; // 셀 처리 변수
- Excel.Range rng2 = null; // 셀 처리 변수2
#region 엑셀 베이스 (셀의 너비, 높이 설정)
ws.Columns[1].ColumnWidth = 6.57; // A
@@ -152,12 +151,10 @@ namespace ISBN_Check_test
#endregion
// 기본 정보 입력칸
- #region 주문일자 / 보낸곳 (4행)
int count = dataGridView1.Rows.Count + 1;
rng = ws.Range["A2", "E"+count.ToString()];
rng.Value2 = grid;
rng.HorizontalAlignment = Excel.XlHAlign.xlHAlignCenter;
- #endregion
application.Interactive = true;
diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.application b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application
index 0a20364..b76c7f9 100644
--- a/ISBN_Check_test/bin/Debug/ISBN_Check_test.application
+++ b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application
@@ -21,7 +21,7 @@
- ASqo5RAEzYhIM4pBWIhJtenvWpMaDL68MGWDMJjPh+U=
+ bNaGxFwsvqHtjKgaMWpSGieYbPRoJTrpUpqP8sLexSE=
diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe
index 2a37491..1e7f8f2 100644
Binary files a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe and b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe differ
diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest
index 75723e5..e891f26 100644
--- a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest
+++ b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe.manifest
@@ -3,7 +3,7 @@
-
+
@@ -67,13 +67,13 @@
-
+
- yUflqpHD9kdvi0tqqwPiYRZIzVCl9hP+ifiKXnd7Mgs=
+ eT6wZ+LInGwQyOBwLKoXJc+YhUQSjW/3BLMLJtqq+ko=
@@ -236,7 +236,7 @@
- kY5Ti7dxBdLMc92uK9vijWUMBzDbFid10nT5Q/VheDY=
+ 5EY2z3HTLvenYjm2DgJUY+W71iazqD+wGh3CSjpO6+w=
\ No newline at end of file
diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb b/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb
index 6454a5a..0a308fa 100644
Binary files a/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb and b/ISBN_Check_test/bin/Debug/ISBN_Check_test.pdb differ
diff --git a/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe
index 44775a7..d901208 100644
Binary files a/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe and b/ISBN_Check_test/bin/Debug/app.publish/ISBN_Check_test.exe differ
diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.application b/ISBN_Check_test/obj/Debug/ISBN_Check_test.application
index 0a20364..b76c7f9 100644
--- a/ISBN_Check_test/obj/Debug/ISBN_Check_test.application
+++ b/ISBN_Check_test/obj/Debug/ISBN_Check_test.application
@@ -21,7 +21,7 @@
- ASqo5RAEzYhIM4pBWIhJtenvWpMaDL68MGWDMJjPh+U=
+ bNaGxFwsvqHtjKgaMWpSGieYbPRoJTrpUpqP8sLexSE=
diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.AssemblyReference.cache b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.AssemblyReference.cache
index ce5a003..eb0610d 100644
Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.AssemblyReference.cache and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.AssemblyReference.cache differ
diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe
index 2a37491..1e7f8f2 100644
Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe differ
diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest
index 75723e5..e891f26 100644
--- a/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest
+++ b/ISBN_Check_test/obj/Debug/ISBN_Check_test.exe.manifest
@@ -3,7 +3,7 @@
-
+
@@ -67,13 +67,13 @@
-
+
- yUflqpHD9kdvi0tqqwPiYRZIzVCl9hP+ifiKXnd7Mgs=
+ eT6wZ+LInGwQyOBwLKoXJc+YhUQSjW/3BLMLJtqq+ko=
@@ -236,7 +236,7 @@
- kY5Ti7dxBdLMc92uK9vijWUMBzDbFid10nT5Q/VheDY=
+ 5EY2z3HTLvenYjm2DgJUY+W71iazqD+wGh3CSjpO6+w=
\ No newline at end of file
diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb b/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb
index 6454a5a..0a308fa 100644
Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.pdb differ
diff --git a/Test_Project/.vs/Test_Project/v16/.suo b/Test_Project/.vs/Test_Project/v16/.suo
new file mode 100644
index 0000000..7a39ab0
Binary files /dev/null and b/Test_Project/.vs/Test_Project/v16/.suo differ
diff --git a/Test_Project/Form1.Designer.cs b/Test_Project/Form1.Designer.cs
new file mode 100644
index 0000000..fd1b244
--- /dev/null
+++ b/Test_Project/Form1.Designer.cs
@@ -0,0 +1,62 @@
+
+namespace Test_Project
+{
+ partial class Form1
+ {
+ ///
+ /// 필수 디자이너 변수입니다.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// 사용 중인 모든 리소스를 정리합니다.
+ ///
+ /// 관리되는 리소스를 삭제해야 하면 true이고, 그렇지 않으면 false입니다.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form 디자이너에서 생성한 코드
+
+ ///
+ /// 디자이너 지원에 필요한 메서드입니다.
+ /// 이 메서드의 내용을 코드 편집기로 수정하지 마세요.
+ ///
+ private void InitializeComponent()
+ {
+ this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+ this.SuspendLayout();
+ //
+ // richTextBox1
+ //
+ this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.richTextBox1.Location = new System.Drawing.Point(0, 0);
+ this.richTextBox1.Name = "richTextBox1";
+ this.richTextBox1.Size = new System.Drawing.Size(1056, 450);
+ this.richTextBox1.TabIndex = 0;
+ this.richTextBox1.Text = "";
+ //
+ // Form1
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1056, 450);
+ this.Controls.Add(this.richTextBox1);
+ this.Name = "Form1";
+ this.Text = "Form1";
+ this.Load += new System.EventHandler(this.Form1_Load);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.RichTextBox richTextBox1;
+ }
+}
+
diff --git a/Test_Project/Form1.cs b/Test_Project/Form1.cs
new file mode 100644
index 0000000..e39ffcf
--- /dev/null
+++ b/Test_Project/Form1.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Management;
+
+
+namespace Test_Project
+{
+ public partial class Form1 : Form
+ {
+ public Form1()
+ {
+ InitializeComponent();
+ }
+ private void Form1_Load(object sender, EventArgs e)
+ {
+ var usbDevices = GetUSBDevices();
+
+ foreach(var usbDevice in usbDevices)
+ {
+ string msg = string.Format("Device ID: {0}, PNP Device ID: {1}, Description: {2}\n",
+ usbDevice.DeviceID, usbDevice.PnpDeviceID, usbDevice.Description);
+ richTextBox1.Text += msg;
+ }
+ }
+
+ static List GetUSBDevices()
+ {
+ List devices = new List();
+
+ ManagementObjectCollection collection;
+ using (var searcher = new ManagementObjectSearcher(@"Select * From Win32_USBHub"))
+ collection = searcher.Get();
+
+ foreach(var device in collection)
+ {
+ devices.Add(new USBDeviceInfo(
+ (string)device.GetPropertyValue("DeviceID"),
+ (string)device.GetPropertyValue("PNPDeviceID"),
+ (string)device.GetPropertyValue("Description")
+ ));
+ }
+ collection.Dispose();
+ return devices;
+ }
+ }
+ class USBDeviceInfo
+ {
+ public USBDeviceInfo(string deviceID, string pnpDeviceID, string description)
+ {
+ this.DeviceID = deviceID;
+ this.PnpDeviceID = pnpDeviceID;
+ this.Description = description;
+ }
+ public string DeviceID { get; private set; }
+ public string PnpDeviceID { get; private set; }
+ public string Description { get; private set; }
+ }
+}
diff --git a/Test_Project/Form1.resx b/Test_Project/Form1.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/Test_Project/Form1.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Test_Project/Program.cs b/Test_Project/Program.cs
new file mode 100644
index 0000000..a243649
--- /dev/null
+++ b/Test_Project/Program.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Test_Project
+{
+ static class Program
+ {
+ ///
+ /// 해당 애플리케이션의 주 진입점입니다.
+ ///
+ [STAThread]
+ static void Main()
+ {
+ Application.EnableVisualStyles();
+ Application.SetCompatibleTextRenderingDefault(false);
+ Application.Run(new Form1());
+ }
+ }
+}
diff --git a/Test_Project/Properties/AssemblyInfo.cs b/Test_Project/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..3146ba7
--- /dev/null
+++ b/Test_Project/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해
+// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면
+// 이러한 특성 값을 변경하세요.
+[assembly: AssemblyTitle("Test_Project")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyProduct("Test_Project")]
+[assembly: AssemblyCopyright("Copyright © Microsoft Corporation 2021")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에
+// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면
+// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요.
+[assembly: ComVisible(false)]
+
+// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다.
+[assembly: Guid("63485a73-8b88-4748-99ac-2d5ce82470e6")]
+
+// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다.
+//
+// 주 버전
+// 부 버전
+// 빌드 번호
+// 수정 버전
+//
+// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
+// 기본값으로 할 수 있습니다.
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Test_Project/Properties/Resources.Designer.cs b/Test_Project/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..5240a14
--- /dev/null
+++ b/Test_Project/Properties/Resources.Designer.cs
@@ -0,0 +1,70 @@
+//------------------------------------------------------------------------------
+//
+// 이 코드는 도구를 사용하여 생성되었습니다.
+// 런타임 버전:4.0.30319.42000
+//
+// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
+// 이러한 변경 내용이 손실됩니다.
+//
+//------------------------------------------------------------------------------
+
+
+namespace Test_Project.Properties
+{
+ ///
+ /// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다.
+ ///
+ // 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder
+ // 클래스에서 자동으로 생성되었습니다.
+ // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여
+ // ResGen을 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources
+ {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources()
+ {
+ }
+
+ ///
+ /// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager
+ {
+ get
+ {
+ if ((resourceMan == null))
+ {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Test_Project.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대해 현재 스레드의 CurrentUICulture 속성을
+ /// 재정의합니다.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture
+ {
+ get
+ {
+ return resourceCulture;
+ }
+ set
+ {
+ resourceCulture = value;
+ }
+ }
+ }
+}
diff --git a/Test_Project/Properties/Resources.resx b/Test_Project/Properties/Resources.resx
new file mode 100644
index 0000000..af7dbeb
--- /dev/null
+++ b/Test_Project/Properties/Resources.resx
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Test_Project/Properties/Settings.Designer.cs b/Test_Project/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..9500c47
--- /dev/null
+++ b/Test_Project/Properties/Settings.Designer.cs
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+
+namespace Test_Project.Properties
+{
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+ {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default
+ {
+ get
+ {
+ return defaultInstance;
+ }
+ }
+ }
+}
diff --git a/Test_Project/Properties/Settings.settings b/Test_Project/Properties/Settings.settings
new file mode 100644
index 0000000..3964565
--- /dev/null
+++ b/Test_Project/Properties/Settings.settings
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/Test_Project/bin/Debug/Test_Project.pdb b/Test_Project/bin/Debug/Test_Project.pdb
new file mode 100644
index 0000000..bd0da28
Binary files /dev/null and b/Test_Project/bin/Debug/Test_Project.pdb differ
diff --git a/Test_Project/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs b/Test_Project/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
new file mode 100644
index 0000000..3871b18
--- /dev/null
+++ b/Test_Project/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+//
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]
diff --git a/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferences.cache
new file mode 100644
index 0000000..dee716d
Binary files /dev/null and b/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..9329ee4
Binary files /dev/null and b/Test_Project/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/Test_Project/obj/Debug/Test_Project.Form1.resources b/Test_Project/obj/Debug/Test_Project.Form1.resources
new file mode 100644
index 0000000..6c05a97
Binary files /dev/null and b/Test_Project/obj/Debug/Test_Project.Form1.resources differ
diff --git a/Test_Project/obj/Debug/Test_Project.Properties.Resources.resources b/Test_Project/obj/Debug/Test_Project.Properties.Resources.resources
new file mode 100644
index 0000000..6c05a97
Binary files /dev/null and b/Test_Project/obj/Debug/Test_Project.Properties.Resources.resources differ
diff --git a/Test_Project/obj/Debug/Test_Project.csproj.AssemblyReference.cache b/Test_Project/obj/Debug/Test_Project.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
Binary files /dev/null and b/Test_Project/obj/Debug/Test_Project.csproj.AssemblyReference.cache differ
diff --git a/Test_Project/obj/Debug/Test_Project.csproj.CoreCompileInputs.cache b/Test_Project/obj/Debug/Test_Project.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..b1ecf07
--- /dev/null
+++ b/Test_Project/obj/Debug/Test_Project.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+fdefe9bfdc3ac6442df724e1b8b8d8f6ce92a914
diff --git a/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt b/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..b310fa2
--- /dev/null
+++ b/Test_Project/obj/Debug/Test_Project.csproj.FileListAbsolute.txt
@@ -0,0 +1,10 @@
+C:\Users\Administrator\Desktop\unimarc\Test_Project\bin\Debug\Test_Project.exe.config
+C:\Users\Administrator\Desktop\unimarc\Test_Project\bin\Debug\Test_Project.exe
+C:\Users\Administrator\Desktop\unimarc\Test_Project\bin\Debug\Test_Project.pdb
+C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.csproj.AssemblyReference.cache
+C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.Form1.resources
+C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.Properties.Resources.resources
+C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.csproj.GenerateResource.cache
+C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.csproj.CoreCompileInputs.cache
+C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.exe
+C:\Users\Administrator\Desktop\unimarc\Test_Project\obj\Debug\Test_Project.pdb
diff --git a/Test_Project/obj/Debug/Test_Project.csproj.GenerateResource.cache b/Test_Project/obj/Debug/Test_Project.csproj.GenerateResource.cache
new file mode 100644
index 0000000..d24e563
Binary files /dev/null and b/Test_Project/obj/Debug/Test_Project.csproj.GenerateResource.cache differ
diff --git a/Test_Project/obj/Debug/Test_Project.pdb b/Test_Project/obj/Debug/Test_Project.pdb
new file mode 100644
index 0000000..bd0da28
Binary files /dev/null and b/Test_Project/obj/Debug/Test_Project.pdb differ
diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo
index 5149873..4e04b1e 100644
Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ
diff --git a/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.7z b/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.7z
deleted file mode 100644
index 9ba2008..0000000
Binary files a/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.7z and /dev/null differ
diff --git a/unimarc/Setup_UniMarc/Setup_UniMarc.zip b/unimarc/Setup_UniMarc/Setup_UniMarc.zip
new file mode 100644
index 0000000..3fec8de
Binary files /dev/null and b/unimarc/Setup_UniMarc/Setup_UniMarc.zip differ
diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj
index 19037c0..c2e35c7 100644
--- a/unimarc/unimarc/UniMarc.csproj
+++ b/unimarc/unimarc/UniMarc.csproj
@@ -114,6 +114,12 @@
Check_ISBN_Sub.cs
+
+ Form
+
+
+ Check_ISBN_Yes24.cs
+
Form
@@ -621,6 +627,9 @@
Check_ISBN_Sub.cs
+
+ Check_ISBN_Yes24.cs
+
findNchange.cs
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe
index 0a3fe1d..cb958cf 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb
index ce34e0c..af8f1e9 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll
index 51ff397..ac4ac47 100644
Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 860c416..1ed5731 100644
Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache
index e9741cf..48fc6ee 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache
index 415914d..5adee8d 100644
--- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache
+++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-d98a511ed220a7ba53ba614a163ba7572f3f0277
+5a3001620e15fcaa616989d7d1f184f6088a5007
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt
index 65a8146..72cc314 100644
--- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt
+++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt
@@ -114,3 +114,4 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.
C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Zoom_Picture.resources
C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Mac_Preview.resources
C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.csproj.AssemblyReference.cache
+C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Check_ISBN_Yes24.resources
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache
index 377e4a3..ae55832 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe
index 0a3fe1d..cb958cf 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb
index ce34e0c..af8f1e9 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.마크.Check_ISBN_Yes24.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.Check_ISBN_Yes24.resources
new file mode 100644
index 0000000..6c05a97
Binary files /dev/null and b/unimarc/unimarc/obj/Debug/UniMarc.마크.Check_ISBN_Yes24.resources differ
diff --git a/unimarc/unimarc/obj/Debug/WindowsFormsApp1.Home.Home_User_manage.resources b/unimarc/unimarc/obj/Debug/WindowsFormsApp1.Home.Home_User_manage.resources
index 7c8fd53..46288c8 100644
Binary files a/unimarc/unimarc/obj/Debug/WindowsFormsApp1.Home.Home_User_manage.resources and b/unimarc/unimarc/obj/Debug/WindowsFormsApp1.Home.Home_User_manage.resources differ
diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll
index 51ff397..ac4ac47 100644
Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/납품관리/Commodity_Search.cs b/unimarc/unimarc/납품관리/Commodity_Search.cs
index 933536b..75eace3 100644
--- a/unimarc/unimarc/납품관리/Commodity_Search.cs
+++ b/unimarc/unimarc/납품관리/Commodity_Search.cs
@@ -23,6 +23,7 @@ namespace WindowsFormsApp1.Delivery
Sales_Input si;
Sales_Lookup sb;
Sales_In_Pay sip;
+ List_Lookup ll;
public Commodity_Search(Purchase _pur)
{
InitializeComponent();
@@ -58,6 +59,11 @@ namespace WindowsFormsApp1.Delivery
InitializeComponent();
sip = _sip;
}
+ public Commodity_Search(List_Lookup _ll)
+ {
+ InitializeComponent();
+ ll = _ll;
+ }
#region 거래처 가져오는 폼의 코드
@@ -134,6 +140,7 @@ namespace WindowsFormsApp1.Delivery
if (si != null) { si.tb_clt.Text = ""; compidx = si.compidx; }
if (sb != null) { sb.tb_clt.Text = ""; compidx = sb.compidx; }
if (sip != null) { sip.tb_clt.Text = ""; compidx = sip.compidx; }
+ if (ll != null) { ll.tb_clt.Text = ""; compidx = ll.compidx; }
return compidx;
}
@@ -146,6 +153,7 @@ namespace WindowsFormsApp1.Delivery
if (si != null) { si.tb_clt.Text = value; si.lbl_tel.Text = dataGridView1.Rows[idx].Cells[2].Value.ToString(); }
if (sb != null) { sb.tb_clt.Text = value; sb.btn_Lookup_Click(null, null); }
if (sip != null) { sip.tb_clt.Text = value; }
+ if (ll != null) { ll.tb_clt.Text = value; }
}
}
}
diff --git a/unimarc/unimarc/납품관리/Commodity_registration.Designer.cs b/unimarc/unimarc/납품관리/Commodity_registration.Designer.cs
index 9b3e4ad..dd747b5 100644
--- a/unimarc/unimarc/납품관리/Commodity_registration.Designer.cs
+++ b/unimarc/unimarc/납품관리/Commodity_registration.Designer.cs
@@ -28,13 +28,13 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
this.label1 = new System.Windows.Forms.Label();
this.tb_FilePath = new System.Windows.Forms.TextBox();
this.btn_FileOpen = new System.Windows.Forms.Button();
@@ -71,7 +71,6 @@
this.stat = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.chk_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.label7 = new System.Windows.Forms.Label();
- this.panel1 = new System.Windows.Forms.Panel();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.dataGridView2 = new System.Windows.Forms.DataGridView();
this.list_date = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -107,7 +106,6 @@
this.panel2 = new System.Windows.Forms.Panel();
this.label14 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
- this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
this.panel2.SuspendLayout();
this.SuspendLayout();
@@ -296,14 +294,14 @@
// dataGridView1
//
this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle22.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.header,
@@ -321,10 +319,11 @@
this.chk_time});
this.dataGridView1.Location = new System.Drawing.Point(13, 82);
this.dataGridView1.Name = "dataGridView1";
- this.dataGridView1.RowHeadersWidth = 20;
+ this.dataGridView1.RowHeadersWidth = 30;
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(1126, 217);
+ this.dataGridView1.Size = new System.Drawing.Size(1126, 229);
this.dataGridView1.TabIndex = 29;
+ this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
//
// header
@@ -359,27 +358,27 @@
//
// count
//
- dataGridViewCellStyle23.Format = "C0";
- dataGridViewCellStyle23.NullValue = null;
- this.count.DefaultCellStyle = dataGridViewCellStyle23;
+ dataGridViewCellStyle2.Format = "C0";
+ dataGridViewCellStyle2.NullValue = null;
+ this.count.DefaultCellStyle = dataGridViewCellStyle2;
this.count.HeaderText = "수량";
this.count.Name = "count";
this.count.Width = 35;
//
// unit
//
- dataGridViewCellStyle24.Format = "N0";
- dataGridViewCellStyle24.NullValue = null;
- this.unit.DefaultCellStyle = dataGridViewCellStyle24;
+ dataGridViewCellStyle3.Format = "N0";
+ dataGridViewCellStyle3.NullValue = null;
+ this.unit.DefaultCellStyle = dataGridViewCellStyle3;
this.unit.HeaderText = "단가";
this.unit.Name = "unit";
this.unit.Width = 70;
//
// total
//
- dataGridViewCellStyle25.Format = "N0";
- dataGridViewCellStyle25.NullValue = null;
- this.total.DefaultCellStyle = dataGridViewCellStyle25;
+ dataGridViewCellStyle4.Format = "N0";
+ dataGridViewCellStyle4.NullValue = null;
+ this.total.DefaultCellStyle = dataGridViewCellStyle4;
this.total.HeaderText = "합계";
this.total.Name = "total";
this.total.Width = 80;
@@ -416,40 +415,17 @@
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(14, 13);
+ this.label7.Location = new System.Drawing.Point(24, 346);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(29, 12);
this.label7.TabIndex = 1;
this.label7.Text = "구분";
//
- // panel1
- //
- this.panel1.Controls.Add(this.comboBox1);
- this.panel1.Controls.Add(this.dataGridView2);
- this.panel1.Controls.Add(this.label7);
- this.panel1.Controls.Add(this.btn_morge);
- this.panel1.Controls.Add(this.btn_Edit);
- this.panel1.Controls.Add(this.btn_Del);
- this.panel1.Controls.Add(this.btn_Complet);
- this.panel1.Controls.Add(this.btn_ing);
- this.panel1.Controls.Add(this.button7);
- this.panel1.Controls.Add(this.btn_lockup);
- this.panel1.Controls.Add(this.tb_dvy2);
- this.panel1.Controls.Add(this.label8);
- this.panel1.Controls.Add(this.label12);
- this.panel1.Controls.Add(this.tb_clt2);
- this.panel1.Controls.Add(this.label13);
- this.panel1.Controls.Add(this.tb_user2);
- this.panel1.Location = new System.Drawing.Point(10, 333);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1129, 271);
- this.panel1.TabIndex = 30;
- //
// comboBox1
//
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.FormattingEnabled = true;
- this.comboBox1.Location = new System.Drawing.Point(50, 9);
+ this.comboBox1.Location = new System.Drawing.Point(60, 342);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(83, 20);
this.comboBox1.TabIndex = 2;
@@ -460,14 +436,14 @@
this.dataGridView2.AllowUserToAddRows = false;
this.dataGridView2.AllowUserToDeleteRows = false;
this.dataGridView2.BackgroundColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle26.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26;
+ dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.list_date,
this.pur,
@@ -481,13 +457,14 @@
this.chk_marc,
this.Grid_Check});
this.dataGridView2.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnKeystroke;
- this.dataGridView2.Location = new System.Drawing.Point(3, 39);
+ this.dataGridView2.Location = new System.Drawing.Point(13, 372);
this.dataGridView2.Name = "dataGridView2";
- this.dataGridView2.RowHeadersWidth = 20;
+ this.dataGridView2.RowHeadersWidth = 30;
this.dataGridView2.RowTemplate.Height = 23;
- this.dataGridView2.Size = new System.Drawing.Size(1083, 229);
+ this.dataGridView2.Size = new System.Drawing.Size(1098, 229);
this.dataGridView2.TabIndex = 29;
this.dataGridView2.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView2_CellClick);
+ this.dataGridView2.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
//
// list_date
//
@@ -521,8 +498,8 @@
//
// cout
//
- dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- this.cout.DefaultCellStyle = dataGridViewCellStyle27;
+ dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ this.cout.DefaultCellStyle = dataGridViewCellStyle6;
this.cout.HeaderText = "수량";
this.cout.Name = "cout";
this.cout.Resizable = System.Windows.Forms.DataGridViewTriState.True;
@@ -530,10 +507,10 @@
//
// tol
//
- dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
- dataGridViewCellStyle28.Format = "N0";
- dataGridViewCellStyle28.NullValue = null;
- this.tol.DefaultCellStyle = dataGridViewCellStyle28;
+ dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+ dataGridViewCellStyle7.Format = "N0";
+ dataGridViewCellStyle7.NullValue = null;
+ this.tol.DefaultCellStyle = dataGridViewCellStyle7;
this.tol.HeaderText = "합계";
this.tol.Name = "tol";
this.tol.Width = 80;
@@ -570,7 +547,7 @@
// btn_morge
//
this.btn_morge.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.btn_morge.Location = new System.Drawing.Point(1039, 8);
+ this.btn_morge.Location = new System.Drawing.Point(1049, 341);
this.btn_morge.Name = "btn_morge";
this.btn_morge.Size = new System.Drawing.Size(62, 23);
this.btn_morge.TabIndex = 28;
@@ -581,7 +558,7 @@
// btn_Edit
//
this.btn_Edit.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.btn_Edit.Location = new System.Drawing.Point(971, 8);
+ this.btn_Edit.Location = new System.Drawing.Point(981, 341);
this.btn_Edit.Name = "btn_Edit";
this.btn_Edit.Size = new System.Drawing.Size(62, 23);
this.btn_Edit.TabIndex = 28;
@@ -592,7 +569,7 @@
// btn_Del
//
this.btn_Del.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.btn_Del.Location = new System.Drawing.Point(903, 8);
+ this.btn_Del.Location = new System.Drawing.Point(913, 341);
this.btn_Del.Name = "btn_Del";
this.btn_Del.Size = new System.Drawing.Size(62, 23);
this.btn_Del.TabIndex = 28;
@@ -603,7 +580,7 @@
// btn_Complet
//
this.btn_Complet.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.btn_Complet.Location = new System.Drawing.Point(835, 8);
+ this.btn_Complet.Location = new System.Drawing.Point(845, 341);
this.btn_Complet.Name = "btn_Complet";
this.btn_Complet.Size = new System.Drawing.Size(62, 23);
this.btn_Complet.TabIndex = 28;
@@ -614,7 +591,7 @@
// btn_ing
//
this.btn_ing.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.btn_ing.Location = new System.Drawing.Point(767, 8);
+ this.btn_ing.Location = new System.Drawing.Point(777, 341);
this.btn_ing.Name = "btn_ing";
this.btn_ing.Size = new System.Drawing.Size(62, 23);
this.btn_ing.TabIndex = 28;
@@ -625,7 +602,7 @@
// button7
//
this.button7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.button7.Location = new System.Drawing.Point(699, 8);
+ this.button7.Location = new System.Drawing.Point(709, 341);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(62, 23);
this.button7.TabIndex = 28;
@@ -635,7 +612,7 @@
// btn_lockup
//
this.btn_lockup.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.btn_lockup.Location = new System.Drawing.Point(631, 8);
+ this.btn_lockup.Location = new System.Drawing.Point(641, 341);
this.btn_lockup.Name = "btn_lockup";
this.btn_lockup.Size = new System.Drawing.Size(62, 23);
this.btn_lockup.TabIndex = 28;
@@ -645,7 +622,7 @@
//
// tb_dvy2
//
- this.tb_dvy2.Location = new System.Drawing.Point(189, 9);
+ this.tb_dvy2.Location = new System.Drawing.Point(199, 342);
this.tb_dvy2.Name = "tb_dvy2";
this.tb_dvy2.Size = new System.Drawing.Size(115, 21);
this.tb_dvy2.TabIndex = 8;
@@ -653,7 +630,7 @@
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(146, 13);
+ this.label8.Location = new System.Drawing.Point(156, 346);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(41, 12);
this.label8.TabIndex = 7;
@@ -662,7 +639,7 @@
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(314, 13);
+ this.label12.Location = new System.Drawing.Point(324, 346);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(41, 12);
this.label12.TabIndex = 9;
@@ -670,7 +647,7 @@
//
// tb_clt2
//
- this.tb_clt2.Location = new System.Drawing.Point(356, 9);
+ this.tb_clt2.Location = new System.Drawing.Point(366, 342);
this.tb_clt2.Name = "tb_clt2";
this.tb_clt2.Size = new System.Drawing.Size(115, 21);
this.tb_clt2.TabIndex = 10;
@@ -678,7 +655,7 @@
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(484, 13);
+ this.label13.Location = new System.Drawing.Point(494, 346);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(41, 12);
this.label13.TabIndex = 11;
@@ -686,7 +663,7 @@
//
// tb_user2
//
- this.tb_user2.Location = new System.Drawing.Point(527, 9);
+ this.tb_user2.Location = new System.Drawing.Point(537, 342);
this.tb_user2.Name = "tb_user2";
this.tb_user2.Size = new System.Drawing.Size(98, 21);
this.tb_user2.TabIndex = 12;
@@ -771,20 +748,35 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1495, 613);
+ this.Controls.Add(this.comboBox1);
this.Controls.Add(this.panel2);
+ this.Controls.Add(this.dataGridView2);
this.Controls.Add(this.richTextBox1);
- this.Controls.Add(this.panel1);
+ this.Controls.Add(this.label7);
+ this.Controls.Add(this.btn_morge);
+ this.Controls.Add(this.btn_Edit);
this.Controls.Add(this.dataGridView1);
+ this.Controls.Add(this.btn_Del);
this.Controls.Add(this.btn_Save);
+ this.Controls.Add(this.btn_Complet);
this.Controls.Add(this.btn_Exit);
+ this.Controls.Add(this.btn_ing);
this.Controls.Add(this.label11);
+ this.Controls.Add(this.button7);
this.Controls.Add(this.label14);
+ this.Controls.Add(this.btn_lockup);
this.Controls.Add(this.label10);
+ this.Controls.Add(this.tb_dvy2);
this.Controls.Add(this.tb_dvy_method);
+ this.Controls.Add(this.label8);
this.Controls.Add(this.tb_Work_method);
+ this.Controls.Add(this.label12);
this.Controls.Add(this.label9);
+ this.Controls.Add(this.tb_clt2);
this.Controls.Add(this.end_date);
+ this.Controls.Add(this.label13);
this.Controls.Add(this.button2);
+ this.Controls.Add(this.tb_user2);
this.Controls.Add(this.tb_ListNum);
this.Controls.Add(this.label6);
this.Controls.Add(this.tb_UserName);
@@ -802,8 +794,6 @@
this.Text = "목록등록";
this.Load += new System.EventHandler(this.Commodity_registration_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).EndInit();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
@@ -836,7 +826,6 @@
private System.Windows.Forms.Button btn_Save;
private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.Label label7;
- private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Button btn_Edit;
private System.Windows.Forms.Button btn_Del;
diff --git a/unimarc/unimarc/납품관리/Commodity_registration.cs b/unimarc/unimarc/납품관리/Commodity_registration.cs
index 51dcd0b..577b27f 100644
--- a/unimarc/unimarc/납품관리/Commodity_registration.cs
+++ b/unimarc/unimarc/납품관리/Commodity_registration.cs
@@ -511,17 +511,35 @@ namespace WindowsFormsApp1.Delivery
}
private void button2_Click(object sender, EventArgs e)
{
- if (tb_ListNum.Text == "") { MessageBox.Show("목록번호가 비어있습니다!"); return; }
- for(int a = 0; a < dataGridView1.Rows.Count; a++)
+ // if (tb_ListNum.Text == "") { MessageBox.Show("목록번호가 비어있습니다!"); return; }
+ int count = 1;
+
+ for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
- int num = a + 1;
if (dataGridView1.Rows[a].Cells["book_name"].Value == null ||
- dataGridView1.Rows[a].Cells["book_name"].Value.ToString() == "") {
+ dataGridView1.Rows[a].Cells["book_name"].Value.ToString() == "") { return; }
+ if (dataGridView1.Rows[a].Cells["header"].Value == null ||
+ dataGridView1.Rows[a].Cells["header"].Value.ToString() == "") {
+ dataGridView1.Rows[a].Cells["header"].Value = tb_ListNum.Text;
+ }
+
+
+ dataGridView1.Rows[a].Cells["num"].Value = count.ToString();
+
+ if(dataGridView1.Rows[a+1].Cells["header"].Value == null) {
return;
}
- dataGridView1.Rows[a].Cells["header"].Value = tb_ListNum.Text;
- dataGridView1.Rows[a].Cells["num"].Value = num.ToString();
+ if (dataGridView1.Rows[a].Cells["header"].Value.ToString() != dataGridView1.Rows[a + 1].Cells["header"].Value.ToString())
+ count = 1;
+ else
+ count++;
}
}
+
+ private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)
+ {
+ Skill_Grid sg = new Skill_Grid();
+ sg.Print_Grid_Num(sender, e);
+ }
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/납품관리/List_Lookup.Designer.cs b/unimarc/unimarc/납품관리/List_Lookup.Designer.cs
index b06bd47..11c1716 100644
--- a/unimarc/unimarc/납품관리/List_Lookup.Designer.cs
+++ b/unimarc/unimarc/납품관리/List_Lookup.Designer.cs
@@ -28,10 +28,10 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(List_Lookup));
this.label1 = new System.Windows.Forms.Label();
this.cb_list = new System.Windows.Forms.ComboBox();
@@ -40,7 +40,7 @@
this.tb_search = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
- this.tb_order = new System.Windows.Forms.TextBox();
+ this.tb_clt = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.btn_print = new System.Windows.Forms.Button();
this.btn_close = new System.Windows.Forms.Button();
@@ -57,14 +57,6 @@
this.cb_import = new System.Windows.Forms.ComboBox();
this.cb_charge = new System.Windows.Forms.ComboBox();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
- this.panel4 = new System.Windows.Forms.Panel();
- this.lbl_total = new System.Windows.Forms.Label();
- this.lbl_pay = new System.Windows.Forms.Label();
- this.lbl_count = new System.Windows.Forms.Label();
- this.label11 = new System.Windows.Forms.Label();
- this.printDialog1 = new System.Windows.Forms.PrintDialog();
- this.printDocument1 = new System.Drawing.Printing.PrintDocument();
- this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.num = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -80,6 +72,14 @@
this.order = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.panel4 = new System.Windows.Forms.Panel();
+ this.lbl_total = new System.Windows.Forms.Label();
+ this.lbl_pay = new System.Windows.Forms.Label();
+ this.lbl_count = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.printDialog1 = new System.Windows.Forms.PrintDialog();
+ this.printDocument1 = new System.Drawing.Printing.PrintDocument();
+ this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.panel3.SuspendLayout();
@@ -148,19 +148,20 @@
// panel2
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel2.Controls.Add(this.tb_order);
+ this.panel2.Controls.Add(this.tb_clt);
this.panel2.Controls.Add(this.label3);
this.panel2.Location = new System.Drawing.Point(357, 12);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(184, 35);
this.panel2.TabIndex = 4;
//
- // tb_order
+ // tb_clt
//
- this.tb_order.Location = new System.Drawing.Point(44, 6);
- this.tb_order.Name = "tb_order";
- this.tb_order.Size = new System.Drawing.Size(134, 21);
- this.tb_order.TabIndex = 2;
+ this.tb_clt.Location = new System.Drawing.Point(44, 6);
+ this.tb_clt.Name = "tb_clt";
+ this.tb_clt.Size = new System.Drawing.Size(134, 21);
+ this.tb_clt.TabIndex = 2;
+ this.tb_clt.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_order_KeyDown);
//
// label3
//
@@ -311,14 +312,14 @@
//
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
- dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.idx,
@@ -336,104 +337,34 @@
this.order,
this.Column2,
this.Column3});
- dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;
this.dataGridView1.Location = new System.Drawing.Point(10, 80);
this.dataGridView1.Name = "dataGridView1";
- dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowHeadersWidth = 21;
- dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle4;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
this.dataGridView1.Size = new System.Drawing.Size(1206, 371);
this.dataGridView1.TabIndex = 8;
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
//
- // panel4
- //
- this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel4.Controls.Add(this.lbl_total);
- this.panel4.Controls.Add(this.lbl_pay);
- this.panel4.Controls.Add(this.lbl_count);
- this.panel4.Controls.Add(this.label11);
- this.panel4.Location = new System.Drawing.Point(10, 457);
- this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(1206, 26);
- this.panel4.TabIndex = 9;
- //
- // lbl_total
- //
- this.lbl_total.AutoSize = true;
- this.lbl_total.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_total.Location = new System.Drawing.Point(723, 5);
- this.lbl_total.Name = "lbl_total";
- this.lbl_total.Size = new System.Drawing.Size(50, 13);
- this.lbl_total.TabIndex = 0;
- this.lbl_total.Text = "합계 : ";
- //
- // lbl_pay
- //
- this.lbl_pay.AutoSize = true;
- this.lbl_pay.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_pay.Location = new System.Drawing.Point(509, 5);
- this.lbl_pay.Name = "lbl_pay";
- this.lbl_pay.Size = new System.Drawing.Size(50, 13);
- this.lbl_pay.TabIndex = 0;
- this.lbl_pay.Text = "단가 : ";
- //
- // lbl_count
- //
- this.lbl_count.AutoSize = true;
- this.lbl_count.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_count.Location = new System.Drawing.Point(288, 5);
- this.lbl_count.Name = "lbl_count";
- this.lbl_count.Size = new System.Drawing.Size(50, 13);
- this.lbl_count.TabIndex = 0;
- this.lbl_count.Text = "수량 : ";
- //
- // label11
- //
- this.label11.AutoSize = true;
- this.label11.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label11.Location = new System.Drawing.Point(78, 5);
- this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(87, 13);
- this.label11.TabIndex = 0;
- this.label11.Text = "목록 총 합계";
- //
- // printDialog1
- //
- this.printDialog1.UseEXDialog = true;
- //
- // printDocument1
- //
- this.printDocument1.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printDocument1_PrintPage);
- //
- // printPreviewDialog1
- //
- this.printPreviewDialog1.AutoScrollMargin = new System.Drawing.Size(0, 0);
- this.printPreviewDialog1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
- this.printPreviewDialog1.ClientSize = new System.Drawing.Size(400, 300);
- this.printPreviewDialog1.Enabled = true;
- this.printPreviewDialog1.Icon = ((System.Drawing.Icon)(resources.GetObject("printPreviewDialog1.Icon")));
- this.printPreviewDialog1.Name = "printPreviewDialog1";
- this.printPreviewDialog1.Visible = false;
- //
// idx
//
this.idx.HeaderText = "idx";
@@ -525,6 +456,76 @@
this.Column3.Visible = false;
this.Column3.Width = 2;
//
+ // panel4
+ //
+ this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel4.Controls.Add(this.lbl_total);
+ this.panel4.Controls.Add(this.lbl_pay);
+ this.panel4.Controls.Add(this.lbl_count);
+ this.panel4.Controls.Add(this.label11);
+ this.panel4.Location = new System.Drawing.Point(10, 457);
+ this.panel4.Name = "panel4";
+ this.panel4.Size = new System.Drawing.Size(1206, 26);
+ this.panel4.TabIndex = 9;
+ //
+ // lbl_total
+ //
+ this.lbl_total.AutoSize = true;
+ this.lbl_total.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.lbl_total.Location = new System.Drawing.Point(723, 5);
+ this.lbl_total.Name = "lbl_total";
+ this.lbl_total.Size = new System.Drawing.Size(50, 13);
+ this.lbl_total.TabIndex = 0;
+ this.lbl_total.Text = "합계 : ";
+ //
+ // lbl_pay
+ //
+ this.lbl_pay.AutoSize = true;
+ this.lbl_pay.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.lbl_pay.Location = new System.Drawing.Point(509, 5);
+ this.lbl_pay.Name = "lbl_pay";
+ this.lbl_pay.Size = new System.Drawing.Size(50, 13);
+ this.lbl_pay.TabIndex = 0;
+ this.lbl_pay.Text = "단가 : ";
+ //
+ // lbl_count
+ //
+ this.lbl_count.AutoSize = true;
+ this.lbl_count.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.lbl_count.Location = new System.Drawing.Point(288, 5);
+ this.lbl_count.Name = "lbl_count";
+ this.lbl_count.Size = new System.Drawing.Size(50, 13);
+ this.lbl_count.TabIndex = 0;
+ this.lbl_count.Text = "수량 : ";
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.label11.Location = new System.Drawing.Point(78, 5);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(87, 13);
+ this.label11.TabIndex = 0;
+ this.label11.Text = "목록 총 합계";
+ //
+ // printDialog1
+ //
+ this.printDialog1.UseEXDialog = true;
+ //
+ // printDocument1
+ //
+ this.printDocument1.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printDocument1_PrintPage);
+ //
+ // printPreviewDialog1
+ //
+ this.printPreviewDialog1.AutoScrollMargin = new System.Drawing.Size(0, 0);
+ this.printPreviewDialog1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
+ this.printPreviewDialog1.ClientSize = new System.Drawing.Size(400, 300);
+ this.printPreviewDialog1.Enabled = true;
+ this.printPreviewDialog1.Icon = ((System.Drawing.Icon)(resources.GetObject("printPreviewDialog1.Icon")));
+ this.printPreviewDialog1.Name = "printPreviewDialog1";
+ this.printPreviewDialog1.Visible = false;
+ //
// List_Lookup
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -563,7 +564,6 @@
private System.Windows.Forms.TextBox tb_search;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel panel2;
- private System.Windows.Forms.TextBox tb_order;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button btn_print;
private System.Windows.Forms.Button btn_close;
@@ -603,5 +603,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn order;
private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+ public System.Windows.Forms.TextBox tb_clt;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/납품관리/List_Lookup.cs b/unimarc/unimarc/납품관리/List_Lookup.cs
index 3f4887b..ce596a6 100644
--- a/unimarc/unimarc/납품관리/List_Lookup.cs
+++ b/unimarc/unimarc/납품관리/List_Lookup.cs
@@ -327,8 +327,8 @@ namespace WindowsFormsApp1.Delivery
}
}
}
- if (tb_order.Text != "") {
- if (array[12].Contains(tb_order.Text) == false) {
+ if (tb_clt.Text != "") {
+ if (array[12].Contains(tb_clt.Text) == false) {
return false;
}
}
@@ -349,6 +349,17 @@ namespace WindowsFormsApp1.Delivery
}
return true;
}
+
+ private void tb_order_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ Commodity_Search cs = new Commodity_Search(this);
+ cs.Clinet_name = tb_clt.Text;
+ cs.Show();
+ }
+ }
+
void Column_Text_Color()
{
for(int a = 0; a < dataGridView1.Rows.Count; a++)
diff --git a/unimarc/unimarc/납품관리/List_aggregation.Designer.cs b/unimarc/unimarc/납품관리/List_aggregation.Designer.cs
index 17c5a32..c8261a3 100644
--- a/unimarc/unimarc/납품관리/List_aggregation.Designer.cs
+++ b/unimarc/unimarc/납품관리/List_aggregation.Designer.cs
@@ -28,7 +28,7 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(List_aggregation));
this.btn_lookup = new System.Windows.Forms.Button();
this.btn_save = new System.Windows.Forms.Button();
@@ -85,7 +85,6 @@
this.tb_count = new System.Windows.Forms.TextBox();
this.tb_stock = new System.Windows.Forms.TextBox();
this.tb_date = new System.Windows.Forms.TextBox();
- this.tb_work_way = new System.Windows.Forms.TextBox();
this.tb_send_way = new System.Windows.Forms.TextBox();
this.tb_work_name = new System.Windows.Forms.TextBox();
this.tb_list_name = new System.Windows.Forms.TextBox();
@@ -106,8 +105,11 @@
this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
this.printDocument1 = new System.Drawing.Printing.PrintDocument();
+ this.tb_work_way = new System.Windows.Forms.RichTextBox();
+ this.panel2 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel1.SuspendLayout();
+ this.panel2.SuspendLayout();
this.SuspendLayout();
//
// btn_lookup
@@ -173,6 +175,7 @@
this.tb_dlv.Name = "tb_dlv";
this.tb_dlv.Size = new System.Drawing.Size(126, 21);
this.tb_dlv.TabIndex = 9;
+ this.tb_dlv.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_clt_KeyDown);
//
// label3
//
@@ -188,14 +191,14 @@
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.list_name,
this.list_date,
@@ -421,6 +424,7 @@
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel1.Controls.Add(this.panel2);
this.panel1.Controls.Add(this.label20);
this.panel1.Controls.Add(this.label21);
this.panel1.Controls.Add(this.lbl_send_n);
@@ -440,7 +444,6 @@
this.panel1.Controls.Add(this.tb_count);
this.panel1.Controls.Add(this.tb_stock);
this.panel1.Controls.Add(this.tb_date);
- this.panel1.Controls.Add(this.tb_work_way);
this.panel1.Controls.Add(this.tb_send_way);
this.panel1.Controls.Add(this.tb_work_name);
this.panel1.Controls.Add(this.tb_list_name);
@@ -464,7 +467,7 @@
this.panel1.Controls.Add(this.btn_process);
this.panel1.Location = new System.Drawing.Point(1002, 5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(385, 366);
+ this.panel1.Size = new System.Drawing.Size(381, 653);
this.panel1.TabIndex = 14;
//
// label20
@@ -481,7 +484,7 @@
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label21.Location = new System.Drawing.Point(10, 309);
+ this.label21.Location = new System.Drawing.Point(10, 167);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(59, 13);
this.label21.TabIndex = 16;
@@ -491,7 +494,7 @@
//
this.lbl_send_n.AutoSize = true;
this.lbl_send_n.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_send_n.Location = new System.Drawing.Point(338, 309);
+ this.lbl_send_n.Location = new System.Drawing.Point(338, 167);
this.lbl_send_n.Name = "lbl_send_n";
this.lbl_send_n.Size = new System.Drawing.Size(24, 13);
this.lbl_send_n.TabIndex = 16;
@@ -502,7 +505,7 @@
//
this.lbl_l_n.AutoSize = true;
this.lbl_l_n.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_l_n.Location = new System.Drawing.Point(148, 309);
+ this.lbl_l_n.Location = new System.Drawing.Point(148, 167);
this.lbl_l_n.Name = "lbl_l_n";
this.lbl_l_n.Size = new System.Drawing.Size(24, 13);
this.lbl_l_n.TabIndex = 16;
@@ -513,7 +516,7 @@
//
this.lbl_unstock_count.AutoSize = true;
this.lbl_unstock_count.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_unstock_count.Location = new System.Drawing.Point(185, 338);
+ this.lbl_unstock_count.Location = new System.Drawing.Point(185, 193);
this.lbl_unstock_count.Name = "lbl_unstock_count";
this.lbl_unstock_count.Size = new System.Drawing.Size(14, 13);
this.lbl_unstock_count.TabIndex = 16;
@@ -523,7 +526,7 @@
//
this.lbl_stock_count.AutoSize = true;
this.lbl_stock_count.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_stock_count.Location = new System.Drawing.Point(74, 338);
+ this.lbl_stock_count.Location = new System.Drawing.Point(74, 193);
this.lbl_stock_count.Name = "lbl_stock_count";
this.lbl_stock_count.Size = new System.Drawing.Size(14, 13);
this.lbl_stock_count.TabIndex = 16;
@@ -533,7 +536,7 @@
//
this.label27.AutoSize = true;
this.label27.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label27.Location = new System.Drawing.Point(317, 309);
+ this.label27.Location = new System.Drawing.Point(317, 167);
this.label27.Name = "label27";
this.label27.Size = new System.Drawing.Size(13, 13);
this.label27.TabIndex = 16;
@@ -543,7 +546,7 @@
//
this.label23.AutoSize = true;
this.label23.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label23.Location = new System.Drawing.Point(127, 309);
+ this.label23.Location = new System.Drawing.Point(127, 167);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(13, 13);
this.label23.TabIndex = 16;
@@ -553,7 +556,7 @@
//
this.lbl_send_y.AutoSize = true;
this.lbl_send_y.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_send_y.Location = new System.Drawing.Point(278, 309);
+ this.lbl_send_y.Location = new System.Drawing.Point(278, 167);
this.lbl_send_y.Name = "lbl_send_y";
this.lbl_send_y.Size = new System.Drawing.Size(31, 13);
this.lbl_send_y.TabIndex = 16;
@@ -564,7 +567,7 @@
//
this.lbl_l_y.AutoSize = true;
this.lbl_l_y.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_l_y.Location = new System.Drawing.Point(88, 309);
+ this.lbl_l_y.Location = new System.Drawing.Point(88, 167);
this.lbl_l_y.Name = "lbl_l_y";
this.lbl_l_y.Size = new System.Drawing.Size(31, 13);
this.lbl_l_y.TabIndex = 16;
@@ -575,7 +578,7 @@
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label19.Location = new System.Drawing.Point(227, 309);
+ this.label19.Location = new System.Drawing.Point(227, 167);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(33, 13);
this.label19.TabIndex = 16;
@@ -584,7 +587,7 @@
// tb_stock_per
//
this.tb_stock_per.BackColor = System.Drawing.SystemColors.Window;
- this.tb_stock_per.Location = new System.Drawing.Point(262, 276);
+ this.tb_stock_per.Location = new System.Drawing.Point(262, 245);
this.tb_stock_per.Name = "tb_stock_per";
this.tb_stock_per.Size = new System.Drawing.Size(111, 21);
this.tb_stock_per.TabIndex = 16;
@@ -592,7 +595,7 @@
// tb_total
//
this.tb_total.BackColor = System.Drawing.SystemColors.Window;
- this.tb_total.Location = new System.Drawing.Point(262, 247);
+ this.tb_total.Location = new System.Drawing.Point(262, 216);
this.tb_total.Name = "tb_total";
this.tb_total.Size = new System.Drawing.Size(111, 21);
this.tb_total.TabIndex = 14;
@@ -625,7 +628,7 @@
// tb_count
//
this.tb_count.BackColor = System.Drawing.SystemColors.Window;
- this.tb_count.Location = new System.Drawing.Point(74, 276);
+ this.tb_count.Location = new System.Drawing.Point(74, 245);
this.tb_count.Name = "tb_count";
this.tb_count.Size = new System.Drawing.Size(111, 21);
this.tb_count.TabIndex = 15;
@@ -633,7 +636,7 @@
// tb_stock
//
this.tb_stock.BackColor = System.Drawing.SystemColors.Window;
- this.tb_stock.Location = new System.Drawing.Point(74, 247);
+ this.tb_stock.Location = new System.Drawing.Point(74, 216);
this.tb_stock.Name = "tb_stock";
this.tb_stock.Size = new System.Drawing.Size(111, 21);
this.tb_stock.TabIndex = 13;
@@ -646,19 +649,10 @@
this.tb_date.Size = new System.Drawing.Size(111, 21);
this.tb_date.TabIndex = 6;
//
- // tb_work_way
- //
- this.tb_work_way.BackColor = System.Drawing.SystemColors.Window;
- this.tb_work_way.Location = new System.Drawing.Point(74, 165);
- this.tb_work_way.Multiline = true;
- this.tb_work_way.Name = "tb_work_way";
- this.tb_work_way.Size = new System.Drawing.Size(299, 45);
- this.tb_work_way.TabIndex = 11;
- //
// tb_send_way
//
this.tb_send_way.BackColor = System.Drawing.SystemColors.Window;
- this.tb_send_way.Location = new System.Drawing.Point(74, 218);
+ this.tb_send_way.Location = new System.Drawing.Point(74, 272);
this.tb_send_way.Name = "tb_send_way";
this.tb_send_way.Size = new System.Drawing.Size(299, 21);
this.tb_send_way.TabIndex = 12;
@@ -683,7 +677,7 @@
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label18.Location = new System.Drawing.Point(214, 280);
+ this.label18.Location = new System.Drawing.Point(214, 249);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(46, 13);
this.label18.TabIndex = 16;
@@ -693,7 +687,7 @@
//
this.lbl_stock_n.AutoSize = true;
this.lbl_stock_n.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_stock_n.Location = new System.Drawing.Point(134, 338);
+ this.lbl_stock_n.Location = new System.Drawing.Point(134, 193);
this.lbl_stock_n.Name = "lbl_stock_n";
this.lbl_stock_n.Size = new System.Drawing.Size(46, 13);
this.lbl_stock_n.TabIndex = 16;
@@ -703,7 +697,7 @@
//
this.label16.AutoSize = true;
this.label16.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label16.Location = new System.Drawing.Point(36, 280);
+ this.label16.Location = new System.Drawing.Point(36, 249);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(33, 13);
this.label16.TabIndex = 16;
@@ -713,7 +707,7 @@
//
this.lbl_stock_y.AutoSize = true;
this.lbl_stock_y.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.lbl_stock_y.Location = new System.Drawing.Point(36, 338);
+ this.lbl_stock_y.Location = new System.Drawing.Point(36, 193);
this.lbl_stock_y.Name = "lbl_stock_y";
this.lbl_stock_y.Size = new System.Drawing.Size(33, 13);
this.lbl_stock_y.TabIndex = 16;
@@ -723,7 +717,7 @@
//
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label14.Location = new System.Drawing.Point(201, 251);
+ this.label14.Location = new System.Drawing.Point(201, 220);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(59, 13);
this.label14.TabIndex = 16;
@@ -733,7 +727,7 @@
//
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label13.Location = new System.Drawing.Point(10, 251);
+ this.label13.Location = new System.Drawing.Point(10, 220);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(59, 13);
this.label13.TabIndex = 16;
@@ -743,7 +737,7 @@
//
this.label12.AutoSize = true;
this.label12.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label12.Location = new System.Drawing.Point(10, 222);
+ this.label12.Location = new System.Drawing.Point(10, 274);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(59, 13);
this.label12.TabIndex = 16;
@@ -753,7 +747,7 @@
//
this.label11.AutoSize = true;
this.label11.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label11.Location = new System.Drawing.Point(10, 169);
+ this.label11.Location = new System.Drawing.Point(10, 301);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(59, 13);
this.label11.TabIndex = 16;
@@ -833,6 +827,25 @@
//
this.printDocument1.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printDocument1_PrintPage);
//
+ // tb_work_way
+ //
+ this.tb_work_way.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.tb_work_way.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tb_work_way.Location = new System.Drawing.Point(0, 0);
+ this.tb_work_way.Name = "tb_work_way";
+ this.tb_work_way.Size = new System.Drawing.Size(297, 345);
+ this.tb_work_way.TabIndex = 17;
+ this.tb_work_way.Text = "";
+ //
+ // panel2
+ //
+ this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel2.Controls.Add(this.tb_work_way);
+ this.panel2.Location = new System.Drawing.Point(74, 301);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(299, 347);
+ this.panel2.TabIndex = 18;
+ //
// List_aggregation
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -859,6 +872,7 @@
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -913,7 +927,6 @@
private System.Windows.Forms.TextBox tb_total;
private System.Windows.Forms.TextBox tb_count;
private System.Windows.Forms.TextBox tb_stock;
- private System.Windows.Forms.TextBox tb_work_way;
private System.Windows.Forms.TextBox tb_send_way;
private System.Windows.Forms.TextBox tb_work_name;
private System.Windows.Forms.Label lbl_stock_count;
@@ -946,5 +959,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn chk_label;
private System.Windows.Forms.DataGridViewCheckBoxColumn Chk_Column;
public System.Windows.Forms.TextBox tb_clt;
+ private System.Windows.Forms.RichTextBox tb_work_way;
+ private System.Windows.Forms.Panel panel2;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/납품관리/List_aggregation.cs b/unimarc/unimarc/납품관리/List_aggregation.cs
index 55d46f0..9dbb35f 100644
--- a/unimarc/unimarc/납품관리/List_aggregation.cs
+++ b/unimarc/unimarc/납품관리/List_aggregation.cs
@@ -16,7 +16,6 @@ namespace WindowsFormsApp1.Delivery
public partial class List_aggregation : Form
{
Helper_DB db = new Helper_DB();
- string db_tmp;
public int EditNumber;
public string compidx;
int row = 0;
@@ -62,88 +61,6 @@ namespace WindowsFormsApp1.Delivery
combo_user.Items.Add(user_name[a]);
}
combo_user.SelectedIndex = 0;
- /*
- string searchdb = "`list_name`, `date`, `date_res`, `charge`, `work_name`, " +
- "`work_way`, `send_way`, `total`, `stock_money`, `vol`, " +
- "`stock`, `unstock`, `list_num`, `chk_marc`";
- string[] searchdb1 = { "comp_num", "state" };
- string[] searchdb2 = { compidx, "진행" };
- db_tmp = db.More_DB_Search("Obj_List", searchdb1, searchdb2, searchdb);
- Made_Grid(db_tmp);
- dataGridView1.Focus();
- infor_Update(0);*/
- }
- ///
- /// 표에 값을 채우는 함수.
- ///
- /// 분할을 하지않은 데이터베이스 값
- private void Made_Grid(string tmp)
- {
- dataGridView1.Rows.Clear();
- string[] db_data = tmp.Split('|');
- string[] grid = {"", "", "", "", "",
- "", "", "", "", "",
- "", "", "", "", "", "" };
- for (int a = 0; a < db_data.Length; a++)
- {
- if (a % 14 == 0) { grid[0] = db_data[a]; }
- if (a % 14 == 1) {
- if (db_data[a].Length < 3) {
- grid[1] = db_data[a];
- }
- else { grid[1] = db_data[a].Substring(0, 10); }
- grid[1] = db_data[a]; }
- if (a % 14 == 2) {
- if (db_data[a].Length < 3) {
- grid[2] = db_data[a];
- }
- else { grid[2] = db_data[a].Substring(0, 10); }
- }
- if (a % 14 == 3) { grid[3] = db_data[a]; }
- if (a % 14 == 4) { grid[4] = db_data[a]; }
- if (a % 14 == 5) { grid[5] = db_data[a]; }
- if (a % 14 == 6) { grid[6] = db_data[a]; }
- if (a % 14 == 7) { grid[7] = db_data[a]; }
- if (a % 14 == 8) { grid[8] = db_data[a]; }
- if (a % 14 == 9) { grid[9] = db_data[a]; }
- if (a % 14 == 10) { grid[10] = db_data[a]; }
- if (a % 14 == 11) { grid[11] = db_data[a]; }
- if (a % 14 == 12) { grid[14] = db_data[a]; }
- if (a % 14 == 13) {
- grid[15] = db_data[a];
- if (Grid_filter(grid)) {
- dataGridView1.Rows.Add(grid);
- }
- }
- }
- GridColorChange();
- }
- private bool Grid_filter(string[] arr)
- {
- String_Text st = new String_Text();
- string db_clt = st.GetMiddelString(arr[0], "[", "]");
- string cb_year = combo_year.SelectedItem.ToString();
- string db_year = arr[1].Substring(0, 4);
- if (combo_state.SelectedIndex == 1) {
- if (cb_year != db_year) {
- MessageBox.Show("연도 컷");
- return false;
- }
- }
- if (combo_user.SelectedIndex != 0) {
- if (combo_user.SelectedItem.ToString() != arr[3]) {
- MessageBox.Show("사용자 컷");
- return false;
- }
- }
- if (tb_clt.Text != "") {
- if(tb_clt.Text == db_clt) {
- return true;
- }
- MessageBox.Show("거래처 컷");
- return false;
- }
- return true;
}
private void btn_lookup_Click(object sender, EventArgs e) // 조회
{
@@ -167,10 +84,115 @@ namespace WindowsFormsApp1.Delivery
string[] searchdb1 = search_L_tbl.ToArray();
string[] searchdb2 = search_L_col.ToArray();
- db_tmp = db.More_DB_Search("Obj_List", searchdb1, searchdb2, searchdb);
+ string db_tmp = db.More_DB_Search("Obj_List", searchdb1, searchdb2, searchdb);
Made_Grid(db_tmp);
dataGridView1.Focus();
}
+ #region Lookup_Click_Sub
+ ///
+ /// 표에 값을 채우는 함수.
+ ///
+ /// 분할을 하지않은 데이터베이스 값
+ private void Made_Grid(string tmp)
+ {
+ dataGridView1.Rows.Clear();
+ string[] db_data = tmp.Split('|');
+ string[] grid = {"", "", "", "", "",
+ "", "", "", "", "",
+ "", "", "", "", "", "" };
+ for (int a = 0; a < db_data.Length; a++)
+ {
+ if (a % 14 == 0) { grid[0] = db_data[a]; }
+ if (a % 14 == 1)
+ {
+ if (db_data[a].Length < 3)
+ {
+ grid[1] = db_data[a];
+ }
+ else { grid[1] = db_data[a].Substring(0, 10); }
+ grid[1] = db_data[a];
+ }
+ if (a % 14 == 2)
+ {
+ if (db_data[a].Length < 3)
+ {
+ grid[2] = db_data[a];
+ }
+ else { grid[2] = db_data[a].Substring(0, 10); }
+ }
+ if (a % 14 == 3) { grid[3] = db_data[a]; }
+ if (a % 14 == 4) { grid[4] = db_data[a]; }
+ if (a % 14 == 5) { grid[5] = db_data[a]; }
+ if (a % 14 == 6) { grid[6] = db_data[a]; }
+ if (a % 14 == 7) { grid[7] = db_data[a]; }
+ if (a % 14 == 8) { grid[8] = db_data[a]; }
+ if (a % 14 == 9) { grid[9] = db_data[a]; }
+ if (a % 14 == 10) { grid[10] = db_data[a]; }
+ if (a % 14 == 11) { grid[11] = db_data[a]; }
+ if (a % 14 == 12) { grid[14] = db_data[a]; }
+ if (a % 14 == 13)
+ {
+ grid[15] = db_data[a];
+ if (Grid_filter(grid))
+ {
+ dataGridView1.Rows.Add(grid);
+ }
+ }
+ }
+ GridColorChange();
+ }
+ private bool Grid_filter(string[] arr)
+ {
+ String_Text st = new String_Text();
+ string db_clt = st.GetMiddelString(arr[0], "[", "]");
+ string cb_year = combo_year.SelectedItem.ToString();
+ string db_year = arr[1].Substring(0, 4);
+ if (!arr[0].Contains(tb_dlv.Text))
+ {
+ return false;
+ }
+ if (combo_state.SelectedIndex == 1)
+ {
+ if (cb_year != db_year)
+ {
+ return false;
+ }
+ }
+ if (combo_user.SelectedIndex != 0)
+ {
+ if (combo_user.SelectedItem.ToString() != arr[3])
+ {
+ return false;
+ }
+ }
+ if (tb_clt.Text != "")
+ {
+ if (tb_clt.Text == db_clt)
+ {
+ return true;
+ }
+ return false;
+ }
+ return true;
+ }
+ ///
+ /// 데이터그리드뷰 색상변경
+ ///
+ public void GridColorChange()
+ {
+ for (int a = 0; a < dataGridView1.Rows.Count; a++)
+ {
+ dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Empty;
+ }
+ for (int a = 0; a < dataGridView1.Rows.Count; a++)
+ {
+ if (dataGridView1.Rows[a].Cells["chk_label"].Value.ToString() == "라벨")
+ {
+ dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Yellow;
+ }
+ }
+ }
+ #endregion
private void btn_save_Click(object sender, EventArgs e) // 저장
{
string table = "Obj_List";
@@ -422,12 +444,25 @@ namespace WindowsFormsApp1.Delivery
private void tb_clt_KeyDown(object sender, KeyEventArgs e)
{
- if (e.KeyCode == Keys.Enter)
- {
- Commodity_Search sea = new Commodity_Search(this);
- sea.Clinet_name = tb_clt.Text;
- sea.Show();
+ string textBox = ((TextBox)sender).Name;
+ switch (textBox) {
+ case "tb_clt":
+ if (e.KeyCode == Keys.Enter)
+ {
+ Commodity_Search sea = new Commodity_Search(this);
+ sea.Clinet_name = tb_clt.Text;
+ sea.Show();
+ }
+ break;
+ case "tb_dlv":
+ if (e.KeyCode == Keys.Enter)
+ {
+ btn_lookup_Click(null, null);
+ }
+ break;
}
+
+
}
private void combo_state_SelectedIndexChanged(object sender, EventArgs e)
{
@@ -440,23 +475,6 @@ namespace WindowsFormsApp1.Delivery
combo_year.Visible = true;
}
}
- ///
- /// 데이터그리드뷰 색상변경
- ///
- public void GridColorChange()
- {
- for (int a = 0; a < dataGridView1.Rows.Count; a++)
- {
- dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Empty;
- }
- for (int a = 0; a < dataGridView1.Rows.Count; a++)
- {
- if (dataGridView1.Rows[a].Cells["chk_label"].Value.ToString() == "라벨")
- {
- dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Yellow;
- }
- }
- }
private void btn_close_Click(object sender, EventArgs e)
{
this.Close();
diff --git a/unimarc/unimarc/납품관리/Order_input.cs b/unimarc/unimarc/납품관리/Order_input.cs
index b1877a3..6929144 100644
--- a/unimarc/unimarc/납품관리/Order_input.cs
+++ b/unimarc/unimarc/납품관리/Order_input.cs
@@ -74,8 +74,19 @@ namespace WindowsFormsApp1.Delivery
}
private void btn_lookup_Click(object sender, EventArgs e)
{
- string[] tmp_col = { "compidx" };
- string[] tmp_data = { compidx };
+ List l_col = new List();
+ List l_data = new List();
+
+ l_col.Add("compidx");
+ l_data.Add(compidx);
+
+ if (tb_search_book_list.Text != "") {
+ l_col.Add("list_name");
+ l_data.Add(tb_search_book_list.Text);
+ }
+
+ string[] tmp_col = l_col.ToArray();
+ string[] tmp_data = l_data.ToArray();
string takedata = "`order`, `order_stat`, `isbn`, `book_name`, `author`, " +
"`book_comp`, `order_count`, `count`, `pay`, `total`, " +
"`etc`, `list_name`, `order_date`, `send_date`, `header`, " +
@@ -84,6 +95,58 @@ namespace WindowsFormsApp1.Delivery
made_grid(cmd, true);
date_Substring();
}
+ #region lookup_Click_Sub
+ public void made_grid(string strValue, bool chk = false)
+ {
+ dataGridView1.Rows.Clear();
+ string[] data = strValue.Split('|');
+ string[] mkgrid = { "false", "", "", "", "",
+ "", "", "", "", "",
+ "", "", "", "", "",
+ "" };
+ /* 선택 / o주문처 / oM / o도서명 / o저자 /
+ * o출판사 / o주문수 / o원주문 / o정가 / o합계 /
+ * o비고 / o납품처 / o주문일자 / o송금일자 / oo번호 /
+ * 목록번호
+ */
+ for (int a = 0; a < data.Length; a++)
+ {
+ if (a % 16 == 0) { mkgrid[1] = data[a]; } // 주문처
+ if (a % 16 == 1)
+ { // M
+ if (data[a] == "0") { data[a] = data[a].Replace("0", ""); }
+ if (data[a] == "1") { data[a] = data[a].Replace("1", "V"); }
+ mkgrid[2] = data[a];
+ }
+ if (a % 16 == 2) { mkgrid[3] = data[a]; } // ISBN
+ if (a % 16 == 3) { mkgrid[4] = data[a]; } // 도서명
+ if (a % 16 == 4) { mkgrid[5] = data[a]; } // 저자
+ if (a % 16 == 5) { mkgrid[6] = data[a]; } // 출판사
+ if (a % 16 == 6) { mkgrid[7] = data[a]; } // 주문수
+ if (a % 16 == 7) { mkgrid[8] = data[a]; } // 원주문
+ if (a % 16 == 8) { mkgrid[9] = data[a]; } // 정가
+ if (a % 16 == 9) { mkgrid[10] = data[a]; } // 합계
+ if (a % 16 == 10) { mkgrid[11] = data[a]; } // 비고
+ if (a % 16 == 11) { mkgrid[12] = data[a]; } // 납품처
+ if (a % 16 == 12) { mkgrid[13] = data[a]; } // 주문일자
+ if (a % 16 == 13) { mkgrid[14] = data[a]; } // 송금일자
+ if (a % 16 == 14) { mkgrid[15] = data[a]; } // 번호
+ if (a % 16 == 15)
+ { // 번호
+ mkgrid[15] += " " + data[a];
+ if (chk == false) { dataGridView1.Rows.Add(mkgrid); }
+ else
+ {
+ if (Array_Inspection(mkgrid) == true)
+ {
+ dataGridView1.Rows.Add(mkgrid);
+ }
+ }
+ }
+ }
+ // 색입히는 함수 기입
+ PrintColor_Grid();
+ }
///
/// Grid내의 주문일자와 송금일자를 날짜까지만 표시하게 해주는 함수.
///
@@ -105,54 +168,6 @@ namespace WindowsFormsApp1.Delivery
}
}
}
- public void made_grid(string strValue, bool chk = false)
- {
- dataGridView1.Rows.Clear();
- string[] data = strValue.Split('|');
- string[] mkgrid = { "false", "", "", "", "",
- "", "", "", "", "",
- "", "", "", "", "",
- "" };
- /* 선택 / o주문처 / oM / o도서명 / o저자 /
- * o출판사 / o주문수 / o원주문 / o정가 / o합계 /
- * o비고 / o납품처 / o주문일자 / o송금일자 / oo번호 /
- * 목록번호
- */
- for (int a = 0; a < data.Length; a++)
- {
- if (a % 16 == 0) { mkgrid[1] = data[a]; } // 주문처
- if (a % 16 == 1) { // M
- if (data[a] == "0") { data[a] = data[a].Replace("0", ""); }
- if (data[a] == "1") { data[a] = data[a].Replace("1", "V"); }
- mkgrid[2] = data[a];
- }
- if (a % 16 == 2) { mkgrid[3] = data[a]; } // ISBN
- if (a % 16 == 3) { mkgrid[4] = data[a]; } // 도서명
- if (a % 16 == 4) { mkgrid[5] = data[a]; } // 저자
- if (a % 16 == 5) { mkgrid[6] = data[a]; } // 출판사
- if (a % 16 == 6) { mkgrid[7] = data[a]; } // 주문수
- if (a % 16 == 7) { mkgrid[8] = data[a]; } // 원주문
- if (a % 16 == 8) { mkgrid[9] = data[a]; } // 정가
- if (a % 16 == 9) { mkgrid[10] = data[a]; } // 합계
- if (a % 16 == 10) { mkgrid[11] = data[a]; } // 비고
- if (a % 16 == 11) { mkgrid[12] = data[a]; } // 납품처
- if (a % 16 == 12) { mkgrid[13] = data[a]; } // 주문일자
- if (a % 16 == 13) { mkgrid[14] = data[a]; } // 송금일자
- if (a % 16 == 14) { mkgrid[15] = data[a]; } // 번호
- if (a % 16 == 15) { // 번호
- mkgrid[15] += " " + data[a];
- if (chk == false) { dataGridView1.Rows.Add(mkgrid); }
- else {
- if(Array_Inspection(mkgrid) == true)
- {
- dataGridView1.Rows.Add(mkgrid);
- }
- }
- }
- }
- // 색입히는 함수 기입
- PrintColor_Grid();
- }
///
/// 작업명단 검색중 상위 텍스트박스 및 콤보박스의 값에 따라 출력할지 안할지 분류.
///
@@ -190,6 +205,7 @@ namespace WindowsFormsApp1.Delivery
}
return true;
}
+ #endregion
private void PrintColor_Grid()
{
for (int a = 0; a < dataGridView1.Rows.Count; a++)
diff --git a/unimarc/unimarc/납품관리/Order_input_Search.Designer.cs b/unimarc/unimarc/납품관리/Order_input_Search.Designer.cs
index c5a0e90..929407d 100644
--- a/unimarc/unimarc/납품관리/Order_input_Search.Designer.cs
+++ b/unimarc/unimarc/납품관리/Order_input_Search.Designer.cs
@@ -32,7 +32,8 @@
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.state = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.date = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.date_res = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
//
@@ -53,7 +54,8 @@
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.list_name,
this.charge,
- this.state});
+ this.date,
+ this.date_res});
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
this.dataGridView1.Location = new System.Drawing.Point(0, 0);
@@ -61,7 +63,7 @@
this.dataGridView1.RowHeadersWidth = 21;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
- this.dataGridView1.Size = new System.Drawing.Size(544, 215);
+ this.dataGridView1.Size = new System.Drawing.Size(641, 215);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick);
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
@@ -78,16 +80,21 @@
this.charge.HeaderText = "담당자";
this.charge.Name = "charge";
//
- // state
+ // date
//
- this.state.HeaderText = "상태";
- this.state.Name = "state";
+ this.date.HeaderText = "목록일자";
+ this.date.Name = "date";
+ //
+ // date_res
+ //
+ this.date_res.HeaderText = "완료일자";
+ this.date_res.Name = "date_res";
//
// Order_input_Search
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(544, 215);
+ this.ClientSize = new System.Drawing.Size(641, 215);
this.Controls.Add(this.dataGridView1);
this.Name = "Order_input_Search";
this.Text = "Order_input_Search";
@@ -102,6 +109,7 @@
private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.DataGridViewTextBoxColumn list_name;
private System.Windows.Forms.DataGridViewTextBoxColumn charge;
- private System.Windows.Forms.DataGridViewTextBoxColumn state;
+ private System.Windows.Forms.DataGridViewTextBoxColumn date;
+ private System.Windows.Forms.DataGridViewTextBoxColumn date_res;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/납품관리/Order_input_Search.cs b/unimarc/unimarc/납품관리/Order_input_Search.cs
index 5c682ef..a29ce33 100644
--- a/unimarc/unimarc/납품관리/Order_input_Search.cs
+++ b/unimarc/unimarc/납품관리/Order_input_Search.cs
@@ -54,22 +54,23 @@ namespace WindowsFormsApp1.Delivery
if(Where_Open == "book_list") {
if(searchText == "") {
string cmd = db.DB_Contains("Obj_List", compidx,
- "", "", "`list_name`, `charge`, `state`");
+ "", "", "`list_name`, `charge`, `date`, `date_res`");
made_grid(cmd);
}
else {
string cmd = db.DB_Contains("Obj_List", compidx,
- "list_name", searchText, "`list_name`, `charge`, `state`");
+ "list_name", searchText, "`list_name`, `charge`, `date`, `date_res`");
made_grid(cmd);
}
}
else if(Where_Open.Contains("Order")) {
list_name.HeaderText = "주문처";
charge.HeaderText = "대표자";
- state.HeaderText = "종목";
+ date.HeaderText = "종목";
+ date_res.HeaderText = "업태";
string cmd = db.DB_Contains("Purchase", compidx,
- "sangho", searchText, "`sangho`, `boss`, `jongmok`");
+ "sangho", searchText, "`sangho`, `boss`, `jongmok`, `uptae`");
made_grid(cmd);
}
}
@@ -77,12 +78,13 @@ namespace WindowsFormsApp1.Delivery
{
string[] data = strValue.Split('|');
dataGridView1.Rows.Clear();
- string[] res = { "", "", "" };
+ string[] res = { "", "", "", "" };
for (int a = 0; a < data.Length; a++)
{
- if (a % 3 == 0) { res[0] = data[a]; }
- if (a % 3 == 1) { res[1] = data[a]; }
- if (a % 3 == 2) { res[2] = data[a];
+ if (a % 4 == 0) { res[0] = data[a]; }
+ if (a % 4 == 1) { res[1] = data[a]; }
+ if (a % 4 == 2) { res[2] = data[a]; }
+ if (a % 4 == 3) { res[3] = data[a];
if(Contain_Text(res[0]))
dataGridView1.Rows.Add(res);
}
diff --git a/unimarc/unimarc/납품관리/Order_input_Search.resx b/unimarc/unimarc/납품관리/Order_input_Search.resx
index 73ac61f..3ccb1a2 100644
--- a/unimarc/unimarc/납품관리/Order_input_Search.resx
+++ b/unimarc/unimarc/납품관리/Order_input_Search.resx
@@ -123,7 +123,10 @@
True
-
+
+ True
+
+
True
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Check_ISBN.Designer.cs b/unimarc/unimarc/마크/Check_ISBN.Designer.cs
index 394469d..20dcd53 100644
--- a/unimarc/unimarc/마크/Check_ISBN.Designer.cs
+++ b/unimarc/unimarc/마크/Check_ISBN.Designer.cs
@@ -28,21 +28,10 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
- this.btn_lookup = new System.Windows.Forms.Button();
- this.cb_filter = new System.Windows.Forms.ComboBox();
- this.label1 = new System.Windows.Forms.Label();
- this.tb_list_name = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.btn_Save = new System.Windows.Forms.Button();
- this.btn_Close = new System.Windows.Forms.Button();
- this.label3 = new System.Windows.Forms.Label();
- this.cb_api = new System.Windows.Forms.ComboBox();
- this.progressBar1 = new System.Windows.Forms.ProgressBar();
- this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.num = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -63,6 +52,18 @@
this.sold_out = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.image = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.api_data = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.btn_lookup = new System.Windows.Forms.Button();
+ this.cb_filter = new System.Windows.Forms.ComboBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.tb_list_name = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.btn_Save = new System.Windows.Forms.Button();
+ this.btn_Close = new System.Windows.Forms.Button();
+ this.label3 = new System.Windows.Forms.Label();
+ this.cb_api = new System.Windows.Forms.ComboBox();
+ this.progressBar1 = new System.Windows.Forms.ProgressBar();
+ this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+ this.btn_yes24 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
//
@@ -71,13 +72,13 @@
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.num,
@@ -103,17 +104,17 @@
this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnF2;
this.dataGridView1.Location = new System.Drawing.Point(12, 35);
this.dataGridView1.Name = "dataGridView1";
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle8;
this.dataGridView1.RowHeadersWidth = 20;
- dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle9;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(1608, 547);
this.dataGridView1.TabIndex = 0;
@@ -121,105 +122,6 @@
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
//
- // btn_lookup
- //
- this.btn_lookup.Location = new System.Drawing.Point(709, 7);
- this.btn_lookup.Name = "btn_lookup";
- this.btn_lookup.Size = new System.Drawing.Size(99, 23);
- this.btn_lookup.TabIndex = 1;
- this.btn_lookup.Text = "ISBN 자동 조회";
- this.btn_lookup.UseVisualStyleBackColor = true;
- this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click);
- //
- // cb_filter
- //
- this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cb_filter.FormattingEnabled = true;
- this.cb_filter.Location = new System.Drawing.Point(516, 8);
- this.cb_filter.Name = "cb_filter";
- this.cb_filter.Size = new System.Drawing.Size(161, 20);
- this.cb_filter.TabIndex = 2;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(16, 12);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(41, 12);
- this.label1.TabIndex = 3;
- this.label1.Text = "목록명";
- //
- // tb_list_name
- //
- this.tb_list_name.Enabled = false;
- this.tb_list_name.Location = new System.Drawing.Point(59, 8);
- this.tb_list_name.Name = "tb_list_name";
- this.tb_list_name.Size = new System.Drawing.Size(199, 21);
- this.tb_list_name.TabIndex = 4;
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(457, 12);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(57, 12);
- this.label2.TabIndex = 3;
- this.label2.Text = "검색 조건";
- //
- // btn_Save
- //
- this.btn_Save.Location = new System.Drawing.Point(819, 7);
- this.btn_Save.Name = "btn_Save";
- this.btn_Save.Size = new System.Drawing.Size(99, 23);
- this.btn_Save.TabIndex = 1;
- this.btn_Save.Text = "전 체 저 장";
- this.btn_Save.UseVisualStyleBackColor = true;
- this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
- //
- // btn_Close
- //
- this.btn_Close.Location = new System.Drawing.Point(929, 7);
- this.btn_Close.Name = "btn_Close";
- this.btn_Close.Size = new System.Drawing.Size(99, 23);
- this.btn_Close.TabIndex = 1;
- this.btn_Close.Text = "닫 기";
- this.btn_Close.UseVisualStyleBackColor = true;
- this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(278, 12);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(57, 12);
- this.label3.TabIndex = 5;
- this.label3.Text = "검색 엔진";
- //
- // cb_api
- //
- this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cb_api.FormattingEnabled = true;
- this.cb_api.Location = new System.Drawing.Point(337, 8);
- this.cb_api.Name = "cb_api";
- this.cb_api.Size = new System.Drawing.Size(93, 20);
- this.cb_api.TabIndex = 6;
- this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged);
- //
- // progressBar1
- //
- this.progressBar1.Location = new System.Drawing.Point(1060, 7);
- this.progressBar1.Name = "progressBar1";
- this.progressBar1.Size = new System.Drawing.Size(219, 23);
- this.progressBar1.TabIndex = 7;
- //
- // richTextBox1
- //
- this.richTextBox1.Location = new System.Drawing.Point(12, 589);
- this.richTextBox1.Name = "richTextBox1";
- this.richTextBox1.Size = new System.Drawing.Size(1608, 123);
- this.richTextBox1.TabIndex = 8;
- this.richTextBox1.Text = "";
- //
// num
//
this.num.HeaderText = "번호";
@@ -329,6 +231,115 @@
this.api_data.Name = "api_data";
this.api_data.Visible = false;
//
+ // btn_lookup
+ //
+ this.btn_lookup.Location = new System.Drawing.Point(706, 7);
+ this.btn_lookup.Name = "btn_lookup";
+ this.btn_lookup.Size = new System.Drawing.Size(99, 23);
+ this.btn_lookup.TabIndex = 1;
+ this.btn_lookup.Text = "ISBN 자동 조회";
+ this.btn_lookup.UseVisualStyleBackColor = true;
+ this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click);
+ //
+ // cb_filter
+ //
+ this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_filter.FormattingEnabled = true;
+ this.cb_filter.Location = new System.Drawing.Point(516, 8);
+ this.cb_filter.Name = "cb_filter";
+ this.cb_filter.Size = new System.Drawing.Size(161, 20);
+ this.cb_filter.TabIndex = 2;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(16, 12);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(41, 12);
+ this.label1.TabIndex = 3;
+ this.label1.Text = "목록명";
+ //
+ // tb_list_name
+ //
+ this.tb_list_name.Enabled = false;
+ this.tb_list_name.Location = new System.Drawing.Point(59, 8);
+ this.tb_list_name.Name = "tb_list_name";
+ this.tb_list_name.Size = new System.Drawing.Size(199, 21);
+ this.tb_list_name.TabIndex = 4;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(457, 12);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(57, 12);
+ this.label2.TabIndex = 3;
+ this.label2.Text = "검색 조건";
+ //
+ // btn_Save
+ //
+ this.btn_Save.Location = new System.Drawing.Point(815, 7);
+ this.btn_Save.Name = "btn_Save";
+ this.btn_Save.Size = new System.Drawing.Size(99, 23);
+ this.btn_Save.TabIndex = 1;
+ this.btn_Save.Text = "전 체 저 장";
+ this.btn_Save.UseVisualStyleBackColor = true;
+ this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
+ //
+ // btn_Close
+ //
+ this.btn_Close.Location = new System.Drawing.Point(1033, 7);
+ this.btn_Close.Name = "btn_Close";
+ this.btn_Close.Size = new System.Drawing.Size(99, 23);
+ this.btn_Close.TabIndex = 1;
+ this.btn_Close.Text = "닫 기";
+ this.btn_Close.UseVisualStyleBackColor = true;
+ this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(278, 12);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(57, 12);
+ this.label3.TabIndex = 5;
+ this.label3.Text = "검색 엔진";
+ //
+ // cb_api
+ //
+ this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cb_api.FormattingEnabled = true;
+ this.cb_api.Location = new System.Drawing.Point(337, 8);
+ this.cb_api.Name = "cb_api";
+ this.cb_api.Size = new System.Drawing.Size(93, 20);
+ this.cb_api.TabIndex = 6;
+ this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged);
+ //
+ // progressBar1
+ //
+ this.progressBar1.Location = new System.Drawing.Point(1166, 7);
+ this.progressBar1.Name = "progressBar1";
+ this.progressBar1.Size = new System.Drawing.Size(219, 23);
+ this.progressBar1.TabIndex = 7;
+ //
+ // richTextBox1
+ //
+ this.richTextBox1.Location = new System.Drawing.Point(12, 589);
+ this.richTextBox1.Name = "richTextBox1";
+ this.richTextBox1.Size = new System.Drawing.Size(1608, 123);
+ this.richTextBox1.TabIndex = 8;
+ this.richTextBox1.Text = "";
+ //
+ // btn_yes24
+ //
+ this.btn_yes24.Location = new System.Drawing.Point(924, 7);
+ this.btn_yes24.Name = "btn_yes24";
+ this.btn_yes24.Size = new System.Drawing.Size(99, 23);
+ this.btn_yes24.TabIndex = 1;
+ this.btn_yes24.Text = "예스 양식 반출";
+ this.btn_yes24.UseVisualStyleBackColor = true;
+ this.btn_yes24.Click += new System.EventHandler(this.btn_yes24_Click);
+ //
// Check_ISBN
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -342,6 +353,7 @@
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.cb_filter);
+ this.Controls.Add(this.btn_yes24);
this.Controls.Add(this.btn_Close);
this.Controls.Add(this.btn_Save);
this.Controls.Add(this.btn_lookup);
@@ -389,5 +401,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn sold_out;
private System.Windows.Forms.DataGridViewTextBoxColumn image;
private System.Windows.Forms.DataGridViewTextBoxColumn api_data;
+ private System.Windows.Forms.Button btn_yes24;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Check_ISBN.cs b/unimarc/unimarc/마크/Check_ISBN.cs
index c8ac048..b793925 100644
--- a/unimarc/unimarc/마크/Check_ISBN.cs
+++ b/unimarc/unimarc/마크/Check_ISBN.cs
@@ -9,6 +9,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
+using UniMarc.마크;
using WindowsFormsApp1.Delivery;
using WindowsFormsApp1.마크;
@@ -595,5 +596,10 @@ namespace WindowsFormsApp1.Mac
}
}
}
+ private void btn_yes24_Click(object sender, EventArgs e)
+ {
+ Check_ISBN_Yes24 yes = new Check_ISBN_Yes24(this);
+ yes.Show();
+ }
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Check_ISBN_Yes24.Designer.cs b/unimarc/unimarc/마크/Check_ISBN_Yes24.Designer.cs
new file mode 100644
index 0000000..03e33e5
--- /dev/null
+++ b/unimarc/unimarc/마크/Check_ISBN_Yes24.Designer.cs
@@ -0,0 +1,179 @@
+
+namespace UniMarc.마크
+{
+ partial class Check_ISBN_Yes24
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.btn_change = new System.Windows.Forms.Button();
+ this.btn_Close = new System.Windows.Forms.Button();
+ this.dataGridView1 = new System.Windows.Forms.DataGridView();
+ this.before_book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.after_book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.before_author = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.after_author = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.before_book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.after_book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.price = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // btn_change
+ //
+ this.btn_change.Location = new System.Drawing.Point(917, 8);
+ this.btn_change.Name = "btn_change";
+ this.btn_change.Size = new System.Drawing.Size(75, 23);
+ this.btn_change.TabIndex = 4;
+ this.btn_change.Text = "엑셀 변환";
+ this.btn_change.UseVisualStyleBackColor = true;
+ this.btn_change.Click += new System.EventHandler(this.btn_change_Click);
+ //
+ // btn_Close
+ //
+ this.btn_Close.Location = new System.Drawing.Point(998, 8);
+ this.btn_Close.Name = "btn_Close";
+ this.btn_Close.Size = new System.Drawing.Size(75, 23);
+ this.btn_Close.TabIndex = 3;
+ this.btn_Close.Text = "닫 기";
+ this.btn_Close.UseVisualStyleBackColor = true;
+ this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
+ //
+ // dataGridView1
+ //
+ this.dataGridView1.AllowUserToAddRows = false;
+ this.dataGridView1.AllowUserToDeleteRows = false;
+ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3;
+ this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.before_book_name,
+ this.after_book_name,
+ this.before_author,
+ this.after_author,
+ this.before_book_comp,
+ this.after_book_comp,
+ this.price});
+ this.dataGridView1.Location = new System.Drawing.Point(12, 39);
+ this.dataGridView1.Name = "dataGridView1";
+ this.dataGridView1.ReadOnly = true;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+ this.dataGridView1.RowTemplate.Height = 23;
+ this.dataGridView1.Size = new System.Drawing.Size(1061, 661);
+ this.dataGridView1.TabIndex = 2;
+ this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
+ //
+ // before_book_name
+ //
+ this.before_book_name.HeaderText = "도서명 [전]";
+ this.before_book_name.Name = "before_book_name";
+ this.before_book_name.ReadOnly = true;
+ this.before_book_name.Width = 200;
+ //
+ // after_book_name
+ //
+ this.after_book_name.HeaderText = "도서명 [후]";
+ this.after_book_name.Name = "after_book_name";
+ this.after_book_name.ReadOnly = true;
+ this.after_book_name.Width = 200;
+ //
+ // before_author
+ //
+ this.before_author.HeaderText = "저자 [전]";
+ this.before_author.Name = "before_author";
+ this.before_author.ReadOnly = true;
+ //
+ // after_author
+ //
+ this.after_author.HeaderText = "저자 [후]";
+ this.after_author.Name = "after_author";
+ this.after_author.ReadOnly = true;
+ //
+ // before_book_comp
+ //
+ this.before_book_comp.HeaderText = "출판사 [전]";
+ this.before_book_comp.Name = "before_book_comp";
+ this.before_book_comp.ReadOnly = true;
+ this.before_book_comp.Width = 150;
+ //
+ // after_book_comp
+ //
+ this.after_book_comp.HeaderText = "출판사 [후]";
+ this.after_book_comp.Name = "after_book_comp";
+ this.after_book_comp.ReadOnly = true;
+ this.after_book_comp.Width = 150;
+ //
+ // price
+ //
+ this.price.HeaderText = "금액";
+ this.price.Name = "price";
+ this.price.ReadOnly = true;
+ //
+ // Check_ISBN_Yes24
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1085, 712);
+ this.Controls.Add(this.btn_change);
+ this.Controls.Add(this.btn_Close);
+ this.Controls.Add(this.dataGridView1);
+ this.Name = "Check_ISBN_Yes24";
+ this.Text = "Yes24양식";
+ this.Load += new System.EventHandler(this.Check_ISBN_Yes24_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Button btn_change;
+ private System.Windows.Forms.Button btn_Close;
+ public System.Windows.Forms.DataGridView dataGridView1;
+ private System.Windows.Forms.DataGridViewTextBoxColumn before_book_name;
+ private System.Windows.Forms.DataGridViewTextBoxColumn after_book_name;
+ private System.Windows.Forms.DataGridViewTextBoxColumn before_author;
+ private System.Windows.Forms.DataGridViewTextBoxColumn after_author;
+ private System.Windows.Forms.DataGridViewTextBoxColumn before_book_comp;
+ private System.Windows.Forms.DataGridViewTextBoxColumn after_book_comp;
+ private System.Windows.Forms.DataGridViewTextBoxColumn price;
+ }
+}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Check_ISBN_Yes24.cs b/unimarc/unimarc/마크/Check_ISBN_Yes24.cs
new file mode 100644
index 0000000..bde56f2
--- /dev/null
+++ b/unimarc/unimarc/마크/Check_ISBN_Yes24.cs
@@ -0,0 +1,176 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+// 추가된 참조
+using WindowsFormsApp1;
+using WindowsFormsApp1.Mac;
+using Excel = Microsoft.Office.Interop.Excel;
+using System.Reflection;
+
+namespace UniMarc.마크
+{
+ public partial class Check_ISBN_Yes24 : Form
+ {
+ Helper_DB db = new Helper_DB();
+ Check_ISBN isbn;
+
+ List l_target = new List();
+ List l_before = new List();
+ List l_after = new List();
+
+ public Check_ISBN_Yes24(Check_ISBN _isbn)
+ {
+ InitializeComponent();
+ isbn = _isbn;
+ }
+
+ private void Check_ISBN_Yes24_Load(object sender, EventArgs e)
+ {
+ db.DBcon();
+ Take_DataBase();
+ Base_Setting();
+ }
+ #region Load_Sub
+ private void Take_DataBase()
+ {
+ string area = "`target`, `before`, `after`";
+ string tmp = db.DB_Select_Search(area, "yes24");
+ string[] ary_tmp = tmp.Split('|');
+
+ for(int a = 0; a < ary_tmp.Length; a++)
+ {
+ if (a % 3 == 0) { l_target.Add(ary_tmp[a]); }
+ if (a % 3 == 1) { l_before.Add(ary_tmp[a]); }
+ if (a % 3 == 2) { l_after.Add(ary_tmp[a]); }
+ }
+ }
+ private void Base_Setting()
+ {
+ int count = isbn.dataGridView1.Rows.Count;
+
+ for(int a= 0; a < count; a++)
+ {
+ string book_name = isbn.dataGridView1.Rows[a].Cells["book_name"].Value.ToString();
+ string author = isbn.dataGridView1.Rows[a].Cells["author"].Value.ToString();
+ string book_comp = isbn.dataGridView1.Rows[a].Cells["book_comp"].Value.ToString();
+ string unit = isbn.dataGridView1.Rows[a].Cells["unit"].Value.ToString();
+ string[] grid = {
+ book_name, Replace_target(book_name, "book_name"),
+ author, Replace_target(author, "author"),
+ book_comp, Replace_target(book_comp, "book_comp"),
+ unit
+ };
+ dataGridView1.Rows.Add(grid);
+ }
+ dataGridView1.Columns[0].DefaultCellStyle.BackColor = Color.Bisque;
+ dataGridView1.Columns[1].DefaultCellStyle.BackColor = Color.FromArgb(234, 226, 202);
+ dataGridView1.Columns[2].DefaultCellStyle.BackColor = Color.Bisque;
+ dataGridView1.Columns[3].DefaultCellStyle.BackColor = Color.FromArgb(234, 226, 202);
+ dataGridView1.Columns[4].DefaultCellStyle.BackColor = Color.Bisque;
+ dataGridView1.Columns[5].DefaultCellStyle.BackColor = Color.FromArgb(234, 226, 202);
+ }
+ private string Replace_target(string value, string sort)
+ {
+ try
+ {
+ int start = value.IndexOf('(');
+ int end = value.IndexOf(')');
+ value = value.Remove(start, end - start);
+ start = value.IndexOf('[');
+ end = value.IndexOf(']');
+ value = value.Remove(start, end - start);
+ start = value.IndexOf('<');
+ end = value.IndexOf('>');
+ value = value.Remove(start, end - start);
+ }
+ catch { }
+
+ string[] target = l_target.ToArray();
+ string[] before = l_before.ToArray();
+ string[] after = l_after.ToArray();
+
+ for(int a= 0; a < before.Length; a++)
+ {
+ if (target[a] == sort)
+ {
+ value = value.Replace(before[a], after[a]);
+ }
+ }
+ return value;
+ }
+ #endregion
+
+ private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e)
+ {
+ Skill_Grid sg = new Skill_Grid();
+ sg.Print_Grid_Num(sender, e);
+ }
+
+ private void btn_change_Click(object sender, EventArgs e)
+ {
+ string[,] grid = new string[dataGridView1.Rows.Count, 5];
+ for(int a= 0; a < dataGridView1.Rows.Count; a++)
+ {
+ int count = a + 1;
+ grid[a, 0] = count.ToString();
+ grid[a, 1] = dataGridView1.Rows[a].Cells["after_book_name"].Value.ToString();
+ grid[a, 3] = dataGridView1.Rows[a].Cells["after_book_comp"].Value.ToString();
+ grid[a, 4] = dataGridView1.Rows[a].Cells["price"].Value.ToString();
+ }
+ Excel_change(grid);
+ }
+ #region 엑셀변환 서브
+ private void Excel_change(string[,] grid)
+ {
+ try
+ {
+ Excel.Application application = new Excel.Application();
+ application.Visible = true;
+ application.Interactive = false;
+
+ Excel._Workbook wb = (Excel._Workbook)application.Workbooks.Add(Missing.Value);
+ Excel._Worksheet ws = (Excel._Worksheet)application.ActiveSheet;
+
+ Excel.Range rng = null;
+
+ #region 엑셀 베이스 (너비 높이)
+ ws.Columns[1].ColumnWidth = 6.57;
+ ws.Columns[2].ColumnWidth = 43.86;
+ ws.Columns[3].ColumnWidth = 18.43;
+ ws.Columns[4].ColumnWidth = 22.57;
+ ws.Columns[5].ColumnWidth = 12.57;
+ #endregion
+
+ string[] title = { "번호", "도서명", "ISBN", "출판사", "정가" };
+
+ #region 내용 삽입
+ rng = ws.Range["A1", "E1"];
+ rng.Value2 = title;
+ rng.HorizontalAlignment = Excel.XlHAlign.xlHAlignCenter;
+ rng.Font.Bold = true;
+
+ int count = dataGridView1.Rows.Count + 1;
+ rng = ws.Range["A2", "E" + count.ToString()];
+ rng.Value2 = grid;
+ rng.HorizontalAlignment = Excel.XlHAlign.xlHAlignCenter;
+ #endregion
+
+ application.Interactive = true;
+ }
+ catch (Exception e) { MessageBox.Show(e.Message); }
+ }
+ #endregion
+
+ private void btn_Close_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+ }
+}
diff --git a/unimarc/unimarc/마크/Check_ISBN_Yes24.resx b/unimarc/unimarc/마크/Check_ISBN_Yes24.resx
new file mode 100644
index 0000000..498b2e4
--- /dev/null
+++ b/unimarc/unimarc/마크/Check_ISBN_Yes24.resx
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
\ No newline at end of file