();
foreach (var uid in uids)
{
+ if(uid.Key == "320854")
+ Console.WriteLine("테스트");
+
//이사용자의 날짜별 근무시간을 확인한다.
db = new EEEntities();
var UserDatas = db.vJobReportForUser.Where(t => t.gcode == Pub.vGcode && t.id == uid.Key && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0).ToList();
@@ -258,6 +262,8 @@ namespace JobReportMailService
private void toolStripButton1_Click(object sender, EventArgs e)
{
taskwait = !taskwait;
+ if (taskwait == false)
+ LastUpdateTime = DateTime.Now.AddHours(-1);
}
private void timer1_Tick(object sender, EventArgs e)
diff --git a/JobReportMailService/fJobReportWeek.cs b/JobReportMailService/fJobReportWeek.cs
index 27a0076..5e05011 100644
--- a/JobReportMailService/fJobReportWeek.cs
+++ b/JobReportMailService/fJobReportWeek.cs
@@ -66,6 +66,7 @@ namespace JobReportMailService
catch (Exception ex)
{
addmsg(ex.Message);
+ task.Wait(5000);
}
}
Task.Delay(Delaytime).Wait();
diff --git a/JobReportMailService/fScheduleDay.cs b/JobReportMailService/fScheduleDay.cs
index 42a2f0e..1692b12 100644
--- a/JobReportMailService/fScheduleDay.cs
+++ b/JobReportMailService/fScheduleDay.cs
@@ -68,6 +68,7 @@ namespace JobReportMailService
catch (Exception ex)
{
addmsg(ex.Message);
+ task.Wait(5000);
}
}
Task.Delay(Delaytime).Wait();
diff --git a/JobReportMailService/fScheduleDayWeek.cs b/JobReportMailService/fScheduleDayWeek.cs
index b13ed76..34568c0 100644
--- a/JobReportMailService/fScheduleDayWeek.cs
+++ b/JobReportMailService/fScheduleDayWeek.cs
@@ -67,6 +67,7 @@ namespace JobReportMailService
catch (Exception ex)
{
addmsg(ex.Message);
+ task.Wait(5000);
}
}
Task.Delay(Delaytime).Wait();
diff --git a/JobReportMailService/fSendMail.Designer.cs b/JobReportMailService/fSendMail.Designer.cs
new file mode 100644
index 0000000..e9b4773
--- /dev/null
+++ b/JobReportMailService/fSendMail.Designer.cs
@@ -0,0 +1,83 @@
+
+namespace JobReportMailService
+{
+ partial class fSendMail
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSendMail));
+ this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.toolStrip1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // timer1
+ //
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // toolStrip1
+ //
+ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripButton1});
+ this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+ this.toolStrip1.Name = "toolStrip1";
+ this.toolStrip1.Size = new System.Drawing.Size(473, 25);
+ this.toolStrip1.TabIndex = 2;
+ this.toolStrip1.Text = "toolStrip1";
+ //
+ // toolStripButton1
+ //
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(48, 22);
+ this.toolStripButton1.Text = "Run";
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ //
+ // fSendMail
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(473, 416);
+ this.Controls.Add(this.toolStrip1);
+ this.Name = "fSendMail";
+ this.Text = "Send Mail";
+ this.Load += new System.EventHandler(this.fJobReportDay_Load);
+ this.Controls.SetChildIndex(this.toolStrip1, 0);
+ this.toolStrip1.ResumeLayout(false);
+ this.toolStrip1.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip toolStrip1;
+ private System.Windows.Forms.ToolStripButton toolStripButton1;
+ }
+}
\ No newline at end of file
diff --git a/JobReportMailService/fSendMail.cs b/JobReportMailService/fSendMail.cs
new file mode 100644
index 0000000..f99249a
--- /dev/null
+++ b/JobReportMailService/fSendMail.cs
@@ -0,0 +1,273 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace JobReportMailService
+{
+ public partial class fSendMail : fChildBase
+ {
+
+ public fSendMail()
+ {
+ InitializeComponent();
+ }
+
+ private void fJobReportDay_Load(object sender, EventArgs e)
+ {
+ this.Delaytime = 3000;
+ task = Task.Run(() =>
+ {
+ while (taskrun)
+ {
+ if (taskwait)
+ {
+ task.Wait(1000);
+ continue;
+ }
+
+ var ts = DateTime.Now - LastUpdateTime;
+ if (ts.TotalMilliseconds <= 1000)
+ {
+ continue;
+ }
+ else
+ {
+ LastUpdateTime = DateTime.Now;
+ try
+ {
+ RunData();
+ }
+ catch (Exception ex)
+ {
+ addmsg(ex.Message);
+ task.Wait(5000);
+ }
+ }
+ Task.Delay(Delaytime).Wait();
+ }
+
+ });
+ timer1.Start();
+ }
+
+ void RunData()
+ {
+ SendMail();
+ System.Threading.Thread.Sleep(1000);
+ MakeAutoMail();
+ }
+
+ void SendMail()
+ {
+
+ var ta = new DataSet1TableAdapters.MailDataTableAdapter();
+ var sendList = ta.GetData(); //발송되지않은 메일목록
+
+ if (sendList.Rows.Count > 0) addmsg("Found : " + sendList.Rows.Count.ToString());
+ else addmsg("전송할 메일이 없습니다");
+
+ foreach (DataSet1.MailDataRow dr in sendList)
+ {
+ //전자메일 검증을 한다.
+ var list_from = getMaillist(dr.fromlist);
+ var list_to = getMaillist(dr.tolist);
+ var list_bcc = getMaillist(dr.bcc);
+ var list_cc = getMaillist(dr.cc);
+
+ string sendMsg = "";
+ if (list_from == "")
+ {
+ sendMsg = ("보내는 주소가 없습니다");
+ }
+ else if (dr.subject.Trim() == "")
+ {
+ sendMsg = ("메일 제목이 없습니다");
+ }
+ else if (dr.body.Trim() == "")
+ {
+ sendMsg = ("본문이 없습니다");
+ }
+ else if (list_to == "")
+ {
+ sendMsg = ("받는 주소가 없습니다");
+ }
+ else
+ {
+
+ var body = dr.body;
+ body +=
+ "" +
+ "
이 메일은 EET 프로그램에서 자동 발신 되었습니다." +
+ "
메일이 잘못 전송 되었다면 [chikyun.kim@amkor.co.kr] 로 문의 주시기 바랍니다" +
+ "
";
+
+
+ //전송을 해야 함
+ var mc = new System.Net.Mail.SmtpClient("10.101.10.6");
+ var msg = new System.Net.Mail.MailMessage
+ (list_from,
+ list_to,
+ dr.subject,
+ body);
+
+
+ if (list_bcc != "") msg.Bcc.Add(list_bcc);
+ if (list_cc != "") msg.CC.Add(list_cc);
+ msg.IsBodyHtml = true;
+
+ try
+ {
+ mc.Send(msg);
+ Console.WriteLine("send mail to" + list_to + ",subject=" + dr.subject);
+ sendMsg = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ }
+ catch (Exception eX)
+ {
+ sendMsg = eX.Message;
+ }
+ }
+
+ Console.WriteLine(string.Format("Send Complete index={0},Msg={1}", dr.idx, sendMsg));
+ ta.UpdateSendOK(sendMsg, dr.idx);
+ break;
+ }
+
+ }
+ static DateTime ChkAutoDate = DateTime.Now.AddDays(-1);
+ void MakeAutoMail()
+ {
+ var ts = DateTime.Now - ChkAutoDate;
+ if (ts.TotalMinutes < 1) return; //10분마다 자동 생성 데이터를 처리한다
+ Console.WriteLine("Check Auto Make Mail");
+
+ var taData = new DataSet1TableAdapters.MailDataTableAdapter();
+ var taList = new DataSet1TableAdapters.MailAutoTableAdapter();
+ var dtList = taList.GetByAutoSend();
+ var dtInsert = new DataSet1.MailDataDataTable();
+
+ //대상
+ Console.WriteLine("Make Auto Send Mail Data (" + dtList.Rows.Count.ToString() + ")");
+
+ foreach (DataSet1.MailAutoRow dr in dtList)
+ {
+ //시간정보가 없는 애들은 처리 하지 않음
+ if (dr.stime.IndexOf(":") == -1) continue;
+ if (dr.sday == null || dr.sday.Length < 2) continue;
+
+ //발신시간을 넘어야 한다
+ var curTime = DateTime.Now.ToString("HH:mm");
+ if (string.Compare(curTime, dr.stime) < 0) continue; //지정된 시간 이전이면 생성 안한다
+
+ //자동생성 구분용 카테고리
+ var cate = string.Format("{0},{1}", dr.sday[0], dr.sday[1]);
+
+ //동륵일
+ var pdate = DateTime.Now.ToString("yyyy-MM-dd");
+
+ //같은날, 같은 atime aidx pdate 의 같이 있으면 이미 생성된것이므로 추가하지 않는다
+ var existData = taData.FindAutoData(dr.idx, dr.stime, pdate, cate);
+ var PreMakeCount = (int)(existData);
+ if (PreMakeCount > 0) continue;
+
+ //전송간격과 대상
+ if (dr.sday[0] == 1)
+ {
+ //week
+ var bitString = Convert.ToString(dr.sday[1], 2).PadLeft(8, '0').ToArray();
+ var weeknum = (int)(DateTime.Now.DayOfWeek);
+ if (bitString[weeknum + 1] == '0') continue;
+ }
+ else
+ {
+ //month
+ if (dr.sday[1] != DateTime.Now.Day) continue;
+ }
+
+
+
+ //같은날, 같은 atime aidx pdate 의 같이 있으면 이미 생성된것이므로 추가하지 않는다
+ //생성해야할 자료라면 만들어 준다
+ var newdr = dtInsert.NewMailDataRow();
+ newdr.pdate = pdate;// DateTime.Now.ToString("yyyy-MM-dd");
+ newdr.gcode = dr.gcode;
+ newdr.fromlist = dr.fromlist;
+ newdr.tolist = dr.tolist;
+ newdr.bcc = dr.bcc;
+ newdr.cate = cate;// string.Format("{0},{1}", dr.sday[0], dr.sday[1]); //cate에 해당 자료를 기록한다.
+ newdr.cc = dr.cc;
+ newdr.subject = dr.subject;
+ newdr.body = dr.body;
+ newdr.aidx = dr.idx;
+ newdr.atime = dr.stime;
+ newdr.wuid = "MANAGER";
+ newdr.wdate = DateTime.Now;
+ dtInsert.AddMailDataRow(newdr);
+ try
+ {
+ taData.Update(newdr);
+ Console.WriteLine("auto make : " + newdr.tolist + ",subject=" + newdr.subject);
+ }
+ catch (Exception eX)
+ {
+ Console.WriteLine("auto make error : " + eX.Message);
+ }
+ }
+ ChkAutoDate = DateTime.Now;
+ }
+
+ string getMaillist(string org)
+ {
+ org = org.Replace(";", ",").Replace(":", ",");
+ string list_to = "";
+ foreach (var item in org.Split(','))
+ {
+ if (item.Trim() != "")
+ {
+ var atindex = item.IndexOf("@");
+ if (atindex != -1)
+ {
+ var dotindex = item.IndexOf(".", atindex + 1);
+ if (dotindex != -1)
+ {
+ //정상이므로 추가한다.
+ if (list_to != "") list_to += ",";
+ list_to += item.Trim();
+ }
+ }
+ }
+ }
+ return list_to;
+ }
+
+ private void toolStripButton1_Click(object sender, EventArgs e)
+ {
+ taskwait = !taskwait;
+ if (taskwait == false)
+ LastUpdateTime = DateTime.Now.AddHours(-1);
+ }
+
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ if (task != null)
+ {
+ if (task.IsCompleted) this.toolStripButton1.Text = "완료";
+ else if (task.IsCanceled) this.toolStripButton1.Text = "취소";
+ else if (taskwait) this.toolStripButton1.Text = "대기상태";
+ else this.toolStripButton1.Text = "가동중";
+ this.toolStripButton1.Enabled = true;
+ }
+ else
+ {
+ this.toolStripButton1.Text = "사용불가";
+ this.toolStripButton1.Enabled = false;
+ }
+
+ }
+ }
+}
diff --git a/JobReportMailService/fSendMail.resx b/JobReportMailService/fSendMail.resx
new file mode 100644
index 0000000..49cb4c2
--- /dev/null
+++ b/JobReportMailService/fSendMail.resx
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
+ 104, 17
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+ YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+ 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+ bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+ VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+ c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+ Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+ TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+
+
+
\ No newline at end of file
diff --git a/MailManager/DataSet1.xss b/MailManager/DataSet1.xss
index 15ab4c6..e50530e 100644
--- a/MailManager/DataSet1.xss
+++ b/MailManager/DataSet1.xss
@@ -6,9 +6,9 @@
-->
-
-
-
+
+
+
\ No newline at end of file
diff --git a/Manual.pdf b/Manual.pdf
new file mode 100644
index 0000000..e4a9361
Binary files /dev/null and b/Manual.pdf differ
diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs
index 4ce13af..096a4ac 100644
--- a/Project/Dialog/fLogin.cs
+++ b/Project/Dialog/fLogin.cs
@@ -186,6 +186,7 @@ namespace Project.Dialog
newdr.pdate = nd;
newdr.import = false;
newdr.hrs = dr.hrs;
+ newdr.type = dr.type;//210305 누락분 추가
newdr.ot = dr.ot;
newdr.process = dr.process;
newdr.projectName = dr.projectName;
diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj
index 2b72744..aa570c4 100644
--- a/Project/EETGW.csproj
+++ b/Project/EETGW.csproj
@@ -371,6 +371,7 @@
+
AdoNetEFMain.tt
@@ -551,6 +552,9 @@
DsPMPDatabase.xsd
+
+ PreserveNewest
+
diff --git a/Project/Manual.pdf b/Project/Manual.pdf
new file mode 100644
index 0000000..e4a9361
Binary files /dev/null and b/Project/Manual.pdf differ
diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 875dcda..1265b9d 100644
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("21.03.02.1257")]
-[assembly: AssemblyFileVersion("21.03.02.1257")]
+[assembly: AssemblyVersion("21.03.05.1750")]
+[assembly: AssemblyFileVersion("21.03.05.1750")]
diff --git a/Project/Settings.cs b/Project/Settings.cs
new file mode 100644
index 0000000..d099acd
--- /dev/null
+++ b/Project/Settings.cs
@@ -0,0 +1,28 @@
+namespace Project.Properties {
+
+
+ // 이 클래스를 사용하여 설정 클래스에 대한 특정 이벤트를 처리할 수 있습니다.
+ // SettingChanging 이벤트는 설정 값이 변경되기 전에 발생합니다.
+ // PropertyChanged 이벤트는 설정 값이 변경된 후에 발생합니다.
+ // SettingsLoaded 이벤트는 설정 값이 로드된 후에 발생합니다.
+ // SettingsSaving 이벤트는 설정 값이 저장되기 전에 발생합니다.
+ internal sealed partial class Settings {
+
+ public Settings() {
+ // // 설정을 저장 및 변경하기 위한 이벤트 처리기를 추가하려면 아래 줄에서 주석 처리를 제거하세요.
+ //
+ // this.SettingChanging += this.SettingChangingEventHandler;
+ //
+ // this.SettingsSaving += this.SettingsSavingEventHandler;
+ //
+ }
+
+ private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
+ // SettingChangingEvent 이벤트를 처리하는 코드를 여기에 추가하세요.
+ }
+
+ private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
+ // SettingsSaving 이벤트를 처리하는 코드를 여기에 추가하세요.
+ }
+ }
+}
diff --git a/SubProject/FEQ0000/Equipment/fEquipment.cs b/SubProject/FEQ0000/Equipment/fEquipment.cs
index fdd4514..1d5f11c 100644
--- a/SubProject/FEQ0000/Equipment/fEquipment.cs
+++ b/SubProject/FEQ0000/Equipment/fEquipment.cs
@@ -79,6 +79,7 @@ namespace FEQ0000
}
if (this.cmbDate.Items.Count > 0) this.cmbDate.SelectedIndex = 0;
}
+
private void __Load(object sender, EventArgs e)
{
this.Text = string.Format("Equipment List({0})", this.dataType);
@@ -237,12 +238,7 @@ namespace FEQ0000
var f = new rpt_equipmentB(dataType, this.cmbDate.Text);
f.Show();
}
-
- private void toolStripButton3_Click(object sender, EventArgs e)
- {
-
- }
-
+
private void toolStripButton2_Click(object sender, EventArgs e)
{
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
index 115cd0f..055dcc8 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs
@@ -30,33 +30,33 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase));
- FarPoint.Win.Spread.CellType.TextCellType textCellType77 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType78 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType79 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType80 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType81 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType82 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType83 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType84 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType85 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType91 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType92 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType93 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType94 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType95 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType5 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
this.dsPurchase = new FEQ0000.dsPurchase();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
@@ -87,6 +87,10 @@
this.toolStripButton1 = new System.Windows.Forms.ToolStripDropDownButton();
this.집계표ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.구매승인양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripButton7 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.입고품목메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.엑셀에서가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.견적서폴더열기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -125,13 +129,10 @@
this.이번달자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.btViewDel = new System.Windows.Forms.ToolStripButton();
+ this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.label1 = new System.Windows.Forms.Label();
- this.toolStripButton7 = new System.Windows.Forms.ToolStripDropDownButton();
- this.견적서폴더열기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.엑셀에서가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.입고품목메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -392,17 +393,53 @@
// 집계표ToolStripMenuItem
//
this.집계표ToolStripMenuItem.Name = "집계표ToolStripMenuItem";
- this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.집계표ToolStripMenuItem.Text = "집계표";
this.집계표ToolStripMenuItem.Click += new System.EventHandler(this.집계표ToolStripMenuItem_Click);
//
// 구매승인양식ToolStripMenuItem
//
this.구매승인양식ToolStripMenuItem.Name = "구매승인양식ToolStripMenuItem";
- this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.구매승인양식ToolStripMenuItem.Text = "구매승인 양식";
this.구매승인양식ToolStripMenuItem.Click += new System.EventHandler(this.구매승인양식ToolStripMenuItem_Click);
//
+ // toolStripButton7
+ //
+ this.toolStripButton7.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.입고품목메일전송ToolStripMenuItem,
+ this.엑셀에서가져오기ToolStripMenuItem,
+ this.견적서폴더열기ToolStripMenuItem});
+ this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
+ this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton7.Name = "toolStripButton7";
+ this.toolStripButton7.Size = new System.Drawing.Size(60, 23);
+ this.toolStripButton7.Text = "기능";
+ //
+ // 입고품목메일전송ToolStripMenuItem
+ //
+ this.입고품목메일전송ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("입고품목메일전송ToolStripMenuItem.Image")));
+ this.입고품목메일전송ToolStripMenuItem.Name = "입고품목메일전송ToolStripMenuItem";
+ this.입고품목메일전송ToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
+ this.입고품목메일전송ToolStripMenuItem.Text = "입고 품목 메일 전송";
+ this.입고품목메일전송ToolStripMenuItem.Click += new System.EventHandler(this.입고품목메일전송ToolStripMenuItem_Click);
+ //
+ // 엑셀에서가져오기ToolStripMenuItem
+ //
+ this.엑셀에서가져오기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("엑셀에서가져오기ToolStripMenuItem.Image")));
+ this.엑셀에서가져오기ToolStripMenuItem.Name = "엑셀에서가져오기ToolStripMenuItem";
+ this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
+ this.엑셀에서가져오기ToolStripMenuItem.Text = "엑셀에서 가져오기";
+ this.엑셀에서가져오기ToolStripMenuItem.Click += new System.EventHandler(this.엑셀에서가져오기ToolStripMenuItem_Click);
+ //
+ // 견적서폴더열기ToolStripMenuItem
+ //
+ this.견적서폴더열기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("견적서폴더열기ToolStripMenuItem.Image")));
+ this.견적서폴더열기ToolStripMenuItem.Name = "견적서폴더열기ToolStripMenuItem";
+ this.견적서폴더열기ToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
+ this.견적서폴더열기ToolStripMenuItem.Text = "견적서 폴더 열기";
+ this.견적서폴더열기ToolStripMenuItem.Click += new System.EventHandler(this.견적서폴더열기ToolStripMenuItem_Click);
+ //
// cm1
//
this.cm1.Font = new System.Drawing.Font("맑은 고딕", 20F);
@@ -549,7 +586,8 @@
this.toolStripSeparator5,
this.toolStripDropDownButton1,
this.toolStripButton2,
- this.btViewDel});
+ this.btViewDel,
+ this.toolStripButton3});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1226, 37);
@@ -720,6 +758,15 @@
this.btViewDel.Text = "삭제표시";
this.btViewDel.Click += new System.EventHandler(this.btViewDel_Click);
//
+ // toolStripButton3
+ //
+ this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
+ this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton3.Name = "toolStripButton3";
+ this.toolStripButton3.Size = new System.Drawing.Size(77, 34);
+ this.toolStripButton3.Text = "설명서";
+ this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click_1);
+ //
// fpSpread1
//
this.fpSpread1.AccessibleDescription = "";
@@ -734,6 +781,7 @@
this.fpSpread1.Size = new System.Drawing.Size(1226, 592);
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 4;
+ this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff);
//
// fpSpread1_Sheet1
//
@@ -777,7 +825,7 @@
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F;
this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true;
- this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType77;
+ this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType20;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일";
@@ -786,7 +834,7 @@
this.fpSpread1_Sheet1.Columns.Get(0).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType78;
+ this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType21;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태";
@@ -794,203 +842,203 @@
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType79;
+ this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType22;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "place";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "보관소";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType80;
+ this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType23;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "process";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Label = "공정";
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType81;
+ this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType24;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "requestName";
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(4).Label = "요청";
this.fpSpread1_Sheet1.Columns.Get(4).Tag = "requestName";
this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType82;
+ this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType25;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "sc";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Label = "SC#";
this.fpSpread1_Sheet1.Columns.Get(5).Tag = "sc";
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType83;
+ this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType26;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "orderno";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "CR/CF#";
this.fpSpread1_Sheet1.Columns.Get(6).Tag = "crcf";
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType84;
+ this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType27;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "receiveName";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(7).Label = "수령";
this.fpSpread1_Sheet1.Columns.Get(7).Tag = "receiveName";
this.fpSpread1_Sheet1.Columns.Get(7).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoSort = true;
- this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType85;
+ this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType28;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sid";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Label = "SID#";
this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sid";
this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType86;
+ this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType29;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumname";
this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(9).Label = "품명";
this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pumname";
this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType29.DecimalPlaces = 0;
- numberCellType29.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType29.MaximumValue = 2147483647D;
- numberCellType29.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType29;
+ numberCellType8.DecimalPlaces = 0;
+ numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType8.MaximumValue = 2147483647D;
+ numberCellType8.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType8;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumidx";
this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType87;
+ this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType30;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumscale";
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "규격";
this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumscale";
this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType88;
+ this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType31;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "dept";
this.fpSpread1_Sheet1.Columns.Get(12).Label = "장비\r\n제조사";
this.fpSpread1_Sheet1.Columns.Get(12).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType88;
+ this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType31;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "manuproc";
this.fpSpread1_Sheet1.Columns.Get(13).Label = "제조\r\n공정";
this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType88;
+ this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType31;
this.fpSpread1_Sheet1.Columns.Get(14).DataField = "asset";
this.fpSpread1_Sheet1.Columns.Get(14).Label = "장비\r\n모델";
this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F;
- numberCellType30.DecimalPlaces = 0;
- numberCellType30.NegativeRed = true;
- numberCellType30.NullDisplay = "--";
- numberCellType30.Separator = ",";
- numberCellType30.ShowSeparator = true;
- numberCellType30.ShrinkToFit = true;
- this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType30;
+ numberCellType9.DecimalPlaces = 0;
+ numberCellType9.NegativeRed = true;
+ numberCellType9.NullDisplay = "--";
+ numberCellType9.Separator = ",";
+ numberCellType9.ShowSeparator = true;
+ numberCellType9.ShrinkToFit = true;
+ this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType9;
this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumqty";
this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(15).Label = "수량";
this.fpSpread1_Sheet1.Columns.Get(15).Tag = "pumqty";
this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType89;
+ this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType32;
this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumunit";
this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(16).Label = "단위";
this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F;
- numberCellType31.DecimalPlaces = 0;
- numberCellType31.MaximumValue = 9999999999999.99D;
- numberCellType31.MinimumValue = -9999999999999.99D;
- numberCellType31.NegativeRed = true;
- numberCellType31.NullDisplay = "--";
- numberCellType31.Separator = ",";
- numberCellType31.ShowSeparator = true;
- numberCellType31.ShrinkToFit = true;
- this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType31;
+ numberCellType10.DecimalPlaces = 0;
+ numberCellType10.MaximumValue = 9999999999999.99D;
+ numberCellType10.MinimumValue = -9999999999999.99D;
+ numberCellType10.NegativeRed = true;
+ numberCellType10.NullDisplay = "--";
+ numberCellType10.Separator = ",";
+ numberCellType10.ShowSeparator = true;
+ numberCellType10.ShrinkToFit = true;
+ this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType10;
this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumprice";
this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(17).Label = "단가";
this.fpSpread1_Sheet1.Columns.Get(17).Tag = "pumprice";
this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F;
- numberCellType32.DecimalPlaces = 0;
- numberCellType32.MaximumValue = 9999999999999.99D;
- numberCellType32.MinimumValue = -9999999999999.99D;
- numberCellType32.NegativeRed = true;
- numberCellType32.NullDisplay = "--";
- numberCellType32.Separator = ",";
- numberCellType32.ShowSeparator = true;
- numberCellType32.ShrinkToFit = true;
- this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType32;
+ numberCellType11.DecimalPlaces = 0;
+ numberCellType11.MaximumValue = 9999999999999.99D;
+ numberCellType11.MinimumValue = -9999999999999.99D;
+ numberCellType11.NegativeRed = true;
+ numberCellType11.NullDisplay = "--";
+ numberCellType11.Separator = ",";
+ numberCellType11.ShowSeparator = true;
+ numberCellType11.ShrinkToFit = true;
+ this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType11;
this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumamt";
this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(18).Label = "합계금액";
this.fpSpread1_Sheet1.Columns.Get(18).Tag = "pumamt";
this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType90;
+ this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType33;
this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supply";
this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(19).Label = "공급업체";
this.fpSpread1_Sheet1.Columns.Get(19).Tag = "supply";
this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType33.DecimalPlaces = 0;
- numberCellType33.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType33.MaximumValue = 2147483647D;
- numberCellType33.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType33;
+ numberCellType12.DecimalPlaces = 0;
+ numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType12.MaximumValue = 2147483647D;
+ numberCellType12.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType12;
this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supplyidx";
this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(20).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(20).Visible = false;
this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType91;
+ this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType34;
this.fpSpread1_Sheet1.Columns.Get(21).DataField = "project";
this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(21).Label = "프로젝트";
this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F;
this.fpSpread1_Sheet1.Columns.Get(22).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType34.DecimalPlaces = 0;
- numberCellType34.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType34.MaximumValue = 2147483647D;
- numberCellType34.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType34;
+ numberCellType13.DecimalPlaces = 0;
+ numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType13.MaximumValue = 2147483647D;
+ numberCellType13.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType13;
this.fpSpread1_Sheet1.Columns.Get(22).DataField = "projectidx";
this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(22).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(22).Tag = "projectidx";
this.fpSpread1_Sheet1.Columns.Get(22).Visible = false;
this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType92;
+ this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType35;
this.fpSpread1_Sheet1.Columns.Get(23).DataField = "bigo";
this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(23).Label = "비고";
this.fpSpread1_Sheet1.Columns.Get(23).Tag = "bigo";
this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType93;
+ this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType36;
this.fpSpread1_Sheet1.Columns.Get(24).DataField = "edate";
this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고예정";
this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType94;
+ this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType37;
this.fpSpread1_Sheet1.Columns.Get(25).DataField = "indate";
this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(25).Label = "입고일";
this.fpSpread1_Sheet1.Columns.Get(25).Tag = "indate";
this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F;
- numberCellType35.NegativeRed = true;
- numberCellType35.ShowSeparator = true;
- this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType35;
+ numberCellType14.NegativeRed = true;
+ numberCellType14.ShowSeparator = true;
+ this.fpSpread1_Sheet1.Columns.Get(26).CellType = numberCellType14;
this.fpSpread1_Sheet1.Columns.Get(26).DataField = "inqty";
this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(26).Label = "입고수량";
this.fpSpread1_Sheet1.Columns.Get(26).Tag = "inqty";
this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType95;
+ this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType38;
this.fpSpread1_Sheet1.Columns.Get(27).DataField = "po";
this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(27).Label = "PO#";
this.fpSpread1_Sheet1.Columns.Get(27).Tag = "po";
this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F;
- this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType5;
+ this.fpSpread1_Sheet1.Columns.Get(28).CellType = checkBoxCellType2;
this.fpSpread1_Sheet1.Columns.Get(28).DataField = "isdel";
this.fpSpread1_Sheet1.Columns.Get(28).Label = "삭제됨";
this.fpSpread1_Sheet1.Columns.Get(28).Tag = "isdel";
@@ -1013,42 +1061,6 @@
this.label1.Text = "--";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
- // toolStripButton7
- //
- this.toolStripButton7.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.입고품목메일전송ToolStripMenuItem,
- this.엑셀에서가져오기ToolStripMenuItem,
- this.견적서폴더열기ToolStripMenuItem});
- this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image")));
- this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton7.Name = "toolStripButton7";
- this.toolStripButton7.Size = new System.Drawing.Size(60, 23);
- this.toolStripButton7.Text = "기능";
- //
- // 견적서폴더열기ToolStripMenuItem
- //
- this.견적서폴더열기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("견적서폴더열기ToolStripMenuItem.Image")));
- this.견적서폴더열기ToolStripMenuItem.Name = "견적서폴더열기ToolStripMenuItem";
- this.견적서폴더열기ToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
- this.견적서폴더열기ToolStripMenuItem.Text = "견적서 폴더 열기";
- this.견적서폴더열기ToolStripMenuItem.Click += new System.EventHandler(this.견적서폴더열기ToolStripMenuItem_Click);
- //
- // 엑셀에서가져오기ToolStripMenuItem
- //
- this.엑셀에서가져오기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("엑셀에서가져오기ToolStripMenuItem.Image")));
- this.엑셀에서가져오기ToolStripMenuItem.Name = "엑셀에서가져오기ToolStripMenuItem";
- this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
- this.엑셀에서가져오기ToolStripMenuItem.Text = "엑셀에서 가져오기";
- this.엑셀에서가져오기ToolStripMenuItem.Click += new System.EventHandler(this.엑셀에서가져오기ToolStripMenuItem_Click);
- //
- // 입고품목메일전송ToolStripMenuItem
- //
- this.입고품목메일전송ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("입고품목메일전송ToolStripMenuItem.Image")));
- this.입고품목메일전송ToolStripMenuItem.Name = "입고품목메일전송ToolStripMenuItem";
- this.입고품목메일전송ToolStripMenuItem.Size = new System.Drawing.Size(182, 22);
- this.입고품목메일전송ToolStripMenuItem.Text = "입고 품목 메일 전송";
- this.입고품목메일전송ToolStripMenuItem.Click += new System.EventHandler(this.입고품목메일전송ToolStripMenuItem_Click);
- //
// fPurchase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1154,5 +1166,6 @@
private System.Windows.Forms.ToolStripMenuItem 입고품목메일전송ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 엑셀에서가져오기ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 견적서폴더열기ToolStripMenuItem;
+ private System.Windows.Forms.ToolStripButton toolStripButton3;
}
}
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs
index 7e8cd27..be55ad9 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase.cs
@@ -23,12 +23,26 @@ namespace FEQ0000
InitializeComponent();
fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini");
this.dsPurchase.Purchase.TableNewRow += Purchase_TableNewRow;
+ this.FormClosing += FPurchase_FormClosing;
this.FormClosed += __Closed;
dtSD.KeyDown += dtSD_KeyDown;
dtED.KeyDown += dtSD_KeyDown;
//this.dv1.CellFormatting += dv1_CellFormatting;
}
+ private void FPurchase_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ if (dsPurchase.HasChanges())
+ {
+ var dlg = FCOMMON.Util.MsgQ("변경된 자료가 있습니다. 화면을 닫을까요? 닫으면 변경된 자료는 손실 됩니다");
+ if (dlg != DialogResult.Yes)
+ {
+ e.Cancel = true;
+ return;
+ }
+ }
+ }
+
void dtSD_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode != Keys.Enter) return;
@@ -281,7 +295,7 @@ namespace FEQ0000
//프로젝트가 걸린데이터는 글자를 bold체로 변경한다.
var prjdata = this.fpSpread1.ActiveSheet.GetValue(i, prjindex);
- if(prjdata != null)
+ if (prjdata != null)
{
var pidx = (int)this.fpSpread1.ActiveSheet.GetValue(i, prjindex);
if (pidx == -1) //프로젝트가 없다
@@ -756,7 +770,7 @@ namespace FEQ0000
private void copyToolStripMenuItem_Click(object sender, EventArgs e)
{
-
+
}
void func_copy()
@@ -781,7 +795,7 @@ namespace FEQ0000
newdr.idx = -1;
newdr.EndEdit();
- repeat:
+ repeat:
bool repeat = false;
DialogResult dlg;
@@ -903,7 +917,7 @@ namespace FEQ0000
private void toolStripButton3_Click(object sender, EventArgs e)
{
-
+
}
private void bs_CurrentChanged(object sender, EventArgs e)
@@ -920,7 +934,7 @@ namespace FEQ0000
private void toolStripButton4_Click(object sender, EventArgs e)
{
-
+
}
string getmaxstr(string src, int len = 30)
@@ -967,7 +981,7 @@ namespace FEQ0000
//구매승인양식
var f = new fPurchaseNRList(this.dsPurchase.Purchase);
f.Show();
-
+
}
private void toolStripButton6_Click(object sender, EventArgs e)
@@ -987,7 +1001,7 @@ namespace FEQ0000
var text = tb.Text.Trim();
var dt = DateTime.Parse(text);
var f = new FCOMMON.fSelectDay(dt);
- if(f.ShowDialog() == DialogResult.OK)
+ if (f.ShowDialog() == DialogResult.OK)
{
tb.Text = f.dtPick.SelectionStart.ToShortDateString();
@@ -1192,5 +1206,33 @@ namespace FEQ0000
"아웃룩의 설정이 정상인지 확인하세요");
}
}
+
+ private void toolStripButton3_Click_1(object sender, EventArgs e)
+ {
+ var fn = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "Manual.pdf");
+ if (System.IO.File.Exists(fn))
+ {
+ FCOMMON.Util.RunExplorer(fn);
+ }
+ else FCOMMON.Util.MsgE("설명서 파일(manual.pdf)이 없습니다. 개발자 문의 해주세요(chikyun.kim@amkor.co.kr)");
+ }
+
+ private void fpSpread1_EditModeOff(object sender, EventArgs e)
+ {
+ if (fpSpread1_Sheet1.Columns["pumqty"].Index == fpSpread1_Sheet1.ActiveColumnIndex)
+ {
+ var drv = this.bs.Current as DataRowView;
+ var dr = drv.Row as dsPurchase.PurchaseRow;
+ dr.pumamt = dr.pumqty * dr.pumprice;
+ dr.EndEdit();
+ }
+ else if (fpSpread1_Sheet1.Columns["pumprice"].Index == fpSpread1_Sheet1.ActiveColumnIndex)
+ {
+ var drv = this.bs.Current as DataRowView;
+ var dr = drv.Row as dsPurchase.PurchaseRow;
+ dr.pumamt = dr.pumqty * dr.pumprice;
+ dr.EndEdit();
+ }
+ }
}
}
diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx
index 80f3871..551b90d 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase.resx
+++ b/SubProject/FEQ0000/Purchase/fPurchase.resx
@@ -249,21 +249,35 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANHSURBVDhPtZBvTNJ5HMfdenbzQdei2aVr/dnc3H4Psm66
- JMn8s0Jdc4doE8Oo0Jykgs3M9CeFpTQ8RQ6h80wjiSxnWhRps1WbiRHUL3NKRWjFnziS+nmVm+t9jrjd
- tXp6r6efz+v13fcT9l9U42T4SWtVLXlPPFJ5p3ih9ObehUJj3kh+b3ZNdk/PEuHA6x9Cq9+ioGpY9ZZK
- x/VnVzHovAnj9A3cf2OF3noOv+jY6tLu6QNFHc8ce7R2Vkj5F7ntSJbhSSeGnIPotJ9HmbUGkgckeqcu
- I7OL7c/p1Kwr6njq77jjg+Tsc3DktqyQuvjyOLnsmLmCHp4eRuO4CoKxgygwH0TbRAfUt1uRpk46sK/d
- oW666obxMQ3NkBfsOjOdVj6yLBggRyUyo/0KTk+eBX9MhNwRIQ5Z6qCz6pCm3GIr0EzE7j4+vjDw6D0U
- N3zoMQdQ1j6JLSVDsmDg0O1Cm+nFIESWI9i1KAtHxdDZDRAZipDQEMfMU07cbTK6cMkSQLn+NWT9XjT0
- vUSsoN8WDBSbCub7nddQaqlGI6XEhalenDI1YvPxn//Ia5nkppGPPlwYnYVE70Lh7zMQambw6xU3YngX
- A8FAfh83MOoZw8WpPqhuKcE6sdkfL91UOyAml6sqzkSkk2aq9boblXo38pud4DU50NDrwmr2GToY4HZn
- 2lpvNWNbK+tNojxObBLnRH3i86s/ZnL99I6dRFLFXerU5VcQtb8Ep/45CtUzELXZsTaj7csX0jUpkuQW
- ptBWvnvV/P79ijkej6Zrj2IudxfoxGQiocRESQ3T2Kd0IqNqCjKDG+yyYaxKbf5yRBw+/OOnkmKtVyCY
- n6uXYdagg7+7E+8ydoKOjSc2CQaoqi4H8hodIBfvwDv5EJGpcjqCWc8IBj6LRIw5Pp9+r/0Nb3u64ZJW
- w3e6DbNbU+CPJoiYnPNUmfYpyHMu5NTdx4ZsPSKYDZyg/A9/ZXE4tECAt2QNfFoVvC0K/BmXAE9kNLE+
- q4sSNE0gWWjCT0kKB4N5YntI+5pAQmLqu9h4h4+bC7eoBF5iIzwrIonV6WoqKqXZvDJJLmWwyPDQ+vfx
- xsSE+9ZES70r15o9jCh4lq4gQqP/i7CwvwHRZOEpN7SW4gAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANISURBVDhPtZBdTFN3GIdJvFu4ULMSFIiZW0JCci5EF4hU
+ OsZHZoEYslIgFMs6LUioQIsBZHCoKwo1ZVBqaR1DsFIrjiBoZwWDURNGsWvnGSNQoSsg/bBWqodtkhB/
+ I7XLZvTW5/Z9n+ef/xv2f1TTZPgZa10j+bN4ouZe2UbF7a83SoyFE0WDuQ25AwNbhCMrH4RW30ZBNbCa
+ LTWOm/M3MOq8DePiLTx4YoXeeglf6tjqiv7FY6U9846vtHZWSPkPue1kjuH3Xow5R9Frv4xKawMkv5AY
+ nLuG7D62P69X83FpzyN/zz0fJBcXwJHbckLq5svT5PZT5mp6fHEcrdMqCKaOo9h8HF0zPVDf7USGOuXY
+ kW6Huu2GG8bfaGjGvGA3memMqontwQA5KZEZ7ddxfvYi+FMi5E8IccLSBJ1VhwzlAVuxZib+MDm9MfLw
+ BRS3fBgwB1DZPYsD5WOyYODE3RKb6Y9RiCwnUbApCyfF0NkNEBlKkdSSwCxUztxvM7rwoyWAKv0KZMNe
+ tAwtI14wbAsGykzF68POn1BhqUcrpcSVuUGcNbVi/7ef/lDYMcvNIB/+dWVyFRK9CyXfL0GoWcJ3192I
+ 410NBANFQ9zApGcKV+eGoLqjBOv0fn+idF/jiJj8UFV9ITKTNFOdN92o0btR1O4Er82BlkEXdrEv0MEA
+ tz/b1nmnHZ93sp4kyxPEJnFezEs+v/7vbK6fPniISKm+T5299hii7mVwmhdQol6CqMuO3Vldr7+QqUmT
+ pHYwhbaqw1HrR48q1ng8mm78Bmv5BaCTU4mkchMlNSziiNKJrLo5yAxusCvHEZXe/vqIqK3d9rK8TOsV
+ CNbXmmVYNejg7+/F86xDoOMTiX2CEaquz4HCVgfIzTvwzvyK6HQ5HclsZgQDr0QixhqfT7/QnsOzgX64
+ pPXwne/C6mdp8McSRFzeZapS+wjkJRfymh5gT64ekcwWTlD+lz9zOBxaIMAzsgE+rQreDgWeJiTBEx1L
+ fJLTRwnaZpAqNGFnisLBYJ7+IqS9SSApOf15fKLDx82HW1QOL7EXnohoYlemmopJazfvSJFLGSwyPLT+
+ brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX
+ EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl
+ 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR
+ BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT
+ Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz
+ tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV
+ iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i
+ DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA
+ AAAASUVORK5CYII=
@@ -303,20 +317,6 @@
oQIAAAJCCriYcSOGDCgzBAiQYSTGDQM4AjBAEwGCCRRIftypoKcDBwcS5MQIYIBRBQ0aPCBAwIKDoR4A
cFiZdKmFAgUOQAWwIKnSpgUkSOgA1UCCqmAlVKgAoWyCBQsSOLhwoAMECBfK2tw7oa9fqBYDL2yIMCAA
Ow==
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX
- EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl
- 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR
- BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT
- Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz
- tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV
- iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i
- DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA
- AAAASUVORK5CYII=
@@ -404,6 +404,19 @@
AMhmkGawjbGxEFuhNoOxjw/cgARrGUwDQE4G2YqiOTQUxYDZriZ4DAD69+umTTg1EzYA5HSQX9E1YzEA
axiAnA4KSGwa0Q0IMZbAYgDQVlBAvgZ6BRfu1pfFbcBLU9P/95WV/9+Qlv5/ko8PjnewscExyOk4DSAG
4DSAGEBVAzBigRgAMwCGyTIAHTAwMDAAABYIANCNo26UAAAAAElFTkSuQmCC
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGSSURBVFhH7ZBNSwJBHMb9Ip37CH2C0lXxDfoSfosIYtfW
+ hG5l9N6hOgZFlyhQd9w65UECO+gxDJSCLKPJZ9gVk8l1ncWNmB88zM78H8afE5D8e4KqQUUSzpC3pG5e
+ BrXCLO5bWDZnUjnzAue8vpv0BUVovrzTw1K9G9PK7fklYy6qF1tHRr2LcxE8E7Q5gKROniBrHQnhuSBe
+ LLJK2OoFngsCr++SgiL4Jrh93aDxbJnu3DSsEz6+CSbWTNbDOgrfBPFykNv9qy84LlKQB+aDGQXmUxcE
+ tpxTF3MpyMOWc+piLgV52HJOXcylIA9bzqmLuRQcxhYbzG9gNnVBN0hBUaSgKFJQlB+Collcv6MbV3X2
+ jRX74c4k6Que176EclLp0PRelV2a3q/S096e13OTvmBELT9vkTa35CbH9x12KWR5czfJ93wUvdhkgiHN
+ CEMSl0+a4T+IH+D1xg3kFNVQmKAooUwpmciR1zxp0bOHT7pptGi8t1c0krAq/hNWjVQsc/sYWil8RLOk
+ BmlrJPGZQOAb99uk1OKmJ2IAAAAASUVORK5CYII=
diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs
index ae901d4..4c368aa 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs
@@ -47,6 +47,7 @@
System.Windows.Forms.Label label5;
System.Windows.Forms.Label label3;
System.Windows.Forms.Label label6;
+ System.Windows.Forms.Label label7;
this.tbSC = new System.Windows.Forms.TextBox();
this.tbSID = new System.Windows.Forms.TextBox();
this.tbPumName = new System.Windows.Forms.TextBox();
@@ -109,6 +110,7 @@
label5 = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label();
label6 = new System.Windows.Forms.Label();
+ label7 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -430,7 +432,7 @@
this.tbBigo.MaxLength = 500;
this.tbBigo.Multiline = true;
this.tbBigo.Name = "tbBigo";
- this.tbBigo.Size = new System.Drawing.Size(381, 188);
+ this.tbBigo.Size = new System.Drawing.Size(381, 197);
this.tbBigo.TabIndex = 28;
this.tbBigo.TabStop = false;
this.toolTip1.SetToolTip(this.tbBigo, resources.GetString("tbBigo.ToolTip"));
@@ -445,10 +447,10 @@
//
// btSave
//
- this.btSave.Location = new System.Drawing.Point(11, 531);
+ this.btSave.Location = new System.Drawing.Point(11, 648);
this.btSave.Margin = new System.Windows.Forms.Padding(4);
this.btSave.Name = "btSave";
- this.btSave.Size = new System.Drawing.Size(490, 49);
+ this.btSave.Size = new System.Drawing.Size(490, 43);
this.btSave.TabIndex = 1;
this.btSave.Text = "저장(&S)";
this.btSave.UseVisualStyleBackColor = true;
@@ -574,10 +576,10 @@
//
// btSaveAdd
//
- this.btSaveAdd.Location = new System.Drawing.Point(511, 531);
+ this.btSaveAdd.Location = new System.Drawing.Point(511, 648);
this.btSaveAdd.Margin = new System.Windows.Forms.Padding(4);
this.btSaveAdd.Name = "btSaveAdd";
- this.btSaveAdd.Size = new System.Drawing.Size(410, 51);
+ this.btSaveAdd.Size = new System.Drawing.Size(410, 43);
this.btSaveAdd.TabIndex = 3;
this.btSaveAdd.Text = "저장 및 추가(&A)";
this.btSaveAdd.UseVisualStyleBackColor = true;
@@ -618,7 +620,7 @@
this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox1.Size = new System.Drawing.Size(490, 518);
+ this.groupBox1.Size = new System.Drawing.Size(490, 525);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "필수입력";
@@ -686,7 +688,7 @@
this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
- this.groupBox2.Size = new System.Drawing.Size(409, 516);
+ this.groupBox2.Size = new System.Drawing.Size(409, 524);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "추가정보";
@@ -805,15 +807,28 @@
//
this.purchaseTableAdapter.ClearBeforeFill = true;
//
+ // label7
+ //
+ label7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ label7.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ label7.Location = new System.Drawing.Point(11, 539);
+ label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ label7.Name = "label7";
+ label7.Padding = new System.Windows.Forms.Padding(5);
+ label7.Size = new System.Drawing.Size(910, 103);
+ label7.TabIndex = 17;
+ label7.Text = resources.GetString("label7.Text");
+ //
// fPurchase_Add
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(928, 589);
+ this.ClientSize = new System.Drawing.Size(928, 701);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btSaveAdd);
this.Controls.Add(this.btSave);
+ this.Controls.Add(label7);
this.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.MaximizeBox = false;
diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx
index dc71af3..4523461 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx
+++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx
@@ -194,6 +194,18 @@
313, 17
+
+ False
+
+
+ 프로젝트 명 (관련 프로젝트에서 선택하여 입력, 가공 파트 및 명확히 프로젝트에 한정되어 구매되는 부품..)
+공용 공구 / 상세한 사유 작성 (공용으로 보관하여 함께 쓰는 공구들..전동 드릴 등…)
+공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들.. 방청제, WIRE, CONNECTOR, PIN 등 )
+공정 정비 파트 / 상세한 사유 작성 (주,보조 공정에서 사용되는 부품..Overhaul 및 개선 지원 부품, FEEDER WHEEL, , 장비 교체 파트 등)
+개인 정비 공구 / 상세한 사유 작성 (개인이 보관하여 사용하는 공구류, WRENCH, DRIVER, DRILL, TAP 등..)
+기타 물품 / 상세한 사유 작성 (상기항목에 포함되지 않는 것들…관리 및 정리에 사용되는 물품 등..)
+
+
58
diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd
index 09971ab..0ab5afe 100644
--- a/SubProject/FEQ0000/dsPurchase.xsd
+++ b/SubProject/FEQ0000/dsPurchase.xsd
@@ -224,7 +224,7 @@ ORDER BY pdate DESC, idx DESC
-
+
diff --git a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs
index 30886a6..7b42317 100644
--- a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs
+++ b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs
@@ -30,27 +30,27 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEboardList));
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType60 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType61 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType62 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType63 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType64 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType65 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType66 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType67 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType68 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType69 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType70 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -93,9 +93,7 @@
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
- this.cmbYearS = new System.Windows.Forms.ToolStripComboBox();
this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
- this.cmbYearE = new System.Windows.Forms.ToolStripComboBox();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
this.tbRequest = new System.Windows.Forms.ToolStripTextBox();
@@ -128,6 +126,8 @@
this.btSearch = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter();
+ this.cmbYearE = new System.Windows.Forms.ToolStripComboBox();
+ this.cmbYearS = new System.Windows.Forms.ToolStripComboBox();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -230,7 +230,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
- this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -330,7 +329,6 @@
// tbFind
//
this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbFind.Name = "tbFind";
this.tbFind.Size = new System.Drawing.Size(100, 25);
this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -524,11 +522,11 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Repair Time(H)";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType1.DecimalPlaces = 0;
- numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType1.MaximumValue = 2147483647D;
- numberCellType1.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
+ numberCellType29.DecimalPlaces = 0;
+ numberCellType29.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType29.MaximumValue = 2147483647D;
+ numberCellType29.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType29;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -536,97 +534,97 @@
this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
+ this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType57;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "uid";
this.fpSpread1_Sheet1.Columns.Get(1).Label = "Engineer";
this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
+ this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType58;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Site";
this.fpSpread1_Sheet1.Columns.Get(2).Label = "SITE";
this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
+ this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType59;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "요청자";
this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청";
- this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
+ this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType60;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pdate";
this.fpSpread1_Sheet1.Columns.Get(4).Label = "입고일";
- this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5;
+ this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType61;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "수리완료일";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Label = "완료일";
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6;
+ this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType62;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "분류";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "Status";
this.fpSpread1_Sheet1.Columns.Get(6).Tag = "status";
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7;
+ this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType63;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Line";
this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8;
+ this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType64;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "Division";
this.fpSpread1_Sheet1.Columns.Get(8).Width = 72F;
this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9;
+ this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType65;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "Process";
this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F;
- this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10;
+ this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType66;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "Model";
this.fpSpread1_Sheet1.Columns.Get(10).Label = "Equipment";
this.fpSpread1_Sheet1.Columns.Get(10).Width = 69F;
- this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11;
+ this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType67;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "BoardName";
this.fpSpread1_Sheet1.Columns.Get(11).Label = "Board Name";
- this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12;
+ this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType68;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "BoardVender";
this.fpSpread1_Sheet1.Columns.Get(12).Label = "보드규격";
- this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType13;
+ this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType69;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "SN";
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).Label = "S/N";
this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).Width = 78F;
- numberCellType2.DecimalPlaces = 0;
- numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType2.MaximumValue = 2147483647D;
- numberCellType2.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2;
+ numberCellType30.DecimalPlaces = 0;
+ numberCellType30.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType30.MaximumValue = 2147483647D;
+ numberCellType30.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType30;
this.fpSpread1_Sheet1.Columns.Get(14).DataField = "QTY";
this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).Label = "Qty";
this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).Width = 59F;
- numberCellType3.MaximumValue = 999999999999999D;
- numberCellType3.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3;
+ numberCellType31.MaximumValue = 999999999999999D;
+ numberCellType31.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType31;
this.fpSpread1_Sheet1.Columns.Get(15).DataField = "NPrice";
this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(15).Label = "New Price($K)";
this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- numberCellType4.MaximumValue = 999999999999999D;
- numberCellType4.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4;
+ numberCellType32.MaximumValue = 999999999999999D;
+ numberCellType32.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType32;
this.fpSpread1_Sheet1.Columns.Get(16).DataField = "OPrice";
this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(16).Label = "OutSourcing\r\nPrice($K)";
this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(16).Width = 97F;
- numberCellType5.MaximumValue = 999999999999999D;
- numberCellType5.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5;
+ numberCellType33.MaximumValue = 999999999999999D;
+ numberCellType33.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType33;
this.fpSpread1_Sheet1.Columns.Get(17).DataField = "RepairCost";
this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(17).Label = "Repair Cost\r\n($K)";
this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- numberCellType6.MaximumValue = 999999999999999D;
- numberCellType6.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType6;
+ numberCellType34.MaximumValue = 999999999999999D;
+ numberCellType34.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType34;
this.fpSpread1_Sheet1.Columns.Get(18).DataField = "CostReduction";
this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.fpSpread1_Sheet1.Columns.Get(18).Formula = "RC[-2]-RC[-1]";
@@ -636,11 +634,11 @@
this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(18).Width = 72F;
this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14;
+ this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType70;
this.fpSpread1_Sheet1.Columns.Get(19).DataField = "외주업체";
- numberCellType7.MaximumValue = 999999999999999D;
- numberCellType7.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7;
+ numberCellType35.MaximumValue = 999999999999999D;
+ numberCellType35.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType35;
this.fpSpread1_Sheet1.Columns.Get(20).DataField = "RepairTime";
this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(20).Label = "Repair Time(H)";
@@ -682,26 +680,12 @@
this.toolStripLabel2.Size = new System.Drawing.Size(43, 24);
this.toolStripLabel2.Text = "입고일";
//
- // cmbYearS
- //
- this.cmbYearS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbYearS.DropDownWidth = 70;
- this.cmbYearS.Name = "cmbYearS";
- this.cmbYearS.Size = new System.Drawing.Size(100, 27);
- //
// toolStripLabel4
//
this.toolStripLabel4.Name = "toolStripLabel4";
this.toolStripLabel4.Size = new System.Drawing.Size(15, 24);
this.toolStripLabel4.Text = "~";
//
- // cmbYearE
- //
- this.cmbYearE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cmbYearE.DropDownWidth = 70;
- this.cmbYearE.Name = "cmbYearE";
- this.cmbYearE.Size = new System.Drawing.Size(100, 27);
- //
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
@@ -717,7 +701,6 @@
// tbRequest
//
this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbRequest.Name = "tbRequest";
this.tbRequest.Size = new System.Drawing.Size(120, 27);
this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -743,7 +726,6 @@
//
// tbSd
//
- this.tbSd.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbSd.Name = "tbSd";
this.tbSd.Size = new System.Drawing.Size(20, 27);
this.tbSd.Text = "2";
@@ -757,7 +739,6 @@
//
// tbSD2
//
- this.tbSD2.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbSD2.Name = "tbSD2";
this.tbSD2.Size = new System.Drawing.Size(20, 27);
this.tbSD2.Text = "7";
@@ -1040,6 +1021,18 @@
//
this.ta.ClearBeforeFill = true;
//
+ // cmbYearE
+ //
+ this.cmbYearE.DropDownWidth = 70;
+ this.cmbYearE.Name = "cmbYearE";
+ this.cmbYearE.Size = new System.Drawing.Size(100, 27);
+ //
+ // cmbYearS
+ //
+ this.cmbYearS.DropDownWidth = 70;
+ this.cmbYearS.Name = "cmbYearS";
+ this.cmbYearS.Size = new System.Drawing.Size(100, 27);
+ //
// fEboardList
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1107,7 +1100,6 @@
private System.Windows.Forms.ToolStripButton btFind;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
- private System.Windows.Forms.ToolStripComboBox cmbYearS;
private System.Windows.Forms.ToolStripMenuItem 엑셀파일로저장ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
@@ -1123,7 +1115,6 @@
private System.Windows.Forms.Label sbSumRepair;
private System.Windows.Forms.Label sbSumReduction;
private System.Windows.Forms.ToolStripLabel toolStripLabel4;
- private System.Windows.Forms.ToolStripComboBox cmbYearE;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem;
@@ -1152,5 +1143,7 @@
private System.Windows.Forms.ToolStripButton chkDelay;
private System.Windows.Forms.ToolStripLabel toolStripLabel7;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ private System.Windows.Forms.ToolStripComboBox cmbYearS;
+ private System.Windows.Forms.ToolStripComboBox cmbYearE;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/EBoard/fEboardList.cs b/SubProject/FPJ0000/EBoard/fEboardList.cs
index 560254a..564ad61 100644
--- a/SubProject/FPJ0000/EBoard/fEboardList.cs
+++ b/SubProject/FPJ0000/EBoard/fEboardList.cs
@@ -44,18 +44,16 @@ namespace FPJ0000
//프로젝트 목록을 처리함
this.tbRequest.Text = FCOMMON.info.Login.nameK;
-
-
//this.cmbSort.SelectedIndex = 0;
this.cmbYearS.Items.Clear();
this.cmbYearE.Items.Clear();
for (int i = 2010; i <= DateTime.Now.Year; i++)
{
- cmbYearS.Items.Add(i.ToString("0000"));
- cmbYearE.Items.Add(i.ToString("0000"));
+ cmbYearS.Items.Add(i.ToString("0000") + "-01-01");
+ cmbYearE.Items.Add(i.ToString("0000") + "-01-01");
}
- this.cmbYearS.Text = DateTime.Now.Year.ToString("0000");
- this.cmbYearE.Text = DateTime.Now.Year.ToString("0000");
+ this.cmbYearS.Text = DateTime.Now.Year.ToString("0000") + "-01-01";
+ this.cmbYearE.Text = DateTime.Now.Year.ToString("0000") + "-12-31";
refreshData();
//일반사용자의경우에는 상태를 변경하지 못한다.
@@ -95,7 +93,7 @@ namespace FPJ0000
string State_Select = " SELECT * FROM EETGW_JobReport_EBoard";
string State_where = " WHERE gcode=@gcode and pdate between ";
- State_where += "'" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(uid, '')) LIKE @username ";
+ State_where += "'" + cmbYearS.Text + "' and '" + cmbYearE.Text + "' AND (ISNULL(uid, '')) LIKE @username ";
if (chkDelay.Checked)
{
@@ -366,17 +364,85 @@ namespace FPJ0000
private void 엑셀파일로저장ToolStripMenuItem_Click(object sender, EventArgs e)
{
SaveFileDialog sd = new SaveFileDialog();
- sd.Filter = ("excel|*.xls");
+ sd.Filter = ("excel|*.xlsx");
var dlg = sd.ShowDialog();
if (dlg == System.Windows.Forms.DialogResult.OK)
{
- this.fpSpread1.SaveExcel(sd.FileName,
- FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
- | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
- | FarPoint.Excel.ExcelSaveFlags.NoFormulas
- | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
+ var book = new libxl.XmlBook();
+ book.setKey("Amkor Technology", "windows-242f240302c3e50d6cb1686ba2q4k0o9");
+ var fn = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "EBoardDailyform.xlsx");
+ System.IO.File.Copy(fn, sd.FileName, true);
+ book.load(sd.FileName);
+ var sht = book.getSheet(0);
+ //2번쨰 줄부터 데이터를 기록한다.
+ var row = 1;
+ foreach (dsPRJ.EETGW_JobReport_EBoardRow dr in this.dsMSSQL.EETGW_JobReport_EBoard.Select(this.bs.Filter,this.bs.Sort))
+ {
+ if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) continue;
+ sht.writeStr(row, 3, dr.요청자);
+ sht.writeStr(row, 4, dr.pdate);
+ sht.writeStr(row, 5, dr.수리완료일);
+ sht.writeStr(row, 8, dr.분류);
- FCOMMON.Util.MsgI("파일생성 완료\n\n" + sd.FileName);
+ sht.writeStr(row, 9, dr.Line);
+ sht.writeStr(row, 10, dr.Division);
+ sht.writeStr(row, 12, dr.Process);
+ sht.writeStr(row, 13, dr.Model);
+ sht.writeStr(row, 14, dr.BoardName);
+ sht.writeStr(row, 15, dr.BoardVender);
+ sht.writeStr(row, 16, dr.원인 + ":" + dr.결과);
+ sht.writeStr(row, 17, dr.SN);
+ sht.writeNum(row, 18, dr.QTY);
+ sht.writeNum(row, 19, (double)dr.NPrice);
+ sht.writeNum(row, 21, (double)dr.RepairCost);
+ sht.writeStr(row, 23, dr.외주업체.isEmpty() ? "자체" : "외주");
+ sht.writeStr(row, 24, dr.외주업체);
+ sht.writeNum(row, 25, dr.RepairTime);
+ sht.writeStr(row, 27, dr.uid);
+
+ row += 1;
+ }
+ var maxrow = sht.lastRow();
+ for (int r = row; r <= maxrow; r++)
+ {
+ sht.writeBlank(r, 3, sht.cellFormat(row, 3));//, String.Empty);
+ sht.writeBlank(r, 4, sht.cellFormat(row, 4));//, string.Empty);
+ sht.writeBlank(r, 5, sht.cellFormat(row, 5));//, dr.수리완료일);
+ sht.writeBlank(r, 8, sht.cellFormat(row, 8));//, dr.분류);
+ sht.writeBlank(r, 9, sht.cellFormat(row, 9));//, dr.Line);
+ sht.writeBlank(r, 10, sht.cellFormat(row, 10));//, dr.Division);
+ sht.writeBlank(r, 12, sht.cellFormat(row, 11));//, dr.Process);
+ sht.writeBlank(r, 13, sht.cellFormat(row, 12));//, dr.Model);
+ sht.writeBlank(r, 14, sht.cellFormat(row, 13));//, dr.BoardName);
+ sht.writeBlank(r, 15, sht.cellFormat(row, 14));//, dr.BoardVender);
+ sht.writeBlank(r, 16, sht.cellFormat(row, 15));//, dr.원인 + ":" + dr.결과);
+ sht.writeBlank(r, 17, sht.cellFormat(row, 16));//, dr.SN);
+ sht.writeBlank(r, 18, sht.cellFormat(row, 17));//, dr.QTY);
+ sht.writeBlank(r, 19, sht.cellFormat(row, 18));//, (double)dr.NPrice);
+ sht.writeBlank(r, 21, sht.cellFormat(row, 20));//, (double)dr.RepairCost);
+ sht.writeBlank(r, 23, sht.cellFormat(row, 22));//, dr.외주업체.isEmpty() ? "자체" : "외주");
+ sht.writeBlank(r, 24, sht.cellFormat(row, 23));//, dr.외주업체);
+ sht.writeBlank(r, 25, sht.cellFormat(row, 24));//, dr.RepairTime);
+ sht.writeBlank(r, 27, sht.cellFormat(row, 26));//, dr.uid);
+ }
+
+ //this.fpSpread1.SaveExcel(sd.FileName,
+ // FarPoint.Excel.ExcelSaveFlags.SaveAsViewed
+ // | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
+ // | FarPoint.Excel.ExcelSaveFlags.NoFormulas
+ // | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
+
+ //var cols = new List();
+ //cols.Add("Mon");
+ //cols.Add("수리완료");
+ //cols.Add("Site");
+ //cols.Add("Request");
+ //cols.Add("입고일");
+ //cols.Add("수리완료");
+ //cols.Add("완료월");
+ book.save(sd.FileName);
+ var dlg2 = FCOMMON.Util.MsgQ("파일생성 완료\n\n열까요?" + sd.FileName);
+ if(dlg2 == DialogResult.Yes) FCOMMON.Util.RunExplorer(sd.FileName);
}
}
diff --git a/SubProject/FPJ0000/EBoard/fEboardList.resx b/SubProject/FPJ0000/EBoard/fEboardList.resx
index d66470f..8a93571 100644
--- a/SubProject/FPJ0000/EBoard/fEboardList.resx
+++ b/SubProject/FPJ0000/EBoard/fEboardList.resx
@@ -223,20 +223,20 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL2SURBVDhPhZLrS1NhHMf3Kv+EsF70UohScmFRL0pTmxrY
- zVTUvM0pmprowiBTppF5CU1UqBCl6EWFqOnUpuac0w1nZNpS8zov4GVOdzlHd8789pyz4QyEfvDhefGc
- 74fz+54j4CboiTLhRrlGEV6h2Qou1lDkpHkquVNLh5cP06Ev1BOXparq0xEfj/GhwxPybFC1bqY3VzZM
- rNG6C6PFzaaZg8bvVTMK2gyIrZi0iTLlHq6oc8JK1etrxh12eMEO7SIDrYGBZoGBen4Pyj+76NJbscsA
- 7ZMUCloWkfxqgvpHElzUS+3Y9jC6xOL7EkNOBiO8ZA8DM7v4qrcRgQOjqyy0K3aUyA0IeNz3gQ9HVfrP
- 3SuO2JfU3UFy7V3UdjehuLkSAYXe8CeISi4hSOaHqvYqfhULzWDNZEOQdIDhBZHlAZ/7xjvQMf0WtZo8
- XhJfE4q893HIaoqGuP4mkuqT0D62ho4JC7783ME26SlYNkjzAlG1yCNUls1qpvrxblyGMmUmL0moCyPh
- W0h7nQrVjJVfpXeagoL0YLLaEVw85BRwE1I6QOc0JEI3o0a99hGe9+QiqvIaEmoioFuwQUeK5QpWzTo7
- MRJBkOyQ4MrTQvuF/FOIqxZhdHYYJf3pkMlzEP0yEE3KVvxYZqAjxQ7P2zFEWDfbEVDkEvhKPSVC6Ulk
- NcYgti4EMVXXeUmOPA7S5lTyJoHg7kcNLEa4T0wwkyL9ctVOgVB6fFkoPUEe8oQwzxO3ywKR8SYRKr0C
- JYp8pH9KhLguEjoi0JJ/Q0MEtN0B32yle4WruYP06jaNsWWWZ2BqBQ8b0pBCgpL6aOQ2Pji447DtsfDJ
- lrsFQmJbMroF/8NKVvBJbXMLLuZ8s+kNm/tHPXwUJrPVcTa+3eKKkyLTeuYWd2xm/dKWY26Dwtw6hRkX
- GxY7D9e8hWaxYbI4KIra9rrf+csVFwjOp3Vn+Ii7es5JFEYfSSt9QIoT75QWJ+IW2kvcaTqT1NnrnShP
- FggEgr9Ef6FyBTeROAAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL5SURBVDhPhZLZTxNRFIf7JH+CQR98JDEKAdyiDwoCFjDB
+ DYEgspVCQECWGkxEtGBEFgMSIFFDIBof1LAoFLSAlFJoQzEii4CsZYkUytJlBjpTft6ZNhQTEk/y5Tzc
+ e77c85sRcOX/QBFzuVgtDylRrwVI1RTpNE8p1zV0SHEfHfRMNXxOoiw/Gvr+AD+0twKf9Cj1Rnp1Qb/G
+ GsxbMJicrBo5aPxaMiL3kw6RJWMWYarMxTFqr+BClf7P6gbbN2uFZo6BRsdAPctANbMNxe8ttI2ascUA
+ zWMUchvnEP9imPpHEpDXTm1atjEwz+L7PEM6g35eso3uyS18HbUQgQ0DSyw0i1YUyHTwvd/5jh8OL/WZ
+ vikN3RFXXUd85Q1UfqlDfn0pfPPc4UMQFpyFv/QUyprL+FVMNIPldQv8s7sZXhBW7Puxc6gFLROvUanO
+ 5iXRFUHIfhuFtLoIiKqvIK46Ds2Dy2gZNuHzz01skJwCpD00LxCWC10CH6ez6vEuvBmSokiRyktiqoLJ
+ 8FUkvUyEctLMr9IxQUFOclg3WxGQ32sXcBVY2E1n1MRCO6lCteYenrZnIbz0ImIqQqGdtUBLguUCVk7Z
+ MzEQgb90j+D8wzzr6ZwjiCoXYmCqDwVdyZDKMhDx3A91iib8WGCgJcH2zVjRS9AbrfB95BB4SVzF3pLD
+ SKuNxK2qQESWXeIlGbIoSOoTyUv8wJ0P6Fj0c5+YYCRBnsxU2QXekoML3pJD5JIrvLNdca3IDymvYqEc
+ laNAnoPkD7EQVYVBSwQa8m+oiYC22uCZrnCucCGzh17aoDG4wPJ0jy/ibk0SEsiguDoCWbV3ds84LNss
+ PNJbnAIvYps3OAX/w0xW8EhscgrOZHyzjMyt7Ox3eT/WNk2249HNJsc4eUFS+/TcpsU4ojPYplcoTOsp
+ TDpYMVl5uORNNAv9mtFGUdSG2+3WEce4QHAi6UuKh6it3VMsN3iIG+ldEuy4JzTYETXQbqLW9WNxrR3u
+ sbJ4gUAg+AsGD6FJM3GofAAAAABJRU5ErkJggg==
@@ -254,6 +254,9 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+
+ 17, 17
+
252, 17
diff --git a/SubProject/FPJ0000/EboardDailyform.xlsx b/SubProject/FPJ0000/EboardDailyform.xlsx
index 02dac3d..463bed8 100644
Binary files a/SubProject/FPJ0000/EboardDailyform.xlsx and b/SubProject/FPJ0000/EboardDailyform.xlsx differ
diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj
index 3c5fd03..f507203 100644
--- a/SubProject/FPJ0000/FPJ0000.csproj
+++ b/SubProject/FPJ0000/FPJ0000.csproj
@@ -746,6 +746,9 @@
EntityModelCodeGenerator
Model1.Designer.cs
+
+ PreserveNewest
+
PreserveNewest
diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs
index b8872f4..088cdc1 100644
--- a/SubProject/FPJ0000/Project/fPartList.Designer.cs
+++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs
@@ -93,6 +93,12 @@
this.tbIdx = new System.Windows.Forms.TextBox();
this.nameTextBox = new System.Windows.Forms.TextBox();
this.pdateTextBox = new System.Windows.Forms.TextBox();
+ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.prb2 = new arCtl.arLabel();
+ this.prb1 = new arCtl.arLabel();
+ this.prb5 = new arCtl.arLabel();
+ this.prb4 = new arCtl.arLabel();
+ this.prb3 = new arCtl.arLabel();
this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -135,12 +141,6 @@
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
- this.prb3 = new arCtl.arLabel();
- this.prb4 = new arCtl.arLabel();
- this.prb5 = new arCtl.arLabel();
- this.prb1 = new arCtl.arLabel();
- this.prb2 = new arCtl.arLabel();
- this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
pdateLabel = new System.Windows.Forms.Label();
requestLabel = new System.Windows.Forms.Label();
reqstaffLabel = new System.Windows.Forms.Label();
@@ -154,13 +154,13 @@
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
+ this.tableLayoutPanel1.SuspendLayout();
this.cm1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsPart)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
- this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// pdateLabel
@@ -547,6 +547,260 @@
this.pdateTextBox.TabIndex = 5;
this.pdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.ColumnCount = 5;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel1.Controls.Add(this.prb2, 1, 0);
+ this.tableLayoutPanel1.Controls.Add(this.prb1, 0, 0);
+ this.tableLayoutPanel1.Controls.Add(this.prb5, 4, 0);
+ this.tableLayoutPanel1.Controls.Add(this.prb4, 3, 0);
+ this.tableLayoutPanel1.Controls.Add(this.prb3, 2, 0);
+ this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 119);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 1;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(1345, 51);
+ this.tableLayoutPanel1.TabIndex = 33;
+ //
+ // prb2
+ //
+ this.prb2.BackColor = System.Drawing.Color.SkyBlue;
+ this.prb2.BackColor2 = System.Drawing.Color.SkyBlue;
+ this.prb2.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
+ this.prb2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90)))));
+ this.prb2.BorderColorOver = System.Drawing.Color.Red;
+ this.prb2.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4);
+ this.prb2.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
+ this.prb2.Cursor = System.Windows.Forms.Cursors.Arrow;
+ this.prb2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.prb2.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.prb2.ForeColor = System.Drawing.Color.Black;
+ this.prb2.GradientEnable = true;
+ this.prb2.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal;
+ this.prb2.GradientRepeatBG = false;
+ this.prb2.isButton = false;
+ this.prb2.Location = new System.Drawing.Point(274, 5);
+ this.prb2.Margin = new System.Windows.Forms.Padding(5);
+ this.prb2.MouseDownColor = System.Drawing.Color.Yellow;
+ this.prb2.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+ this.prb2.msg = null;
+ this.prb2.Name = "prb2";
+ this.prb2.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
+ this.prb2.ProgressBorderColor = System.Drawing.Color.Black;
+ this.prb2.ProgressColor1 = System.Drawing.Color.Yellow;
+ this.prb2.ProgressColor2 = System.Drawing.Color.Gold;
+ this.prb2.ProgressEnable = false;
+ this.prb2.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold);
+ this.prb2.ProgressForeColor = System.Drawing.Color.Black;
+ this.prb2.ProgressMax = 100F;
+ this.prb2.ProgressMin = 0F;
+ this.prb2.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5);
+ this.prb2.ProgressValue = 50F;
+ this.prb2.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+ this.prb2.Sign = "";
+ this.prb2.SignAlign = System.Drawing.ContentAlignment.BottomRight;
+ this.prb2.SignColor = System.Drawing.Color.Yellow;
+ this.prb2.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
+ this.prb2.Size = new System.Drawing.Size(259, 41);
+ this.prb2.TabIndex = 32;
+ this.prb2.Text = "구매요청건";
+ this.prb2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.prb2.TextShadow = false;
+ this.prb2.TextVisible = true;
+ //
+ // prb1
+ //
+ this.prb1.BackColor = System.Drawing.Color.White;
+ this.prb1.BackColor2 = System.Drawing.Color.Gainsboro;
+ this.prb1.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
+ this.prb1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90)))));
+ this.prb1.BorderColorOver = System.Drawing.Color.Red;
+ this.prb1.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4);
+ this.prb1.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
+ this.prb1.Cursor = System.Windows.Forms.Cursors.Arrow;
+ this.prb1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.prb1.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.prb1.ForeColor = System.Drawing.Color.Black;
+ this.prb1.GradientEnable = true;
+ this.prb1.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal;
+ this.prb1.GradientRepeatBG = false;
+ this.prb1.isButton = false;
+ this.prb1.Location = new System.Drawing.Point(5, 5);
+ this.prb1.Margin = new System.Windows.Forms.Padding(5);
+ this.prb1.MouseDownColor = System.Drawing.Color.Yellow;
+ this.prb1.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+ this.prb1.msg = null;
+ this.prb1.Name = "prb1";
+ this.prb1.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
+ this.prb1.ProgressBorderColor = System.Drawing.Color.Black;
+ this.prb1.ProgressColor1 = System.Drawing.Color.Yellow;
+ this.prb1.ProgressColor2 = System.Drawing.Color.Gold;
+ this.prb1.ProgressEnable = false;
+ this.prb1.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold);
+ this.prb1.ProgressForeColor = System.Drawing.Color.Black;
+ this.prb1.ProgressMax = 100F;
+ this.prb1.ProgressMin = 0F;
+ this.prb1.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5);
+ this.prb1.ProgressValue = 50F;
+ this.prb1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+ this.prb1.Sign = "";
+ this.prb1.SignAlign = System.Drawing.ContentAlignment.BottomRight;
+ this.prb1.SignColor = System.Drawing.Color.Yellow;
+ this.prb1.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
+ this.prb1.Size = new System.Drawing.Size(259, 41);
+ this.prb1.TabIndex = 32;
+ this.prb1.Text = "비 구매";
+ this.prb1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.prb1.TextShadow = false;
+ this.prb1.TextVisible = true;
+ this.toolTip1.SetToolTip(this.prb1, "전체 수량 중 구매 불필요 수량");
+ //
+ // prb5
+ //
+ this.prb5.BackColor = System.Drawing.Color.LightGreen;
+ this.prb5.BackColor2 = System.Drawing.Color.Lime;
+ this.prb5.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
+ this.prb5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90)))));
+ this.prb5.BorderColorOver = System.Drawing.Color.Red;
+ this.prb5.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4);
+ this.prb5.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
+ this.prb5.Cursor = System.Windows.Forms.Cursors.Arrow;
+ this.prb5.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.prb5.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.prb5.ForeColor = System.Drawing.Color.Black;
+ this.prb5.GradientEnable = true;
+ this.prb5.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal;
+ this.prb5.GradientRepeatBG = false;
+ this.prb5.isButton = false;
+ this.prb5.Location = new System.Drawing.Point(1081, 5);
+ this.prb5.Margin = new System.Windows.Forms.Padding(5);
+ this.prb5.MouseDownColor = System.Drawing.Color.Yellow;
+ this.prb5.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+ this.prb5.msg = null;
+ this.prb5.Name = "prb5";
+ this.prb5.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
+ this.prb5.ProgressBorderColor = System.Drawing.Color.Black;
+ this.prb5.ProgressColor1 = System.Drawing.Color.Yellow;
+ this.prb5.ProgressColor2 = System.Drawing.Color.Gold;
+ this.prb5.ProgressEnable = false;
+ this.prb5.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold);
+ this.prb5.ProgressForeColor = System.Drawing.Color.Black;
+ this.prb5.ProgressMax = 100F;
+ this.prb5.ProgressMin = 0F;
+ this.prb5.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5);
+ this.prb5.ProgressValue = 50F;
+ this.prb5.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+ this.prb5.Sign = "";
+ this.prb5.SignAlign = System.Drawing.ContentAlignment.BottomRight;
+ this.prb5.SignColor = System.Drawing.Color.Yellow;
+ this.prb5.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
+ this.prb5.Size = new System.Drawing.Size(259, 41);
+ this.prb5.TabIndex = 32;
+ this.prb5.Text = "구매 완료";
+ this.prb5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.prb5.TextShadow = false;
+ this.prb5.TextVisible = true;
+ this.toolTip1.SetToolTip(this.prb5, "구매대상 중 구매완료 율");
+ //
+ // prb4
+ //
+ this.prb4.BackColor = System.Drawing.Color.Magenta;
+ this.prb4.BackColor2 = System.Drawing.Color.DarkMagenta;
+ this.prb4.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
+ this.prb4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90)))));
+ this.prb4.BorderColorOver = System.Drawing.Color.Red;
+ this.prb4.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4);
+ this.prb4.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
+ this.prb4.Cursor = System.Windows.Forms.Cursors.Arrow;
+ this.prb4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.prb4.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.prb4.ForeColor = System.Drawing.Color.Black;
+ this.prb4.GradientEnable = true;
+ this.prb4.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal;
+ this.prb4.GradientRepeatBG = false;
+ this.prb4.isButton = false;
+ this.prb4.Location = new System.Drawing.Point(812, 5);
+ this.prb4.Margin = new System.Windows.Forms.Padding(5);
+ this.prb4.MouseDownColor = System.Drawing.Color.Yellow;
+ this.prb4.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+ this.prb4.msg = null;
+ this.prb4.Name = "prb4";
+ this.prb4.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
+ this.prb4.ProgressBorderColor = System.Drawing.Color.Black;
+ this.prb4.ProgressColor1 = System.Drawing.Color.Yellow;
+ this.prb4.ProgressColor2 = System.Drawing.Color.Gold;
+ this.prb4.ProgressEnable = false;
+ this.prb4.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold);
+ this.prb4.ProgressForeColor = System.Drawing.Color.Black;
+ this.prb4.ProgressMax = 100F;
+ this.prb4.ProgressMin = 0F;
+ this.prb4.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5);
+ this.prb4.ProgressValue = 50F;
+ this.prb4.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+ this.prb4.Sign = "";
+ this.prb4.SignAlign = System.Drawing.ContentAlignment.BottomRight;
+ this.prb4.SignColor = System.Drawing.Color.Yellow;
+ this.prb4.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
+ this.prb4.Size = new System.Drawing.Size(259, 41);
+ this.prb4.TabIndex = 32;
+ this.prb4.Text = "구매진행중";
+ this.prb4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.prb4.TextShadow = false;
+ this.prb4.TextVisible = true;
+ this.toolTip1.SetToolTip(this.prb4, "구매대상 중 구매");
+ //
+ // prb3
+ //
+ this.prb3.BackColor = System.Drawing.Color.OrangeRed;
+ this.prb3.BackColor2 = System.Drawing.Color.Orange;
+ this.prb3.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
+ this.prb3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90)))));
+ this.prb3.BorderColorOver = System.Drawing.Color.Red;
+ this.prb3.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4);
+ this.prb3.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
+ this.prb3.Cursor = System.Windows.Forms.Cursors.Arrow;
+ this.prb3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.prb3.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.prb3.ForeColor = System.Drawing.Color.Black;
+ this.prb3.GradientEnable = true;
+ this.prb3.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal;
+ this.prb3.GradientRepeatBG = false;
+ this.prb3.isButton = false;
+ this.prb3.Location = new System.Drawing.Point(543, 5);
+ this.prb3.Margin = new System.Windows.Forms.Padding(5);
+ this.prb3.MouseDownColor = System.Drawing.Color.Yellow;
+ this.prb3.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+ this.prb3.msg = null;
+ this.prb3.Name = "prb3";
+ this.prb3.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
+ this.prb3.ProgressBorderColor = System.Drawing.Color.Black;
+ this.prb3.ProgressColor1 = System.Drawing.Color.Yellow;
+ this.prb3.ProgressColor2 = System.Drawing.Color.Gold;
+ this.prb3.ProgressEnable = false;
+ this.prb3.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold);
+ this.prb3.ProgressForeColor = System.Drawing.Color.Black;
+ this.prb3.ProgressMax = 100F;
+ this.prb3.ProgressMin = 0F;
+ this.prb3.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5);
+ this.prb3.ProgressValue = 50F;
+ this.prb3.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
+ this.prb3.Sign = "";
+ this.prb3.SignAlign = System.Drawing.ContentAlignment.BottomRight;
+ this.prb3.SignColor = System.Drawing.Color.Yellow;
+ this.prb3.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
+ this.prb3.Size = new System.Drawing.Size(259, 41);
+ this.prb3.TabIndex = 32;
+ this.prb3.Text = "PO대기";
+ this.prb3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.prb3.TextShadow = false;
+ this.prb3.TextVisible = true;
+ //
// cm1
//
this.cm1.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
@@ -876,6 +1130,7 @@
this.tam.EETGW_JobReport_EBoardTableAdapter = null;
this.tam.EETGW_NoteTableAdapter = null;
this.tam.EETGW_ProjecthistoryDTableAdapter = null;
+ this.tam.EETGW_ProjectsScheduleTableAdapter = null;
this.tam.EETGW_ProjectToDoTableAdapter = null;
this.tam.EETGW_SaveCostTableAdapter = null;
this.tam.JobReportTableAdapter = null;
@@ -913,6 +1168,7 @@
this.fpSpread1_Sheet1});
this.fpSpread1.Size = new System.Drawing.Size(1345, 464);
this.fpSpread1.Skin = FarPoint.Win.Spread.DefaultSpreadSkins.Office2013;
+ this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 4;
this.fpSpread1.TitleInfo.Text = "PartList";
this.fpSpread1.TitleInfo.Value = "PartList";
@@ -1167,260 +1423,6 @@
this.fpSpread1_Sheet1.TitleInfo.Value = "Partlist";
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
- // prb3
- //
- this.prb3.BackColor = System.Drawing.Color.OrangeRed;
- this.prb3.BackColor2 = System.Drawing.Color.Orange;
- this.prb3.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
- this.prb3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90)))));
- this.prb3.BorderColorOver = System.Drawing.Color.Red;
- this.prb3.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4);
- this.prb3.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
- this.prb3.Cursor = System.Windows.Forms.Cursors.Arrow;
- this.prb3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.prb3.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.prb3.ForeColor = System.Drawing.Color.Black;
- this.prb3.GradientEnable = true;
- this.prb3.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal;
- this.prb3.GradientRepeatBG = false;
- this.prb3.isButton = false;
- this.prb3.Location = new System.Drawing.Point(543, 5);
- this.prb3.Margin = new System.Windows.Forms.Padding(5);
- this.prb3.MouseDownColor = System.Drawing.Color.Yellow;
- this.prb3.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.prb3.msg = null;
- this.prb3.Name = "prb3";
- this.prb3.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
- this.prb3.ProgressBorderColor = System.Drawing.Color.Black;
- this.prb3.ProgressColor1 = System.Drawing.Color.Yellow;
- this.prb3.ProgressColor2 = System.Drawing.Color.Gold;
- this.prb3.ProgressEnable = false;
- this.prb3.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold);
- this.prb3.ProgressForeColor = System.Drawing.Color.Black;
- this.prb3.ProgressMax = 100F;
- this.prb3.ProgressMin = 0F;
- this.prb3.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5);
- this.prb3.ProgressValue = 50F;
- this.prb3.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
- this.prb3.Sign = "";
- this.prb3.SignAlign = System.Drawing.ContentAlignment.BottomRight;
- this.prb3.SignColor = System.Drawing.Color.Yellow;
- this.prb3.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
- this.prb3.Size = new System.Drawing.Size(259, 41);
- this.prb3.TabIndex = 32;
- this.prb3.Text = "PO대기";
- this.prb3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.prb3.TextShadow = false;
- this.prb3.TextVisible = true;
- //
- // prb4
- //
- this.prb4.BackColor = System.Drawing.Color.Magenta;
- this.prb4.BackColor2 = System.Drawing.Color.DarkMagenta;
- this.prb4.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
- this.prb4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90)))));
- this.prb4.BorderColorOver = System.Drawing.Color.Red;
- this.prb4.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4);
- this.prb4.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
- this.prb4.Cursor = System.Windows.Forms.Cursors.Arrow;
- this.prb4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.prb4.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.prb4.ForeColor = System.Drawing.Color.Black;
- this.prb4.GradientEnable = true;
- this.prb4.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal;
- this.prb4.GradientRepeatBG = false;
- this.prb4.isButton = false;
- this.prb4.Location = new System.Drawing.Point(812, 5);
- this.prb4.Margin = new System.Windows.Forms.Padding(5);
- this.prb4.MouseDownColor = System.Drawing.Color.Yellow;
- this.prb4.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.prb4.msg = null;
- this.prb4.Name = "prb4";
- this.prb4.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
- this.prb4.ProgressBorderColor = System.Drawing.Color.Black;
- this.prb4.ProgressColor1 = System.Drawing.Color.Yellow;
- this.prb4.ProgressColor2 = System.Drawing.Color.Gold;
- this.prb4.ProgressEnable = false;
- this.prb4.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold);
- this.prb4.ProgressForeColor = System.Drawing.Color.Black;
- this.prb4.ProgressMax = 100F;
- this.prb4.ProgressMin = 0F;
- this.prb4.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5);
- this.prb4.ProgressValue = 50F;
- this.prb4.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
- this.prb4.Sign = "";
- this.prb4.SignAlign = System.Drawing.ContentAlignment.BottomRight;
- this.prb4.SignColor = System.Drawing.Color.Yellow;
- this.prb4.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
- this.prb4.Size = new System.Drawing.Size(259, 41);
- this.prb4.TabIndex = 32;
- this.prb4.Text = "구매진행중";
- this.prb4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.prb4.TextShadow = false;
- this.prb4.TextVisible = true;
- this.toolTip1.SetToolTip(this.prb4, "구매대상 중 구매");
- //
- // prb5
- //
- this.prb5.BackColor = System.Drawing.Color.LightGreen;
- this.prb5.BackColor2 = System.Drawing.Color.Lime;
- this.prb5.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
- this.prb5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90)))));
- this.prb5.BorderColorOver = System.Drawing.Color.Red;
- this.prb5.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4);
- this.prb5.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
- this.prb5.Cursor = System.Windows.Forms.Cursors.Arrow;
- this.prb5.Dock = System.Windows.Forms.DockStyle.Fill;
- this.prb5.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.prb5.ForeColor = System.Drawing.Color.Black;
- this.prb5.GradientEnable = true;
- this.prb5.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal;
- this.prb5.GradientRepeatBG = false;
- this.prb5.isButton = false;
- this.prb5.Location = new System.Drawing.Point(1081, 5);
- this.prb5.Margin = new System.Windows.Forms.Padding(5);
- this.prb5.MouseDownColor = System.Drawing.Color.Yellow;
- this.prb5.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.prb5.msg = null;
- this.prb5.Name = "prb5";
- this.prb5.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
- this.prb5.ProgressBorderColor = System.Drawing.Color.Black;
- this.prb5.ProgressColor1 = System.Drawing.Color.Yellow;
- this.prb5.ProgressColor2 = System.Drawing.Color.Gold;
- this.prb5.ProgressEnable = false;
- this.prb5.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold);
- this.prb5.ProgressForeColor = System.Drawing.Color.Black;
- this.prb5.ProgressMax = 100F;
- this.prb5.ProgressMin = 0F;
- this.prb5.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5);
- this.prb5.ProgressValue = 50F;
- this.prb5.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
- this.prb5.Sign = "";
- this.prb5.SignAlign = System.Drawing.ContentAlignment.BottomRight;
- this.prb5.SignColor = System.Drawing.Color.Yellow;
- this.prb5.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
- this.prb5.Size = new System.Drawing.Size(259, 41);
- this.prb5.TabIndex = 32;
- this.prb5.Text = "구매 완료";
- this.prb5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.prb5.TextShadow = false;
- this.prb5.TextVisible = true;
- this.toolTip1.SetToolTip(this.prb5, "구매대상 중 구매완료 율");
- //
- // prb1
- //
- this.prb1.BackColor = System.Drawing.Color.White;
- this.prb1.BackColor2 = System.Drawing.Color.Gainsboro;
- this.prb1.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
- this.prb1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90)))));
- this.prb1.BorderColorOver = System.Drawing.Color.Red;
- this.prb1.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4);
- this.prb1.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
- this.prb1.Cursor = System.Windows.Forms.Cursors.Arrow;
- this.prb1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.prb1.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.prb1.ForeColor = System.Drawing.Color.Black;
- this.prb1.GradientEnable = true;
- this.prb1.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal;
- this.prb1.GradientRepeatBG = false;
- this.prb1.isButton = false;
- this.prb1.Location = new System.Drawing.Point(5, 5);
- this.prb1.Margin = new System.Windows.Forms.Padding(5);
- this.prb1.MouseDownColor = System.Drawing.Color.Yellow;
- this.prb1.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.prb1.msg = null;
- this.prb1.Name = "prb1";
- this.prb1.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
- this.prb1.ProgressBorderColor = System.Drawing.Color.Black;
- this.prb1.ProgressColor1 = System.Drawing.Color.Yellow;
- this.prb1.ProgressColor2 = System.Drawing.Color.Gold;
- this.prb1.ProgressEnable = false;
- this.prb1.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold);
- this.prb1.ProgressForeColor = System.Drawing.Color.Black;
- this.prb1.ProgressMax = 100F;
- this.prb1.ProgressMin = 0F;
- this.prb1.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5);
- this.prb1.ProgressValue = 50F;
- this.prb1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
- this.prb1.Sign = "";
- this.prb1.SignAlign = System.Drawing.ContentAlignment.BottomRight;
- this.prb1.SignColor = System.Drawing.Color.Yellow;
- this.prb1.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
- this.prb1.Size = new System.Drawing.Size(259, 41);
- this.prb1.TabIndex = 32;
- this.prb1.Text = "비 구매";
- this.prb1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.prb1.TextShadow = false;
- this.prb1.TextVisible = true;
- this.toolTip1.SetToolTip(this.prb1, "전체 수량 중 구매 불필요 수량");
- //
- // prb2
- //
- this.prb2.BackColor = System.Drawing.Color.SkyBlue;
- this.prb2.BackColor2 = System.Drawing.Color.SkyBlue;
- this.prb2.BackgroundImagePadding = new System.Windows.Forms.Padding(0);
- this.prb2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(90)))), ((int)(((byte)(90)))));
- this.prb2.BorderColorOver = System.Drawing.Color.Red;
- this.prb2.BorderSize = new System.Windows.Forms.Padding(2, 2, 2, 4);
- this.prb2.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
- this.prb2.Cursor = System.Windows.Forms.Cursors.Arrow;
- this.prb2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.prb2.Font = new System.Drawing.Font("맑은 고딕", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.prb2.ForeColor = System.Drawing.Color.Black;
- this.prb2.GradientEnable = true;
- this.prb2.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.ForwardDiagonal;
- this.prb2.GradientRepeatBG = false;
- this.prb2.isButton = false;
- this.prb2.Location = new System.Drawing.Point(274, 5);
- this.prb2.Margin = new System.Windows.Forms.Padding(5);
- this.prb2.MouseDownColor = System.Drawing.Color.Yellow;
- this.prb2.MouseOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.prb2.msg = null;
- this.prb2.Name = "prb2";
- this.prb2.Padding = new System.Windows.Forms.Padding(0, 2, 0, 0);
- this.prb2.ProgressBorderColor = System.Drawing.Color.Black;
- this.prb2.ProgressColor1 = System.Drawing.Color.Yellow;
- this.prb2.ProgressColor2 = System.Drawing.Color.Gold;
- this.prb2.ProgressEnable = false;
- this.prb2.ProgressFont = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold);
- this.prb2.ProgressForeColor = System.Drawing.Color.Black;
- this.prb2.ProgressMax = 100F;
- this.prb2.ProgressMin = 0F;
- this.prb2.ProgressPadding = new System.Windows.Forms.Padding(5, 25, 5, 5);
- this.prb2.ProgressValue = 50F;
- this.prb2.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
- this.prb2.Sign = "";
- this.prb2.SignAlign = System.Drawing.ContentAlignment.BottomRight;
- this.prb2.SignColor = System.Drawing.Color.Yellow;
- this.prb2.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
- this.prb2.Size = new System.Drawing.Size(259, 41);
- this.prb2.TabIndex = 32;
- this.prb2.Text = "구매요청건";
- this.prb2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- this.prb2.TextShadow = false;
- this.prb2.TextVisible = true;
- //
- // tableLayoutPanel1
- //
- this.tableLayoutPanel1.ColumnCount = 5;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel1.Controls.Add(this.prb2, 1, 0);
- this.tableLayoutPanel1.Controls.Add(this.prb1, 0, 0);
- this.tableLayoutPanel1.Controls.Add(this.prb5, 4, 0);
- this.tableLayoutPanel1.Controls.Add(this.prb4, 3, 0);
- this.tableLayoutPanel1.Controls.Add(this.prb3, 2, 0);
- this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 119);
- this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.RowCount = 1;
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(1345, 51);
- this.tableLayoutPanel1.TabIndex = 33;
- //
// fPartList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1438,6 +1440,7 @@
this.panel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
+ this.tableLayoutPanel1.ResumeLayout(false);
this.cm1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bsPart)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
@@ -1445,7 +1448,6 @@
this.bn.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
- this.tableLayoutPanel1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -1521,12 +1523,12 @@
private System.Windows.Forms.RadioButton radSortIpNum;
private System.Windows.Forms.Button button4;
private System.Windows.Forms.Panel panel7;
- private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private arCtl.arLabel prb2;
private arCtl.arLabel prb1;
private arCtl.arLabel prb5;
private arCtl.arLabel prb4;
private arCtl.arLabel prb3;
+ private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs
index d1e921e..0971ef5 100644
--- a/SubProject/FPJ0000/Project/fPartList.cs
+++ b/SubProject/FPJ0000/Project/fPartList.cs
@@ -307,11 +307,23 @@ namespace FPJ0000
void RefreshSum()
{
- decimal sum = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
- decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
+
+ var rows = dsPRJ.ProjectsPart.Select(this.bsPart.Filter);
+ decimal s1 = 0;
+ decimal s2 = 0;
+ foreach(dsPRJ.ProjectsPartRow dr in rows)
+ {
+ if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) continue;
+ s1 += dr.amt;
+ s2 += dr.amtn;
+ }
- lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", sum, sumN);
+ //decimal sum = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amt);
+ //decimal sumN = this.dsPRJ.ProjectsPart.Where(t => t.RowState != DataRowState.Deleted && t.RowState != DataRowState.Detached).Sum(t => t.amtn);
+
+
+ lbSum.Text = string.Format("1:{0:N0} / N:{1:N0}", s1, s2);
}
@@ -543,7 +555,7 @@ namespace FPJ0000
if (e.KeyCode == Keys.Enter)
{
var search = tbFind.Text.Trim();
- var ColumnList = new string[] { "ItemName", "ItemModel", "ItemSupply", "ItemManu", "ItemSid" };
+ var ColumnList = new string[] { "ItemGroup","option1","ItemName", "ItemModel", "ItemSupply", "ItemManu", "ItemSid" };
var Filter = "";
if (search != "")
{
@@ -565,6 +577,10 @@ namespace FPJ0000
this.bsPart.Filter = "";
tbFind.BackColor = SystemColors.Window;
}
+
+ RefreshSum();
+ //FormattingData();
+
}
catch
{
diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx
index 425d4be..dbf76c4 100644
--- a/SubProject/FPJ0000/Project/fPartList.resx
+++ b/SubProject/FPJ0000/Project/fPartList.resx
@@ -397,19 +397,19 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF6WpTQ3s
- ZjrMvM0pmprowiBbTCNTF5qoUCFK0YsKtdKpzds2pxtukrlMzeu8gJel7nKO29n89pyzpQZCP/jwvHjO
- 98P5fc/hsRP6UJl4pUyriCrX/g6TaCly0hwy9tTRUWUDdMQzjfG8WF3pF/3+ABfaO+FP+tQrFnrNaDS6
- zLYtmK27rFlYaPxcsqDwswmC8jE7P0t+0Bv1TGSJZoUND8w6oZtjoDMx0M4y0Mw4oPy1hfZRG7YYoGWM
- QmHzHFJeGKl/JGGSdmrT7oBh3oWheYacDAY5iQOqyS18HbUTgRuGJRd0i04Uy00IftD9jgvHyoKmb0mi
- t0U1N5BSfRPVHQ0oapQhWOKPIAK/+BxCpadR0VLBrWKlGSyv2xGaoGI4QUxZ8MfukVa0TrxGtTafkyRU
- RSD/bTyyGwQQ1l5Fcm0yWoaX0Wq04sv3TWyQnsKkfTQn4FfyD/pJclza8V68GZGiVJnFSRJrIkn4GtJf
- pkE9aeNW6ZqgoCA9rNucCCvq9wjYCS9R0bl1SdBPalCru4+nnXmIlV1CYlU09LN26EmxbMHqKU8nZiII
- le4RXHgkcZ4pOIr4Sj4MUwMo7s2AVJ4LwfMQNCg/4dsCAz0pdmDGiX7CisWJ4MdewUmxjyhQfATZ9XG4
- XROOuIrLnCRXHg9xYxp5kxCw9waTC4PsJyZYSJEBORqPIFB8aCFQfJg85IPAfB9cLw1B5qskqEcVKFYU
- IONDEoQ1MdATgY78G1oioJ1uIlDurnAxp49e2qAxvODiUI0v4l5dOlJJUFQrQF793Z07FrvDRQRNuwLW
- Nm/eFfwPG7tC2h7B2dwee3Nn//Z+D++HTj/kPp7QYvXGSZHpndNzm3ZLT4/WPb1KYXqFwqSXVauTg23e
- Srug0RncFEVt+N5p++GN83in0jsyA4TtnSdECnOAqIneIdWD/1+ETbSvsG39WHJbl3+SPIXH4/H+AGZa
- nrYFb5VbAAAAAElFTkSuQmCC
+ Zipm3uYUTU10YZAtppGpC02cUCFK0YsK7aLzMm/bnNtyRuYyNa/zAl6Wuss5urP57TlnyxkI/eDD8+I5
+ 3w/n9z2Hx07ofWXSpXKdIqpC9ztMrKPISXNI2VNPR5Vr6YgnGuNZkbrKL/rtPi60e8If9amXLfSq0Wh0
+ mm2bMFu9rFpYaPxctKDokwlxFaN2frZ8vyfqnshSzTIb1s44oJ9loDcx0M0w0ExvQflrE20jNmwyQPMo
+ haIPs0h9ZqT+kYSJ26gN+xYG55z4OseQk8EAJ9mCamITHSN2InBhcNEJ/YIDJXITgu91v+HCsdKgqRvi
+ 6G2h7BpSa66jpr0BxY1SBIv9EUTgl5xBqOQkKpsruVWsNIOlNTtCE1UMJ4gpD37fPdyClvGXqNEVcJLE
+ 6ggUvE5ATkMcBLWXkVKbguahJbQYrfj8fQPrpKcwSR/NCfhV/P1+4lynbqwXr4YlKFNmc5IkWSQJX0HG
+ 83SoJ2zcKl3jFBSkhzWbA2HF/W4BO+GlKjqvLhmGCQ1q9XfxuDMfsdILSKqOhmHGDgMpli1YPenuxEwE
+ oZJdgnMPxI5ThYeRUMXH4KQWJb2ZkMjzEPc0BA3Kj/g2z8BAitVOO9BPWLY4EPzQIzgu8hEGig4hpz4e
+ N2XhiK+8yEny5AkQNaaTNwkBez9ocmKA/cQECykyIFfjFgSKDswHig6Sh3wQWOCDq2UhyHqRDPWIAiWK
+ QmS+S4ZAFgMDEejJv6EjAtrhIgKld4XzuX304jqNoXknh2psAXfqMpBGgsLaOOTX3965Y7FvOYmgyStg
+ bXNmr+B/2NgV0ncJTuf12Bs7+rb3engvtF8MrqOJzVZPnBSZ0Tk1u2G39PT0u6ZWKEwtU5jwsGJ1cLDN
+ W2kn1NoBF0VR6763Wn944jzeiYz2rABBW+cxocIcIGyid0hz4/8XQRPtK2hdO5LS2uWfLE/l8Xi8P1vw
+ nqKxv6G/AAAAAElFTkSuQmCC
diff --git a/SubProject/FPJ0000/Project/rPartList.Designer.cs b/SubProject/FPJ0000/Project/rPartList.Designer.cs
index 13dc583..2b17ff9 100644
--- a/SubProject/FPJ0000/Project/rPartList.Designer.cs
+++ b/SubProject/FPJ0000/Project/rPartList.Designer.cs
@@ -36,11 +36,12 @@
System.Windows.Forms.Label edateLabel;
System.Windows.Forms.Label odateLabel;
System.Windows.Forms.Label statusLabel;
- FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
this.dsPRJ = new FPJ0000.dsPRJ();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -157,7 +158,7 @@
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
- this.fpSpread1.Size = new System.Drawing.Size(915, 599);
+ this.fpSpread1.Size = new System.Drawing.Size(978, 594);
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 6;
//
@@ -218,7 +219,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(915, 97);
+ this.panel1.Size = new System.Drawing.Size(978, 97);
this.panel1.TabIndex = 7;
//
// button1
@@ -334,7 +335,7 @@
this.fpSpread1_Sheet1.SheetName = "Sheet1";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
- this.fpSpread1_Sheet1.ColumnCount = 5;
+ this.fpSpread1_Sheet1.ColumnCount = 6;
this.fpSpread1_Sheet1.RowCount = 0;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
@@ -343,43 +344,53 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "공급처";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "금액";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "금액(N)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "금액(구매신청)";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 38F;
- this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
+ this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "중분류";
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Width = 151F;
- this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
+ this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType5;
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(1).Label = "소분류";
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F;
- this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
+ this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "공급처";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F;
- numberCellType1.DecimalPlaces = 0;
- numberCellType1.MaximumValue = 999999999999999D;
- numberCellType1.MinimumValue = -999999999999999D;
- numberCellType1.NegativeRed = true;
- numberCellType1.Separator = ",";
- numberCellType1.ShowSeparator = true;
- this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType1;
+ numberCellType4.DecimalPlaces = 0;
+ numberCellType4.MaximumValue = 999999999999999D;
+ numberCellType4.MinimumValue = -999999999999999D;
+ numberCellType4.NegativeRed = true;
+ numberCellType4.ShowSeparator = true;
+ this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType4;
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(3).Label = "금액";
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(3).Width = 143F;
- numberCellType2.DecimalPlaces = 0;
- numberCellType2.MaximumValue = 10000000D;
- numberCellType2.MinimumValue = -10000000D;
- numberCellType2.NegativeRed = true;
- numberCellType2.ShowSeparator = true;
- this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType2;
+ this.fpSpread1_Sheet1.Columns.Get(3).Width = 120F;
+ numberCellType5.DecimalPlaces = 0;
+ numberCellType5.MaximumValue = 10000000D;
+ numberCellType5.MinimumValue = -10000000D;
+ numberCellType5.NegativeRed = true;
+ numberCellType5.ShowSeparator = true;
+ this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType5;
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(4).Label = "금액(N)";
this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(4).Width = 140F;
+ this.fpSpread1_Sheet1.Columns.Get(4).Width = 120F;
+ numberCellType6.DecimalPlaces = 0;
+ numberCellType6.MaximumValue = 10000000D;
+ numberCellType6.MinimumValue = -10000000D;
+ numberCellType6.NegativeRed = true;
+ numberCellType6.ShowSeparator = true;
+ this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType6;
+ this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+ this.fpSpread1_Sheet1.Columns.Get(5).Label = "금액(구매신청)";
+ this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(5).Width = 120F;
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
@@ -388,7 +399,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(915, 696);
+ this.ClientSize = new System.Drawing.Size(978, 691);
this.Controls.Add(this.fpSpread1);
this.Controls.Add(this.panel1);
this.Name = "rPartList";
diff --git a/SubProject/FPJ0000/Project/rPartList.cs b/SubProject/FPJ0000/Project/rPartList.cs
index 0cdaf95..9624a54 100644
--- a/SubProject/FPJ0000/Project/rPartList.cs
+++ b/SubProject/FPJ0000/Project/rPartList.cs
@@ -40,7 +40,7 @@ namespace FPJ0000
//order by 절은 다시 생성한다.
- var SSQl = " select ItemGroup,option1,ItemSupply,sum(amt) as amt ,sum(amtn) as amtn " +
+ var SSQl = " select ItemGroup,option1,ItemSupply,sum(amt) as amt ,sum(amtn) as amtn ,sum(isnull(qtybuy,0)*isnull(price,0)) as amtb " +
" from projectspart" +
" where Project = " + this.ProjectIndex.ToString() +
" group by ItemGroup,option1,ItemSupply" +
@@ -56,14 +56,19 @@ namespace FPJ0000
//데이터를 회전해서 입력하고 소계를 넣는다
string grp1 = "!";
string grp2 = "!";
+
decimal sum = 0;
decimal sum2 = 0;
decimal sum3 = 0;
+
decimal sumn = 0;
decimal sumn2 = 0;
decimal sumn3 = 0;
+ decimal sumb = 0;
+ decimal sumb2 = 0;
+ decimal sumb3 = 0;
Boolean first = true;
int grp2cnt = 0;
@@ -77,6 +82,8 @@ namespace FPJ0000
{
sum3 += dr.amt;
sumn3 += dr.amtn;
+ sumb3 += dr.amtb;
+
if (first)
{
grp1 = dr.ItemGroup.Trim();
@@ -89,13 +96,18 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = dr.ItemSupply;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = dr.amt;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = dr.amtn;
+ this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 5].Value = dr.amtb;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
sum = dr.amt;
sum2 = dr.amt;
+
sumn = dr.amtn;
sumn2 = dr.amtn;
+ sumb = dr.amtb;
+ sumb2 = dr.amtb;
+
first = false;
grp2cnt = 0;
}
@@ -113,6 +125,7 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn2;
+ this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 5].Value = sumb2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].BackColor = Color.FromArgb(240, 240, 240);
@@ -142,6 +155,7 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn;
+ this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 5].Value = sumb;
this.fpSpread1_Sheet1.Rows[this.fpSpread1_Sheet1.RowCount - 1].BackColor = Color.FromArgb(220, 220, 220);
//중분류가 변경되었으므로 처음 줄부터 지금 줄까지 스팬을 건다
@@ -160,6 +174,9 @@ namespace FPJ0000
sumn = 0;
sumn2 = 0;
+ sumb = 0;
+ sumb2 = 0;
+
grp1 = dr.ItemGroup.Trim();
grp2 = dr.option1.Trim();
grp2cnt = 0;
@@ -177,6 +194,7 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn2;
+ this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 5].Value = sumb2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].BackColor = Color.FromArgb(240, 240, 240);
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].BackColor = Color.FromArgb(240, 240, 240);
@@ -199,6 +217,7 @@ namespace FPJ0000
spanStart2 = this.fpSpread1_Sheet1.RowCount;
sum2 = 0;
sumn2 = 0;
+ sumb2 = 0;
grp2 = dr.option1.Trim();
}
@@ -210,6 +229,7 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = dr.ItemSupply;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = dr.amt;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = dr.amtn;
+ this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 5].Value = dr.amtb;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
cnt++;
@@ -220,6 +240,9 @@ namespace FPJ0000
sumn += dr.amtn;
sumn2 += dr.amtn;
+ sumb += dr.amtb;
+ sumb2 += dr.amtb;
+
//grp2cnt += 1;
}
}
@@ -234,6 +257,7 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn2;
+ this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 5].Value = sumb2;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 1].BackColor = Color.FromArgb(240, 240, 240);
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].BackColor = Color.FromArgb(240, 240, 240);
@@ -263,6 +287,7 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn;
+ this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 5].Value = sumb;
this.fpSpread1_Sheet1.Rows[this.fpSpread1_Sheet1.RowCount - 1].BackColor = Color.FromArgb(220, 220, 220);
@@ -276,6 +301,7 @@ namespace FPJ0000
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 2].Value = "";
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 3].Value = sum3;
this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 4].Value = sumn3;
+ this.fpSpread1_Sheet1.Cells[this.fpSpread1_Sheet1.RowCount - 1, 5].Value = sumb3;
this.fpSpread1_Sheet1.Rows[this.fpSpread1_Sheet1.RowCount - 1].BackColor = Color.LightSkyBlue;
diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs
index 77f03b4..12c58bd 100644
--- a/SubProject/FPJ0000/dsReport.Designer.cs
+++ b/SubProject/FPJ0000/dsReport.Designer.cs
@@ -1672,6 +1672,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnamtn;
+ private global::System.Data.DataColumn columnamtb;
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public PartSummaryDataTable() {
@@ -1745,6 +1747,14 @@ namespace FPJ0000 {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public global::System.Data.DataColumn amtbColumn {
+ get {
+ return this.columnamtb;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -1782,14 +1792,15 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public PartSummaryRow AddPartSummaryRow(string ItemGroup, string option1, string ItemSupply, decimal amt, decimal amtn) {
+ public PartSummaryRow AddPartSummaryRow(string ItemGroup, string option1, string ItemSupply, decimal amt, decimal amtn, decimal amtb) {
PartSummaryRow rowPartSummaryRow = ((PartSummaryRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
ItemGroup,
option1,
ItemSupply,
amt,
- amtn};
+ amtn,
+ amtb};
rowPartSummaryRow.ItemArray = columnValuesArray;
this.Rows.Add(rowPartSummaryRow);
return rowPartSummaryRow;
@@ -1817,6 +1828,7 @@ namespace FPJ0000 {
this.columnItemSupply = base.Columns["ItemSupply"];
this.columnamt = base.Columns["amt"];
this.columnamtn = base.Columns["amtn"];
+ this.columnamtb = base.Columns["amtb"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1832,6 +1844,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnamt);
this.columnamtn = new global::System.Data.DataColumn("amtn", typeof(decimal), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnamtn);
+ this.columnamtb = new global::System.Data.DataColumn("amtb", typeof(decimal), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnamtb);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2531,6 +2545,22 @@ namespace FPJ0000 {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public decimal amtb {
+ get {
+ if (this.IsamtbNull()) {
+ return 0m;
+ }
+ else {
+ return ((decimal)(this[this.tablePartSummary.amtbColumn]));
+ }
+ }
+ set {
+ this[this.tablePartSummary.amtbColumn] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsItemGroupNull() {
@@ -2590,6 +2620,18 @@ namespace FPJ0000 {
public void SetamtnNull() {
this[this.tablePartSummary.amtnColumn] = global::System.Convert.DBNull;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public bool IsamtbNull() {
+ return this.IsNull(this.tablePartSummary.amtbColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public void SetamtbNull() {
+ this[this.tablePartSummary.amtbColumn] = global::System.Convert.DBNull;
+ }
}
///
diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd
index aea1ee6..78b0c33 100644
--- a/SubProject/FPJ0000/dsReport.xsd
+++ b/SubProject/FPJ0000/dsReport.xsd
@@ -156,7 +156,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
-
+
@@ -193,10 +193,10 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
-
+
-
+
@@ -210,7 +210,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
-
+
@@ -226,7 +226,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
-
+
@@ -236,7 +236,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
-
+
@@ -249,7 +249,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
-
+
@@ -276,7 +276,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
-
+
@@ -284,6 +284,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
+
diff --git a/SubProject/FPJ0000/dsReport.xss b/SubProject/FPJ0000/dsReport.xss
index b052405..2151f98 100644
--- a/SubProject/FPJ0000/dsReport.xss
+++ b/SubProject/FPJ0000/dsReport.xss
@@ -10,7 +10,7 @@
-
+
\ No newline at end of file