Gloria/Unimarc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

=====* UniMarc [0.0167] 버전 업데이트 내용 *=====

Browse Source 
** ERP 작업 전면 중단 (마크우선) **

1. 업데이트가 누락되는 버그가 틈틈히 발생하여, 해결하기 위해 설치 프로그램을 새로 배포함.

2. 실행파일을 메모장으로 열 경우, 서버접속 정보가 노출되던 사항 수정.

3. 목록DB 인덱스 최대한 활용하여 속도 개선작업중
This commit is contained in:
SeungHo Yang
2022-10-07 18:32:25 +09:00
parent 6be6e8d8d3
commit 707070f751
40 changed files with 379 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
unimarc/.vs/unimarc/FileContentIndex/27c84db3-3024-4e40-94fb-6ea1fda488d5.vsidx Normal file
View File

Binary file not shown.

BIN
unimarc/.vs/unimarc/FileContentIndex/336dff4a-a5dc-4e62-af8b-908f8abdf796.vsidx
View File

Binary file not shown.

BIN
unimarc/.vs/unimarc/FileContentIndex/48e3c305-229a-4af0-85d5-6d0837295a3b.vsidx Normal file
View File

Binary file not shown.

BIN
unimarc/.vs/unimarc/FileContentIndex/4c9cd9ca-407b-458a-ad49-31f17e749efe.vsidx Normal file
View File

Binary file not shown.

BIN
unimarc/.vs/unimarc/FileContentIndex/97e578d3-855e-4ecd-98f9-9fc61ddee57b.vsidx
View File

Binary file not shown.

BIN
unimarc/.vs/unimarc/FileContentIndex/0ee88110-fda0-4351-a63c-a59ad95eebd0.vsidx → unimarc/.vs/unimarc/FileContentIndex/d31c0a11-9cc3-43a6-a954-3b626a5d74d9.vsidx
View File

Binary file not shown.

BIN
unimarc/.vs/unimarc/FileContentIndex/e3185dd4-107c-45df-8481-4ea61fde1044.vsidx
View File

Binary file not shown.

BIN
unimarc/.vs/unimarc/v17/.suo
View File

Binary file not shown.

BIN
unimarc/UniMarcSetup/Debug/UniMarcSetup.msi
View File

Binary file not shown.

38
unimarc/UniMarcSetup/UniMarcSetup.vdproj
View File

@@ -27,14 +27,14 @@
}
"Entry"
{
"MsmKey" = "8:_DB613D3560F844F89E088F109623E80F"
"MsmKey" = "8:_F9161DD480D9480B9BA0326B45F68C44"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_DB613D3560F844F89E088F109623E80F"
"OwnerKey" = "8:_F9161DD480D9480B9BA0326B45F68C44"
"MsmSig" = "8:_UNDEFINED"
}
}
@@ -55,6 +55,14 @@
"PrivateKeyFile" = "8:"
"TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2"
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
{
"Enabled" = "11:TRUE"
"PromptEnabled" = "11:TRUE"
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
}
}
"Release"
{
@@ -71,6 +79,14 @@
"PrivateKeyFile" = "8:"
"TimeStampServer" = "8:"
"InstallerBootstrapper" = "3:2"
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
{
"Enabled" = "11:TRUE"
"PromptEnabled" = "11:TRUE"
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
}
}
}
"Deployable"
@@ -205,12 +221,12 @@
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.0"
"Manufacturer" = "8:Microsoft Corporation"
"Manufacturer" = "8:GloriaBook"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:UniMarcSetup"
"Subject" = "8:"
"ARPCONTACT" = "8:Microsoft Corporation"
"ARPCONTACT" = "8:GloriaBook"
"Keywords" = "8:"
"ARPCOMMENTS" = "8:"
"ARPURLINFOABOUT" = "8:"
@@ -317,7 +333,7 @@
}
"Shortcut"
{
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_241AF677901B496384371820B6FFF937"
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_4DA41A228EA24F96A54F44E174D06DE7"
{
"Name" = "8:UniMarc"
"Arguments" = "8:"
@@ -325,13 +341,13 @@
"ShowCmd" = "3:1"
"IconIndex" = "3:0"
"Transitive" = "11:FALSE"
"Target" = "8:_DB613D3560F844F89E088F109623E80F"
"Folder" = "8:_7289ABD2FB4B45B68B477B86A524EE33"
"Target" = "8:_F9161DD480D9480B9BA0326B45F68C44"
"Folder" = "8:_3D727FC4A8BB41DABE294210589BB7CD"
"WorkingFolder" = "8:_A364675CFF7847C09ACEC7EAA54B96DD"
"Icon" = "8:_30910C6D846D44E6AE488D5CFB73A8E8"
"Feature" = "8:"
}
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_55E2D093148047B69FD538E883FBE888"
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_DA34256B50134030A88EDD7E7634D3D5"
{
"Name" = "8:UniMarc"
"Arguments" = "8:"
@@ -339,8 +355,8 @@
"ShowCmd" = "3:1"
"IconIndex" = "3:0"
"Transitive" = "11:FALSE"
"Target" = "8:_DB613D3560F844F89E088F109623E80F"
"Folder" = "8:_3D727FC4A8BB41DABE294210589BB7CD"
"Target" = "8:_F9161DD480D9480B9BA0326B45F68C44"
"Folder" = "8:_7289ABD2FB4B45B68B477B86A524EE33"
"WorkingFolder" = "8:_A364675CFF7847C09ACEC7EAA54B96DD"
"Icon" = "8:_30910C6D846D44E6AE488D5CFB73A8E8"
"Feature" = "8:"
@@ -744,7 +760,7 @@
}
"ProjectOutput"
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_DB613D3560F844F89E088F109623E80F"
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F9161DD480D9480B9BA0326B45F68C44"
{
"SourcePath" = "8:..\\Factory_Client\\obj\\Debug\\Factory_Client.exe"
"TargetName" = "8:"

14
unimarc/unimarc/App.config
View File

@@ -34,25 +34,25 @@
<value />
</setting>
<setting name="IP" serializeAs="String">
<value>1.215.250.130</value>
<value>1.11010111.11111010.10000010</value>
</setting>
<setting name="Port" serializeAs="String">
<value>815</value>
<value>1100101111</value>
</setting>
<setting name="Uid" serializeAs="String">
<value>gloriabook</value>
<value>103.108.111.114.105.97.98.111.111.107</value>
</setting>
<setting name="pwd" serializeAs="String">
<value>admin@!@#$</value>
<value>97.100.109.105.110.64.33.64.35.36</value>
</setting>
<setting name="dbPort" serializeAs="String">
<value>3306</value>
<value>110011101010</value>
</setting>
<setting name="dbUid" serializeAs="String">
<value>root</value>
<value>114.111.111.116</value>
</setting>
<setting name="dbPwd" serializeAs="String">
<value>Admin21234</value>
<value>65.100.109.105.110.50.49.50.51.52</value>
</setting>
</UniMarc.Properties.Settings>
</userSettings>

9
unimarc/unimarc/Helper_DB.cs
View File

@@ -406,9 +406,10 @@ namespace WindowsFormsApp1
/// </summary>
/// <param name="Search_Data">검색할 회사 명</param>
/// <returns></returns>
public bool chk_comp(string Search_Data)
public string chk_comp(string CompName)
{
string cmd = "SELECT `comp_name` FROM `Comp`;";
string cmd = "SELECT `idx` FROM `Comp`;";
string result = "";
// DB연결
conn.Open();
// 쿼리 맵핑
@@ -422,11 +423,11 @@ namespace WindowsFormsApp1
{
for (int cout = 0; cout < sd.FieldCount; cout++)
{
if(sd[cout].ToString() == Search_Data) { conn.Close(); return false; }
result = sd[cout].ToString();
}
}
conn.Close();
return true;
return result;
}
/// <summary>
/// SQL문을 직접 만들어서 작성하여 사용해야함. (단, DELETE문/UPDATE문은 사용하지말 것!)

40
unimarc/unimarc/Login.cs
View File

@@ -10,13 +10,14 @@ using System.Windows.Forms;
using System.IO;
using System.Net;
using System.Net.Sockets;
using Microsoft.VisualBasic;
using Application = System.Windows.Forms.Application;
namespace WindowsFormsApp1
{
public partial class login : Form
{
Helper_DB db = new Helper_DB();
IP ip = new IP();
public login()
{
InitializeComponent();
@@ -24,7 +25,7 @@ namespace WindowsFormsApp1
private void login_Load(object sender, EventArgs e)
{
lbl_IP.Text = String.Format("{0}", GetIP);
lbl_IP.Text = String.Format("{0}", ip.GetIP);
this.ActiveControl = ID_text;
@@ -32,7 +33,6 @@ namespace WindowsFormsApp1
chk_Save.Checked = true;
ReadFile();
}
db.DBcon();
}
@@ -103,40 +103,6 @@ namespace WindowsFormsApp1
return false;
}
/// <summary>
/// 현 PC의 외부아이피를 가져옴
/// 프로그램에서 가져올 방법이 딱히 없어 꼼수로 웹사이트 크롤링을 통해 가져옴
/// </summary>
public static string GetIP
{
get
{
string externalIp = new WebClient().DownloadString("http://ipinfo.io/ip").Trim(); // http://icanhazip.com
if (string.IsNullOrWhiteSpace(externalIp))
externalIp = GetIP;
return externalIp;
// string url = "http://checkip.dyndns.org/";
// HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
// request.Method = "GET";
//
// string resResult = string.Empty;
// using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
// {
// StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8, true);
// resResult = reader.ReadToEnd();
// }
// string realip = Parsing(Parsing(resResult, "Current IP Address:")[1], "</body>")[0].Trim();
// return realip;
}
}
static string[] Parsing(string _body, string _parseString)
{
return System.Text.RegularExpressions.Regex.Split(_body, _parseString);
}
#endregion
#region AutoLogin

6
unimarc/unimarc/Main.cs
View File

@@ -76,10 +76,10 @@ namespace WindowsFormsApp1
// if (com_idx != "1")
// {
납품관리ToolStripMenuItem.Visible = false;
회계ToolStripMenuItem.Visible = false;
납품관리ToolStripMenuItem.Visible = false;
회계ToolStripMenuItem.Visible = false;
// }
if (result[4] != "테스트용") { 마스터ToolStripMenuItem.Visible = false; }
if (result[5] != "관리자") { 마스터ToolStripMenuItem.Visible = false; }
Settings.Default.compidx = com_idx;
Settings.Default.User = botUserLabel.Text;

46
unimarc/unimarc/Program.cs
View File

@@ -16,8 +16,54 @@ namespace WindowsFormsApp1
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
DB_InitSetting();
Application.Run(new Main());
}
static void DB_InitSetting()
{
UniMarc.Properties.Settings.Default.IP = ConvertIP(UniMarc.Properties.Settings.Default.IP);
UniMarc.Properties.Settings.Default.Port = Convert2to10(UniMarc.Properties.Settings.Default.Port);
UniMarc.Properties.Settings.Default.Uid = ConvertAscii(UniMarc.Properties.Settings.Default.Uid);
UniMarc.Properties.Settings.Default.pwd = ConvertAscii(UniMarc.Properties.Settings.Default.pwd);
UniMarc.Properties.Settings.Default.dbPort = Convert2to10(UniMarc.Properties.Settings.Default.dbPort);
UniMarc.Properties.Settings.Default.dbUid = ConvertAscii(UniMarc.Properties.Settings.Default.dbUid);
UniMarc.Properties.Settings.Default.dbPwd = ConvertAscii(UniMarc.Properties.Settings.Default.dbPwd);
}
public static string ConvertIP(string TargetIP)
{
string[] IpSplit = TargetIP.Split('.');
int[] TenIP = new int[IpSplit.Length];
for (int a = 0; a < IpSplit.Length; a++)
{
TenIP[a] = Convert.ToInt32(IpSplit[a], 2);
}
return String.Join(".", TenIP);
}
#region 2진수를 10진수로 바꾸는 함수 서브
public static int Convert2to10(int Target)
{
return Convert.ToInt32(Target.ToString(), 2);
}
public static string Convert2to10(string Target)
{
return Convert.ToInt32(Target, 2).ToString();
}
#endregion
public static string ConvertAscii(string Target)
{
string[] TargetSplit = Target.Split('.');
string result = "";
foreach (string s in TargetSplit)
{
result += Convert.ToChar(Convert.ToInt32(s));
}
return result;
}
}
}

14
unimarc/unimarc/Properties/Settings.Designer.cs generated
View File

@@ -49,7 +49,7 @@ namespace UniMarc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("1.215.250.130")]
[global::System.Configuration.DefaultSettingValueAttribute("1.11010111.11111010.10000010")]
public string IP {
get {
return ((string)(this["IP"]));
@@ -61,7 +61,7 @@ namespace UniMarc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("815")]
[global::System.Configuration.DefaultSettingValueAttribute("1100101111")]
public int Port {
get {
return ((int)(this["Port"]));
@@ -73,7 +73,7 @@ namespace UniMarc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("gloriabook")]
[global::System.Configuration.DefaultSettingValueAttribute("103.108.111.114.105.97.98.111.111.107")]
public string Uid {
get {
return ((string)(this["Uid"]));
@@ -85,7 +85,7 @@ namespace UniMarc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("admin@!@#$")]
[global::System.Configuration.DefaultSettingValueAttribute("97.100.109.105.110.64.33.64.35.36")]
public string pwd {
get {
return ((string)(this["pwd"]));
@@ -97,7 +97,7 @@ namespace UniMarc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("3306")]
[global::System.Configuration.DefaultSettingValueAttribute("110011101010")]
public string dbPort {
get {
return ((string)(this["dbPort"]));
@@ -109,7 +109,7 @@ namespace UniMarc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("root")]
[global::System.Configuration.DefaultSettingValueAttribute("114.111.111.116")]
public string dbUid {
get {
return ((string)(this["dbUid"]));
@@ -121,7 +121,7 @@ namespace UniMarc.Properties {
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Admin21234")]
[global::System.Configuration.DefaultSettingValueAttribute("65.100.109.105.110.50.49.50.51.52")]
public string dbPwd {
get {
return ((string)(this["dbPwd"]));

14
unimarc/unimarc/Properties/Settings.settings
View File

@@ -9,25 +9,25 @@
<Value Profile="(Default)" />
</Setting>
<Setting Name="IP" Type="System.String" Scope="User">
<Value Profile="(Default)">1.215.250.130</Value>
<Value Profile="(Default)">1.11010111.11111010.10000010</Value>
</Setting>
<Setting Name="Port" Type="System.Int32" Scope="User">
<Value Profile="(Default)">815</Value>
<Value Profile="(Default)">1100101111</Value>
</Setting>
<Setting Name="Uid" Type="System.String" Scope="User">
<Value Profile="(Default)">gloriabook</Value>
<Value Profile="(Default)">103.108.111.114.105.97.98.111.111.107</Value>
</Setting>
<Setting Name="pwd" Type="System.String" Scope="User">
<Value Profile="(Default)">admin@!@#$</Value>
<Value Profile="(Default)">97.100.109.105.110.64.33.64.35.36</Value>
</Setting>
<Setting Name="dbPort" Type="System.String" Scope="User">
<Value Profile="(Default)">3306</Value>
<Value Profile="(Default)">110011101010</Value>
</Setting>
<Setting Name="dbUid" Type="System.String" Scope="User">
<Value Profile="(Default)">root</Value>
<Value Profile="(Default)">114.111.111.116</Value>
</Setting>
<Setting Name="dbPwd" Type="System.String" Scope="User">
<Value Profile="(Default)">Admin21234</Value>
<Value Profile="(Default)">65.100.109.105.110.50.49.50.51.52</Value>
</Setting>
</Settings>
</SettingsFile>

41
unimarc/unimarc/Skill.cs
View File

@@ -24,28 +24,6 @@ using System.Threading;
namespace WindowsFormsApp1
{
#region TestComparer
public class DGVComparer : System.Collections.IComparer
{
public int Compare(object x, object y)
{
DataGridViewRow row1 = (DataGridViewRow)x;
DataGridViewRow row2 = (DataGridViewRow)y;
int compareResult = string.Compare(
(string)row1.Cells[0].Value,
(string)row2.Cells[0].Value);
if (compareResult == 0)
compareResult = ((int)row1.Cells[1].Value).CompareTo((int)row2.Cells[1].Value);
return compareResult;
}
}
#endregion
/// <summary>
/// 여러 기능들이 추가될 예정.
/// Excel_to_DataGridView
@@ -2662,4 +2640,23 @@ namespace WindowsFormsApp1
return hi;
}
}
public class IP
{
/// <summary>
/// 현 PC의 외부아이피를 가져옴
/// 프로그램에서 가져올 방법이 딱히 없어 꼼수로 웹사이트 크롤링을 통해 가져옴
/// </summary>
public string GetIP
{
get
{
string externalIp = new WebClient().DownloadString("http://ipinfo.io/ip").Trim(); // http://icanhazip.com
if (string.IsNullOrWhiteSpace(externalIp))
externalIp = GetIP;
return externalIp;
}
}
}
}

BIN
unimarc/unimarc/bin/Debug/UniMarc.exe
View File

Binary file not shown.

14
unimarc/unimarc/bin/Debug/UniMarc.exe.config
View File

@@ -34,25 +34,25 @@
<value />
</setting>
<setting name="IP" serializeAs="String">
<value>1.215.250.130</value>
<value>1.11010111.11111010.10000010</value>
</setting>
<setting name="Port" serializeAs="String">
<value>815</value>
<value>1100101111</value>
</setting>
<setting name="Uid" serializeAs="String">
<value>gloriabook</value>
<value>103.108.111.114.105.97.98.111.111.107</value>
</setting>
<setting name="pwd" serializeAs="String">
<value>admin@!@#$</value>
<value>97.100.109.105.110.64.33.64.35.36</value>
</setting>
<setting name="dbPort" serializeAs="String">
<value>3306</value>
<value>110011101010</value>
</setting>
<setting name="dbUid" serializeAs="String">
<value>root</value>
<value>114.111.111.116</value>
</setting>
<setting name="dbPwd" serializeAs="String">
<value>Admin21234</value>
<value>65.100.109.105.110.50.49.50.51.52</value>
</setting>
</UniMarc.Properties.Settings>
</userSettings>

BIN
unimarc/unimarc/bin/Debug/UniMarc.pdb
View File

Binary file not shown.

BIN
unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll
View File

Binary file not shown.

BIN
unimarc/unimarc/obj/Debug/TempPE/Connected Services.BaroService_API.Reference.cs.dll
View File

Binary file not shown.

BIN
unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
unimarc/unimarc/obj/Debug/UniMarc.exe
View File

Binary file not shown.

BIN
unimarc/unimarc/obj/Debug/UniMarc.pdb
View File

Binary file not shown.

BIN
unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll
View File

Binary file not shown.

9
unimarc/unimarc/납품관리/Order_input_Search.Designer.cs generated
View File

@@ -30,6 +30,7 @@
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.charge = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.date = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -52,6 +53,7 @@
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.idx,
this.list_name,
this.charge,
this.date,
@@ -69,6 +71,12 @@
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
//
// idx
//
this.idx.HeaderText = "idx";
this.idx.Name = "idx";
this.idx.Visible = false;
//
// list_name
//
this.list_name.HeaderText = "목록";
@@ -107,6 +115,7 @@
#endregion
private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.DataGridViewTextBoxColumn idx;
private System.Windows.Forms.DataGridViewTextBoxColumn list_name;
private System.Windows.Forms.DataGridViewTextBoxColumn charge;
private System.Windows.Forms.DataGridViewTextBoxColumn date;

16
unimarc/unimarc/납품관리/Order_input_Search.cs
View File

@@ -65,7 +65,7 @@ namespace WindowsFormsApp1.Delivery
if (Where_Open == "book_list")
{
string table = "Obj_List";
string Area = "`list_name`, `charge`, `date`, `date_res`";
string Area = "`idx`, `list_name`, `charge`, `date`, `date_res`";
cmd = string.Format("SELECT {0} FROM {1} WHERE `comp_num` = {2} AND `state` = \"진행\"", Area, table, compidx);
if (searchText != "")
{
@@ -102,13 +102,14 @@ namespace WindowsFormsApp1.Delivery
{
string[] data = strValue.Split('|');
dataGridView1.Rows.Clear();
string[] res = { "", "", "", "" };
string[] res = { "", "", "", "", "" };
for (int a = 0; a < data.Length; 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 (a % 5 == 0) { res[0] = data[a]; }
if (a % 5 == 1) { res[1] = data[a]; }
if (a % 5 == 2) { res[2] = data[a]; }
if (a % 5 == 3) { res[3] = data[a]; }
if (a % 5 == 4) { res[3] = data[a];
if (res[0].Contains(searchText))
dataGridView1.Rows.Add(res);
}
@@ -148,8 +149,9 @@ namespace WindowsFormsApp1.Delivery
}
else if (isbn != null) {
string listName = dataGridView1.Rows[row].Cells["list_name"].Value.ToString();
string l_idx = dataGridView1.Rows[row].Cells["idx"].Value.ToString();
isbn.tb_list_name.Text = listName;
isbn.DataLoad(listName);
isbn.DataLoad(listName, l_idx);
}
Close();
}

3
unimarc/unimarc/납품관리/Order_input_Search.resx
View File

@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="idx.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="list_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>

191
unimarc/unimarc/마스터/User_manage.Designer.cs generated
View File

@@ -32,6 +32,13 @@
this.btn_save = new System.Windows.Forms.Button();
this.label11 = new System.Windows.Forms.Label();
this.panel12 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.tb_pw = new System.Windows.Forms.TextBox();
this.tb_id = new System.Windows.Forms.TextBox();
this.panel16 = new System.Windows.Forms.Panel();
this.label15 = new System.Windows.Forms.Label();
this.panel20 = new System.Windows.Forms.Panel();
this.label19 = new System.Windows.Forms.Label();
this.tb_boss = new System.Windows.Forms.TextBox();
this.tb_bank_comp = new System.Windows.Forms.TextBox();
this.tb_bank_no = new System.Windows.Forms.TextBox();
@@ -72,14 +79,12 @@
this.label13 = new System.Windows.Forms.Label();
this.panel6 = new System.Windows.Forms.Panel();
this.label6 = new System.Windows.Forms.Label();
this.tb_pw = new System.Windows.Forms.TextBox();
this.tb_id = new System.Windows.Forms.TextBox();
this.panel16 = new System.Windows.Forms.Panel();
this.label15 = new System.Windows.Forms.Label();
this.panel20 = new System.Windows.Forms.Panel();
this.label19 = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button();
this.panel7 = new System.Windows.Forms.Panel();
this.label7 = new System.Windows.Forms.Label();
this.cb_IPList = new System.Windows.Forms.ComboBox();
this.panel12.SuspendLayout();
this.panel16.SuspendLayout();
this.panel20.SuspendLayout();
this.panel2.SuspendLayout();
this.panel19.SuspendLayout();
this.panel18.SuspendLayout();
@@ -93,8 +98,7 @@
this.panel5.SuspendLayout();
this.panel14.SuspendLayout();
this.panel6.SuspendLayout();
this.panel16.SuspendLayout();
this.panel20.SuspendLayout();
this.panel7.SuspendLayout();
this.SuspendLayout();
//
// btn_close
@@ -123,13 +127,14 @@
this.label11.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label11.Location = new System.Drawing.Point(10, 9);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(139, 16);
this.label11.Size = new System.Drawing.Size(138, 16);
this.label11.TabIndex = 10;
this.label11.Text = "신규 사업자 등록";
//
// panel12
//
this.panel12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel12.Controls.Add(this.cb_IPList);
this.panel12.Controls.Add(this.button1);
this.panel12.Controls.Add(this.tb_pw);
this.panel12.Controls.Add(this.tb_id);
@@ -164,9 +169,75 @@
this.panel12.Controls.Add(this.panel6);
this.panel12.Location = new System.Drawing.Point(7, 36);
this.panel12.Name = "panel12";
this.panel12.Size = new System.Drawing.Size(475, 217);
this.panel12.Size = new System.Drawing.Size(475, 244);
this.panel12.TabIndex = 11;
//
// button1
//
this.button1.Location = new System.Drawing.Point(178, 190);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(69, 23);
this.button1.TabIndex = 5;
this.button1.Text = "중복확인";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// tb_pw
//
this.tb_pw.BackColor = System.Drawing.SystemColors.Info;
this.tb_pw.Location = new System.Drawing.Point(318, 191);
this.tb_pw.Name = "tb_pw";
this.tb_pw.PasswordChar = '*';
this.tb_pw.Size = new System.Drawing.Size(150, 21);
this.tb_pw.TabIndex = 1;
//
// tb_id
//
this.tb_id.BackColor = System.Drawing.SystemColors.Info;
this.tb_id.Location = new System.Drawing.Point(64, 191);
this.tb_id.Name = "tb_id";
this.tb_id.Size = new System.Drawing.Size(107, 21);
this.tb_id.TabIndex = 2;
this.tb_id.TextChanged += new System.EventHandler(this.tb_id_TextChanged);
//
// panel16
//
this.panel16.BackColor = System.Drawing.SystemColors.ActiveBorder;
this.panel16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel16.Controls.Add(this.label15);
this.panel16.Location = new System.Drawing.Point(-1, 188);
this.panel16.Name = "panel16";
this.panel16.Size = new System.Drawing.Size(59, 28);
this.panel16.TabIndex = 3;
//
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(6, 7);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(44, 12);
this.label15.TabIndex = 0;
this.label15.Text = "만들 ID";
//
// panel20
//
this.panel20.BackColor = System.Drawing.SystemColors.ActiveBorder;
this.panel20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel20.Controls.Add(this.label19);
this.panel20.Location = new System.Drawing.Point(252, 188);
this.panel20.Name = "panel20";
this.panel20.Size = new System.Drawing.Size(59, 28);
this.panel20.TabIndex = 4;
//
// label19
//
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(3, 7);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(51, 12);
this.label19.TabIndex = 0;
this.label19.Text = "만들 PW";
//
// tb_boss
//
this.tb_boss.Location = new System.Drawing.Point(318, 3);
@@ -516,86 +587,53 @@
this.label6.TabIndex = 0;
this.label6.Text = "전화번호";
//
// tb_pw
// panel7
//
this.tb_pw.BackColor = System.Drawing.SystemColors.Info;
this.tb_pw.Location = new System.Drawing.Point(318, 191);
this.tb_pw.Name = "tb_pw";
this.tb_pw.PasswordChar = '*';
this.tb_pw.Size = new System.Drawing.Size(150, 21);
this.tb_pw.TabIndex = 1;
this.panel7.BackColor = System.Drawing.SystemColors.ActiveBorder;
this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel7.Controls.Add(this.label7);
this.panel7.Location = new System.Drawing.Point(7, 252);
this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(59, 28);
this.panel7.TabIndex = 3;
//
// tb_id
// label7
//
this.tb_id.BackColor = System.Drawing.SystemColors.Info;
this.tb_id.Location = new System.Drawing.Point(64, 191);
this.tb_id.Name = "tb_id";
this.tb_id.Size = new System.Drawing.Size(107, 21);
this.tb_id.TabIndex = 2;
this.tb_id.TextChanged += new System.EventHandler(this.tb_id_TextChanged);
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(6, 7);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(44, 12);
this.label7.TabIndex = 0;
this.label7.Text = "허가 IP";
//
// panel16
// cb_IPList
//
this.panel16.BackColor = System.Drawing.SystemColors.ActiveBorder;
this.panel16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel16.Controls.Add(this.label15);
this.panel16.Location = new System.Drawing.Point(-1, 188);
this.panel16.Name = "panel16";
this.panel16.Size = new System.Drawing.Size(59, 28);
this.panel16.TabIndex = 3;
//
// label15
//
this.label15.AutoSize = true;
this.label15.Location = new System.Drawing.Point(6, 7);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(44, 12);
this.label15.TabIndex = 0;
this.label15.Text = "만들 ID";
//
// panel20
//
this.panel20.BackColor = System.Drawing.SystemColors.ActiveBorder;
this.panel20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel20.Controls.Add(this.label19);
this.panel20.Location = new System.Drawing.Point(252, 188);
this.panel20.Name = "panel20";
this.panel20.Size = new System.Drawing.Size(59, 28);
this.panel20.TabIndex = 4;
//
// label19
//
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(3, 7);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(51, 12);
this.label19.TabIndex = 0;
this.label19.Text = "만들 PW";
//
// button1
//
this.button1.Location = new System.Drawing.Point(178, 190);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(69, 23);
this.button1.TabIndex = 5;
this.button1.Text = "중복확인";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
this.cb_IPList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_IPList.FormattingEnabled = true;
this.cb_IPList.Location = new System.Drawing.Point(64, 218);
this.cb_IPList.Name = "cb_IPList";
this.cb_IPList.Size = new System.Drawing.Size(182, 20);
this.cb_IPList.TabIndex = 6;
//
// User_manage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(488, 260);
this.ClientSize = new System.Drawing.Size(488, 299);
this.Controls.Add(this.btn_close);
this.Controls.Add(this.btn_save);
this.Controls.Add(this.label11);
this.Controls.Add(this.panel7);
this.Controls.Add(this.panel12);
this.Name = "User_manage";
this.Text = "신규 사업자 등록";
this.Load += new System.EventHandler(this.User_manage_Load);
this.panel12.ResumeLayout(false);
this.panel12.PerformLayout();
this.panel16.ResumeLayout(false);
this.panel16.PerformLayout();
this.panel20.ResumeLayout(false);
this.panel20.PerformLayout();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panel19.ResumeLayout(false);
@@ -622,10 +660,8 @@
this.panel14.PerformLayout();
this.panel6.ResumeLayout(false);
this.panel6.PerformLayout();
this.panel16.ResumeLayout(false);
this.panel16.PerformLayout();
this.panel20.ResumeLayout(false);
this.panel20.PerformLayout();
this.panel7.ResumeLayout(false);
this.panel7.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -683,5 +719,8 @@
private System.Windows.Forms.Panel panel20;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Panel panel7;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.ComboBox cb_IPList;
}
}

23
unimarc/unimarc/마스터/User_manage.cs
View File

@@ -26,6 +26,11 @@ namespace WindowsFormsApp1
{
db.DBcon();
button1.ForeColor = Color.Red;
IP ip = new IP();
string[] IPList = { "ALL", ip.GetIP };
cb_IPList.Items.AddRange(IPList);
cb_IPList.SelectedIndex = 0;
}
private void button1_Click(object sender, EventArgs e)
@@ -89,20 +94,26 @@ namespace WindowsFormsApp1
return;
}
string[] InsertData = {
tb_sangho.Text, tb_boss.Text, tb_bubin.Text, tb_cobin.Text, tb_uptae.Text,
tb_jongmok.Text, tb_zip.Text, tb_addr.Text, tb_tel.Text, tb_fax.Text,
tb_bank_comp.Text, tb_bank_no.Text, tb_email.Text, tb_barea.Text, "외부업체"
}; // 15
string[] InsertCol = {
"comp_name", "boss", "bubin", "cobin", "uptae",
"jongmok", "zip", "addr", "tel", "fax",
"bank_comp", "bank_no", "email", "barea", "grade"
}; // 15
string[] InsertData = {
tb_sangho.Text, tb_boss.Text, tb_bubin.Text, tb_cobin.Text, tb_uptae.Text,
tb_jongmok.Text, tb_zip.Text, tb_addr.Text, tb_tel.Text, tb_fax.Text,
tb_bank_comp.Text, tb_bank_no.Text, tb_email.Text, tb_barea.Text, "외부업체"
}; // 15
db.DB_Send_CMD_reVoid(db.DB_INSERT("Comp", InsertCol, InsertData));
// IP 적용
string[] IP_Col = { "compidx", "IP" };
string[] IP_Data = { db.chk_comp(tb_sangho.Text), cb_IPList.Text };
db.DB_Send_CMD_reVoid(db.DB_INSERT("Comp_IP", IP_Col, IP_Data));
InsertAccount(tb_sangho.Text);
}

2
unimarc/unimarc/마크/AddMarc.cs
View File

@@ -217,7 +217,7 @@ namespace UniMarc.마크
MessageBox.Show("[칸채우기]가 아닌 [마크 작성] 탭에서 저장해주세요!");
return;
}
if (grade == 3)
if (grade == 3 || grade == -1)
{
MessageBox.Show("등급을 설정해주세요. (C 이상)");
return;

23
unimarc/unimarc/마크/Check_ISBN.cs
View File

@@ -91,6 +91,29 @@ namespace WindowsFormsApp1.Mac
string[] data = db_res.Split('|');
made_Grid(data);
}
public void DataLoad(string ListName, string l_idx)
{
dataGridView1.Rows.Clear();
cb_api.Items.Clear();
list_name = ListName;
string[] list_combo = { "알라딘", "네이버 (사용중단)", "다음" };
cb_api.Items.AddRange(list_combo);
db.DBcon();
string[] search_tbl = { "compidx", "l_idx" };
string[] search_col = { compidx, l_idx };
string search_data = "`idx`, `header`, `num`, `isbn_marc`, `book_name`, `author`, `book_comp`, " +
"`count`, `pay`, `total`, `import`, `price`, " +
"`etc`, `pubDate`, `persent`, `category`, `image_url`, `set_book_name`";
string cmd = db.More_DB_Search("Obj_List_Book", search_tbl, search_col, search_data);
string db_res = db.DB_Send_CMD_Search(cmd);
string[] data = db_res.Split('|');
made_Grid(data);
}
#region Load_Sub
void made_Grid(string[] data)
{

12
unimarc/unimarc/마크/Mac_List.cs
View File

@@ -269,12 +269,13 @@ namespace WindowsFormsApp1.Mac
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
if (dataGridView1.Rows[a].Cells["check"].Value.ToString() == "V") {
string l_idx = dataGridView1.Rows[a].Cells["idx"].Value.ToString();
string D_cmd = db.DB_Delete("Obj_List", "comp_num", compidx,
"idx", dataGridView1.Rows[a].Cells["idx"].Value.ToString());
"idx", l_idx);
db.DB_Send_CMD_reVoid(D_cmd);
string[] delete_tbl = { "list_name", "date" };
string[] deleteData = { dataGridView1.Rows[a].Cells["list_name"].Value.ToString(), dataGridView1.Rows[a].Cells["start_date"].Value.ToString() };
string[] delete_tbl = { "l_idx" };
string[] deleteData = { l_idx };
D_cmd = db.DB_Delete_No_Limit("Obj_List_Book", "compidx", compidx, delete_tbl, deleteData);
db.DB_Send_CMD_reVoid(D_cmd);
}
@@ -298,8 +299,9 @@ namespace WindowsFormsApp1.Mac
marc.MdiParent = main;
marc.WindowState = FormWindowState.Maximized;
marc.Show();
marc.input_list(dataGridView1.Rows[idx_row].Cells["start_date"].Value.ToString(),
dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx);
//marc.input_list(dataGridView1.Rows[idx_row].Cells["start_date"].Value.ToString(),
// dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx);
marc.input_list(dataGridView1.Rows[idx_row].Cells["idx"].Value.ToString(), dataGridView1.Rows[idx_row].Cells["list_name"].Value.ToString(), compidx);
}
if (((DataGridView)sender).Columns[idx_col].Name == "check")
{

24
unimarc/unimarc/마크/Mac_List_Add.cs
View File

@@ -85,9 +85,18 @@ namespace UniMarc.마크
string InBook_Area = "`compidx`, `list_name`, `date`, `header`, `num`, " +
"`book_name`, `author`, `book_comp`, `pay`, `count`, " +
"`total`, `isbn_marc`";
"`total`, `isbn_marc`, `l_idx`";
List<string> InBook_List = new List<string>();
int TotalCount = dataGridView1.Rows.Count;
string[] InList_Tbl = { "comp_num", "date", "list_name", "m_charge", "state", "vol", "chk_marc" };
string[] InList_Col = { compidx, Today, listName, charge, "진행", TotalCount.ToString(), "1" };
string InList_Cmd = db.DB_INSERT("Obj_List", InList_Tbl, InList_Col);
db.DB_Send_CMD_reVoid(InList_Cmd);
string InList_Idx = db.DB_Send_CMD_Search(db.More_DB_Search("Obj_List", InList_Tbl, InList_Col, "`idx`")).Replace("|", "");
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
GridNotNull(a);
@@ -108,25 +117,16 @@ namespace UniMarc.마크
string tmp = string.Format(
"(\"{0}\", \"{1}\", \"{2}\", \"{3}\", \"{4}\", " +
"\"{5}\", \"{6}\", \"{7}\", \"{8}\", \"{9}\", " +
"\"{10}\", \"{11}\")",
"\"{10}\", \"{11}\", \"{12}\")",
compidx, listName, Today, header, num,
bookname, author, bookcomp, price, count,
total, isbn );
total, isbn, InList_Idx);
InBook_List.Add(tmp);
}
int TotalCount = InBook_List.Count;
string[] InList_Tbl = { "comp_num", "date", "list_name", "m_charge", "state", "vol", "chk_marc" };
string[] InList_Col = { compidx, Today, listName, charge, "진행", TotalCount.ToString(), "1" };
string InList_Cmd = db.DB_INSERT("Obj_List", InList_Tbl, InList_Col);
string InBook_Col = string.Join(", ", InBook_List);
string InBook_Cmd = string.Format("INSERT INTO `Obj_List_Book` ({0}) VALUES {1};", InBook_Area, InBook_Col);
db.DB_Send_CMD_reVoid(InList_Cmd);
db.DB_Send_CMD_reVoid(InBook_Cmd);
MessageBox.Show("저장되었습니다!");

21
unimarc/unimarc/마크/Mac_List_Merge.cs
View File

@@ -19,6 +19,7 @@ namespace WindowsFormsApp1.마크
public string UserName = "";
public string ListState = "";
string date = DateTime.Now.ToString("yyyy-MM-dd");
public Mac_List_Merge(Mac_List _ml)
{
@@ -98,7 +99,7 @@ namespace WindowsFormsApp1.마크
void data_Insert()
{
string table = "Obj_List";
string start = DateTime.Now.ToString("yyyy-MM-dd");
string start = date;
string end = end_date.Value.ToString().Substring(0, 10);
string[] in_col = {
@@ -143,10 +144,10 @@ namespace WindowsFormsApp1.마크
string tmpString = string.Format(
"(\"{0}\", \"{1}\", \"{2}\", \"{3}\", \"{4}\", " +
"\"{5}\", \"{6}\", \"{7}\", \"{8}\", \"{9}\", " +
"\"{10}\", \"{11}\")",
Search_Data[a - 9], Search_Data[a - 8], Search_Data[a - 7], tb_list_name.Text, DateTime.Now.ToString("yyyy-MM-dd"),
"\"{10}\", \"{11}\", \"{12}\")",
Search_Data[a - 9], Search_Data[a - 8], Search_Data[a - 7], tb_list_name.Text, date,
Search_Data[a - 6], Search_Data[a - 5], Search_Data[a - 4], Search_Data[a - 3], Search_Data[a - 2],
Search_Data[a - 1], Search_Data[a]);
Search_Data[a - 1], Search_Data[a], Find_ListIndex());
tmpList.Add(tmpString);
}
@@ -155,13 +156,23 @@ namespace WindowsFormsApp1.마크
string Insert_Col =
"`compidx`, `header`, `num`, `list_name`, `date`, " +
"`isbn_marc`, `book_name`, `author`, `book_comp`, `pay`, " +
"`count`, `total`";
"`count`, `total`, `l_idx`";
string InsertData = string.Join(", ", tmpList);
string InCmd = string.Format("INSERT INTO `{0}` ({1}) VALUES {2};", table, Insert_Col, InsertData);
db.DB_Send_CMD_reVoid(InCmd);
}
string Find_ListIndex()
{
string table = "Obj_List";
string Area = "idx";
string[] Col = { "comp_num", "list_name", "date" };
string[] Data = { ml.compidx, tb_list_name.Text, date };
string cmd = db.More_DB_Search(table, Col, Data, Area);
return db.DB_Send_CMD_Search(cmd).Replace("|", "");
}
void data_delete()
{
string table = "Obj_List";

13
unimarc/unimarc/마크/Marc.cs
View File

@@ -92,20 +92,23 @@ namespace ExcelTest
/// </summary>
/// <param name="date">목록일자</param>
/// <param name="value">목록명</param>
public void input_list(string date, string value, string C_idx)
public void input_list(string l_idx, string value, string C_idx)
{
db.DBcon();
string Area = "`idx`, `isbn_marc`, `header`, `num`, `book_name`, `author`, `book_comp`, `count`, `pay`, `image_url`, `m_idx`";
string[] sear_tbl = { "date", "list_name", "compidx" };
string[] sear_col = { date, value, C_idx };
// string[] sear_tbl = { "date", "list_name", "compidx" };
// string[] sear_col = { date, value, C_idx };
string[] sear_tbl = { "l_idx", "compidx" };
string[] sear_col = { l_idx, C_idx };
lbl_BookList.Text = value;
string cmd = //db.More_DB_Search("Obj_List_Book", sear_tbl, sear_col, Area);
string.Format("SELECT {0} " +
"FROM {1} " +
"WHERE `{2}` = \"{5}\" AND `{3}` = \"{6}\" AND `{4}` =\"{7}\" " +
"ORDER BY `idx` ASC;", Area, "Obj_List_Book", sear_tbl[0], sear_tbl[1], sear_tbl[2], sear_col[0], sear_col[1], sear_col[2]);
// "WHERE `{2}` = \"{5}\" AND `{3}` = \"{6}\" AND `{4}` =\"{7}\" " +
"WHERE `{2}` = \"{4}\" AND `{3}` = \"{5}\"" +
"ORDER BY `idx` ASC;", Area, "Obj_List_Book", sear_tbl[0], sear_tbl[1], sear_col[0], sear_col[1]);
string db_res = db.DB_Send_CMD_Search(cmd);
string[] db_data = db_res.Split('|');
string[] grid = {

39
unimarc/unimarc/마크/Marc_Macro_Sub.cs
View File

@@ -109,6 +109,7 @@ namespace UniMarc.마크
private string RunningMacro(string ViewMarc, string[] idx)
{
TargetMarc = ViewMarc;
List<string> SplitMarc = new List<string>(ViewMarc.Split('\n'));
for (int a = 0; a < SplitMarc.Count; a++)
@@ -168,7 +169,7 @@ namespace UniMarc.마크
string Target = SplitContent[2];
foreach (string i in idx)
{
Jisi = ChangeJisi(i, ContentTag, Jisi);
Jisi = ChangeJisi(i, ContentTag, Jisi, Target);
switch (ContentTag)
{
case "020": Target = Index_020(i, Target.Split('▼')); break;
@@ -207,7 +208,7 @@ namespace UniMarc.마크
}
string ChangeJisi(string idx, string TagNum, string Jisi)
string ChangeJisi(string idx, string TagNum, string Jisi, string Content)
{
if (idx == "34" && TagNum == "049") return "0 ";
if (idx == "35" && TagNum == "100") return "1 ";
@@ -223,9 +224,33 @@ namespace UniMarc.마크
if (idx == "45" && TagNum == "910") return " 0";
if (idx == "46" && TagNum == "940") return "0 ";
if (idx == "47" && TagNum == "950") return "0 ";
if (idx == "48" && TagNum == "245") return JiSi245(Content);
return Jisi;
}
#region JISI_SUB
/// <summary>
/// 245가 괄호 시작일 경우 [20], 괄호 시작이 아니며 100이나 110태그 사용시 [10], 해당 없을시 [00]
/// </summary>
/// <param name="Content"></param>
/// <returns></returns>
string JiSi245(string Content)
{
if (Content.StartsWith("▼a"))
{
Content = Content.Replace("▼a", "");
if (Content.StartsWith("("))
return "20";
else if (isAuthorTag)
return "10";
}
return "00";
}
#endregion
#region IDX TAG NUM
@@ -362,16 +387,6 @@ namespace UniMarc.마크
{
if (a <= 1) continue;
if (SplitContent[a].StartsWith("a") && idx == "48")
{
if (SplitContent[a].Contains("("))
SplitContent[1] = "20";
else if (isAuthorTag)
SplitContent[1] = "10";
else
SplitContent[1] = "00";
}
// 두번째 $a 앞에 ":"
if (SplitContent[a - 1].StartsWith("a") && idx == "2")
if (SplitContent[a].StartsWith("a"))

12
unimarc/unimarc/마크/Marc_Plan.cs
View File

@@ -554,16 +554,6 @@ namespace WindowsFormsApp1.Mac
Set_Macro sm = new Set_Macro(this, dataGridView1);
String_Text st = new String_Text();
string FileEncodingType = "";
switch (cb_EncodingType.SelectedIndex)
{
case 0: FileEncodingType = "ANSI"; break;
case 1: FileEncodingType = "UTF-8"; break;
case 2: FileEncodingType = "UniCode"; break;
default: break;
}
string[] MarcArray = new string[dataGridView1.RowCount];
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
@@ -581,7 +571,6 @@ namespace WindowsFormsApp1.Mac
}
sm.ViewMarcArray = MarcArray;
// sm.FileType = FileEncodingType;
sm.Show();
}
@@ -636,7 +625,6 @@ namespace WindowsFormsApp1.Mac
{
String_Text st = new String_Text();
int row = e.RowIndex;
int col = dataGridView1.CurrentCell.ColumnIndex;