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

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

Browse Source 
1. 목록등록
ㄴ> 등록이나 삭제할 경우 오류메시지 표출되는 버그 수정.

2. 마크 정리
ㄴ> 드래그 앤 드랍으로 행이동 하는 함수 추가 (현재 활용면에서 의견 논의 필요하므로 사용은 중단)
  ㄴ> 활성화 방법 - dataGridView1의 AllowDrop을 True로 변경.

3. 마크 작성
ㄴ> Ctrl+H 오류나는 버그 수정.
ㄴ> 최신 마크 표출되지 않는 버그 수정.
This commit is contained in:
SeungHo Yang
2022-02-11 10:57:20 +09:00
parent b8c5092f75
commit 3e2b676aa2
17 changed files with 73 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Test_Project/.vs/Test_Project/v16/.suo
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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/UniMarc.csproj.AssemblyReference.cache
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.

11
unimarc/unimarc/납품관리/Commodity_Edit.cs
View File

@@ -64,17 +64,6 @@ namespace WindowsFormsApp1.Delivery
////////////////////////////////////////
string[] marc_search_col = { "compidx", "date", "connect_data", "charge" };
string[] marc_search_data = { compidx, Old_Date.Text, Old_Name.Text, Old_User.Text };
string[] marc_col = { "date", "connect_data", "charge" };
string[] marc_data = { date, New_Name.Text, New_User.Text };
U_cmd = DB.More_Update("Obj_List_Marc", marc_col, marc_data, marc_search_col, marc_search_data);
//DB.DB_Send_CMD_reVoid(U_cmd);
/////////////////////////////////////////
string[] list_search_col = { "comp_num", "date", "list_name", "clt", "dly", "charge" };
string[] list_search_data = { compidx, Old_Date.Text, Old_Name.Text, Old_Clit.Text, Old_Dlv.Text, Old_User.Text };

18
unimarc/unimarc/납품관리/Commodity_registration.cs
View File

@@ -224,8 +224,6 @@ namespace WindowsFormsApp1.Delivery
string Incmd = db.DB_INSERT("Obj_List", col_name, setData);
db.DB_Send_CMD_reVoid(Incmd);
if (chk_Save_DB() > 0) { Marc_list_input(data); }
Grid1_total();
dataGridView2.Rows.Add(add_grid_data);
GridColorChange();
@@ -242,18 +240,6 @@ namespace WindowsFormsApp1.Delivery
tb_dvy_method.Text = "";
dataGridView1.Rows.Clear();
}
private void Marc_list_input(string[] data)
{
string table = "Obj_List_Marc";
/* 목록일자, 완료일자, 마크목록명, 목록명, 목록담당자,
전체, 미편목 */
string[] col_name = { "date", "date_res", "connect_data", "list_name", "charge",
"total", "unflatter", "compidx", "state" };
string[] setData = { data[0], data[1], data[2], data[2], data[5],
data[8], data[8], main.com_idx, data[9] };
string Incmd = db.DB_INSERT(table, col_name, setData);
db.DB_Send_CMD_reVoid(Incmd);
}
private void btn_Exit_Click(object sender, EventArgs e)
{
this.Close();
@@ -308,10 +294,6 @@ namespace WindowsFormsApp1.Delivery
cmd = db.DB_Delete_No_Limit("Obj_List_Book", "compidx", comp_idx, del_table, del_target);
db.DB_Send_CMD_reVoid(cmd);
del_table[1] = "connect_data";
cmd = db.DB_Delete_More_term("Obj_List_Marc", "compidx", main.com_idx, del_table, del_target);
db.DB_Send_CMD_reVoid(cmd);
dataGridView2.Rows.Remove(dataGridView2.Rows[delcout]);
}
}

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

@@ -144,6 +144,13 @@ namespace ExcelTest
bool isMyData;
string cmd;
if (Chk_Arr.Length <= 1) {
int count = 0;
foreach (string chk in Chk_Arr)
{
if (count > 0 && chk == "1")
Area = Area.Replace("`marc`", string.Format("`marc{0}`", count));
count++;
}
cmd = string.Format(
"SELECT {0} FROM {1} WHERE `{2}` = \"{3}\" " +
"AND (`marc_chk` = 1 OR `marc_chk1` = 1 OR `marc_chk2` = 1);",
@@ -151,6 +158,14 @@ namespace ExcelTest
isMyData = false;
}
else {
int count = 0;
foreach (string chk in Chk_Arr)
{
if (count > 0 && chk == "1")
Area = Area.Replace("`marc`", string.Format("`marc{0}`", count));
count++;
}
cmd = string.Format(
"SELECT {0} FROM {1} WHERE `{2}` = \"{3}\" AND `{4}` = \"{5}\" " +
"AND (`marc_chk` = 1 OR `marc_chk1` = 1 OR `marc_chk2` = 1);",

58
unimarc/unimarc/마크/Marc_Plan.Designer.cs generated
View File

@@ -28,13 +28,13 @@
/// </summary>
private void InitializeComponent()
{
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();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
this.panel1 = new System.Windows.Forms.Panel();
this.btn_Output = new System.Windows.Forms.Button();
this.btn_Excel = new System.Windows.Forms.Button();
@@ -267,14 +267,14 @@
//
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.idx,
@@ -307,6 +307,10 @@
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.DragDrop += new System.Windows.Forms.DragEventHandler(this.dataGridView1_DragDrop);
this.dataGridView1.DragOver += new System.Windows.Forms.DragEventHandler(this.dataGridView1_DragOver);
this.dataGridView1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.dataGridView1_MouseDown);
this.dataGridView1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.dataGridView1_MouseMove);
//
// idx
//
@@ -325,8 +329,8 @@
//
// reg_num
//
dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.reg_num.DefaultCellStyle = dataGridViewCellStyle9;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.reg_num.DefaultCellStyle = dataGridViewCellStyle2;
this.reg_num.FillWeight = 130.9363F;
this.reg_num.HeaderText = "등록번호";
this.reg_num.Name = "reg_num";
@@ -334,8 +338,8 @@
//
// class_code
//
dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.class_code.DefaultCellStyle = dataGridViewCellStyle10;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.class_code.DefaultCellStyle = dataGridViewCellStyle3;
this.class_code.FillWeight = 76.41504F;
this.class_code.HeaderText = "분류";
this.class_code.Name = "class_code";
@@ -343,8 +347,8 @@
//
// author_code
//
dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.author_code.DefaultCellStyle = dataGridViewCellStyle11;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.author_code.DefaultCellStyle = dataGridViewCellStyle4;
this.author_code.FillWeight = 77.02635F;
this.author_code.HeaderText = "저자기호";
this.author_code.Name = "author_code";
@@ -352,8 +356,8 @@
//
// volume
//
dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.volume.DefaultCellStyle = dataGridViewCellStyle12;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.volume.DefaultCellStyle = dataGridViewCellStyle5;
this.volume.FillWeight = 38.80909F;
this.volume.HeaderText = "V";
this.volume.Name = "volume";
@@ -362,8 +366,8 @@
//
// copy
//
dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.copy.DefaultCellStyle = dataGridViewCellStyle13;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.copy.DefaultCellStyle = dataGridViewCellStyle6;
this.copy.FillWeight = 40.14827F;
this.copy.HeaderText = "C";
this.copy.Name = "copy";
@@ -372,8 +376,8 @@
//
// prefix
//
dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.prefix.DefaultCellStyle = dataGridViewCellStyle14;
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.prefix.DefaultCellStyle = dataGridViewCellStyle7;
this.prefix.FillWeight = 41.51828F;
this.prefix.HeaderText = "F";
this.prefix.Name = "prefix";

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

@@ -317,5 +317,30 @@ namespace WindowsFormsApp1.Mac
System.IO.File.WriteAllText(FileName, Marc_data, Encoding.Default);
}
}
#region Grid 드래그 앤 드랍 함수 (현재 사용 중지) (사용하려면 dataGridView1의 AllowDrop 활성화해야함)
Skill_Grid sg = new Skill_Grid();
private void dataGridView1_MouseDown(object sender, MouseEventArgs e)
{
sg.MouseDown(sender, e);
}
private void dataGridView1_MouseMove(object sender, MouseEventArgs e)
{
sg.MouseMove(sender, e);
}
private void dataGridView1_DragDrop(object sender, DragEventArgs e)
{
sg.DragDrop(sender, e);
}
private void dataGridView1_DragOver(object sender, DragEventArgs e)
{
sg.DragOver(sender, e);
}
#endregion
}
}

1
unimarc/unimarc/마크/Marc_memo.cs
View File

@@ -95,7 +95,6 @@ namespace UniMarc.마크
{
case 72: // h
findNchange fnc = new findNchange(this);
fnc.call = ((RichTextBox)sender).Name;
fnc.TopMost = true;
fnc.Show();
break;

6
unimarc/unimarc/마크/findNchange.cs
View File

@@ -19,7 +19,6 @@ namespace ExcelTest
public bool buttonClick2 = false;
string find = "";
string change = "";
public string call = "";
String_Text st = new String_Text();
Marc mac;
Marc_memo mmm;
@@ -27,7 +26,6 @@ namespace ExcelTest
{
InitializeComponent();
mac = _mac;
call = mac.call;
}
public findNchange(Marc_memo _mmm)
{
@@ -73,10 +71,10 @@ namespace ExcelTest
public void textChange(string ftext, string ctext)
{
if (mac != null) {
mac.Controls[call].Text = mac.Controls[call].Text.Replace(ftext, ctext);
mac.richTextBox1.Text = mac.richTextBox1.Text.Replace(ftext, ctext);
}
if (mmm != null) {
mmm.Controls[call].Text = mmm.Controls[call].Text.Replace(ftext, ctext);
mmm.richTextBox1.Text = mmm.richTextBox1.Text.Replace(ftext, ctext);
}
}