diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo index 4ce1391..96a4fa2 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/bin/Debug/ISBN_Check_test.application b/ISBN_Check_test/bin/Debug/ISBN_Check_test.application index 722187b..0e5b862 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 @@ - p/8+mV8YlxrwyLlcWvj9n6b9mL7rQTkpRvbI/T5huPg= + cqV1zNdwGf/IYcD6DWSOD83rn93mGKxyGos+bu88soo= diff --git a/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe b/ISBN_Check_test/bin/Debug/ISBN_Check_test.exe index 74cb251..f99b6c2 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 3fca3da..66117ea 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 @@ - + @@ -42,14 +42,14 @@ - - + + - zjvRlunNW73xa4PGNpIH7X3GQ1vGHrUDWZycVhU9Sb8= + s53FAzC3vGlUru48yMhRttgnDVd9urz8LanR4mf4XJ0= @@ -80,7 +80,7 @@ - a3hCM2zE7EusOows2VdWMoHAICsIRva0zyZEIdHfe3g= + PhJADKf4k02+7MGHqG3SI3tL5S39c+CQ2aNdm9gOez0= \ 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 3e68412..0db195f 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 9930dfb..3a8b296 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 722187b..0e5b862 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 @@ - p/8+mV8YlxrwyLlcWvj9n6b9mL7rQTkpRvbI/T5huPg= + cqV1zNdwGf/IYcD6DWSOD83rn93mGKxyGos+bu88soo= diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.GenerateResource.cache b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.GenerateResource.cache index 0afa59e..62a65cc 100644 Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.GenerateResource.cache and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csproj.GenerateResource.cache differ diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache index ccf2831..eee08e5 100644 Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.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 74cb251..f99b6c2 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 3fca3da..66117ea 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 @@ - + @@ -42,14 +42,14 @@ - - + + - zjvRlunNW73xa4PGNpIH7X3GQ1vGHrUDWZycVhU9Sb8= + s53FAzC3vGlUru48yMhRttgnDVd9urz8LanR4mf4XJ0= @@ -80,7 +80,7 @@ - a3hCM2zE7EusOows2VdWMoHAICsIRva0zyZEIdHfe3g= + PhJADKf4k02+7MGHqG3SI3tL5S39c+CQ2aNdm9gOez0= \ 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 3e68412..0db195f 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/Setup1/Debug/Setup1.msi b/Setup1/Debug/Setup1.msi index 0773318..932836e 100644 Binary files a/Setup1/Debug/Setup1.msi and b/Setup1/Debug/Setup1.msi differ diff --git a/Setup1/Debug/setup.exe b/Setup1/Debug/setup.exe index 8eafd5b..b182766 100644 Binary files a/Setup1/Debug/setup.exe and b/Setup1/Debug/setup.exe differ diff --git a/Setup1/Setup1.vdproj b/Setup1/Setup1.vdproj index 1871eef..bf5323d 100644 --- a/Setup1/Setup1.vdproj +++ b/Setup1/Setup1.vdproj @@ -22,18 +22,18 @@ "Entry" { "MsmKey" = "8:_36AC4F62C92B6D0BCDD2C56761258591" - "OwnerKey" = "8:_DA8C774840A942BC81BFF0E6B6623E5B" + "OwnerKey" = "8:_92AA506E92914E4AB38A50AE2AE7370C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_8E5B8C9896AC806B09C2BF089A2B0DA2" - "OwnerKey" = "8:_DA8C774840A942BC81BFF0E6B6623E5B" + "OwnerKey" = "8:_92AA506E92914E4AB38A50AE2AE7370C" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_DA8C774840A942BC81BFF0E6B6623E5B" + "MsmKey" = "8:_92AA506E92914E4AB38A50AE2AE7370C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -46,7 +46,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DA8C774840A942BC81BFF0E6B6623E5B" + "OwnerKey" = "8:_92AA506E92914E4AB38A50AE2AE7370C" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -287,26 +287,26 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:Setup1" + "ProductName" = "8:ISBN조회프로그램" "ProductCode" = "8:{A8A04035-B337-4B41-88F1-8A5982917757}" "PackageCode" = "8:{E8137EB0-3234-42B5-B209-18D17ACB496F}" "UpgradeCode" = "8:{26ED5F40-94B6-454E-894F-FE448A69CB2D}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" - "RemovePreviousVersions" = "11:FALSE" + "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" "ProductVersion" = "8:1.0.0" - "Manufacturer" = "8:Microsoft Corporation" + "Manufacturer" = "8:(주)글로리아북" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" - "Title" = "8:Setup1" + "Title" = "8:ISBN조회프로그램" "Subject" = "8:" - "ARPCONTACT" = "8:Microsoft Corporation" + "ARPCONTACT" = "8:(주)글로리아북" "Keywords" = "8:" "ARPCOMMENTS" = "8:" "ARPURLINFOABOUT" = "8:" - "ARPPRODUCTICON" = "8:" + "ARPPRODUCTICON" = "8:_0D6062360C5F4D6BA7D1EBF485EEFF70" "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" @@ -409,7 +409,7 @@ } "Shortcut" { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_32CA64AF558A4FAEA0514A673174CC75" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_5781E6AEAD7B464F91B182423764814D" { "Name" = "8:ISBN 조회" "Arguments" = "8:" @@ -417,10 +417,10 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_DA8C774840A942BC81BFF0E6B6623E5B" + "Target" = "8:_92AA506E92914E4AB38A50AE2AE7370C" "Folder" = "8:_A66867392A5046CAB74023B14B8C3140" "WorkingFolder" = "8:_945325C397F845FB86F255B5AAC3663E" - "Icon" = "8:_0D6062360C5F4D6BA7D1EBF485EEFF70" + "Icon" = "8:" "Feature" = "8:" } } @@ -822,7 +822,7 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_DA8C774840A942BC81BFF0E6B6623E5B" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_92AA506E92914E4AB38A50AE2AE7370C" { "SourcePath" = "8:..\\ISBN_Check_test\\obj\\Debug\\ISBN_Check_test.exe" "TargetName" = "8:" diff --git a/unimarc/.vs/WindowsFormsApp1/v16/.suo b/unimarc/.vs/WindowsFormsApp1/v16/.suo index 88d04ff..802f831 100644 Binary files a/unimarc/.vs/WindowsFormsApp1/v16/.suo and b/unimarc/.vs/WindowsFormsApp1/v16/.suo differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe index 39d498e..eeb15ad 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe and b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.exe differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb index 88a5c93..27076f2 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb and b/unimarc/WindowsFormsApp1/bin/Debug/WindowsFormsApp1.pdb differ diff --git a/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll b/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll index c244ce0..466a539 100644 Binary files a/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll and b/unimarc/WindowsFormsApp1/bin/Debug/ko/WindowsFormsApp1.resources.dll differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8289da1..3a7737e 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/WindowsFormsApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache index 99056ff..144ed3b 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csproj.GenerateResource.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache index 75461d6..e083281 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.csprojAssemblyReference.cache differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe index 39d498e..eeb15ad 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.exe differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb index 88a5c93..27076f2 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb and b/unimarc/WindowsFormsApp1/obj/Debug/WindowsFormsApp1.pdb differ diff --git a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll index c244ce0..466a539 100644 Binary files a/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll and b/unimarc/WindowsFormsApp1/obj/Debug/ko/WindowsFormsApp1.resources.dll differ diff --git a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs index fc91b9a..2e4f5f0 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.Designer.cs @@ -28,12 +28,12 @@ /// 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 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = 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(); @@ -73,6 +73,17 @@ this.panel1 = new System.Windows.Forms.Panel(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.dataGridView2 = new System.Windows.Forms.DataGridView(); + this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column20 = new System.Windows.Forms.DataGridViewButtonColumn(); + this.chk_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Del_Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.btn_morge = new System.Windows.Forms.Button(); this.btn_Edit = new System.Windows.Forms.Button(); this.btn_Del = new System.Windows.Forms.Button(); @@ -95,17 +106,6 @@ this.rbtn_all = new System.Windows.Forms.RadioButton(); this.panel2 = new System.Windows.Forms.Panel(); this.label14 = new System.Windows.Forms.Label(); - this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column20 = new System.Windows.Forms.DataGridViewButtonColumn(); - this.chk_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Del_Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit(); @@ -296,14 +296,14 @@ // dataGridView1 // 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; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - 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; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column22, @@ -359,27 +359,27 @@ // // Column5 // - dataGridViewCellStyle2.Format = "C0"; - dataGridViewCellStyle2.NullValue = null; - this.Column5.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle8.Format = "C0"; + dataGridViewCellStyle8.NullValue = null; + this.Column5.DefaultCellStyle = dataGridViewCellStyle8; this.Column5.HeaderText = "수량"; this.Column5.Name = "Column5"; this.Column5.Width = 35; // // Column6 // - dataGridViewCellStyle3.Format = "N0"; - dataGridViewCellStyle3.NullValue = null; - this.Column6.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle9.Format = "N0"; + dataGridViewCellStyle9.NullValue = null; + this.Column6.DefaultCellStyle = dataGridViewCellStyle9; this.Column6.HeaderText = "단가"; this.Column6.Name = "Column6"; this.Column6.Width = 70; // // Column7 // - dataGridViewCellStyle4.Format = "N0"; - dataGridViewCellStyle4.NullValue = null; - this.Column7.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle10.Format = "N0"; + dataGridViewCellStyle10.NullValue = null; + this.Column7.DefaultCellStyle = dataGridViewCellStyle10; this.Column7.HeaderText = "합계"; this.Column7.Name = "Column7"; this.Column7.Width = 80; @@ -416,7 +416,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(14, 17); + this.label7.Location = new System.Drawing.Point(14, 13); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(29, 12); this.label7.TabIndex = 1; @@ -449,7 +449,7 @@ // this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(50, 13); + this.comboBox1.Location = new System.Drawing.Point(50, 9); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(83, 20); this.comboBox1.TabIndex = 2; @@ -460,14 +460,14 @@ this.dataGridView2.AllowUserToAddRows = false; this.dataGridView2.AllowUserToDeleteRows = false; this.dataGridView2.BackgroundColor = System.Drawing.SystemColors.Control; - 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; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column11, this.Column12, @@ -489,10 +489,83 @@ this.dataGridView2.TabIndex = 29; this.dataGridView2.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView2_CellClick); // + // Column11 + // + this.Column11.HeaderText = "목록일자"; + this.Column11.Name = "Column11"; + this.Column11.Width = 80; + // + // Column12 + // + this.Column12.HeaderText = "거래처명"; + this.Column12.Name = "Column12"; + this.Column12.Width = 180; + // + // Column13 + // + this.Column13.HeaderText = "납품목록"; + this.Column13.Name = "Column13"; + this.Column13.Width = 180; + // + // Column14 + // + this.Column14.HeaderText = "담당자"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "목록번호"; + this.Column15.Name = "Column15"; + this.Column15.Resizable = System.Windows.Forms.DataGridViewTriState.True; + // + // Column16 + // + this.Column16.HeaderText = "수량"; + this.Column16.Name = "Column16"; + this.Column16.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.Column16.Width = 50; + // + // Column17 + // + dataGridViewCellStyle12.Format = "N0"; + dataGridViewCellStyle12.NullValue = null; + this.Column17.DefaultCellStyle = dataGridViewCellStyle12; + this.Column17.HeaderText = "합계"; + this.Column17.Name = "Column17"; + // + // Column18 + // + this.Column18.HeaderText = "상태"; + this.Column18.Name = "Column18"; + this.Column18.Width = 50; + // + // Column20 + // + this.Column20.HeaderText = "ISBN조회"; + this.Column20.Name = "Column20"; + this.Column20.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.Column20.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // chk_marc + // + this.chk_marc.HeaderText = "MarcCheck"; + this.chk_marc.Name = "chk_marc"; + this.chk_marc.ReadOnly = true; + this.chk_marc.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.chk_marc.Visible = false; + // + // Del_Check + // + this.Del_Check.HeaderText = "체크"; + this.Del_Check.Name = "Del_Check"; + this.Del_Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.Del_Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.Del_Check.Width = 40; + // // 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, 12); + this.btn_morge.Location = new System.Drawing.Point(1039, 8); this.btn_morge.Name = "btn_morge"; this.btn_morge.Size = new System.Drawing.Size(62, 23); this.btn_morge.TabIndex = 28; @@ -503,7 +576,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, 12); + this.btn_Edit.Location = new System.Drawing.Point(971, 8); this.btn_Edit.Name = "btn_Edit"; this.btn_Edit.Size = new System.Drawing.Size(62, 23); this.btn_Edit.TabIndex = 28; @@ -514,7 +587,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, 12); + this.btn_Del.Location = new System.Drawing.Point(903, 8); this.btn_Del.Name = "btn_Del"; this.btn_Del.Size = new System.Drawing.Size(62, 23); this.btn_Del.TabIndex = 28; @@ -525,7 +598,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, 12); + this.btn_Complet.Location = new System.Drawing.Point(835, 8); this.btn_Complet.Name = "btn_Complet"; this.btn_Complet.Size = new System.Drawing.Size(62, 23); this.btn_Complet.TabIndex = 28; @@ -536,7 +609,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, 12); + this.btn_ing.Location = new System.Drawing.Point(767, 8); this.btn_ing.Name = "btn_ing"; this.btn_ing.Size = new System.Drawing.Size(62, 23); this.btn_ing.TabIndex = 28; @@ -547,7 +620,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, 12); + this.button7.Location = new System.Drawing.Point(699, 8); this.button7.Name = "button7"; this.button7.Size = new System.Drawing.Size(62, 23); this.button7.TabIndex = 28; @@ -557,7 +630,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, 12); + this.btn_lockup.Location = new System.Drawing.Point(631, 8); this.btn_lockup.Name = "btn_lockup"; this.btn_lockup.Size = new System.Drawing.Size(62, 23); this.btn_lockup.TabIndex = 28; @@ -567,7 +640,7 @@ // // tb_dvy2 // - this.tb_dvy2.Location = new System.Drawing.Point(189, 13); + this.tb_dvy2.Location = new System.Drawing.Point(189, 9); this.tb_dvy2.Name = "tb_dvy2"; this.tb_dvy2.Size = new System.Drawing.Size(115, 21); this.tb_dvy2.TabIndex = 8; @@ -575,7 +648,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(146, 17); + this.label8.Location = new System.Drawing.Point(146, 13); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(41, 12); this.label8.TabIndex = 7; @@ -584,7 +657,7 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(314, 17); + this.label12.Location = new System.Drawing.Point(314, 13); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(41, 12); this.label12.TabIndex = 9; @@ -592,7 +665,7 @@ // // tb_clt2 // - this.tb_clt2.Location = new System.Drawing.Point(356, 13); + this.tb_clt2.Location = new System.Drawing.Point(356, 9); this.tb_clt2.Name = "tb_clt2"; this.tb_clt2.Size = new System.Drawing.Size(115, 21); this.tb_clt2.TabIndex = 10; @@ -600,7 +673,7 @@ // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(484, 17); + this.label13.Location = new System.Drawing.Point(484, 13); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(41, 12); this.label13.TabIndex = 11; @@ -608,7 +681,7 @@ // // tb_user2 // - this.tb_user2.Location = new System.Drawing.Point(527, 13); + this.tb_user2.Location = new System.Drawing.Point(527, 9); this.tb_user2.Name = "tb_user2"; this.tb_user2.Size = new System.Drawing.Size(98, 21); this.tb_user2.TabIndex = 12; @@ -699,79 +772,6 @@ this.label14.TabIndex = 22; this.label14.Text = "작업\n대상"; // - // Column11 - // - this.Column11.HeaderText = "목록일자"; - this.Column11.Name = "Column11"; - this.Column11.Width = 80; - // - // Column12 - // - this.Column12.HeaderText = "거래처명"; - this.Column12.Name = "Column12"; - this.Column12.Width = 180; - // - // Column13 - // - this.Column13.HeaderText = "납품목록"; - this.Column13.Name = "Column13"; - this.Column13.Width = 180; - // - // Column14 - // - this.Column14.HeaderText = "담당자"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "목록번호"; - this.Column15.Name = "Column15"; - this.Column15.Resizable = System.Windows.Forms.DataGridViewTriState.True; - // - // Column16 - // - this.Column16.HeaderText = "수량"; - this.Column16.Name = "Column16"; - this.Column16.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.Column16.Width = 50; - // - // Column17 - // - dataGridViewCellStyle6.Format = "N0"; - dataGridViewCellStyle6.NullValue = null; - this.Column17.DefaultCellStyle = dataGridViewCellStyle6; - this.Column17.HeaderText = "합계"; - this.Column17.Name = "Column17"; - // - // Column18 - // - this.Column18.HeaderText = "상태"; - this.Column18.Name = "Column18"; - this.Column18.Width = 50; - // - // Column20 - // - this.Column20.HeaderText = "ISBN조회"; - this.Column20.Name = "Column20"; - this.Column20.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.Column20.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // chk_marc - // - this.chk_marc.HeaderText = "MarcCheck"; - this.chk_marc.Name = "chk_marc"; - this.chk_marc.ReadOnly = true; - this.chk_marc.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.chk_marc.Visible = false; - // - // Del_Check - // - this.Del_Check.HeaderText = "체크"; - this.Del_Check.Name = "Del_Check"; - this.Del_Check.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.Del_Check.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.Del_Check.Width = 40; - // // Commodity_registration // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.resx b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.resx index 484535d..32956c3 100644 --- a/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.resx +++ b/unimarc/WindowsFormsApp1/납품관리/Commodity_registration.resx @@ -190,6 +190,9 @@ True - 17, 17 + 5, 4 + + + 32 \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN.Designer.cs b/unimarc/WindowsFormsApp1/마크/Check_ISBN.Designer.cs index 1dc3135..7c64348 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN.Designer.cs +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN.Designer.cs @@ -41,11 +41,15 @@ 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.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.search_book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.search_author = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.search_book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.unit = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.total = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -57,7 +61,6 @@ this.category = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.sold_out = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.api_data = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // @@ -78,8 +81,11 @@ this.num, this.isbn, this.book_name, + this.search_book_name, this.author, + this.search_author, this.book_comp, + this.search_book_comp, this.count, this.unit, this.total, @@ -91,8 +97,8 @@ this.category, this.sold_out, this.api_data}); - this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; - this.dataGridView1.Location = new System.Drawing.Point(12, 55); + 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; @@ -106,14 +112,15 @@ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1309, 433); + this.dataGridView1.Size = new System.Drawing.Size(1615, 547); 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); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // // btn_lookup // - this.btn_lookup.Location = new System.Drawing.Point(719, 15); + 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; @@ -125,15 +132,15 @@ // this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_filter.FormattingEnabled = true; - this.cb_filter.Location = new System.Drawing.Point(554, 16); + this.cb_filter.Location = new System.Drawing.Point(516, 8); this.cb_filter.Name = "cb_filter"; - this.cb_filter.Size = new System.Drawing.Size(121, 20); + 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, 20); + 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; @@ -142,7 +149,7 @@ // tb_list_name // this.tb_list_name.Enabled = false; - this.tb_list_name.Location = new System.Drawing.Point(59, 16); + 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; @@ -150,7 +157,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(495, 20); + 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; @@ -158,7 +165,7 @@ // // btn_Save // - this.btn_Save.Location = new System.Drawing.Point(829, 15); + 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; @@ -168,7 +175,7 @@ // // btn_Close // - this.btn_Close.Location = new System.Drawing.Point(939, 15); + 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; @@ -179,7 +186,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(297, 20); + 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; @@ -189,12 +196,19 @@ // this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_api.FormattingEnabled = true; - this.cb_api.Location = new System.Drawing.Point(356, 16); + this.cb_api.Location = new System.Drawing.Point(337, 8); this.cb_api.Name = "cb_api"; - this.cb_api.Size = new System.Drawing.Size(121, 20); + 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; + // // num // this.num.HeaderText = "번호"; @@ -212,16 +226,31 @@ this.book_name.Name = "book_name"; this.book_name.Width = 130; // + // search_book_name + // + this.search_book_name.HeaderText = "검색 도서명"; + this.search_book_name.Name = "search_book_name"; + // // author // this.author.HeaderText = "저자"; this.author.Name = "author"; // + // search_author + // + this.search_author.HeaderText = "검색 저자"; + this.search_author.Name = "search_author"; + // // book_comp // this.book_comp.HeaderText = "출판사"; this.book_comp.Name = "book_comp"; // + // search_book_comp + // + this.search_book_comp.HeaderText = "검색 출판사"; + this.search_book_comp.Name = "search_book_comp"; + // // count // this.count.HeaderText = "수량"; @@ -283,18 +312,11 @@ this.api_data.Name = "api_data"; this.api_data.Visible = false; // - // progressBar1 - // - this.progressBar1.Location = new System.Drawing.Point(1070, 15); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(219, 23); - this.progressBar1.TabIndex = 7; - // // Check_ISBN // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1333, 594); + this.ClientSize = new System.Drawing.Size(1639, 594); this.Controls.Add(this.progressBar1); this.Controls.Add(this.cb_api); this.Controls.Add(this.label3); @@ -308,6 +330,7 @@ this.Controls.Add(this.dataGridView1); this.Name = "Check_ISBN"; this.Text = "Check_ISBN"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Check_ISBN_FormClosing); this.Load += new System.EventHandler(this.Check_ISBN_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.ResumeLayout(false); @@ -325,11 +348,16 @@ private System.Windows.Forms.Button btn_Close; private System.Windows.Forms.Label label3; private System.Windows.Forms.ComboBox cb_api; + private System.Windows.Forms.ProgressBar progressBar1; + public System.Windows.Forms.DataGridView dataGridView1; private System.Windows.Forms.DataGridViewTextBoxColumn num; private System.Windows.Forms.DataGridViewTextBoxColumn isbn; private System.Windows.Forms.DataGridViewTextBoxColumn book_name; + private System.Windows.Forms.DataGridViewTextBoxColumn search_book_name; private System.Windows.Forms.DataGridViewTextBoxColumn author; + private System.Windows.Forms.DataGridViewTextBoxColumn search_author; private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; + private System.Windows.Forms.DataGridViewTextBoxColumn search_book_comp; private System.Windows.Forms.DataGridViewTextBoxColumn count; private System.Windows.Forms.DataGridViewTextBoxColumn unit; private System.Windows.Forms.DataGridViewTextBoxColumn total; @@ -341,7 +369,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn category; private System.Windows.Forms.DataGridViewTextBoxColumn sold_out; private System.Windows.Forms.DataGridViewTextBoxColumn api_data; - private System.Windows.Forms.ProgressBar progressBar1; - public System.Windows.Forms.DataGridView dataGridView1; } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs b/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs index 5359aac..6d7ddd6 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN.cs @@ -16,17 +16,13 @@ namespace WindowsFormsApp1.Mac { public partial class Check_ISBN : Form { - /// - /// 전체 보류. - /// 납품측 ISBN조회부터 작성할것. - /// - Main main; List_aggregation list_agg; Helper_DB db = new Helper_DB(); public string compidx; public string list_name = string.Empty; private int rowidx; + private bool save = false; public Check_ISBN(Main _main) { InitializeComponent(); @@ -57,13 +53,14 @@ namespace WindowsFormsApp1.Mac string tmp_data = db.More_DB_Search("Obj_List_Book", search_tbl, search_col,search_data); string[] data = tmp_data.Split('|'); made_Grid(data); - } private void btn_lookup_Click(object sender, EventArgs e) { if (cb_api.SelectedIndex == -1) { MessageBox.Show("조건이 선택되지 않았습니다."); return; } if (cb_filter.SelectedIndex == -1) { MessageBox.Show("조건이 선택되지 않았습니다."); return; } + clear_api(); + progressBar1.Style = ProgressBarStyle.Continuous; progressBar1.Minimum = 0; progressBar1.Maximum = dataGridView1.Rows.Count; @@ -86,9 +83,21 @@ namespace WindowsFormsApp1.Mac // 총 검색 횟수, 일치, 중복 MessageBox.Show("검색이 완료되었습니다!"); + progressBar1.Value = dataGridView1.Rows.Count; dataGridView1.CurrentCell = dataGridView1.Rows[0].Cells[0]; this.ActiveControl = dataGridView1; rowidx = 0; + save = false; + } + /// + /// 불러와서 저장한 api값 초기화 + /// + void clear_api() + { + for(int a = 0; a < dataGridView1.Rows.Count; a++) + { + dataGridView1.Rows[a].Cells["api_data"].Value = ""; + } } private void Aladin_API(DataGridView gridview) { @@ -126,7 +135,6 @@ namespace WindowsFormsApp1.Mac else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray) gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty; - query = Aladin_Set_query(type, a); insert_Aladin(api.Aladin(query, type, param), a); } @@ -171,7 +179,6 @@ namespace WindowsFormsApp1.Mac else if (gridview.Rows[a].DefaultCellStyle.BackColor == Color.LightGray) gridview.Rows[a].DefaultCellStyle.BackColor = Color.Empty; - #region 필터적용 switch (cb_filter.SelectedIndex) { @@ -270,7 +277,7 @@ namespace WindowsFormsApp1.Mac dataGridView1.Rows[row].Selected = true; if (data.Length > 0) { - dataGridView1.Rows[row].Cells["api_data"].Value.ToString(); + dataGridView1.Rows[row].Cells["api_data"].Value = data; dataGridView1.Rows[row].DefaultCellStyle.BackColor = Color.LightGray; } string[] insert = data.Split('|'); @@ -335,7 +342,7 @@ namespace WindowsFormsApp1.Mac else grid[7] = ""; - dataGridView1.Rows[row].Cells["Column1"].Value += string.Join("|", grid) + "|"; + dataGridView1.Rows[row].Cells["api_data"].Value += string.Join("|", grid) + "|"; dataGridView1.Rows[row].DefaultCellStyle.BackColor = Color.LightGray; } #endregion @@ -345,8 +352,15 @@ namespace WindowsFormsApp1.Mac if (row > 0) dataGridView1.Rows[row - 1].Selected = false; dataGridView1.Rows[row].Selected = true; - - string newstring = DateTime.ParseExact(grid[5], "yyyyMMdd", null).ToString("yyyy-MM-dd"); + string newstring = ""; + try + { + newstring = DateTime.ParseExact(grid[5], "yyyyMMdd", null).ToString("yyyy-MM-dd"); + } + catch (Exception e) + { + MessageBox.Show("[" + grid[5] + "]" + e.ToString()); + } input_api(grid, row, newstring); } @@ -377,7 +391,7 @@ namespace WindowsFormsApp1.Mac grid[5] = data[5].Substring(0, 10); grid[7] = data[6]; - dataGridView1.Rows[row].Cells["Column1"].Value += string.Join("|", grid) + "|"; + dataGridView1.Rows[row].Cells["api_data"].Value += string.Join("|", grid) + "|"; dataGridView1.Rows[row].DefaultCellStyle.BackColor = Color.LightGray; } @@ -386,8 +400,6 @@ namespace WindowsFormsApp1.Mac if (row > 0) dataGridView1.Rows[row - 1].Selected = false; dataGridView1.Rows[row].Selected = true; - bool[] chk = { false, false, false }; - // string newstring = DateTime.ParseExact(grid[5], "yyyyMMdd", null).ToString("yyyy-MM-dd"); string newstring = grid[5]; input_api(grid, row, newstring); @@ -418,6 +430,9 @@ namespace WindowsFormsApp1.Mac if (chk[0] == true && chk[1] == true && chk[2] == true) { + dataGridView1.Rows[idx].Cells["search_book_name"].Value = value[0]; + dataGridView1.Rows[idx].Cells["search_author"].Value = value[1]; + dataGridView1.Rows[idx].Cells["search_book_comp"].Value = value[2]; dataGridView1.Rows[idx].Cells["isbn"].Value = value[3]; dataGridView1.Rows[idx].Cells["price"].Value = value[4]; dataGridView1.Rows[idx].Cells["pubDate"].Value = date; @@ -433,7 +448,8 @@ namespace WindowsFormsApp1.Mac * 비고 발행일 % 도서분류 */ string[] grid = { "", "", "", "", "", "", "", "", "", "", - "", "", "", "", "" }; + "", "", "", "", "", + "", "", "" }; int sdc = 15; // search_data_count for (int a = 0; a < data.Length; a++) @@ -441,19 +457,42 @@ namespace WindowsFormsApp1.Mac if (a % sdc == 1) { grid[0] = data[a-1] + " " + data[a]; } // 번호 if (a % sdc == 2) { grid[1] = data[a]; } // isbn if (a % sdc == 3) { grid[2] = data[a]; } // 도서명 - if (a % sdc == 4) { grid[3] = data[a]; } // 저자 - if (a % sdc == 5) { grid[4] = data[a]; } // 출판사 - if (a % sdc == 6) { grid[5] = data[a]; } // 수량 - if (a % sdc == 7) { grid[6] = data[a]; } // 단가 - if (a % sdc == 8) { grid[7] = data[a]; } // 합계 - if (a % sdc == 9) { grid[8] = data[a]; } // 상태 - if (a % sdc == 10) { grid[9] = data[a]; } // 정가 - if (a % sdc == 11) { grid[10] = data[a]; } // 비고 - if (a % sdc == 12) { grid[11] = data[a]; } // 발행일 - if (a % sdc == 13) { grid[12] = data[a]; } // % - if (a % sdc == 14) { grid[13] = data[a]; // 도서분류 + if (a % sdc == 4) { grid[4] = data[a]; } // 저자 + if (a % sdc == 5) { grid[6] = data[a]; } // 출판사 + if (a % sdc == 6) { grid[8] = data[a]; } // 수량 + if (a % sdc == 7) { grid[9] = data[a]; } // 단가 + if (a % sdc == 8) { grid[10] = data[a]; } // 합계 + if (a % sdc == 9) { grid[11] = data[a]; } // 상태 + if (a % sdc == 10) { grid[12] = data[a]; } // 정가 + if (a % sdc == 11) { grid[13] = data[a]; } // 비고 + if (a % sdc == 12) { grid[14] = data[a]; } // 발행일 + if (a % sdc == 13) { grid[15] = data[a]; } // % + if (a % sdc == 14) { grid[16] = data[a]; // 도서분류 dataGridView1.Rows.Add(grid); } } + for(int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["isbn"].Value.ToString() != "") + { + if (dataGridView1.Rows[a].Cells["unit"].Value.ToString() != + dataGridView1.Rows[a].Cells["price"].Value.ToString()) { + dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Orange; + } + else { + dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Yellow; + } + } + } + Set_grid(); + } + void Set_grid() + { + for(int a = 0; a < dataGridView1.Columns.Count; a++) + { + if(dataGridView1.Columns[a].HeaderText != "ISBN13") + dataGridView1.Columns[a].ReadOnly = true; + + } } private void btn_Save_Click(object sender, EventArgs e) { @@ -474,6 +513,8 @@ namespace WindowsFormsApp1.Mac list_name }; db.More_Update("Obj_List_Book", Edit_tbl, Edit_Col, Search_tbl, Search_col); } + MessageBox.Show("저장되었습니다!"); + save = true; } private void btn_Close_Click(object sender, EventArgs e) { @@ -481,6 +522,7 @@ namespace WindowsFormsApp1.Mac } private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { + if (rowidx > dataGridView1.Rows.Count) return; if (dataGridView1.Rows[rowidx].Cells["api_data"].Value == null || dataGridView1.Rows[rowidx].Cells["api_data"].Value.ToString() == "") { return; @@ -524,5 +566,17 @@ namespace WindowsFormsApp1.Mac cb_filter.Items.AddRange(daum); } } + private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e) + { + rowidx = e.RowIndex; + } + private void Check_ISBN_FormClosing(object sender, FormClosingEventArgs e) + { + if (!save) { + if (MessageBox.Show("데이터가 저장되지않았습니다!\n종료하시겠습니까?", "Warning!", MessageBoxButtons.YesNo) == DialogResult.No) { + e.Cancel = true; + } + } + } } } \ No newline at end of file diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN.resx b/unimarc/WindowsFormsApp1/마크/Check_ISBN.resx index f4993f0..0bcce43 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN.resx +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN.resx @@ -126,12 +126,21 @@ True + + True + True + + True + True + + True + True diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.Designer.cs b/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.Designer.cs index 5c1d7fe..ef29de4 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.Designer.cs +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.Designer.cs @@ -181,17 +181,18 @@ namespace WindowsFormsApp1.마크 this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.dataGridView1.Size = new System.Drawing.Size(834, 361); + this.dataGridView1.Size = new System.Drawing.Size(964, 361); this.dataGridView1.TabIndex = 19; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); + this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // // book_name // this.book_name.HeaderText = "도서명"; this.book_name.Name = "book_name"; - this.book_name.Width = 200; + this.book_name.Width = 300; // // author // @@ -207,7 +208,6 @@ namespace WindowsFormsApp1.마크 // this.isbn.HeaderText = "ISBN"; this.isbn.Name = "isbn"; - this.isbn.Width = 70; // // price // @@ -242,7 +242,7 @@ namespace WindowsFormsApp1.마크 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(834, 412); + this.ClientSize = new System.Drawing.Size(964, 412); this.Controls.Add(this.dataGridView1); this.Controls.Add(this.btn_Close); this.Controls.Add(this.label5); diff --git a/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs b/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs index b5ef46d..15965de 100644 --- a/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs +++ b/unimarc/WindowsFormsApp1/마크/Check_ISBN_Sub.cs @@ -32,6 +32,10 @@ namespace WindowsFormsApp1.마크 { Sort_data(); same_chk(); // 비슷한거 색깔표시 + + dataGridView1.CurrentCell = dataGridView1.Rows[0].Cells[0]; + this.ActiveControl = dataGridView1; + rowidx = 0; } private void Sort_data() { @@ -39,8 +43,8 @@ namespace WindowsFormsApp1.마크 tb_author.Text = ci.dataGridView1.Rows[row].Cells["author"].Value.ToString(); tb_book_comp.Text = ci.dataGridView1.Rows[row].Cells["book_comp"].Value.ToString(); - if (ci.dataGridView1.Rows[row].Cells["price"].Value != null) - tb_price.Text = ci.dataGridView1.Rows[row].Cells["price"].Value.ToString(); + if (ci.dataGridView1.Rows[row].Cells["unit"].Value != null) + tb_price.Text = ci.dataGridView1.Rows[row].Cells["unit"].Value.ToString(); else tb_price.Text = ""; @@ -104,7 +108,7 @@ namespace WindowsFormsApp1.마크 if (ori_data[4] != "") price = Convert.ToInt32(ori_data[4]); - if (price - 5000 <= pay && pay <= price + 5000) + if (price - 500 <= pay && pay <= price + 500) dataGridView1.Rows[a].DefaultCellStyle.BackColor = Color.Yellow; else @@ -131,11 +135,11 @@ namespace WindowsFormsApp1.마크 string category = dataGridView1.Rows[rowidx].Cells["category"].Value.ToString(); string sold = dataGridView1.Rows[rowidx].Cells["sold_out"].Value.ToString(); - ci.dataGridView1.Rows[row].Cells["book_name"].Value = book_name; - ci.dataGridView1.Rows[row].Cells["author"].Value = author; - ci.dataGridView1.Rows[row].Cells["book_comp"].Value = book_comp; + ci.dataGridView1.Rows[row].Cells["search_book_name"].Value = book_name; + ci.dataGridView1.Rows[row].Cells["search_author"].Value = author; + ci.dataGridView1.Rows[row].Cells["search_book_comp"].Value = book_comp; ci.dataGridView1.Rows[row].Cells["isbn"].Value = isbn; - ci.dataGridView1.Rows[row].Cells["price2"].Value = price; + ci.dataGridView1.Rows[row].Cells["price"].Value = price; ci.dataGridView1.Rows[row].Cells["pubDate"].Value = Date; ci.dataGridView1.Rows[row].Cells["category"].Value = category; ci.dataGridView1.Rows[row].Cells["sold_out"].Value = sold; @@ -165,5 +169,10 @@ namespace WindowsFormsApp1.마크 this.Close(); } } + private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } } }