This commit is contained in:
chi
2021-08-02 16:26:53 +09:00
parent 12a33f174b
commit 2311774c42
23 changed files with 3823 additions and 231 deletions

View File

@@ -105,6 +105,8 @@ namespace Project
public static void ApplyCommonValue(ref string contents)
{
//메뉴 푸터 - 개발자 정보
if (contents.Contains("{title}"))
contents = contents.Replace("{title}", FCOMMON.info.Login.gcode + " Groupware");
}

View File

@@ -86,8 +86,7 @@ namespace Project
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("<td colspan='8'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}

View File

@@ -27,6 +27,92 @@ namespace Project
var vals = Request.GetQueryNameValuePairs();
return string.Empty;
}
//[HttpPost]
//public string Edit([FromBody] string value)
//{
// var vals = Request.GetQueryNameValuePairs();
// var req = Request.GetRequestContext();
// return string.Empty;
//}
[HttpPost]
public string Edit(FormCollection value)
{
var vals = Request.GetQueryNameValuePairs();
var req = Request.GetRequestContext();
return string.Empty;
}
[HttpGet]
public HttpResponseMessage Edit(int id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View("/jobreport/edit");
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var db = new EEEntitiesJobreport();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Now.ToShortDateString();
var rows = db.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == id).FirstOrDefault();
var contents = result.Content;
if (rows == null)
{
//아이템이 없는 메시지를 표시한다
}
else
{
//치환작업을 진행한다
contents = contents.Replace("{pdate}", rows.pdate);
contents = contents.Replace("{status}", rows.status);
contents = contents.Replace("{name}", rows.name);
contents = contents.Replace("{package}", rows.package);
contents = contents.Replace("{process}", rows.process);
contents = contents.Replace("{type}", rows.type);
contents = contents.Replace("{userProcess}", rows.userProcess);
contents = contents.Replace("{projectName}", rows.projectName);
contents = contents.Replace("{hrs}", rows.hrs.ToString());
contents = contents.Replace("{ot}", rows.ot.ToString());
contents = contents.Replace("{requestpart}", rows.requestpart);
contents = contents.Replace("{description}", rows.description);
}
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
@@ -224,7 +310,7 @@ namespace Project
//if (searchkey.isEmpty() == false)
{
var db = new EEEntitiesJobreport();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var sd = DateTime.Now.ToShortDateString();
var ed = DateTime.Now.ToShortDateString();
var rows = db.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate);
itemcnt = rows.Count();
@@ -242,7 +328,7 @@ namespace Project
tbody.AppendLine($"<td class='text-center'>{item.status}</td>");
tbody.AppendLine($"<td>{item.type}</td>");
tbody.AppendLine($"<td>{item.projectName}</td>");
tbody.AppendLine($"<td><a href='/jobreport/edit/{item.idx}'>{item.projectName}</a></td>");
tbody.AppendLine($"<td>{item.hrs}</td>");
tbody.AppendLine($"<td>{item.ot}</td>");

View File

@@ -0,0 +1,88 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project
{
public class ManualController : BaseController
{
[HttpPost]
public void Index([FromBody]string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public HttpResponseMessage Page(string id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View($"\\Manual\\{id}");
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -138,39 +138,39 @@ namespace Project
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
//{
var db = new EEEntitiesPurchase();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var rows = db.vPurchase.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(sd) >= 0).OrderByDescending(t => t.pdate);
itemcnt = rows.Count();
foreach (vPurchase item in rows)
{
var db = new EEEntitiesPurchase();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var rows = db.vPurchase.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(sd) >= 0).OrderByDescending(t => t.pdate);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.pdate.Substring(5)}</th>");
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.pdate.Substring(5)}</th>");
if (item.state == "---") tbody.AppendLine($"<td class='table-info'>{item.state}</td>");
else if (item.state == "Received") tbody.AppendLine($"<td class='table-success'>{item.state}</td>");
else tbody.AppendLine($"<td>{item.state}</td>");
if (item.state == "---") tbody.AppendLine($"<td class='table-info'>{item.state}</td>");
else if (item.state == "Received") tbody.AppendLine($"<td class='table-success'>{item.state}</td>");
else tbody.AppendLine($"<td>{item.state}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.sid}</td>");
tbody.AppendLine($"<td>{item.pumname}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.sid}</td>");
tbody.AppendLine($"<td>{item.pumname}</td>");
if (item.pumscale.Length > 10) tbody.AppendLine($"<td>{item.pumscale.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.pumscale}</td>");
if (item.pumscale.Length > 10) tbody.AppendLine($"<td>{item.pumscale.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.pumscale}</td>");
tbody.AppendLine($"<td>{item.pumqty}</td>");
tbody.AppendLine($"<td>{item.pumprice}</td>");
tbody.AppendLine($"<td>{item.pumamt}</td>");
tbody.AppendLine($"<td>{item.supply}</td>");
if (item.project != null && item.project.Length > 10) tbody.AppendLine($"<td>{item.project.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.project}</td>");
tbody.AppendLine($"<td>{item.pumqty}</td>");
tbody.AppendLine($"<td>{item.pumprice}</td>");
tbody.AppendLine($"<td>{item.pumamt}</td>");
tbody.AppendLine($"<td>{item.supply}</td>");
if (item.project != null && item.project.Length > 10) tbody.AppendLine($"<td>{item.project.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.project}</td>");
if (item.bigo.Length > 10) tbody.AppendLine($"<td>{item.bigo.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.bigo}</td>");
tbody.AppendLine("</tr>");
}
if (item.bigo.Length > 10) tbody.AppendLine($"<td>{item.bigo.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.bigo}</td>");
tbody.AppendLine("</tr>");
}
//}
//아잍쳄이 없는경우
if (itemcnt == 0)

View File

@@ -257,6 +257,7 @@
</Compile>
<Compile Include="BaseController.cs" />
<Compile Include="Controller\APIController.cs" />
<Compile Include="Controller\ManualController.cs" />
<Compile Include="Controller\ProjectController.cs" />
<Compile Include="Controller\JobreportController.cs" />
<Compile Include="Controller\CustomerController.cs" />
@@ -491,7 +492,7 @@
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="Purchase.cs">
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
<DependentUpon>ModelPurchase.tt</DependentUpon>
</Compile>
<Compile Include="Settings.cs" />
<Compile Include="SqlServerTypes\Loader.cs" />

View File

@@ -36,5 +36,6 @@ namespace Project
public System.DateTime wdate { get; set; }
public Nullable<bool> bEstimate { get; set; }
public Nullable<bool> bSAP { get; set; }
public Nullable<decimal> priceD { get; set; }
}
}

View File

@@ -22,6 +22,7 @@
<Property Name="supply" Type="nvarchar" MaxLength="100" />
<Property Name="supplyidx" Type="int" />
<Property Name="price" Type="decimal" Precision="18" Scale="0" />
<Property Name="priceD" Type="decimal" Precision="18" Scale="2" />
<Property Name="memo" Type="nvarchar" MaxLength="255" />
<Property Name="image" Type="varbinary(max)" />
<Property Name="bparam1" Type="bit" />
@@ -51,6 +52,7 @@
<Property Name="pumunit" Type="varchar" MaxLength="50" />
<Property Name="pumqty" Type="int" />
<Property Name="pumprice" Type="decimal" Precision="18" Scale="0" />
<Property Name="pumpriceD" Type="decimal" Precision="18" Scale="2" />
<Property Name="pumamt" Type="decimal" Precision="18" Scale="0" />
<Property Name="supply" Type="varchar" MaxLength="200" />
<Property Name="supplyidx" Type="int" />
@@ -96,6 +98,7 @@
<Property Name="pumunit" Type="varchar" MaxLength="50" />
<Property Name="pumqty" Type="int" />
<Property Name="pumprice" Type="decimal" Precision="18" Scale="0" />
<Property Name="pumpriceD" Type="decimal" Precision="18" Scale="2" />
<Property Name="pumamt" Type="decimal" Precision="18" Scale="0" />
<Property Name="supply" Type="varchar" MaxLength="200" />
<Property Name="supplyidx" Type="int" />
@@ -137,6 +140,7 @@
[vPurchase].[pumunit] AS [pumunit],
[vPurchase].[pumqty] AS [pumqty],
[vPurchase].[pumprice] AS [pumprice],
[vPurchase].[pumpriceD] AS [pumpriceD],
[vPurchase].[pumamt] AS [pumamt],
[vPurchase].[supply] AS [supply],
[vPurchase].[supplyidx] AS [supplyidx],
@@ -189,6 +193,7 @@
<Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
<Property Name="bEstimate" Type="Boolean" />
<Property Name="bSAP" Type="Boolean" />
<Property Name="priceD" Type="Decimal" Precision="18" Scale="2" />
</EntityType>
<EntityType Name="Purchase">
<Key>
@@ -228,6 +233,7 @@
<Property Name="wuid" Type="String" MaxLength="20" FixedLength="false" Unicode="false" Nullable="false" />
<Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
<Property Name="inqty" Type="Int32" />
<Property Name="pumpriceD" Type="Decimal" Precision="18" Scale="2" />
</EntityType>
<EntityContainer Name="EEEntitiesPurchase" annotation:LazyLoadingEnabled="true">
<EntitySet Name="Items" EntityType="Self.Items" />
@@ -257,6 +263,7 @@
<Property Name="pumunit" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="pumqty" Type="Int32" />
<Property Name="pumprice" Type="Decimal" Precision="18" Scale="0" />
<Property Name="pumpriceD" Type="Decimal" Precision="18" Scale="2" />
<Property Name="pumamt" Type="Decimal" Precision="18" Scale="0" />
<Property Name="supply" Type="String" MaxLength="200" FixedLength="false" Unicode="false" />
<Property Name="supplyidx" Type="Int32" />
@@ -286,6 +293,7 @@
<EntitySetMapping Name="Items">
<EntityTypeMapping TypeName="EEModel.Items">
<MappingFragment StoreEntitySet="Items">
<ScalarProperty Name="priceD" ColumnName="priceD" />
<ScalarProperty Name="idx" ColumnName="idx" />
<ScalarProperty Name="disable" ColumnName="disable" />
<ScalarProperty Name="gcode" ColumnName="gcode" />
@@ -314,6 +322,7 @@
<EntitySetMapping Name="Purchase">
<EntityTypeMapping TypeName="EEModel.Purchase">
<MappingFragment StoreEntitySet="Purchase">
<ScalarProperty Name="pumpriceD" ColumnName="pumpriceD" />
<ScalarProperty Name="idx" ColumnName="idx" />
<ScalarProperty Name="gcode" ColumnName="gcode" />
<ScalarProperty Name="pdate" ColumnName="pdate" />
@@ -373,6 +382,7 @@
<ScalarProperty Name="supplyidx" ColumnName="supplyidx" />
<ScalarProperty Name="supply" ColumnName="supply" />
<ScalarProperty Name="pumamt" ColumnName="pumamt" />
<ScalarProperty Name="pumpriceD" ColumnName="pumpriceD" />
<ScalarProperty Name="pumprice" ColumnName="pumprice" />
<ScalarProperty Name="pumqty" ColumnName="pumqty" />
<ScalarProperty Name="pumunit" ColumnName="pumunit" />

View File

@@ -48,5 +48,6 @@ namespace Project
public string wuid { get; set; }
public System.DateTime wdate { get; set; }
public Nullable<int> inqty { get; set; }
public Nullable<decimal> pumpriceD { get; set; }
}
}

View File

@@ -66,6 +66,7 @@
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_jago = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -112,6 +113,7 @@
this.pMP데이터베이스업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mailBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.accessDBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem();
@@ -197,7 +199,8 @@
this.mn_docu,
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.btDev});
this.btDev,
this.ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(1, 1);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1094, 27);
@@ -312,6 +315,7 @@
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.mn_jago,
this.mn_eq,
this.ToolStripMenuItem,
@@ -345,21 +349,21 @@
// 목록ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "목록ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
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, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.ToolStripMenuItem.Text = "CR구매현황";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// layoutToolStripMenuItem
//
this.layoutToolStripMenuItem.Name = "layoutToolStripMenuItem";
this.layoutToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.layoutToolStripMenuItem.Size = new System.Drawing.Size(152, 24);
this.layoutToolStripMenuItem.Text = "Layout";
this.layoutToolStripMenuItem.Click += new System.EventHandler(this.layoutToolStripMenuItem_Click);
//
@@ -378,21 +382,21 @@
// 목록ToolStripMenuItem1
//
this.ToolStripMenuItem1.Name = "목록ToolStripMenuItem1";
this.ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem1.Size = new System.Drawing.Size(134, 24);
this.ToolStripMenuItem1.Text = "목록";
this.ToolStripMenuItem1.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
//
// 자동입력ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "자동입력ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
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, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(134, 24);
this.ToolStripMenuItem.Text = "양식";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -419,6 +423,14 @@
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(208, 24);
this.ToolStripMenuItem.Text = "라이선스";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// mn_jago
//
this.mn_jago.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -433,14 +445,14 @@
// 관리ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "관리ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
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, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
this.ToolStripMenuItem.Text = "재고 현황";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -448,7 +460,7 @@
//
this.pMP현황ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.pMP현황ToolStripMenuItem.Name = "pMP현황ToolStripMenuItem";
this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.pMP현황ToolStripMenuItem.Size = new System.Drawing.Size(140, 24);
this.pMP현황ToolStripMenuItem.Text = "PMP 현황";
this.pMP현황ToolStripMenuItem.Visible = false;
this.pMP현황ToolStripMenuItem.Click += new System.EventHandler(this.pMP현황ToolStripMenuItem_Click);
@@ -551,39 +563,39 @@
// 메모장ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "메모장ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.ToolStripMenuItem.Text = "메모장";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6);
this.toolStripMenuItem4.Size = new System.Drawing.Size(162, 6);
//
// 패치내역ToolStripMenuItem1
//
this.ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1";
this.ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem1.Size = new System.Drawing.Size(165, 24);
this.ToolStripMenuItem1.Text = "패치 내역";
this.ToolStripMenuItem1.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
//
// 메일내역ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "메일내역ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.ToolStripMenuItem.Text = "메일 내역";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6);
this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 6);
//
// minutesToolStripMenuItem
//
this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem";
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.minutesToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.minutesToolStripMenuItem.Text = "회의록";
this.minutesToolStripMenuItem.Visible = false;
this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click);
@@ -592,7 +604,7 @@
//
this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink;
this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem";
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.requestITemToolStripMenuItem.Text = "견적요청";
this.requestITemToolStripMenuItem.Visible = false;
this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click);
@@ -601,7 +613,7 @@
//
this.freeBoardToolStripMenuItem.Enabled = false;
this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem";
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.freeBoardToolStripMenuItem.Text = "Free Board";
this.freeBoardToolStripMenuItem.Visible = false;
//
@@ -609,7 +621,7 @@
//
this.bugReportToolStripMenuItem.Enabled = false;
this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem";
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.bugReportToolStripMenuItem.Text = "Bug Report";
this.bugReportToolStripMenuItem.Visible = false;
//
@@ -617,7 +629,7 @@
//
this.todoListToolStripMenuItem.Enabled = false;
this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem";
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.todoListToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.todoListToolStripMenuItem.Text = "Todo List";
this.todoListToolStripMenuItem.Visible = false;
this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click);
@@ -626,7 +638,7 @@
//
this.ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.ToolStripMenuItem.Name = "메일전송ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(165, 24);
this.ToolStripMenuItem.Text = "메일전송";
this.ToolStripMenuItem.Visible = false;
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
@@ -635,7 +647,7 @@
//
this.toolStripMenuItem5.ForeColor = System.Drawing.Color.Red;
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24);
this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 24);
this.toolStripMenuItem5.Text = "(test)휴가등록";
this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
//
@@ -643,14 +655,15 @@
//
this.ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem});
this.ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("기타ToolStripMenuItem.Image")));
this.ToolStripMenuItem.Name = "기타ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(49, 23);
this.ToolStripMenuItem.Size = new System.Drawing.Size(65, 23);
this.ToolStripMenuItem.Text = "기타";
//
// 품목검색ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "품목검색ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Text = "품목 검색";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -681,8 +694,9 @@
this.mailBackupToolStripMenuItem,
this.accessDBToolStripMenuItem});
this.btDev.ForeColor = System.Drawing.Color.Blue;
this.btDev.Image = ((System.Drawing.Image)(resources.GetObject("btDev.Image")));
this.btDev.Name = "btDev";
this.btDev.Size = new System.Drawing.Size(91, 23);
this.btDev.Size = new System.Drawing.Size(107, 23);
this.btDev.Text = "개발자메뉴";
this.btDev.Visible = false;
//
@@ -780,9 +794,11 @@
//
// pMP데이터베이스업데이트ToolStripMenuItem
//
this.pMP데이터베이스업데이트ToolStripMenuItem.ForeColor = System.Drawing.Color.Red;
this.pMP데이터베이스업데이트ToolStripMenuItem.Name = "pMP데이터베이스업데이트ToolStripMenuItem";
this.pMP데이터베이스업데이트ToolStripMenuItem.Size = new System.Drawing.Size(278, 24);
this.pMP데이터베이스업데이트ToolStripMenuItem.Text = "PMP 데이터베이스 업데이트";
this.pMP데이터베이스업데이트ToolStripMenuItem.Visible = false;
this.pMP데이터베이스업데이트ToolStripMenuItem.Click += new System.EventHandler(this.pMP데이터베이스업데이트ToolStripMenuItem_Click);
//
// mailBackupToolStripMenuItem
@@ -799,6 +815,14 @@
this.accessDBToolStripMenuItem.Text = "Access DB";
this.accessDBToolStripMenuItem.Click += new System.EventHandler(this.accessDBToolStripMenuItem_Click);
//
// 설명서ToolStripMenuItem
//
this.ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("설명서ToolStripMenuItem.Image")));
this.ToolStripMenuItem.Name = "설명서ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(79, 23);
this.ToolStripMenuItem.Text = "설명서";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// tabControl1
//
this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons;
@@ -1002,6 +1026,8 @@
private System.Windows.Forms.ToolStripMenuItem layoutToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
}
}

View File

@@ -1045,5 +1045,18 @@ namespace Project
if (!ShowForm(formkey))
AddForm(formkey, new FCM0000.fJRForm());
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
Util.RunExplorer("http://127.0.0.1:9000/Manual");
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
string formkey = "LICENSE";
if (!ShowForm(formkey))
AddForm(formkey, new FED0000.fLicenseList());
}
}
}

View File

@@ -232,6 +232,16 @@
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo
oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E
RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7
</value>
</data>
<data name="라이선스ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQAAIWOl8rKyoibetPT02hoarm6usPDw/Pz89ra2uTk5Hl6e6mrpmGNRH2vWunp6e3t
7ZPNX47LVbW1tZPIa5nXWvv7+1hZXfT2+HFxcfNXV2FhYZ6ens7OzvDw8GOPRf///yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIxQA/CBz4IUIDggQRGDCwQIAHgx4ECNgAoIBAAwQfNvAg
8MIFAAItJvBAksIEkh44XFAQ8kOCCh4gUIAQgUEFDh9YfpDwAQGCAx4aNGDQgQNODAIX9EQQ4AADogaM
fkD6QemAAQUkdOggQYJUqlavGh0rlYDADQe2Plj7wIFbt2Y/bOigsIBduxIKcHAQd+7VARwCfJhgIIOB
BBrOXvgbOMBCAwU6JP4AAMGFDm3fOkjQIYAFgQAUiMaAgYBpDagtxEXImmBAADs=
</value>
</data>
<data name="mn_jago.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -316,6 +326,16 @@
oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui
ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC
Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs=
</value>
</data>
<data name="기타ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAKnrVsfvlYnVOHy8KnfJLJneRWqyJLvth1W7GzGTEVWnHT2aFIPNMkuiGmrKJGKt
Io7eOXa5KU64GDiWE1yqIHK3KHa5J0WeGGC/IG+1JW/FKGjCJHnRLWrOIP///////yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqwA/CBTooeDAgwg9DFjoAWHCAQEAFBjQ0CHBAQAEFLBQ
8WDBjxEARPjY8YPChREiZshg4EFJhQFiFmBQAAIECh8vLoTAgAEBAgIUeGhwoaHCghUE/NTAgcCFAxAW
GDWZQamGDRgwIEAgYUJBjh4MCODAAYODBRMkSEhQMAJLARQUNODgwGsCtiYjHBDgsuCCDl4NmqxQAK7R
v3gHemD5QK4HtBMSEyRplOTBgAA7
</value>
</data>
<data name="즐겨찾기ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -325,6 +345,26 @@
JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP
jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA
Ow==
</value>
</data>
<data name="btDev.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAKxoR8VkLxFw1feVPITSWv+eQv7Qo0Cc6OyIN/v7+3PLTSCZEFy17Wa6XuT1x2bG
Q3nNUU6vRXPAa9mLXMTkwJZEHJt7LL5aJ/z8/O2KONx3L/ubP/r6+rtVI////////yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpgA/CBxIsOBADBgEeljoweAHDB06eIi4QICAhRwOdjAQ
kaMDCgwELOiQ8WGHAQYMFIjIgMEBCBEzQkSwoUCBCR0OSGigIKZJDQM2cKxwoAGBBx0ykISoIcOGiAcO
EFCAVCkHphueAtgaIYKFpks7NM0qFIDFCxk0kPyQQCzZiB0CbLAqsO1YslnTrq0r9m4GvSUHcoioobDa
vQU5DIar2KFgxYEHBgQAOw==
</value>
</data>
<data name="설명서ToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQAAP/99v/qaOvOSem4M+zSSv/ypf/ug//1w//2zP/xnv/te//zrf/0uv/41/nWdufB
MP/vkevTVf/rcv/0s//wlv/57OvRM//vi+/OQtaXIuuYEuvTLNyhJ+vHUP///////yH/C05FVFNDQVBF
Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIoAA/CBxIsCBBDwgTKizogUCEhwQIYLBgYYOHgR4cKPQA
oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG
IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB
D4UNMwz8ISAAOw==
</value>
</data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -391,20 +431,20 @@
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

View File

@@ -30,6 +30,7 @@ namespace Project
public string pumunit { get; set; }
public Nullable<int> pumqty { get; set; }
public Nullable<decimal> pumprice { get; set; }
public Nullable<decimal> pumpriceD { get; set; }
public Nullable<decimal> pumamt { get; set; }
public string supply { get; set; }
public Nullable<int> supplyidx { get; set; }