diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 4243617..f17bd60 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("24.01.24.1000")] -[assembly: AssemblyFileVersion("24.01.24.1000")] +[assembly: AssemblyVersion("24.01.26.1128")] +[assembly: AssemblyFileVersion("24.01.26.1128")] diff --git a/Project/Setting.cs b/Project/Setting.cs index 6fd5f25..849b41c 100644 --- a/Project/Setting.cs +++ b/Project/Setting.cs @@ -37,8 +37,8 @@ namespace Project [DisplayName("업무일지8시간초과입력불가"),Description("업무일지 근무시간 란에 8시간을 초과 입력 할 수 없게 합니다")] public Boolean Disable8HourOver { get; set; } - [DisplayName("원달러환율")] - public double wondoller { get; set; } + //[DisplayName("원달러환율")] + //public double wondoller { get; set; } [Description("시작 화면")] public eFormList startForm { get; set; } @@ -99,7 +99,7 @@ namespace Project public override void AfterLoad() { - if (wondoller < 1) wondoller = 1200; + //if (wondoller < 1) wondoller = 1200; if (Language.isEmpty()) Language = "Kor"; if (Password_Setup.isEmpty()) Password_Setup = "0000"; if (Password_User.isEmpty()) Password_User = "9999"; diff --git a/Project/fMain.cs b/Project/fMain.cs index f64c720..7b70668 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -351,7 +351,7 @@ namespace Project { //환율재적용 - 210711 - FCOMMON.info.dollertowon = Pub.setting.wondoller; + //FCOMMON.info.dollertowon = Pub.setting.wondoller; FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; } diff --git a/SubProject/FCM0000/Item/fItemAdd.cs b/SubProject/FCM0000/Item/fItemAdd.cs index 8114df5..eed2b94 100644 --- a/SubProject/FCM0000/Item/fItemAdd.cs +++ b/SubProject/FCM0000/Item/fItemAdd.cs @@ -123,22 +123,22 @@ namespace FCM0000.Item newdr.barcode = tbBarcode.Text.Trim(); //21711 - if (tbPriceD.Text.isEmpty() == false) - { - if (decimal.TryParse(tbPriceD.Text, out decimal priced)) - { - newdr.priceD = priced; - if (decimal.TryParse(tbPrice.Text, out decimal priceWon) == false) - { - var ConvertedPrice = (decimal)((double)priced * FCOMMON.info.dollertowon); - tbPrice.Text = ConvertedPrice.ToString(); - } - } - else - { - FCOMMON.Util.MsgE("입력값이 숫자가 아닙니다. 단가($)를 사용할 수 없습니다"); - } - } + //if (tbPriceD.Text.isEmpty() == false) + //{ + // if (decimal.TryParse(tbPriceD.Text, out decimal priced)) + // { + // newdr.priceD = priced; + // if (decimal.TryParse(tbPrice.Text, out decimal priceWon) == false) + // { + // var ConvertedPrice = (decimal)((double)priced * FCOMMON.info.dollertowon); + // tbPrice.Text = ConvertedPrice.ToString(); + // } + // } + // else + // { + // FCOMMON.Util.MsgE("입력값이 숫자가 아닙니다. 단가($)를 사용할 수 없습니다"); + // } + //} int price; diff --git a/SubProject/FCM0000/Item/fItemEdit.cs b/SubProject/FCM0000/Item/fItemEdit.cs index 7937c62..479b328 100644 --- a/SubProject/FCM0000/Item/fItemEdit.cs +++ b/SubProject/FCM0000/Item/fItemEdit.cs @@ -137,23 +137,23 @@ namespace FCM0000.Item dr.Storage = tbStorage.Text.Trim(); dr.barcode = tbBarcode.Text.Trim(); - //21711 - if (tbPriceD.Text.isEmpty() == false) - { - if (decimal.TryParse(tbPriceD.Text, out decimal priced)) - { - dr.priceD = priced; - if (decimal.TryParse(tbPrice.Text, out decimal priceWon) == false) - { - var ConvertedPrice = (decimal)((double)priced * FCOMMON.info.dollertowon); - tbPrice.Text = ConvertedPrice.ToString(); - } - } - else - { - FCOMMON.Util.MsgE("입력값이 숫자가 아닙니다. 단가($)를 사용할 수 없습니다"); - } - } + ////21711 + //if (tbPriceD.Text.isEmpty() == false) + //{ + // if (decimal.TryParse(tbPriceD.Text, out decimal priced)) + // { + // dr.priceD = priced; + // if (decimal.TryParse(tbPrice.Text, out decimal priceWon) == false) + // { + // var ConvertedPrice = (decimal)((double)priced * FCOMMON.info.dollertowon); + // tbPrice.Text = ConvertedPrice.ToString(); + // } + // } + // else + // { + // FCOMMON.Util.MsgE("입력값이 숫자가 아닙니다. 단가($)를 사용할 수 없습니다"); + // } + //} int price; diff --git a/SubProject/FCM0000/fSIDListSelect.Designer.cs b/SubProject/FCM0000/fSIDListSelect.Designer.cs index a3e03d4..a462b5b 100644 --- a/SubProject/FCM0000/fSIDListSelect.Designer.cs +++ b/SubProject/FCM0000/fSIDListSelect.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSIDListSelect)); this.dv1 = new System.Windows.Forms.DataGridView(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -44,6 +44,7 @@ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btopenspm = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -56,22 +57,22 @@ this.dv1.AllowUserToDeleteRows = false; this.dv1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv1.DefaultCellStyle = dataGridViewCellStyle2; this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.dv1.Location = new System.Drawing.Point(0, 0); this.dv1.Name = "dv1"; this.dv1.ReadOnly = true; this.dv1.RowTemplate.Height = 23; this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dv1.Size = new System.Drawing.Size(884, 378); + this.dv1.Size = new System.Drawing.Size(1110, 483); this.dv1.TabIndex = 0; this.dv1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick); // @@ -92,15 +93,16 @@ this.bindingNavigatorMoveNextItem, this.bindingNavigatorMoveLastItem, this.bindingNavigatorSeparator2, - this.toolStripButton1}); - this.bn.Location = new System.Drawing.Point(0, 378); + this.toolStripButton1, + this.btopenspm}); + this.bn.Location = new System.Drawing.Point(0, 483); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(884, 39); + this.bn.Size = new System.Drawing.Size(1110, 39); this.bn.TabIndex = 1; this.bn.Text = "bindingNavigator1"; // @@ -182,11 +184,20 @@ this.toolStripButton1.Text = "확인 완료"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // btopenspm + // + this.btopenspm.Image = ((System.Drawing.Image)(resources.GetObject("btopenspm.Image"))); + this.btopenspm.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btopenspm.Name = "btopenspm"; + this.btopenspm.Size = new System.Drawing.Size(132, 36); + this.btopenspm.Text = "SPM사이트 열기"; + this.btopenspm.Click += new System.EventHandler(this.btopenspm_Click); + // // fSIDListSelect // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(884, 417); + this.ClientSize = new System.Drawing.Size(1110, 522); this.Controls.Add(this.dv1); this.Controls.Add(this.bn); this.Name = "fSIDListSelect"; @@ -218,5 +229,6 @@ private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton btopenspm; } } \ No newline at end of file diff --git a/SubProject/FCM0000/fSIDListSelect.cs b/SubProject/FCM0000/fSIDListSelect.cs index c2b0772..a7a6baa 100644 --- a/SubProject/FCM0000/fSIDListSelect.cs +++ b/SubProject/FCM0000/fSIDListSelect.cs @@ -1,4 +1,5 @@ -using FCOMMON; +using FarPoint.Win.Spread; +using FCOMMON; using System; using System.Collections.Generic; using System.ComponentModel; @@ -13,6 +14,7 @@ namespace FCM0000 { public partial class fSIDListSelect : Form { + public string selectbatch = ""; public fSIDListSelect(string sid,DataTable dt) { InitializeComponent(); @@ -25,11 +27,18 @@ namespace FCM0000 if (e1.KeyCode == Keys.Escape) this.Close(); }; this.Width += 150; + this.dv1.Tag = sid; } private void toolStripButton1_Click(object sender, EventArgs e) { DBM.InsertLog("SIDCHK", this.Text); + var drv = this.bs.Current as DataRowView; + var dr = drv.Row as DataRow; + var v_vatch = dr["batch_no"]; + if (v_vatch != null) selectbatch = v_vatch.ToString(); + else selectbatch = ""; + DialogResult = DialogResult.OK; } @@ -42,5 +51,15 @@ namespace FCM0000 { this.dv1.AutoResizeColumns(); } + + private void btopenspm_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + var dr = drv.Row as DataRow; + var sid = this.dv1.Tag.ToString(); + + var url = @"https://atknet.amkor.co.kr/#/department/ee/spm"; + FCOMMON.Util.RunExplorer(url); + } } } diff --git a/SubProject/FCM0000/fSIDListSelect.resx b/SubProject/FCM0000/fSIDListSelect.resx index 36daea1..c28bb6d 100644 --- a/SubProject/FCM0000/fSIDListSelect.resx +++ b/SubProject/FCM0000/fSIDListSelect.resx @@ -127,7 +127,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wQAADsEBuJFr7QAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -138,7 +138,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wQAADsEBuJFr7QAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -147,7 +147,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wQAADsEBuJFr7QAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -156,7 +156,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wQAADsEBuJFr7QAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -177,6 +177,21 @@ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + 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/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 5668b26..4e04689 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -163,24 +163,24 @@ namespace FCOMMON public int PR { get; set; } public int PO { get; set; } public int Received { get; set; } - public int Cancled { get; set; } + //public int Cancled { get; set; } public int Total_Request { get; set; } - public int Total_Buy { get; set; } + public int Total_Ipko { get; set; } public int Total_Remain { get; set; } + } public static buyinfo GetPartBuyInfo(int project, string sid = null) { var sql = " select " + - " isnull(sum(case when[state] = 'PR' then 0 when[state] = 'PO' then 0 when[state] = 'Received' then 0 when[state] = 'Cancled' then 0 else pumqtyReq end),0) as Request," + - " isnull(sum(case when[state] = 'PR' then pumqty else 0 end),0) as PR," + - " isnull(sum(case when[state] = 'PO' then pumqty else 0 end),0) as PO," + + " isnull(sum(case when[state] = 'PR' then 0 when[state] = 'PO' then 0 when[state] = 'Received' then 0 when[state] = 'Cancled' then 0 else pumqty end),0) as Request," + + " isnull(sum(case when[state] = 'PR' then pumqtyReq else 0 end),0) as PR," + + " isnull(sum(case when[state] = 'PO' then pumqtyReq else 0 end),0) as PO," + " isnull(sum(case when[state] = 'Received' then inqty else 0 end),0) as Received," + - " isnull(sum(case when[state] = 'Cancled' then pumqtyReq else 0 end),0) as Cancled," + " isnull(sum(isnull(pumqty,pumqtyreq)),0) as Total_Request," + " isnull(sum(inqty),0) as Total_Buy," + - " isnull(sum(pumqty) - sum(inqty),0) as Total_Remain" + + " isnull(sum(isnull(pumqty,pumqtyreq)) - sum(inqty),0) as Total_Remain" + " from EETGW_PurchaseCR" + " where gcode = @gcode and state <> 'Cancled'" + " and projectidx = @project" + @@ -202,7 +202,7 @@ namespace FCOMMON var o_pr = rdr["PR"]; var o_po = rdr["PO"]; var o_received = rdr["Received"]; - var o_cancled = rdr["Cancled"]; + //var o_cancled = rdr["Cancled"]; var o_totalrequest = rdr["Total_Request"]; var o_totalbuy = rdr["Total_Buy"]; @@ -212,9 +212,9 @@ namespace FCOMMON if (o_pr != null) retval.PR = int.Parse(o_pr.ToString()); if (o_po != null) retval.PO = int.Parse(o_po.ToString()); if (o_received != null) retval.Received = int.Parse(o_received.ToString()); - if (o_cancled != null) retval.Cancled = int.Parse(o_cancled.ToString()); + //if (o_cancled != null) retval.Cancled = int.Parse(o_cancled.ToString()); if (o_totalrequest != null) retval.Total_Request = int.Parse(o_totalrequest.ToString()); - if (o_totalbuy != null) retval.Total_Buy = int.Parse(o_totalbuy.ToString()); + if (o_totalbuy != null) retval.Total_Ipko = int.Parse(o_totalbuy.ToString()); if (o_totalremain != null) retval.Total_Remain = int.Parse(o_totalremain.ToString()); } rdr.Close(); @@ -1146,14 +1146,14 @@ namespace FCOMMON { System.Data.DataTable retval = new System.Data.DataTable(); - retval.Columns.Add("Code"); - retval.Columns.Add("Value"); - retval.Columns.Add("SValue"); - retval.Columns.Add("FValue"); + retval.Columns.Add("Code", typeof(string)); + retval.Columns.Add("Value", typeof(string)); + retval.Columns.Add("SValue",typeof(string)); + retval.Columns.Add("FValue", typeof(float)); var cn = getCn(); cn.Open(); - var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,''),isnull(fvalue,'')" + + var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,''),isnull(fvalue,0)" + " from common" + " where gcode='" + FCOMMON.info.Login.gcode + "' and grp = '" + GroupCode + "'" + " and isnull(code,'') <> ''" + diff --git a/SubProject/FCOMMON/Info.cs b/SubProject/FCOMMON/Info.cs index 2d4f0b1..17907c2 100644 --- a/SubProject/FCOMMON/Info.cs +++ b/SubProject/FCOMMON/Info.cs @@ -54,7 +54,7 @@ namespace FCOMMON } public static Boolean NotShowJobReportview = false; - public static double dollertowon = 1200; + //public static double dollertowon = 1200; public static Boolean ShowBuyerror = true; public static Boolean Disable_8hourover = false; public static sUserInfo Login; diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index 064f512..10be438 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -343,12 +343,6 @@ fSIDCheckNR.cs - - Form - - - fSIDListSelect.cs - Form @@ -475,9 +469,6 @@ fSIDCheckNR.cs - - fSIDListSelect.cs - diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs index b79b040..15eb580 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.Designer.cs @@ -30,44 +30,44 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseCR)); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType10 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType11 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType76 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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 numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType36 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType37 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType38 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType91 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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.NumberCellType numberCellType39 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType94 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType95 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType96 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType97 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType12 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType40 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType98 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType99 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType100 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + 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.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = 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(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + 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.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + 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(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter(); @@ -99,6 +99,12 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripDropDownButton(); 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.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.현재목록입고양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.선택목록입고양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.엑셀에서가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.sAP구매신청엑셀작성ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton5 = new System.Windows.Forms.ToolStripDropDownButton(); @@ -155,12 +161,8 @@ this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label2 = new System.Windows.Forms.Label(); - this.메일전송ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.현재목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.선택목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.현재목록입고양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.선택목록입고양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator(); + this.btMakeItemsData = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -443,7 +445,9 @@ this.toolStripButton7.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.메일전송ToolStripMenuItem, this.엑셀에서가져오기ToolStripMenuItem, - this.sAP구매신청엑셀작성ToolStripMenuItem}); + this.sAP구매신청엑셀작성ToolStripMenuItem, + this.toolStripMenuItem6, + this.btMakeItemsData}); this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton7.Name = "toolStripButton7"; @@ -451,18 +455,64 @@ this.toolStripButton7.Text = "기능"; this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click); // + // 메일전송ToolStripMenuItem + // + this.메일전송ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.현재목록ToolStripMenuItem, + this.선택목록ToolStripMenuItem, + this.toolStripSeparator7, + this.현재목록입고양식ToolStripMenuItem, + this.선택목록입고양식ToolStripMenuItem}); + this.메일전송ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일전송ToolStripMenuItem.Image"))); + this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(226, 22); + this.메일전송ToolStripMenuItem.Text = "메일 전송"; + // + // 현재목록ToolStripMenuItem + // + this.현재목록ToolStripMenuItem.Name = "현재목록ToolStripMenuItem"; + this.현재목록ToolStripMenuItem.Size = new System.Drawing.Size(178, 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(178, 22); + this.선택목록ToolStripMenuItem.Text = "선택목록"; + this.선택목록ToolStripMenuItem.Click += new System.EventHandler(this.선택목록ToolStripMenuItem_Click); + // + // toolStripSeparator7 + // + this.toolStripSeparator7.Name = "toolStripSeparator7"; + this.toolStripSeparator7.Size = new System.Drawing.Size(175, 6); + // + // 현재목록입고양식ToolStripMenuItem + // + this.현재목록입고양식ToolStripMenuItem.Name = "현재목록입고양식ToolStripMenuItem"; + this.현재목록입고양식ToolStripMenuItem.Size = new System.Drawing.Size(178, 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(178, 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(208, 22); + this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(226, 22); this.엑셀에서가져오기ToolStripMenuItem.Text = "엑셀에서 가져오기"; this.엑셀에서가져오기ToolStripMenuItem.Click += new System.EventHandler(this.엑셀에서가져오기ToolStripMenuItem_Click); // // sAP구매신청엑셀작성ToolStripMenuItem // this.sAP구매신청엑셀작성ToolStripMenuItem.Name = "sAP구매신청엑셀작성ToolStripMenuItem"; - this.sAP구매신청엑셀작성ToolStripMenuItem.Size = new System.Drawing.Size(208, 22); + this.sAP구매신청엑셀작성ToolStripMenuItem.Size = new System.Drawing.Size(226, 22); this.sAP구매신청엑셀작성ToolStripMenuItem.Text = "SAP 구매 신청 엑셀 작성"; this.sAP구매신청엑셀작성ToolStripMenuItem.Click += new System.EventHandler(this.sAP구매신청엑셀작성ToolStripMenuItem_Click); // @@ -992,15 +1042,15 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 29F; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 35F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType10; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "chk1"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType11; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "chk2"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 37F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType76; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Tag = "pdate"; @@ -1008,243 +1058,243 @@ this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType77; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Tag = "state"; 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 = textCellType78; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "place"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType79; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "requestName"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(5).Tag = "requestName"; this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType80; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "costcenter"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType81; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "linecode"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType82; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Tag = "sc"; 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).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType83; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Tag = "crcf"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType84; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(10).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(10).Tag = "pumname"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType31.DecimalPlaces = 0; - numberCellType31.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType31.MaximumValue = 2147483647D; - numberCellType31.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType31; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType85; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(12).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType86; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(13).Label = "모델"; this.fpSpread1_Sheet1.Columns.Get(13).Tag = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; - numberCellType32.DecimalPlaces = 0; - numberCellType32.NegativeRed = true; - numberCellType32.NullDisplay = "--"; - numberCellType32.Separator = ","; - numberCellType32.ShowSeparator = true; - numberCellType32.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType32; + numberCellType2.DecimalPlaces = 0; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "--"; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + numberCellType2.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumqtyReq"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "수량\r\n(요청)"; this.fpSpread1_Sheet1.Columns.Get(14).Tag = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; - numberCellType33.DecimalPlaces = 0; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType33; + numberCellType3.DecimalPlaces = 0; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3; 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 = "수량\r\n(구매)\r\n"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType87; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType12; 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).Tag = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F; - numberCellType34.DecimalPlaces = 2; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType34; + numberCellType4.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumpriceD"; 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 = "pumpriceD"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType35.DecimalPlaces = 0; - numberCellType35.MaximumValue = 9999999999999.99D; - numberCellType35.MinimumValue = -9999999999999.99D; - numberCellType35.NegativeRed = true; - numberCellType35.NullDisplay = "--"; - numberCellType35.Separator = ","; - numberCellType35.ShowSeparator = true; - numberCellType35.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType35; + numberCellType5.DecimalPlaces = 0; + numberCellType5.MaximumValue = 9999999999999.99D; + numberCellType5.MinimumValue = -9999999999999.99D; + numberCellType5.NegativeRed = true; + numberCellType5.NullDisplay = "--"; + numberCellType5.Separator = ","; + numberCellType5.ShowSeparator = true; + numberCellType5.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "pumprice"; 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 = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; - numberCellType36.DecimalPlaces = 0; - numberCellType36.MaximumValue = 9999999999999.99D; - numberCellType36.MinimumValue = -9999999999999.99D; - numberCellType36.NegativeRed = true; - numberCellType36.NullDisplay = "--"; - numberCellType36.Separator = ","; - numberCellType36.ShowSeparator = true; - numberCellType36.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType36; + numberCellType6.DecimalPlaces = 0; + numberCellType6.MaximumValue = 9999999999999.99D; + numberCellType6.MinimumValue = -9999999999999.99D; + numberCellType6.NegativeRed = true; + numberCellType6.NullDisplay = "--"; + numberCellType6.Separator = ","; + numberCellType6.ShowSeparator = true; + numberCellType6.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(19).Label = "금액"; this.fpSpread1_Sheet1.Columns.Get(19).Tag = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(20).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType88; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(20).Label = "공급"; this.fpSpread1_Sheet1.Columns.Get(20).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(20).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType37.DecimalPlaces = 0; - numberCellType37.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType37.MaximumValue = 2147483647D; - numberCellType37.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType37; + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType89; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(22).Tag = "project"; this.fpSpread1_Sheet1.Columns.Get(22).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(23).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType38.DecimalPlaces = 0; - numberCellType38.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType38.MaximumValue = 2147483647D; - numberCellType38.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType38; + numberCellType8.DecimalPlaces = 0; + numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType8.MaximumValue = 2147483647D; + numberCellType8.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Tag = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(23).Visible = false; this.fpSpread1_Sheet1.Columns.Get(23).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType90; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(24).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType91; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "edate"; 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 = "edate"; this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType92; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(26).Label = "수령인"; this.fpSpread1_Sheet1.Columns.Get(26).Tag = "receiveName"; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType93; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Label = "입고일"; this.fpSpread1_Sheet1.Columns.Get(27).Tag = "indate"; this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F; - numberCellType39.DecimalPlaces = 0; - numberCellType39.NegativeRed = true; - numberCellType39.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = numberCellType39; + numberCellType9.DecimalPlaces = 0; + numberCellType9.NegativeRed = true; + numberCellType9.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = numberCellType9; this.fpSpread1_Sheet1.Columns.Get(28).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(28).Tag = "inqty"; this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType94; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(29).DataField = "inremark"; this.fpSpread1_Sheet1.Columns.Get(29).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(29).Tag = "inremark"; - this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType95; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType20; this.fpSpread1_Sheet1.Columns.Get(30).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(30).Tag = "po"; this.fpSpread1_Sheet1.Columns.Get(30).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType96; + this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType21; this.fpSpread1_Sheet1.Columns.Get(31).DataField = "chkremark"; this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType97; + this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType22; this.fpSpread1_Sheet1.Columns.Get(32).DataField = "purchase_manager"; this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType97; + this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType22; this.fpSpread1_Sheet1.Columns.Get(33).DataField = "purchase_admin"; this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(34).CellType = checkBoxCellType12; + this.fpSpread1_Sheet1.Columns.Get(34).CellType = checkBoxCellType3; this.fpSpread1_Sheet1.Columns.Get(34).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(34).Tag = "isdel"; this.fpSpread1_Sheet1.Columns.Get(34).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(35).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(35).CellType = numberCellType40; + this.fpSpread1_Sheet1.Columns.Get(35).CellType = numberCellType10; this.fpSpread1_Sheet1.Columns.Get(35).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(35).ForeColor = System.Drawing.Color.Red; this.fpSpread1_Sheet1.Columns.Get(35).Tag = "idx"; this.fpSpread1_Sheet1.Columns.Get(35).Visible = false; this.fpSpread1_Sheet1.Columns.Get(36).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType98; + this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType23; this.fpSpread1_Sheet1.Columns.Get(36).DataField = "conf_status"; this.fpSpread1_Sheet1.Columns.Get(36).ForeColor = System.Drawing.Color.Red; this.fpSpread1_Sheet1.Columns.Get(36).Tag = "conf_status"; this.fpSpread1_Sheet1.Columns.Get(36).Visible = false; this.fpSpread1_Sheet1.Columns.Get(37).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(37).CellType = textCellType99; + this.fpSpread1_Sheet1.Columns.Get(37).CellType = textCellType24; this.fpSpread1_Sheet1.Columns.Get(37).DataField = "conf_request"; this.fpSpread1_Sheet1.Columns.Get(37).ForeColor = System.Drawing.Color.Red; this.fpSpread1_Sheet1.Columns.Get(37).Tag = "conf_request"; this.fpSpread1_Sheet1.Columns.Get(37).Visible = false; this.fpSpread1_Sheet1.Columns.Get(38).BackColor = System.Drawing.Color.Red; - this.fpSpread1_Sheet1.Columns.Get(38).CellType = textCellType100; + this.fpSpread1_Sheet1.Columns.Get(38).CellType = textCellType25; this.fpSpread1_Sheet1.Columns.Get(38).DataField = "conf_request"; this.fpSpread1_Sheet1.Columns.Get(38).ForeColor = System.Drawing.Color.Red; this.fpSpread1_Sheet1.Columns.Get(38).Tag = "conf_request"; @@ -1269,51 +1319,17 @@ this.label2.Text = "--"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // 메일전송ToolStripMenuItem + // toolStripMenuItem6 // - this.메일전송ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.현재목록ToolStripMenuItem, - this.선택목록ToolStripMenuItem, - this.toolStripSeparator7, - this.현재목록입고양식ToolStripMenuItem, - this.선택목록입고양식ToolStripMenuItem}); - this.메일전송ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일전송ToolStripMenuItem.Image"))); - this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(208, 22); - this.메일전송ToolStripMenuItem.Text = "메일 전송"; + this.toolStripMenuItem6.Name = "toolStripMenuItem6"; + this.toolStripMenuItem6.Size = new System.Drawing.Size(223, 6); // - // 현재목록ToolStripMenuItem + // btMakeItemsData // - this.현재목록ToolStripMenuItem.Name = "현재목록ToolStripMenuItem"; - this.현재목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 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.Text = "선택목록"; - this.선택목록ToolStripMenuItem.Click += new System.EventHandler(this.선택목록ToolStripMenuItem_Click); - // - // toolStripSeparator7 - // - this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); - // - // 현재목록입고양식ToolStripMenuItem - // - this.현재목록입고양식ToolStripMenuItem.Name = "현재목록입고양식ToolStripMenuItem"; - this.현재목록입고양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 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.Text = "선택목록(입고양식)"; - this.선택목록입고양식ToolStripMenuItem.Click += new System.EventHandler(this.선택목록입고양식ToolStripMenuItem_Click); + this.btMakeItemsData.Name = "btMakeItemsData"; + this.btMakeItemsData.Size = new System.Drawing.Size(226, 22); + this.btMakeItemsData.Text = "구매내역에서 품목정보 생성"; + this.btMakeItemsData.Click += new System.EventHandler(this.구매내역에서품목정보생성ToolStripMenuItem_Click); // // fPurchaseCR // @@ -1439,5 +1455,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; private System.Windows.Forms.ToolStripMenuItem 현재목록입고양식ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 선택목록입고양식ToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem6; + private System.Windows.Forms.ToolStripMenuItem btMakeItemsData; } } diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs index 8e6a13d..8f9b602 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs @@ -147,6 +147,7 @@ namespace FEQ0000 } else { + btMakeItemsData.Visible = false; 엑셀에서가져오기ToolStripMenuItem.Visible = false; btSave.Visible = false; btViewDel.Visible = false; @@ -1458,5 +1459,15 @@ namespace FEQ0000 { MailSendNoForm(false, "PD"); } + + private void 구매내역에서품목정보생성ToolStripMenuItem_Click(object sender, EventArgs e) + { + var ta = new dsPurchaseTableAdapters.QueriesTableAdapter(); + var dlg = FCOMMON.Util.MsgQ("구매내역에서 품목정보를 생성합니다, 중복되는 sid는 업데이트 되지 않습니다\n" + + "완료메시지 나올떄까지 기다려주세요"); + if (dlg != DialogResult.Yes) return; + ta.PurchaseDataToItemsCR(FCOMMON.info.Login.gcode); + FCOMMON.Util.MsgI("업데이트 완료"); + } } } diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs index d928b0c..8acd4b8 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.Designer.cs @@ -44,7 +44,6 @@ System.Windows.Forms.Label label3; System.Windows.Forms.Label label6; System.Windows.Forms.Label label8; - System.Windows.Forms.Label label9; System.Windows.Forms.Label label10; System.Windows.Forms.Label label2; System.Windows.Forms.Label label4; @@ -104,6 +103,8 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); + this.lbcurrentwon = new System.Windows.Forms.Label(); + this.cmbCurrency = new System.Windows.Forms.ComboBox(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); sidLabel = new System.Windows.Forms.Label(); @@ -118,7 +119,6 @@ label3 = new System.Windows.Forms.Label(); label6 = new System.Windows.Forms.Label(); label8 = new System.Windows.Forms.Label(); - label9 = new System.Windows.Forms.Label(); label10 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label(); @@ -276,18 +276,6 @@ label8.TabIndex = 18; label8.Text = "단가($)"; // - // label9 - // - label9.AutoSize = true; - label9.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - label9.ForeColor = System.Drawing.Color.Blue; - label9.Location = new System.Drawing.Point(277, 215); - label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label9.Name = "label9"; - label9.Size = new System.Drawing.Size(163, 15); - label9.TabIndex = 37; - label9.Text = "해외물품은 좌측 단가를 입력"; - // // label10 // label10.AutoSize = true; @@ -654,6 +642,8 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.cmbCurrency); + this.groupBox1.Controls.Add(this.lbcurrentwon); this.groupBox1.Controls.Add(this.tbQtyReal); this.groupBox1.Controls.Add(label13); this.groupBox1.Controls.Add(this.btSIDChk); @@ -663,7 +653,6 @@ this.groupBox1.Controls.Add(label10); this.groupBox1.Controls.Add(this.tbCostCenter); this.groupBox1.Controls.Add(label11); - this.groupBox1.Controls.Add(label9); this.groupBox1.Controls.Add(this.tbPumPriceD); this.groupBox1.Controls.Add(label8); this.groupBox1.Controls.Add(this.button3); @@ -753,7 +742,7 @@ this.tbPumPriceD.Location = new System.Drawing.Point(94, 208); this.tbPumPriceD.Margin = new System.Windows.Forms.Padding(4); this.tbPumPriceD.Name = "tbPumPriceD"; - this.tbPumPriceD.Size = new System.Drawing.Size(178, 27); + this.tbPumPriceD.Size = new System.Drawing.Size(133, 27); this.tbPumPriceD.TabIndex = 19; this.tbPumPriceD.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.tbPumPriceD.TextChanged += new System.EventHandler(this.tbDolloerPrice_TextChanged); @@ -930,6 +919,31 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // + // lbcurrentwon + // + this.lbcurrentwon.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbcurrentwon.ForeColor = System.Drawing.Color.Blue; + this.lbcurrentwon.Location = new System.Drawing.Point(322, 207); + this.lbcurrentwon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbcurrentwon.Name = "lbcurrentwon"; + this.lbcurrentwon.Size = new System.Drawing.Size(153, 28); + this.lbcurrentwon.TabIndex = 55; + this.lbcurrentwon.Text = "통화기호를 선택하세요"; + this.lbcurrentwon.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // cmbCurrency + // + this.cmbCurrency.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbCurrency.FormattingEnabled = true; + this.cmbCurrency.Items.AddRange(new object[] { + "USD"}); + this.cmbCurrency.Location = new System.Drawing.Point(229, 207); + this.cmbCurrency.Margin = new System.Windows.Forms.Padding(4); + this.cmbCurrency.Name = "cmbCurrency"; + this.cmbCurrency.Size = new System.Drawing.Size(89, 28); + this.cmbCurrency.TabIndex = 56; + this.cmbCurrency.SelectedIndexChanged += new System.EventHandler(this.cmbCurrency_SelectedIndexChanged); + // // fPurchaseCR_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); @@ -1017,5 +1031,7 @@ private System.Windows.Forms.TextBox tbQtyReal; private System.Windows.Forms.TextBox tbAdmin; private System.Windows.Forms.TextBox tbManager; + private System.Windows.Forms.Label lbcurrentwon; + private System.Windows.Forms.ComboBox cmbCurrency; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs index 285f995..019cee8 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs @@ -101,6 +101,12 @@ namespace FEQ0000 //this.cbProcess.ValueMember = "Key"; //this.cbProcess.DataSource = new BindingSource(procList, ""); + //통화 + var LstCur = FCOMMON.DBM.getCodeTable("69"); + this.cmbCurrency.DisplayMember = "Value"; + this.cmbCurrency.ValueMember = "Value"; + this.cmbCurrency.DataSource = LstCur; + //담당자목록 var userList = FCOMMON.DBM.getUserList(); //.getGroupList("name", "Users", "[level] > 0 and [level] < 10"); cmbReceive.Items.Clear(); @@ -765,6 +771,14 @@ namespace FEQ0000 } } + if (dr.RowState == DataRowState.Detached && vqtyreq < 1) + { + Util.MsgE($"요청수량을 입력하세요"); + tbQtyReq.Focus(); + return false; + } + + dr.pumqty = vqtyreal;// int.Parse(tbPumQty.Text); dr.pumqtyReq = vqtyreq;// int.Parse(tbpumqtyReq.Text); dr.pumprice = vpumprice;// decimal.Parse(tbPumPrice.Text); @@ -784,6 +798,12 @@ namespace FEQ0000 if (vqtyreal > 0) dr.pumamt = dr.pumqty * dr.pumprice; else dr.pumamt = dr.pumqtyReq * dr.pumprice; + if (dr.pumamt < 1) + { + FCOMMON.Util.MsgE($"금액이 없습니다. 단가 및 수량을 확인하세요\n해외 통화를 사용할 경우 환율을 고려한 국내단가를 입력해주세요\n환율을 자동으로 입력하려면 공용코드(69)의 FValue 에 값을 입력하세요"); + return false; + } + if (tbPumIDX.Text == "" || tbPumIDX.Text == "-1") dr.SetpumidxNull(); else dr.pumidx = int.Parse(tbPumIDX.Text); dr.sid = tbSID.Text.Trim(); @@ -1040,7 +1060,8 @@ namespace FEQ0000 { if (decimal.TryParse(tbPumPriceD.Text, out decimal priced)) { - var price = FCOMMON.info.dollertowon * (double)priced; + var curr = lbcurrentwon.Tag != null ? (float)lbcurrentwon.Tag : 0; + var price = curr * (double)priced; tbPumPrice.Text = (Math.Ceiling(price)).ToString(); } else tbPumPrice.Text = "0"; @@ -1101,7 +1122,7 @@ namespace FEQ0000 var dt = Amkor.RestfulService.SPMSIDSearch(sid); if (dt.Complete) { - var f = new fSIDListSelect(sid, dt.Result); + var f = new FCM0000.fSIDListSelect(sid, dt.Result); if (f.ShowDialog() == DialogResult.OK) { dr.chk1 = true; @@ -1133,5 +1154,43 @@ namespace FEQ0000 else FCOMMON.Util.RunExplorer(path); } + + private void cmbCurrency_SelectedIndexChanged(object sender, EventArgs e) + { + + if (cmbCurrency.SelectedIndex >= 0) + { + var val = cmbCurrency.SelectedValue.ToString(); + var dt = cmbCurrency.DataSource as DataTable; + var v = dt.AsEnumerable().Where(t => t.Field("Value") == val).FirstOrDefault(); + if (v != null) + { + var price = v.Field("FValue"); + lbcurrentwon.Text = $"환율:{price}원"; + lbcurrentwon.Tag = price; + //if (binit) + //{ + + // if (decimal.TryParse(tbPumPriceD.Text,out decimal priced)) + // { + // if (priced > 0) + // dr.pumamt = priced * (decimal)price; + // } + + + //} + } + else + { + lbcurrentwon.Text = $"환율이 입력되지 않았습니다"; + lbcurrentwon.Tag = 0; + } + } + else + { + lbcurrentwon.Text = "통화기호를 선택하세요"; + lbcurrentwon.Tag = 0; + } + } } } diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx index 73651d8..e226c64 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.resx @@ -169,9 +169,6 @@ False - - False - False diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs index 79fafc6..e85a4fa 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs @@ -147,6 +147,7 @@ this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); + this.btMakeItemsData = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -259,7 +260,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(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -386,7 +386,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, 26); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -412,7 +411,8 @@ this.메일전송ToolStripMenuItem, this.엑셀에서가져오기ToolStripMenuItem, this.견적서폴더열기ToolStripMenuItem, - this.toolStripMenuItem2}); + this.toolStripMenuItem2, + this.btMakeItemsData}); this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton7.Name = "toolStripButton7"; @@ -429,7 +429,7 @@ this.선택목록입고양식ToolStripMenuItem}); this.메일전송ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일전송ToolStripMenuItem.Image"))); this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(226, 22); this.메일전송ToolStripMenuItem.Text = "메일 전송"; // // 현재목록ToolStripMenuItem @@ -469,7 +469,7 @@ // this.엑셀에서가져오기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("엑셀에서가져오기ToolStripMenuItem.Image"))); this.엑셀에서가져오기ToolStripMenuItem.Name = "엑셀에서가져오기ToolStripMenuItem"; - this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(226, 22); this.엑셀에서가져오기ToolStripMenuItem.Text = "엑셀에서 가져오기"; this.엑셀에서가져오기ToolStripMenuItem.Click += new System.EventHandler(this.엑셀에서가져오기ToolStripMenuItem_Click); // @@ -477,14 +477,14 @@ // this.견적서폴더열기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("견적서폴더열기ToolStripMenuItem.Image"))); this.견적서폴더열기ToolStripMenuItem.Name = "견적서폴더열기ToolStripMenuItem"; - this.견적서폴더열기ToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.견적서폴더열기ToolStripMenuItem.Size = new System.Drawing.Size(226, 22); this.견적서폴더열기ToolStripMenuItem.Text = "견적서 폴더 열기"; this.견적서폴더열기ToolStripMenuItem.Click += new System.EventHandler(this.견적서폴더열기ToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(171, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(223, 6); // // toolStripButton6 // @@ -511,14 +511,14 @@ // 집계표ToolStripMenuItem // this.집계표ToolStripMenuItem.Name = "집계표ToolStripMenuItem"; - this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(180, 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(150, 22); + this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.구매승인양식ToolStripMenuItem.Text = "구매승인 양식"; this.구매승인양식ToolStripMenuItem.Click += new System.EventHandler(this.구매승인양식ToolStripMenuItem_Click); // @@ -697,7 +697,6 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(75, 37); this.dtSD.Text = "1982-11-23"; @@ -714,7 +713,6 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(75, 37); this.dtED.Text = "1982-11-23"; @@ -770,7 +768,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(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -1210,6 +1207,13 @@ this.label2.Text = "--"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // btMakeItemsData + // + this.btMakeItemsData.Name = "btMakeItemsData"; + this.btMakeItemsData.Size = new System.Drawing.Size(226, 22); + this.btMakeItemsData.Text = "구매내역에서 품목정보 생성"; + this.btMakeItemsData.Click += new System.EventHandler(this.toolStripMenuItem6_Click); + // // fPurchaseEB // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1327,5 +1331,6 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; private System.Windows.Forms.ToolStripMenuItem 현재목록입고양식ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 선택목록입고양식ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem btMakeItemsData; } } diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs index 692481f..e3123e7 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs @@ -137,6 +137,7 @@ namespace FEQ0000 } else { + btMakeItemsData.Visible = false; 상태일괄변경ToolStripMenuItem.Enabled = false; 엑셀에서가져오기ToolStripMenuItem.Enabled = false; btSave.Visible = false; @@ -1668,5 +1669,15 @@ namespace FEQ0000 { MailSendNoForm(false, "PF"); } + + private void toolStripMenuItem6_Click(object sender, EventArgs e) + { + var ta = new dsPurchaseTableAdapters.QueriesTableAdapter(); + var dlg = FCOMMON.Util.MsgQ("구매내역에서 품목정보를 생성합니다, 중복되는 sid는 업데이트 되지 않습니다\n" + + "완료메시지 나올떄까지 기다려주세요"); + if (dlg != DialogResult.Yes) return; + ta.PurchaseDataToItemsEB(FCOMMON.info.Login.gcode); + FCOMMON.Util.MsgI("업데이트 완료"); + } } } diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs index d94a13a..cac986c 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.Designer.cs @@ -47,7 +47,6 @@ System.Windows.Forms.Label label11; System.Windows.Forms.Label label14; System.Windows.Forms.Label label15; - System.Windows.Forms.Label label9; System.Windows.Forms.Label label18; System.Windows.Forms.Label label2; this.tbSC = new System.Windows.Forms.TextBox(); @@ -95,6 +94,7 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); + this.lbcurrentwon = new System.Windows.Forms.Label(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); sidLabel = new System.Windows.Forms.Label(); @@ -112,7 +112,6 @@ label11 = new System.Windows.Forms.Label(); label14 = new System.Windows.Forms.Label(); label15 = new System.Windows.Forms.Label(); - label9 = new System.Windows.Forms.Label(); label18 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); @@ -295,18 +294,6 @@ label15.TabIndex = 14; label15.Text = "실 구매 수량"; // - // label9 - // - label9.AutoSize = true; - label9.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - label9.ForeColor = System.Drawing.Color.Blue; - label9.Location = new System.Drawing.Point(371, 200); - label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label9.Name = "label9"; - label9.Size = new System.Drawing.Size(99, 30); - label9.TabIndex = 20; - label9.Text = "해외물품은\r\n좌측 단가를 입력"; - // // label18 // label18.AutoSize = true; @@ -556,6 +543,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.lbcurrentwon); this.groupBox1.Controls.Add(this.cmbDept); this.groupBox1.Controls.Add(label2); this.groupBox1.Controls.Add(this.cmbSite); @@ -567,7 +555,6 @@ this.groupBox1.Controls.Add(this.tbBigoChk); this.groupBox1.Controls.Add(label14); this.groupBox1.Controls.Add(label10); - this.groupBox1.Controls.Add(label9); this.groupBox1.Controls.Add(this.tbPumPriceD); this.groupBox1.Controls.Add(label8); this.groupBox1.Controls.Add(this.button2); @@ -649,11 +636,12 @@ this.cmbCurrency.FormattingEnabled = true; this.cmbCurrency.Items.AddRange(new object[] { "USD"}); - this.cmbCurrency.Location = new System.Drawing.Point(274, 202); + this.cmbCurrency.Location = new System.Drawing.Point(219, 202); this.cmbCurrency.Margin = new System.Windows.Forms.Padding(4); this.cmbCurrency.Name = "cmbCurrency"; this.cmbCurrency.Size = new System.Drawing.Size(89, 28); this.cmbCurrency.TabIndex = 50; + this.cmbCurrency.SelectedIndexChanged += new System.EventHandler(this.cmbCurrency_SelectedIndexChanged); // // tbQtyReal // @@ -684,7 +672,7 @@ this.tbPumPriceD.Location = new System.Drawing.Point(94, 203); this.tbPumPriceD.Margin = new System.Windows.Forms.Padding(4); this.tbPumPriceD.Name = "tbPumPriceD"; - this.tbPumPriceD.Size = new System.Drawing.Size(178, 27); + this.tbPumPriceD.Size = new System.Drawing.Size(122, 27); this.tbPumPriceD.TabIndex = 19; this.tbPumPriceD.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.tbPumPriceD.TextChanged += new System.EventHandler(this.tbDolloerPrice_TextChanged); @@ -838,6 +826,18 @@ // this.purchaseTableAdapter.ClearBeforeFill = true; // + // lbcurrentwon + // + this.lbcurrentwon.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbcurrentwon.ForeColor = System.Drawing.Color.Blue; + this.lbcurrentwon.Location = new System.Drawing.Point(312, 202); + this.lbcurrentwon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbcurrentwon.Name = "lbcurrentwon"; + this.lbcurrentwon.Size = new System.Drawing.Size(161, 28); + this.lbcurrentwon.TabIndex = 55; + this.lbcurrentwon.Text = "통화기호를 선택하세요"; + this.lbcurrentwon.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // fPurchaseEB_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); @@ -915,5 +915,6 @@ private System.Windows.Forms.DateTimePicker dtExpDate; private System.Windows.Forms.CheckBox chkExp; private System.Windows.Forms.ComboBox cmbDept; + private System.Windows.Forms.Label lbcurrentwon; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs index 3b23f53..baf7f21 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs @@ -577,6 +577,13 @@ namespace FEQ0000 } } + if (dr.RowState == DataRowState.Detached && vqtyreq < 1) + { + Util.MsgE($"요청수량을 입력하세요"); + tbQtyReq.Focus(); + return false; + } + dr.pumqty = vqtyreal;// int.Parse(tbPumQty.Text); dr.pumqtyReq = vqtyreq;// int.Parse(tbpumqtyReq.Text); dr.pumprice = vpumprice;// decimal.Parse(tbPumPrice.Text); @@ -592,6 +599,12 @@ namespace FEQ0000 if (vqtyreal > 0) dr.pumamt = dr.pumqty * dr.pumprice; else dr.pumamt = dr.pumqtyReq * dr.pumprice; + if (dr.pumamt < 1) + { + FCOMMON.Util.MsgE($"금액이 없습니다. 단가 및 수량을 확인하세요\n해외 통화를 사용할 경우 환율을 고려한 국내단가를 입력해주세요\n환율을 자동으로 입력하려면 공용코드(69)의 FValue 에 값을 입력하세요"); + return false; + } + if (tbPumIDX.Text == "" || tbPumIDX.Text == "-1") dr.SetpumidxNull(); else dr.pumidx = int.Parse(tbPumIDX.Text); dr.sid = tbSID.Text.Trim(); @@ -832,7 +845,8 @@ namespace FEQ0000 { if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) { - var price = FCOMMON.info.dollertowon * (double)priced; + var curr = lbcurrentwon.Tag != null ? (float)lbcurrentwon.Tag : 0; + var price = curr * (double)priced; tbPumPrice.Text = (Math.Ceiling(price)).ToString("N0"); } else tbPumPrice.Text = "0"; @@ -847,5 +861,43 @@ namespace FEQ0000 { this.dtExpDate.Enabled = chkExp.Checked; } + + private void cmbCurrency_SelectedIndexChanged(object sender, EventArgs e) + { + + if (cmbCurrency.SelectedIndex >= 0) + { + var val = cmbCurrency.SelectedValue.ToString(); + var dt = cmbCurrency.DataSource as DataTable; + var v = dt.AsEnumerable().Where(t => t.Field("Value") == val).FirstOrDefault(); + if (v != null) + { + var price = v.Field("FValue"); + lbcurrentwon.Text = $"환율:{price}원"; + lbcurrentwon.Tag = price; + //if (binit) + //{ + + // if (decimal.TryParse(tbPumPriceD.Text,out decimal priced)) + // { + // if (priced > 0) + // dr.pumamt = priced * (decimal)price; + // } + + + //} + } + else + { + lbcurrentwon.Text = $"환율이 입력되지 않았습니다"; + lbcurrentwon.Tag = 0; + } + } + else + { + lbcurrentwon.Text = "통화기호를 선택하세요"; + lbcurrentwon.Tag = 0; + } + } } } diff --git a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx index cad3f7a..7cbf788 100644 --- a/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx +++ b/SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.resx @@ -185,9 +185,6 @@ False - - False - False diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs index fc21c04..f3eaa44 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs @@ -110,6 +110,8 @@ this.선택목록입고양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.엑셀에서가져오기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.견적서폴더열기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); + this.btMakeItemsData = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -459,7 +461,9 @@ this.toolStripButton7.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.메일전송ToolStripMenuItem, this.엑셀에서가져오기ToolStripMenuItem, - this.견적서폴더열기ToolStripMenuItem}); + this.견적서폴더열기ToolStripMenuItem, + this.toolStripMenuItem5, + this.btMakeItemsData}); this.toolStripButton7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton7.Image"))); this.toolStripButton7.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton7.Name = "toolStripButton7"; @@ -476,7 +480,7 @@ this.선택목록입고양식ToolStripMenuItem}); this.메일전송ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일전송ToolStripMenuItem.Image"))); this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(234, 30); this.메일전송ToolStripMenuItem.Text = "메일 전송"; // // 현재목록ToolStripMenuItem @@ -516,7 +520,7 @@ // this.엑셀에서가져오기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("엑셀에서가져오기ToolStripMenuItem.Image"))); this.엑셀에서가져오기ToolStripMenuItem.Name = "엑셀에서가져오기ToolStripMenuItem"; - this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(234, 30); this.엑셀에서가져오기ToolStripMenuItem.Text = "엑셀에서 가져오기"; this.엑셀에서가져오기ToolStripMenuItem.Click += new System.EventHandler(this.엑셀에서가져오기ToolStripMenuItem_Click); // @@ -524,10 +528,22 @@ // this.견적서폴더열기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("견적서폴더열기ToolStripMenuItem.Image"))); this.견적서폴더열기ToolStripMenuItem.Name = "견적서폴더열기ToolStripMenuItem"; - this.견적서폴더열기ToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.견적서폴더열기ToolStripMenuItem.Size = new System.Drawing.Size(234, 30); this.견적서폴더열기ToolStripMenuItem.Text = "견적서 폴더 열기"; this.견적서폴더열기ToolStripMenuItem.Click += new System.EventHandler(this.견적서폴더열기ToolStripMenuItem_Click); // + // toolStripMenuItem5 + // + this.toolStripMenuItem5.Name = "toolStripMenuItem5"; + this.toolStripMenuItem5.Size = new System.Drawing.Size(231, 6); + // + // btMakeItemsData + // + this.btMakeItemsData.Name = "btMakeItemsData"; + this.btMakeItemsData.Size = new System.Drawing.Size(234, 30); + this.btMakeItemsData.Text = "구매내역에서 품목정보 생성"; + this.btMakeItemsData.Click += new System.EventHandler(this.구매내역에서품목정보생성ToolStripMenuItem_Click); + // // toolStripButton5 // this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); @@ -1427,5 +1443,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem 현재목록입고양식ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 선택목록입고양식ToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5; + private System.Windows.Forms.ToolStripMenuItem btMakeItemsData; } } diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs index d5f14b8..1901301 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs @@ -19,6 +19,7 @@ using System.Diagnostics; using FarPoint.Win.Spread.CellType; using FCM0000; using GrapeCity.Win.Spread.InputMan.CellType; +using NetOffice.OutlookApi; namespace FEQ0000 { @@ -166,11 +167,11 @@ namespace FEQ0000 { btSave.Visible = true; 엑셀에서가져오기ToolStripMenuItem.Visible = true; - } else { 엑셀에서가져오기ToolStripMenuItem.Visible = false; + btMakeItemsData.Visible = false; btSave.Visible = false; btViewDel.Visible = false; fpSpread1.EditMode = false; @@ -414,7 +415,7 @@ namespace FEQ0000 var cnt = this.tam.UpdateAll(this.dsPurchase); if (prompt) FCOMMON.Util.MsgI(string.Format("{0}건의 자료가 저장 되었습니다.", cnt)); } - catch (Exception ex) + catch (System.Exception ex) { FCOMMON.Util.MsgE("저장 실패\n" + ex.Message); } @@ -617,7 +618,7 @@ namespace FEQ0000 if (cnt != 1) FCOMMON.Util.MsgE(cnt.ToString() + "건의 자료가 삭제되었습니다."); } - catch (Exception ex) + catch (System.Exception ex) { FCOMMON.Util.MsgE("delete error\n" + ex.Message); } @@ -672,7 +673,7 @@ namespace FEQ0000 tbFind.Focus(); showSummary(); } - catch (Exception ex) + catch (System.Exception ex) { this.tbFind.BackColor = Color.Tomato; FCOMMON.Util.MsgE(ex.Message); @@ -753,7 +754,7 @@ namespace FEQ0000 } - + private void exportDataToolStripMenuItem_Click(object sender, EventArgs e) { SaveFileDialog sd = new SaveFileDialog(); @@ -1009,7 +1010,7 @@ namespace FEQ0000 return retval; } - + private void 구매승인양식ToolStripMenuItem_Click(object sender, EventArgs e) { @@ -1153,8 +1154,8 @@ namespace FEQ0000 //{ // FCOMMON.Util.MsgE($"{i}번 줄의 데이터는 신청이 완료된 자료 입니다"); //} - // else - rowidxs.Add(i); + // else + rowidxs.Add(i); } } } @@ -1464,7 +1465,7 @@ namespace FEQ0000 form_body = form_body.Replace("{DATE}", datestr); newMail.HTMLBody = form_body + newMail.HTMLBody; // } - catch (Exception ex) + catch (System.Exception ex) { util.MsgE("전송실패\n\n" + ex.Message + "\n\n" + "아웃룩의 설정이 정상인지 확인하세요"); @@ -1480,5 +1481,15 @@ namespace FEQ0000 { MailSendNoForm(false, "PC"); } + + private void 구매내역에서품목정보생성ToolStripMenuItem_Click(object sender, EventArgs e) + { + var ta = new dsPurchaseTableAdapters.QueriesTableAdapter(); + var dlg = FCOMMON.Util.MsgQ("구매내역에서 품목정보를 생성합니다, 중복되는 sid는 업데이트 되지 않습니다\n" + + "완료메시지 나올떄까지 기다려주세요"); + if (dlg != DialogResult.Yes) return; + ta.PurchaseDataToItemsNR(FCOMMON.info.Login.gcode); + FCOMMON.Util.MsgI("업데이트 완료"); + } } } diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs index ca84c19..b4acc2d 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs @@ -56,7 +56,6 @@ System.Windows.Forms.Label label14; System.Windows.Forms.Label label15; System.Windows.Forms.Label label17; - System.Windows.Forms.Label label9; this.label18 = new System.Windows.Forms.Label(); this.tbSC = new System.Windows.Forms.TextBox(); this.tbSID = new System.Windows.Forms.TextBox(); @@ -83,6 +82,7 @@ this.chkExp = new System.Windows.Forms.CheckBox(); this.btSaveAdd = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.tbPumIDX = new System.Windows.Forms.Button(); this.tbStorage = new System.Windows.Forms.ComboBox(); this.cmbRemark = new System.Windows.Forms.ComboBox(); this.cmbCurrency = new System.Windows.Forms.ComboBox(); @@ -117,7 +117,7 @@ this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); - this.tbPumIDX = new System.Windows.Forms.Button(); + this.lbcurrentwon = new System.Windows.Forms.Label(); processLabel = new System.Windows.Forms.Label(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); @@ -144,7 +144,6 @@ label14 = new System.Windows.Forms.Label(); label15 = new System.Windows.Forms.Label(); label17 = new System.Windows.Forms.Label(); - label9 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -420,24 +419,12 @@ label17.TabIndex = 42; label17.Text = "구매담당자명"; // - // label9 - // - label9.AutoSize = true; - label9.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - label9.ForeColor = System.Drawing.Color.Blue; - label9.Location = new System.Drawing.Point(371, 200); - label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label9.Name = "label9"; - label9.Size = new System.Drawing.Size(99, 30); - label9.TabIndex = 20; - label9.Text = "해외물품은\r\n좌측 단가를 입력"; - // // label18 // - this.label18.Location = new System.Drawing.Point(277, 175); + this.label18.Location = new System.Drawing.Point(321, 175); this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(198, 20); + this.label18.Size = new System.Drawing.Size(151, 20); this.label18.TabIndex = 51; this.label18.Text = "원"; // @@ -510,8 +497,9 @@ this.tbPumPrice.Location = new System.Drawing.Point(93, 172); this.tbPumPrice.Margin = new System.Windows.Forms.Padding(4); this.tbPumPrice.Name = "tbPumPrice"; - this.tbPumPrice.Size = new System.Drawing.Size(178, 27); + this.tbPumPrice.Size = new System.Drawing.Size(220, 27); this.tbPumPrice.TabIndex = 17; + this.tbPumPrice.Text = "0"; this.tbPumPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.tbPumPrice.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); // @@ -707,6 +695,7 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.lbcurrentwon); this.groupBox1.Controls.Add(this.tbPumIDX); this.groupBox1.Controls.Add(this.tbStorage); this.groupBox1.Controls.Add(this.label18); @@ -720,7 +709,6 @@ this.groupBox1.Controls.Add(this.chk1); this.groupBox1.Controls.Add(this.btSIDChk); this.groupBox1.Controls.Add(label10); - this.groupBox1.Controls.Add(label9); this.groupBox1.Controls.Add(this.tbPumPriceD); this.groupBox1.Controls.Add(label8); this.groupBox1.Controls.Add(this.button3); @@ -760,6 +748,15 @@ this.groupBox1.Text = "필수입력"; this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter); // + // tbPumIDX + // + this.tbPumIDX.Location = new System.Drawing.Point(410, 79); + this.tbPumIDX.Name = "tbPumIDX"; + this.tbPumIDX.Size = new System.Drawing.Size(65, 27); + this.tbPumIDX.TabIndex = 53; + this.tbPumIDX.UseVisualStyleBackColor = true; + this.tbPumIDX.Click += new System.EventHandler(this.tbPumIDX_Click); + // // tbStorage // this.tbStorage.FormattingEnabled = true; @@ -793,11 +790,12 @@ this.cmbCurrency.FormattingEnabled = true; this.cmbCurrency.Items.AddRange(new object[] { "USD"}); - this.cmbCurrency.Location = new System.Drawing.Point(274, 202); + this.cmbCurrency.Location = new System.Drawing.Point(224, 203); this.cmbCurrency.Margin = new System.Windows.Forms.Padding(4); this.cmbCurrency.Name = "cmbCurrency"; this.cmbCurrency.Size = new System.Drawing.Size(89, 28); this.cmbCurrency.TabIndex = 50; + this.cmbCurrency.SelectedIndexChanged += new System.EventHandler(this.cmbCurrency_SelectedIndexChanged); // // tbQtyReal // @@ -861,8 +859,9 @@ this.tbPumPriceD.Location = new System.Drawing.Point(94, 203); this.tbPumPriceD.Margin = new System.Windows.Forms.Padding(4); this.tbPumPriceD.Name = "tbPumPriceD"; - this.tbPumPriceD.Size = new System.Drawing.Size(178, 27); + this.tbPumPriceD.Size = new System.Drawing.Size(122, 27); this.tbPumPriceD.TabIndex = 19; + this.tbPumPriceD.Text = "0"; this.tbPumPriceD.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.tbPumPriceD.TextChanged += new System.EventHandler(this.tbDolloerPrice_TextChanged); // @@ -1140,14 +1139,18 @@ // this.ta.ClearBeforeFill = true; // - // tbPumIDX + // lbcurrentwon // - this.tbPumIDX.Location = new System.Drawing.Point(410, 79); - this.tbPumIDX.Name = "tbPumIDX"; - this.tbPumIDX.Size = new System.Drawing.Size(65, 27); - this.tbPumIDX.TabIndex = 53; - this.tbPumIDX.UseVisualStyleBackColor = true; - this.tbPumIDX.Click += new System.EventHandler(this.tbPumIDX_Click); + this.lbcurrentwon.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbcurrentwon.ForeColor = System.Drawing.Color.Blue; + this.lbcurrentwon.Location = new System.Drawing.Point(321, 202); + this.lbcurrentwon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbcurrentwon.Name = "lbcurrentwon"; + this.lbcurrentwon.Size = new System.Drawing.Size(153, 28); + this.lbcurrentwon.TabIndex = 54; + this.lbcurrentwon.Text = "통화기호를 선택하세요"; + this.lbcurrentwon.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.lbcurrentwon.Click += new System.EventHandler(this.lbcurrentwon_Click); // // fPurchase_Add // @@ -1242,5 +1245,6 @@ private System.Windows.Forms.DateTimePicker dtPrdate; private System.Windows.Forms.CheckBox chkprdate; private System.Windows.Forms.Button tbPumIDX; + private System.Windows.Forms.Label lbcurrentwon; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs index 2fde3f0..16f2224 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs @@ -123,6 +123,7 @@ namespace FEQ0000 this.cmbCurrency.DataSource = LstCur; + //구매자비고 var LstRemark = FCOMMON.DBM.getCodeList("70"); this.cmbRemark.Items.Clear(); @@ -244,6 +245,9 @@ namespace FEQ0000 else btEQModel.Text = dr.asset; //제조모델명 cmbCurrency.Text = dr.currency; + //if (cmbCurrency.SelectedIndex < 0 && cmbCurrency.Items.Count == 1) + // cmbCurrency.SelectedIndex = 0; + tbPumName.Text = dr.pumname; tbPumName.Tag = tbPumName.Text; @@ -843,20 +847,41 @@ namespace FEQ0000 } } + if (dr.RowState == DataRowState.Detached && vqtyreq < 1) + { + Util.MsgE($"요청수량을 입력하세요"); + tbQtyReq.Focus(); + return false; + } + dr.pumqty = vqtyreal;// int.Parse(tbPumQty.Text); dr.pumqtyReq = vqtyreq;// int.Parse(tbpumqtyReq.Text); dr.pumprice = vpumprice;// decimal.Parse(tbPumPrice.Text); dr.currency = cmbCurrency.Text.Trim(); + var applyprice = dr.pumprice; if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) { dr.pumpriceD = priced; + applyprice = priced; + if (vpumprice == 0) + { + //원화단가가없다면 환산해준다 + var 환율 = lbcurrentwon.Tag != null ? (float)lbcurrentwon.Tag : 0f; + vpumprice = ((decimal)환율 * priced); + dr.pumprice = vpumprice; + } } else dr.SetpumpriceDNull(); if (vqtyreal > 0) dr.pumamt = dr.pumqty * dr.pumprice; else dr.pumamt = dr.pumqtyReq * dr.pumprice; + if (dr.pumamt < 1) + { + FCOMMON.Util.MsgE($"금액이 없습니다. 단가 및 수량을 확인하세요\n해외 통화를 사용할 경우 환율을 고려한 국내단가를 입력해주세요\n환율을 자동으로 입력하려면 공용코드(69)의 FValue 에 값을 입력하세요"); + return false; + } if (tbPumIDX.Text == "" || tbPumIDX.Text == "-1") dr.SetpumidxNull(); else dr.pumidx = int.Parse(tbPumIDX.Text); dr.sid = tbSID.Text.Trim(); @@ -913,7 +938,7 @@ namespace FEQ0000 if (cmbReceive.SelectedIndex < 1) dr.receive = string.Empty; else dr.receive = cmbReceive.Text.Trim(); } - + dr.process = btProcess.Text; dr.sc = tbSC.Text; @@ -978,9 +1003,9 @@ namespace FEQ0000 private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) { - if(cmbState.Text == "PR" || cmbState.Text == "PO") + if (cmbState.Text == "PR" || cmbState.Text == "PO") { - if(chkprdate.Checked==false) + if (chkprdate.Checked == false) { chkprdate.Checked = true; dtPrdate.Value = DateTime.Now; @@ -1188,30 +1213,32 @@ namespace FEQ0000 private void tbDolloerPrice_TextChanged(object sender, EventArgs e) { //단가에 금액이 없는경우에는 환율을 곱해준다. - //if ( decimal.TryParse(tbPumPrice.Text, out decimal result) == false || result == 0) - //if (binit) - //{ - // if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced) == true) - // { - // applyDollerToWon(); - // } - // else - // { - // //달러입력값도 이상하니 처리 못함 - // tbPumPrice.Text = "0"; - // } - //} + // if (decimal.TryParse(tbPumPrice.Text, out decimal result) == false || result == 0) + if (binit) + { + if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced) == true) + { + applyDollerToWon(); + } + else + { + //달러입력값도 이상하니 처리 못함 + tbPumPrice.Text = "0"; + } + } } - //void applyDollerToWon() - //{ - // if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) - // { - // var price = FCOMMON.info.dollertowon * (double)priced; - // tbPumPrice.Text = (Math.Ceiling(price)).ToString(); - // } - // else tbPumPrice.Text = "0"; - //} + + void applyDollerToWon() + { + if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) + { + var curr = lbcurrentwon.Tag != null ? (float)lbcurrentwon.Tag : 0; + var price = curr * (double)priced; + tbPumPrice.Text = (Math.Ceiling(price)).ToString(); + } + else tbPumPrice.Text = "0"; + } private void btSIDChk_Click(object sender, EventArgs e) { @@ -1235,7 +1262,7 @@ namespace FEQ0000 var dt = Amkor.RestfulService.SPMSIDSearch(sid); if (dt.Complete) { - var f = new fSIDListSelect(sid, dt.Result); + var f = new FCM0000.fSIDListSelect(sid, dt.Result); if (f.ShowDialog() == DialogResult.OK) { dr.chk1 = true; @@ -1388,7 +1415,7 @@ namespace FEQ0000 FCOMMON.Util.MsgE("품번호가 정확하지 않습니다\n품목을 다시 선택하세요"); return; } - if(pumidx < 0) + if (pumidx < 0) { FCOMMON.Util.MsgE("품번호가 정확하지 않습니다\n품목을 다시 선택하세요"); return; @@ -1404,5 +1431,48 @@ namespace FEQ0000 tbSupplyIndex.Text = f.tbSupplyIdx.Text; tbSID.Text = f.tbSid.Text; } + + private void cmbCurrency_SelectedIndexChanged(object sender, EventArgs e) + { + + if (cmbCurrency.SelectedIndex >= 0) + { + var val = cmbCurrency.SelectedValue.ToString(); + var dt = cmbCurrency.DataSource as DataTable; + var v = dt.AsEnumerable().Where(t => t.Field("Value") == val).FirstOrDefault(); + if (v != null) + { + var price = v.Field("FValue"); + lbcurrentwon.Text = $"환율:{price}원"; + lbcurrentwon.Tag = price; + //if (binit) + //{ + + // if (decimal.TryParse(tbPumPriceD.Text,out decimal priced)) + // { + // if (priced > 0) + // dr.pumamt = priced * (decimal)price; + // } + + + //} + } + else + { + lbcurrentwon.Text = $"환율이 입력되지 않았습니다"; + lbcurrentwon.Tag = 0; + } + } + else + { + lbcurrentwon.Text = "통화기호를 선택하세요"; + lbcurrentwon.Tag = 0; + } + } + + private void lbcurrentwon_Click(object sender, EventArgs e) + { + FCOMMON.Util.MsgI("환율을 입력하려면 공용코드(68)의 Fvalue 에 값을 입력하세요"); + } } } diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.resx b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.resx index ff9977a..dec71c8 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.resx +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.resx @@ -221,9 +221,6 @@ False - - False - * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs index 8d9f385..11c5692 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs @@ -1,5 +1,6 @@ using FarPoint.Win.Spread; using FCOMMON; +using NetOffice.OutlookApi; using System; using System.Collections.Generic; using System.ComponentModel; @@ -237,9 +238,17 @@ namespace FEQ0000 //string userNo = this.cmbRequest.Text.Substring(cmbRequest.Text.LastIndexOf('(') + 1); //userNo = userNo.Substring(0, userNo.Length - 1); + //part 목록을 조회해서 NR에 등록해줘야 함 + var dlg2 = FCOMMON.Util.MsgQ($"해당 파트리스트를 ({crmode})구매 목록에 등록 하시겠습니까?\n" + + listView1.CheckedItems.Count.ToString() + "건"); + if (dlg2 != System.Windows.Forms.DialogResult.Yes) return; + + + //체크안된 데이터를 dr에서 삭제한다. decimal itemAmt = 0; var itemCount = 0; + var totalcnt = listView1.CheckedItems.Count; foreach (ListViewItem lv in this.listView1.Items) { if (crmode == eImporttype.CR) @@ -260,11 +269,12 @@ namespace FEQ0000 dr.AcceptChanges(); dr.SetAdded(); itemAmt += dr.pumamt; + taCR.Update(dr); } } else if (crmode == eImporttype.NR) { - var dr = lv.Tag as dsPurchase.EETGW_PurchaseEBRow; + var dr = lv.Tag as dsPurchase.PurchaseRow; if (lv.Checked == false) dr.AcceptChanges(); else { @@ -280,6 +290,10 @@ namespace FEQ0000 dr.AcceptChanges(); dr.SetAdded(); itemAmt += dr.pumamt; + + taNR.Update(dr); + + } } else if (crmode == eImporttype.EB) @@ -300,15 +314,15 @@ namespace FEQ0000 dr.AcceptChanges(); dr.SetAdded(); itemAmt += dr.pumamt; + taEB.Update(dr); } } + this.Text = $"데이터 입력중({itemCount}/{totalcnt})"; + if (itemCount % 10 == 0) System.Windows.Forms.Application.DoEvents(); } - //part 목록을 조회해서 NR에 등록해줘야 함 - var dlg2 = FCOMMON.Util.MsgQ($"해당 파트리스트를 ({crmode})구매 목록에 등록 하시겠습니까?\n" + - itemCount.ToString() + "건 " + itemAmt.ToString("N0") + "원"); - if (dlg2 != System.Windows.Forms.DialogResult.Yes) return; + if (crmode == eImporttype.CR) taCR.Update(this.dsPRJ.EETGW_PurchaseCR); @@ -411,7 +425,7 @@ namespace FEQ0000 { book.load(textBox1.Text); } - catch (Exception ex) + catch (System.Exception ex) { FCOMMON.Util.MsgE(ex.Message); return; @@ -546,12 +560,13 @@ namespace FEQ0000 if (cf_입고일 == libxl.CellType.CELLTYPE_STRING) { 입고일 = sheet.readStr(r, (int)nudInDate.Value - 1).Trim(); - if(DateTime.TryParse(입고일,out DateTime indatevalue)==false) + if (DateTime.TryParse(입고일, out DateTime indatevalue) == false) { sb.AppendLine("입고일을 확인할 수 없어 입력하지 않습니다\n" + $"줄번호:{r},입고일자료:{입고일}"); continue; - } else + } + else { 입고일 = indatevalue.ToShortDateString(); } @@ -639,7 +654,20 @@ namespace FEQ0000 if (비고.Length >= 500) 비고 = 비고.Substring(0, 500 - 4) + "..."; if (규격.Length >= 200) 규격 = 규격.Substring(0, 200 - 4) + "..."; - + 요청일 = (요청일.Replace(" ", "")); + 요청인 = (요청인.Replace(" ", "")); + SID = (SID.Replace(" ", "")); + 단위 = (단위.Replace(" ", "")); + v_공급처 = (v_공급처.Replace(" ", "")); + PO = (PO.Replace(" ", "")); + SC = (SC.Replace(" ", "")); + CRCF = (CRCF.Replace(" ", "")); + 입고일 = (입고일.Replace(" ", "")); + 수령인 = (수령인.Replace(" ", "")); + CostCode = (CostCode.Replace(" ", "")); + LIneCode = (LIneCode.Replace(" ", "")); + 구매담당 = (구매담당.Replace(" ", "")); + 구매승인 = (구매승인.Replace(" ", "")); //리스트뷰에 추가 var newitem = this.listView1.Items.Add(요청일); @@ -763,12 +791,12 @@ namespace FEQ0000 } //this.dsPRJ.ProjectsPart.AcceptChanges(); - if(sb.Length > 0) + if (sb.Length > 0) { Util.MsgE(sb.ToString()); } } - catch (Exception ex) + catch (System.Exception ex) { FCOMMON.Util.MsgE("불러오는 중 오류 발생\n" + ex.Message); } @@ -787,7 +815,7 @@ namespace FEQ0000 { FCOMMON.Util.MsgE("입력된 자료가 없습니다.\n\n지정된 엑셀의 1번째 칸에 값이 없다면 입력되지 않습니다."); } - + } private void 전체선택ToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs index 8ba5bb6..dc9dd63 100644 --- a/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs +++ b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs @@ -119,7 +119,7 @@ namespace FEQ0000.Purchase var dlg = FCOMMON.Util.MsgQ("모든 자료의 SPR/NR 재고를 검색 할까요?"); if (dlg != DialogResult.Yes) return; var cnt = 0; - foreach(var dr in this.dsPurchase.PurchaseCheck) + foreach (var dr in this.dsPurchase.PurchaseCheck) { var sid = dr.sid; if (sid.Length != 9 || sid.StartsWith("10") == false) @@ -157,7 +157,7 @@ namespace FEQ0000.Purchase var drv = this.dv1.Rows[e.RowIndex].DataBoundItem as DataRowView; var dr = drv.Row as dsPurchase.PurchaseCheckRow; var sid = dr.sid; - if(sid.Length != 9 || sid.StartsWith("10")==false) + if (sid.Length != 9 || sid.StartsWith("10") == false) { dr.sitecnt = "SID오류"; dr.chk2 = true; @@ -168,8 +168,15 @@ namespace FEQ0000.Purchase if (dt.Complete) { dr.sitecnt = $"{dt.Result.Rows.Count}건"; - var f = new fSIDListSelect(sid, dt.Result); - f.ShowDialog(); + var f = new FCM0000.fSIDListSelect(sid, dt.Result); + if (f.ShowDialog() == DialogResult.OK) + { + dr.chk2 = true; + } + else + { + dr.chk2 = false; + } } else { @@ -185,7 +192,7 @@ namespace FEQ0000.Purchase { var cnt = this.dsPurchase.PurchaseCheck.Where(t => t.chk2).Count(); - if(cnt == 0) + if (cnt == 0) { this.Close(); } @@ -198,7 +205,7 @@ namespace FEQ0000.Purchase this.chklist.AddRange(lists.Select(t => t.idx)); DialogResult = DialogResult.OK; } - + } private void toolStripButton3_Click(object sender, EventArgs e) diff --git a/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.Designer.cs deleted file mode 100644 index 0cf2c44..0000000 --- a/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.Designer.cs +++ /dev/null @@ -1,222 +0,0 @@ -namespace FEQ0000.Purchase -{ - partial class fSIDListSelect - { - /// - /// 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() - { - this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fSIDListSelect)); - this.dv1 = new System.Windows.Forms.DataGridView(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.bn = new System.Windows.Forms.BindingNavigator(this.components); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); - ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); - this.bn.SuspendLayout(); - this.SuspendLayout(); - // - // dv1 - // - this.dv1.AllowUserToAddRows = false; - this.dv1.AllowUserToDeleteRows = false; - this.dv1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; - this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv1.DefaultCellStyle = dataGridViewCellStyle1; - this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dv1.Location = new System.Drawing.Point(0, 0); - this.dv1.Name = "dv1"; - this.dv1.ReadOnly = true; - this.dv1.RowTemplate.Height = 23; - this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dv1.Size = new System.Drawing.Size(884, 378); - this.dv1.TabIndex = 0; - this.dv1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick); - // - // bn - // - this.bn.AddNewItem = null; - this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = null; - this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.ImageScalingSize = new System.Drawing.Size(32, 32); - this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bindingNavigatorMoveFirstItem, - this.bindingNavigatorMovePreviousItem, - this.bindingNavigatorSeparator, - this.bindingNavigatorPositionItem, - this.bindingNavigatorCountItem, - this.bindingNavigatorSeparator1, - this.bindingNavigatorMoveNextItem, - this.bindingNavigatorMoveLastItem, - this.bindingNavigatorSeparator2, - this.toolStripButton1}); - this.bn.Location = new System.Drawing.Point(0, 378); - this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; - this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; - this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; - this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; - this.bn.Name = "bn"; - this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(884, 39); - this.bn.TabIndex = 1; - this.bn.Text = "bindingNavigator1"; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 36); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); - this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; - this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(36, 36); - this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); - this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; - this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(36, 36); - this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 39); - // - // bindingNavigatorPositionItem - // - 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(50, 23); - this.bindingNavigatorPositionItem.Text = "0"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 39); - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); - this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; - this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(36, 36); - this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); - this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; - this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(36, 36); - this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 39); - // - // toolStripButton1 - // - this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - 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(95, 36); - this.toolStripButton1.Text = "확인 완료"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); - // - // fSIDListSelect - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(884, 417); - this.Controls.Add(this.dv1); - this.Controls.Add(this.bn); - this.Name = "fSIDListSelect"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "SPM 검색 결과"; - this.Load += new System.EventHandler(this.fSIDListSelect_Load); - ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.DataGridView dv1; - private System.Windows.Forms.BindingSource bs; - private System.Windows.Forms.BindingNavigator bn; - private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; - private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.ToolStripButton toolStripButton1; - } -} \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.cs b/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.cs deleted file mode 100644 index 9747d0b..0000000 --- a/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.cs +++ /dev/null @@ -1,46 +0,0 @@ -using FCOMMON; -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 FEQ0000.Purchase -{ - public partial class fSIDListSelect : Form - { - public fSIDListSelect(string sid,DataTable dt) - { - InitializeComponent(); - this.bs.DataSource = dt; - this.dv1.DataSource = this.bs; - this.bs.Sort = "quantity desc"; - this.Text = $"SPM/NR 검색 결과 SID:{sid}"; - this.KeyPreview = true; - this.KeyDown += (s1, e1) => { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - this.Width += 150; - } - - private void toolStripButton1_Click(object sender, EventArgs e) - { - DBM.InsertLog("SIDCHK", this.Text); - DialogResult = DialogResult.OK; - } - - private void dataGridView1_DoubleClick(object sender, EventArgs e) - { - - } - - private void fSIDListSelect_Load(object sender, EventArgs e) - { - this.dv1.AutoResizeColumns(); - } - } -} diff --git a/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.resx b/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.resx deleted file mode 100644 index 36daea1..0000000 --- a/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.resx +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - 81, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - - 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/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index 24ee73c..87c6899 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -20633,6 +20633,139 @@ ORDER BY pdate DESC, idx DESC"; } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class QueriesTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.IDbCommand[] _commandCollection; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + protected global::System.Data.IDbCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.IDbCommand[3]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FEQ0000.Properties.Settings.Default.gwcs); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandText = "dbo.PurchaseDataToItemsCR"; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).CommandType = global::System.Data.CommandType.StoredProcedure; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[0])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FEQ0000.Properties.Settings.Default.gwcs); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandText = "dbo.PurchaseDataToItemsEB"; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).CommandType = global::System.Data.CommandType.StoredProcedure; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[1])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Connection = new global::System.Data.SqlClient.SqlConnection(global::FEQ0000.Properties.Settings.Default.gwcs); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandText = "dbo.PurchaseDataToItemsNR"; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).CommandType = global::System.Data.CommandType.StoredProcedure; + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + ((global::System.Data.SqlClient.SqlCommand)(this._commandCollection[2])).Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int PurchaseDataToItemsCR(string gcode) { + global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[0])); + if ((gcode == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(gcode)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int PurchaseDataToItemsEB(string gcode) { + global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[1])); + if ((gcode == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(gcode)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int PurchaseDataToItemsNR(string gcode) { + global::System.Data.SqlClient.SqlCommand command = ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[2])); + if ((gcode == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(gcode)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index 351d5f3..e28b4a4 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -2,7 +2,7 @@ - + @@ -1608,7 +1608,41 @@ ORDER BY pdate DESC, idx DESC - + + + + + dbo.PurchaseDataToItemsCR + + + + + + + + + + + dbo.PurchaseDataToItemsEB + + + + + + + + + + + dbo.PurchaseDataToItemsNR + + + + + + + + @@ -2203,14 +2237,14 @@ ORDER BY pdate DESC, idx DESC - + - + diff --git a/SubProject/FPJ0000/Project/fPartList.Designer.cs b/SubProject/FPJ0000/Project/fPartList.Designer.cs index 1e8d0c1..b3d3283 100644 --- a/SubProject/FPJ0000/Project/fPartList.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartList.Designer.cs @@ -61,6 +61,8 @@ FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); 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.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); this.label3 = new System.Windows.Forms.Label(); @@ -949,6 +951,7 @@ // 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(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -1006,6 +1009,7 @@ // 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, 47); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -1152,6 +1156,7 @@ flatScrollBarRenderer2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer2; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); + this.fpSpread1.SetViewportLeftColumn(0, 0, 3); // // fpSpread1_Sheet1 // @@ -1159,7 +1164,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 = 21; + this.fpSpread1_Sheet1.ColumnCount = 23; this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; @@ -1191,9 +1196,9 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "공급"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).ColumnSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).ColumnSpan = 4; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "구매"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "상태"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 0).Value = "중"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 1).Value = "소"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "SID"; @@ -1207,7 +1212,9 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = " 금액"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "금액(N)"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "요청"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "입고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "승인"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "진행"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "완료"; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; @@ -1355,29 +1362,46 @@ this.fpSpread1_Sheet1.Columns.Get(16).Locked = false; this.fpSpread1_Sheet1.Columns.Get(16).Tag = "구매요청"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 93F; - this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(16).Width = 75F; numberCellType7.DecimalPlaces = 0; numberCellType7.MaximumValue = 10000000D; numberCellType7.MinimumValue = -10000000D; this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "입고"; - this.fpSpread1_Sheet1.Columns.Get(17).Tag = "구매입고"; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 93F; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "승인"; + this.fpSpread1_Sheet1.Columns.Get(17).Tag = "구매승인"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType8.DecimalPlaces = 0; + numberCellType8.MaximumValue = 10000000D; + numberCellType8.MinimumValue = -10000000D; this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "Item"; - this.fpSpread1_Sheet1.Columns.Get(18).Tag = "item"; - this.fpSpread1_Sheet1.Columns.Get(18).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 93F; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "진행"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "구매진행"; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 77F; + this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType9.DecimalPlaces = 0; + numberCellType9.MaximumValue = 10000000D; + numberCellType9.MinimumValue = -10000000D; this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType9; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "ItemSupplyidx"; - this.fpSpread1_Sheet1.Columns.Get(19).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(19).Width = 93F; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "완료"; + this.fpSpread1_Sheet1.Columns.Get(19).Tag = "구매완료"; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 84F; this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType10; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Tag = "idx"; - this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "Item"; + this.fpSpread1_Sheet1.Columns.Get(20).Tag = "item"; + this.fpSpread1_Sheet1.Columns.Get(20).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 93F; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType11; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "ItemSupplyidx"; + this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(21).Width = 93F; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType12; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).Tag = "idx"; + this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bsPart; @@ -1507,10 +1531,10 @@ private arCtl.arLabel prb4; private arCtl.arLabel prb3; private System.Windows.Forms.Label label3; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripDropDownButton toolStripButton1; private System.Windows.Forms.ToolStripMenuItem 전체선택ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 선택해제ToolStripMenuItem; private System.Windows.Forms.ToolStripButton toolStripButton5; + 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 7b636f0..bc22f51 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -191,8 +191,11 @@ namespace FPJ0000 var col_supply = this.fpSpread1.ActiveSheet.Columns["ItemSupply"].Index; //구매요청컬럼값 - var col_buyqty = this.fpSpread1.ActiveSheet.Columns["구매요청"].Index; - var col_inqty = this.fpSpread1.ActiveSheet.Columns["구매입고"].Index; + var col_buyrq = this.fpSpread1.ActiveSheet.Columns["구매요청"].Index; + var col_buypr = this.fpSpread1.ActiveSheet.Columns["구매승인"].Index; + var col_buypo = this.fpSpread1.ActiveSheet.Columns["구매진행"].Index; + var col_byuin = this.fpSpread1.ActiveSheet.Columns["구매완료"].Index; + //var col_inuser = this.fpSpread1.ActiveSheet.Columns["구매수령인"].Index; //var col_indate = this.fpSpread1.ActiveSheet.Columns["구매수령일"].Index; //var col_inbigo = this.fpSpread1.ActiveSheet.Columns["구매비고"].Index; @@ -228,6 +231,11 @@ namespace FPJ0000 FCOMMON.DBM.buyinfo sidinfo; if (v_sid.isEmpty() == false && v_sid.Length == 9 && v_sid.StartsWith("10")) { + if (v_sid == "108963609") + { + + } + if (sidlist.Contains(v_sid)) { //한번 계산했던 SID이다 @@ -235,15 +243,25 @@ namespace FPJ0000 row.ForeColor = Color.Gray; row.BackColor = Color.WhiteSmoke; + + sidinfo = FCOMMON.DBM.GetPartBuyInfo(project, v_sid); - fpSpread1.ActiveSheet.Cells[i, col_buyqty].Value = sidinfo.Total_Request; - fpSpread1.ActiveSheet.Cells[i, col_inqty].Value = sidinfo.Total_Buy; + + fpSpread1.ActiveSheet.Cells[i, col_buyrq].Value = sidinfo.Request; + fpSpread1.ActiveSheet.Cells[i, col_buypr].Value = sidinfo.PR; + fpSpread1.ActiveSheet.Cells[i, col_buypo].Value = sidinfo.PO; + fpSpread1.ActiveSheet.Cells[i, col_byuin].Value = sidinfo.Received; + continue; } else { sidinfo = FCOMMON.DBM.GetPartBuyInfo(project, v_sid); sidlist.Add(v_sid); + fpSpread1.ActiveSheet.Cells[i, col_buyrq].Value = sidinfo.Request; + fpSpread1.ActiveSheet.Cells[i, col_buypr].Value = sidinfo.PR; + fpSpread1.ActiveSheet.Cells[i, col_buypo].Value = sidinfo.PO; + fpSpread1.ActiveSheet.Cells[i, col_byuin].Value = sidinfo.Received; } } @@ -262,8 +280,8 @@ namespace FPJ0000 continue; } - fpSpread1.ActiveSheet.Cells[i, col_buyqty].Value = sidinfo.Total_Request; - fpSpread1.ActiveSheet.Cells[i, col_inqty].Value = sidinfo.Total_Buy; + //fpSpread1.ActiveSheet.Cells[i, col_buyrq].Value = sidinfo.Total_Request; + //fpSpread1.ActiveSheet.Cells[i, col_byuin].Value = sidinfo.Total_Ipko; TotInfo.PO += sidinfo.PO; @@ -273,7 +291,7 @@ namespace FPJ0000 전체건수 += 1; - int qty_in = sidinfo.Total_Buy;// 0; + int qty_in = sidinfo.Total_Ipko;// 0; int qty_buy = sidinfo.Total_Request;// ; if (sidinfo.Total_Request < 1) //비구매건 @@ -284,37 +302,44 @@ namespace FPJ0000 } else { + //if(v_sid == "108963609") + //{ + + //} //여기서부터는 무조건 구매대상이다 //입고수량이 구매수량을 넘어가면 완료이다 - if (sidinfo.Total_Buy >= sidinfo.Total_Request) + if (sidinfo.Received >= sidinfo.Total_Request) { 구매완료 += 1; row.ForeColor = Color.Black; row.BackColor = Color.LimeGreen; } - else if (sidinfo.Total_Buy > 0) //구매진행중이다 + else if (sidinfo.PO > 0) //구매진행중이다 { 구매진행 += 1; row.ForeColor = Color.White; row.BackColor = Color.DarkMagenta; } - else if (sidinfo.PR > 0) + else if (sidinfo.PR > 0) //승인요청 { PO대기 += 1; row.ForeColor = Color.Black; row.BackColor = Color.Gold; } - else if (sidinfo.PO > 0) - { - 구매진행 += 1; - row.ForeColor = Color.White; - row.BackColor = Color.DarkMagenta; - } else { - 구매요청 += 1; - row.ForeColor = Color.Black; - row.BackColor = Color.LightSkyBlue; + if(sidinfo.Request > 0) + { + 구매요청 += 1; + row.ForeColor = Color.Black; + row.BackColor = Color.LightSkyBlue; + } + else + { + 비구매 += 1; + row.ForeColor = Color.Black; + row.BackColor = Color.White; + } } //if (bPR == false) //{ diff --git a/SubProject/FPJ0000/Project/fPartList.resx b/SubProject/FPJ0000/Project/fPartList.resx index 5baf3dd..26e2ee1 100644 --- a/SubProject/FPJ0000/Project/fPartList.resx +++ b/SubProject/FPJ0000/Project/fPartList.resx @@ -161,7 +161,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAkBJREFUSEvt1u9LE3EcB/B7XA/6U3rQv2AFouxBRVvD9EE9KbAHISwoC6IpDVx0 + vgAADr4B6kKxwAAAAkBJREFUSEvt1u9LE3EcB/B7XA/6U3rQv2AFouxBRVvD9EE9KbAHISwoC6IpDVx0 bm2IgkkxzMIfiaFECYp33o/9aC3O0+XImei2s83Vft19uru+F6tuxfTOHugb3tzY7njx/ex7x2EHM+cf 0m0XH7Gx/ejZB4tXEIthdi/b/TRcAh8tmlrFsOKUB7EHFR6PFWBiSTK1ivEHHP2UBbOjGIfwIQypbBGo FeHnZ0cgVneV66rz31ZM8Bk44yafIXb/4Al2A5pdBINY40cdWEiq1/0ecjkDvdPxOGLNWXE6V4S+twno @@ -177,7 +177,7 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAG - 6QAABukBM89dwwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFNSURBVFhH7ZLN + 6AAABugB4Yi/JwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFNSURBVFhH7ZLN S8MwGIf7Z3sXvHSIIlU2u01oL0rXzTm/ceuGzM+rB0FchTEQbx1MwUrllbTLIV3bZUknyQPPpdD+HtIo kkVRXGsMm8YN0Xbj2QvdLDV9s977mUfDdnxwXbO/KoVWAU2nw65eD16evIBk/2IUuWd1grcPj0qj3g3u Ou5nRW1to/lkeAfCdzNFsghcUfVI/HkYCEJkWT3WUEY8eQWC9447SYzMMxC8bb/O/t15B4IzI5chEIyN @@ -189,7 +189,7 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAG - 6QAABukBM89dwwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAVsSURBVFhH3VhZ + 6AAABugB4Yi/JwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAVsSURBVFhH3VhZ TxtXFJ6qfWr7Q1pVrSK1PyAvSaUWAqZsITg4tC8EUvWhUpUAqVMgYLOTsENMqzSYNSyChLAFSAqhNuAQ A0ElQMJOKPsYg8fTe8Z3wtg+GIOBh37SJ4/mnuXzzF3OGeZ/i7zob766l3QuvToj4NHD3NCnjzUKQ0dJ +CiwrVhhgHvV6QFNxCY1J/bsl9TteJGtPP2xNlmmbswN0Rvrflr+t0fJb/YluCTYvKj9cRl8ylL8VMk/ @@ -276,7 +276,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vgAADr4B6kKxwAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -288,7 +288,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vgAADr4B6kKxwAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -300,7 +300,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vgAADr4B6kKxwAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -311,7 +311,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vgAADr4B6kKxwAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -320,7 +320,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vgAADr4B6kKxwAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -329,7 +329,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vgAADr4B6kKxwAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -360,20 +360,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF6WpTQ3s - ZjrMvM0pmprowiBbzEWmLjTRQYUoRi+6aBed2rzNOd1wi8xlal7nBbwsdZdz5s7023POlhoI/eDD8+I5 - 3w/n9z2Hx07ofXXipVKdKqpM9ztMoqPISXPI2VNPR5X20xFPtKazYk2FX/SbfVxo94Q/6tUsWekVk8nk - ttidsNh2WLGy0Pi5YEXhJzMEZSMOfpZyvzfqmchi7RIb7p92QT/DQG9moJtmoJ3agPqXE63DdjgZoGmE - QuGHGaQ8M1H/SMIkrdS6YwPGWTe+zjLkZDDASTbQM+7El2EHEWzCuOCGft4FmdKM4Hudr7lwrDxo8oYk - ektUfQ0pVddR1VaHogY5giX+CCLwZWcQKj2J8qZybhUbzWBx1YHQhB6GE8SUBr/rHGpG89hLVOnyOUlC - ZQTyX8Uju04AoeIykhXJaBpcRLPJhs/f17FGegqT9tKcgF/B3+8nyXHrRrtRPyRFiTqLkyRWR5LwFaQ/ - T4Nm3M6t0jFGQUV6WLW7EFbU5xGwE17cQ+fWJMEwroVCfxeP2/MQK7+AxMpoGKYdMJBi2YI1E55OLEQQ - Kt0lOPdA4jpVcBjxFXwYJ/oh686AVJkLwdMQ1Kk/4tscAwMptn/KhT7CktWF4IdewXGxjyhQfAjZtXG4 - WR2OuPKLnCRXGQ9xQxp5kxCw90azGwPsJyZYSZEBOVqPIFB8YC5QfJA85IPAfB9cLQlB5oskaIZVkKkK - kPE2CcLqGBiIQE/+DR0R0K5NIlDvrHA+p5deWKMxOOfm6Bmdx52adKSSoEghQF7t7e07FseGmwgadwSs - bdayI/gfdnaFtF2C07ldDkX9+629Ht6Lrq6uzaMJTTZvnBSZ3j45s+6wsheTyxQmlyiMe1m2uTjY5m20 - J0xR1JrvrZYf3jiPdyK9LTNA2Np+TKSyBIga6W1SPfj/RdhI+wpbVo8kt3T4JylTeDwe7w8N254ecwx/ - mgAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF+VSmxrY + zVTMvM0pmprowiBbTCPzEppMoUKUohcZ2kWnNnXOOd1wi8xlanPeBS9L3eUctzP99pyzpQZCP/jwvHjO + 98P5fc/hsRP6QJV0uVyriKrQ/g6TaCly0hyV7Kmjo8oH6YinGuM5sbraP/rdAS60d8If96uXrfSq0Wh0 + W+ybsNh2WbWy0Pi5aEXRp1nEVYw5BNlyH2/UM5GlmmU2PDjtgm6GgW6WgXaagWbKCdWvTXSM2rHJAK1j + FIo+zCD1uZH6RxIm6aA2HE4Y5tz4OseQk8EQJ3Giz7SJL6MOItiCYdEN3YILJfJZ8O/3vOXCsZXB5puS + 6G1R7XWkym5A1tmI4uZK8CUBCCYISs4iVHoKVa1V3Co2msHSmgOhiX0MJ4gp57/vGWlD28QryLQFnCSx + JgIFbxKQ0xgHYd0VpNSloHV4CW1GGz5/38A66SlM2k9zAkG1wMdfkuvWjvfi9YgUZapsTpJUG0nCV5Hx + Ih1qk51bpXuCgoL0sGZ3Iax4wCNgJ7y0j86rT4bepEGd7h6edOUjtvIikmqioZ92QE+KZQtWT3o6sRBB + qHSP4PxDiet04REkVAtgmBxESW8mpPI8xD0LQaPqI77NM9CTYgenXBggLFtd4D/yCk6IfUVB4sPIaYjH + rdpwxFdd4iR58gSIm9PJm4SAvTfMujHEfmKClRQZmKvxCILEB+eDxIfIQ74IKvDFtbIQZL1MhnpUgRJF + ITKbkiGsjYGeCHTk39ASAe3aIgLV7goXcvvpxXUaw/Nujr7xBdytz0AaCYrq4pDfcGfnjsXhdBNBy66A + tc1ZdgX/w86ukL5HcCZP6ZA1Nm3v9/B+KJXKrWOJrTZvnBSZ0WWe2XBY2QvzCgXzMgWTlxWbi4Nt3kZ7 + whRFrfvdbv/hjfN4JzM6swKFHV3HRQpLoKiF3iHNQ8BfhC20n7B97WhKe3dAsjyVx+Px/gAJhZ4YRxAS + FgAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs index 1ddb645..103b23b 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs @@ -35,7 +35,7 @@ System.Windows.Forms.Label label6; System.Windows.Forms.Label label7; System.Windows.Forms.Label label2; - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectPartToPurchaseCR)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -44,6 +44,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.tbProject = new System.Windows.Forms.TextBox(); this.tbProjectIndex = new System.Windows.Forms.TextBox(); this.dtPdate = new System.Windows.Forms.DateTimePicker(); @@ -64,21 +65,23 @@ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.taProject = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.taPart = new FPJ0000.dsPRJTableAdapters.ProjectsPartTableAdapter(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.dvc_sid = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dvc_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dvc_model = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dvc_price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_qtyreq = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dvc_qty = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dvc_amt = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dvc_spm = new System.Windows.Forms.DataGridViewButtonColumn(); this.dvc_remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); projectLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); label3 = new System.Windows.Forms.Label(); @@ -316,18 +319,19 @@ this.dvc_name, this.dvc_model, this.dvc_price, + this.dvc_qtyreq, this.dvc_qty, this.dvc_amt, this.dvc_spm, this.dvc_remark}); - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle8.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv1.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle9.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv1.DefaultCellStyle = dataGridViewCellStyle9; this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.dv1.Location = new System.Drawing.Point(3, 21); this.dv1.Name = "dv1"; @@ -335,6 +339,8 @@ this.dv1.Size = new System.Drawing.Size(968, 370); this.dv1.TabIndex = 27; this.dv1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dv1_CellContentClick); + this.dv1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dv1_CellEndEdit_1); + this.dv1.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dv1_CellFormatting); // // toolStrip1 // @@ -345,7 +351,8 @@ this.toolStripButton4, this.toolStripButton8, this.toolStripButton1, - this.toolStripButton3}); + this.toolStripButton3, + this.toolStripButton5}); this.toolStrip1.Location = new System.Drawing.Point(3, 391); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(968, 47); @@ -380,6 +387,26 @@ this.toolStripButton8.Text = "목록 재구성(&R)"; this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); // + // 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(100, 44); + this.toolStripButton1.Text = "SPM검사"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // toolStripButton3 + // + this.toolStripButton3.ForeColor = System.Drawing.Color.Red; + 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(192, 44); + this.toolStripButton3.Text = "구매수량에 SPM수량 제외"; + this.toolStripButton3.Visible = false; + this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); + // // panel1 // this.panel1.Controls.Add(this.groupBox2); @@ -416,14 +443,14 @@ // this.taPart.ClearBeforeFill = true; // - // toolStripButton1 + // toolStripButton5 // - 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(100, 44); - this.toolStripButton1.Text = "SPM검사"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); + this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton5.Name = "toolStripButton5"; + this.toolStripButton5.Size = new System.Drawing.Size(136, 44); + this.toolStripButton5.Text = "SPM사이트열기"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); // // dvc_sid // @@ -458,19 +485,28 @@ this.dvc_price.HeaderText = "단가"; this.dvc_price.Name = "dvc_price"; // + // dvc_qtyreq + // + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dvc_qtyreq.DefaultCellStyle = dataGridViewCellStyle5; + this.dvc_qtyreq.HeaderText = "구매요청"; + this.dvc_qtyreq.Name = "dvc_qtyreq"; + this.dvc_qtyreq.ReadOnly = true; + // // dvc_qty // - dataGridViewCellStyle5.Format = "N0"; - this.dvc_qty.DefaultCellStyle = dataGridViewCellStyle5; - this.dvc_qty.HeaderText = "구매수량"; + dataGridViewCellStyle6.Format = "N0"; + this.dvc_qty.DefaultCellStyle = dataGridViewCellStyle6; + this.dvc_qty.HeaderText = "구매신청"; this.dvc_qty.Name = "dvc_qty"; // // dvc_amt // - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle6.Format = "N0"; - this.dvc_amt.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + dataGridViewCellStyle7.Format = "N0"; + this.dvc_amt.DefaultCellStyle = dataGridViewCellStyle7; this.dvc_amt.HeaderText = "구매금액"; this.dvc_amt.Name = "dvc_amt"; this.dvc_amt.ReadOnly = true; @@ -483,22 +519,11 @@ // dvc_remark // this.dvc_remark.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - this.dvc_remark.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + this.dvc_remark.DefaultCellStyle = dataGridViewCellStyle8; this.dvc_remark.HeaderText = "비고"; this.dvc_remark.Name = "dvc_remark"; // - // toolStripButton3 - // - this.toolStripButton3.ForeColor = System.Drawing.Color.Red; - 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(192, 44); - this.toolStripButton3.Text = "구매수량에 SPM수량 제외"; - this.toolStripButton3.Visible = false; - this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); - // // fProjectPartToPurchaseCR // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -560,14 +585,16 @@ private System.Windows.Forms.ToolStripButton toolStripButton8; private arCtl.arDatagridView dv1; private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton toolStripButton3; + private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_sid; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_name; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_model; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_price; + private System.Windows.Forms.DataGridViewTextBoxColumn dvc_qtyreq; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_qty; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_amt; private System.Windows.Forms.DataGridViewButtonColumn dvc_spm; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_remark; - private System.Windows.Forms.ToolStripButton toolStripButton3; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs index 3decd23..b52ad2f 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs @@ -89,6 +89,7 @@ namespace FPJ0000 row.Cells[col++].Value = dr.price; row.Cells[col].Tag = dr.qty; row.Cells[col++].Value = dr.qty; + row.Cells[col++].Value = dr.qty; row.Cells[col++].Value = dr.price * dr.qty; // row.Cells[col++].Value = 0; row.Cells[col++].Value = ""; @@ -219,7 +220,13 @@ namespace FPJ0000 decimal sumAmt = 0; foreach (DataGridViewRow item in dv1.Rows) { - sumAmt += (decimal)item.Cells["dvc_amt"].Value; + var v = item.Cells["dvc_amt"].Value; + if (v != null) + { + if (decimal.TryParse(v.ToString(), out decimal vv)) + sumAmt += vv; + } + } this.tbSum.Text = sumAmt.ToString("N0"); @@ -237,6 +244,9 @@ namespace FPJ0000 FCOMMON.Util.MsgE("SPM검사가 완료되지 않았습니다"); return false; } + + + } if (this.dv1.Rows.Count < 1) @@ -317,11 +327,28 @@ namespace FPJ0000 var dtCR = new dsPurchase.EETGW_PurchaseCRDataTable(); var dtNR = new dsPurchase.PurchaseDataTable(); + var skipcnt = 0; foreach (DataGridViewRow item in dv1.Rows) { var dr = item.Tag as dsPRJ.ProjectsPartRow; var sid = dr.ItemSid.Replace(" ", "").Trim(); + var o_price = item.Cells[Col_Price].Value; + var o_qty = item.Cells[Col_Qty].Value; + decimal v_price = 0; + int v_qty = 0; + if (o_price != null) v_price = decimal.Parse(o_price.ToString()); + if (o_qty != null) v_qty = int.Parse(o_qty.ToString()); + + if (v_qty < 1) + { + skipcnt += 1; + fProg.IncProgress(); + continue; + } + + + bool newadd = false; if (isCR) { @@ -335,12 +362,7 @@ namespace FPJ0000 // newdr.asset = cbEQModel.Text.Trim(); // newdr.dept = cbEQModel.Text.Trim(); ///newdr.manuproc = cbManuProc.Text.Trim(); - var o_price = item.Cells[Col_Price].Value; - var o_qty = item.Cells[Col_Qty].Value; - decimal v_price = 0; - int v_qty = 0; - if (o_price != null) v_price = decimal.Parse(o_price.ToString()); - if (o_qty != null) v_qty = int.Parse(o_qty.ToString()); + if (newadd) @@ -403,12 +425,7 @@ namespace FPJ0000 // newdr.asset = cbEQModel.Text.Trim(); // newdr.dept = cbEQModel.Text.Trim(); ///newdr.manuproc = cbManuProc.Text.Trim(); - var o_price = item.Cells[Col_Price].Value; - var o_qty = item.Cells[Col_Qty].Value; - decimal v_price = 0; - int v_qty = 0; - if (o_price != null) v_price = decimal.Parse(o_price.ToString()); - if (o_qty != null) v_qty = int.Parse(o_qty.ToString()); + if (newadd) @@ -476,6 +493,25 @@ namespace FPJ0000 addcnt = ta.Update(dtNR); } + //비고를 업데이트한다. + foreach (DataGridViewRow row in this.dv1.Rows) + { + var drpart = row.Tag as dsPRJ.ProjectsPartRow; + + var vmemo = row.Cells["dvc_remark"].Value; + if (vmemo != null) + { + drpart.memo = vmemo.ToString(); + drpart.EndEdit(); + } + } + + if (skipcnt > 0) + { + FCOMMON.Util.MsgE($"{skipcnt}건은 수량이 없어 등록되지 않았습니다"); + } + + FCOMMON.Util.MsgI(string.Format("{0}/{1}건의 자료가 생성 되었습니다.\n\n구매등록 화면에서 내용을 확인하세요.", addcnt, itemCount)); fProg.Close(); fProg.Dispose(); @@ -586,7 +622,7 @@ namespace FPJ0000 if (col.Name == "dvc_spm") { //site검색 해야한다 - var sid = dv1.Rows[e.RowIndex].Cells["dvc_spm"].Value.ToString();// dr.sid; + var sid = dv1.Rows[e.RowIndex].Cells["dvc_sid"].Value.ToString();// dr.sid; if (sid.Length != 9 || sid.StartsWith("10") == false) { dv1.Rows[e.RowIndex].Cells["dvc_spm"].Value = "SID오류"; @@ -600,15 +636,59 @@ namespace FPJ0000 dv1.Rows[e.RowIndex].Cells["dvc_spm"].Value = $"{dt.Result.Rows.Count}건"; dv1.Rows[e.RowIndex].Cells["dvc_spm"].Tag = dt.Result.Rows.Count; var f = new FCM0000.fSIDListSelect(sid, dt.Result); - f.ShowDialog(); + if (f.ShowDialog() == DialogResult.OK) + { + var oldvalue = dv1.Rows[e.RowIndex].Cells["dvc_remark"].Value; + if (oldvalue == null) + dv1.Rows[e.RowIndex].Cells["dvc_remark"].Value = "SPM:" + f.selectbatch; + else + dv1.Rows[e.RowIndex].Cells["dvc_remark"].Value = oldvalue.ToString() + ",SPM:" + f.selectbatch; + } } else { - dv1.Rows[e.RowIndex].Cells["dvc_sid"].Value = "없음"; - dv1.Rows[e.RowIndex].Cells["dvc_sid"].Tag = 0; + dv1.Rows[e.RowIndex].Cells["dvc_spm"].Value = "없음"; + dv1.Rows[e.RowIndex].Cells["dvc_spm"].Tag = 0; } } } } + + private void toolStripButton5_Click(object sender, EventArgs e) + { + + var url = @"https://atknet.amkor.co.kr/#/department/ee/spm"; + FCOMMON.Util.RunExplorer(url); + } + + private void dv1_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e) + { + if (e.RowIndex < 0 || e.ColumnIndex < 0) return; + var colr = "dvc_qtyreq"; + var col = "dvc_qty"; + //dv1.Rows[e.RowIndex].Cells[e.ColumnIndex] + } + + private void dv1_CellEndEdit_1(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex < 0 || e.ColumnIndex < 0) return; + var coli = dv1.Columns["dvc_qty"].Index; + var colr = dv1.Columns["dvc_qtyreq"].Index; + if (e.ColumnIndex != coli && e.ColumnIndex != colr) return; + var vqty = dv1.Rows[e.RowIndex].Cells[coli].Value; + var vqtr = dv1.Rows[e.RowIndex].Cells[colr].Value; + if (vqty != null && vqtr != null) + { + if (vqty.ToString() != vqtr.ToString()) + { + dv1.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.LightSkyBlue; + } + else + { + dv1.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.White; + } + } + else dv1.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.DimGray; + } } } diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.resx b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.resx index df7f557..c31bd33 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.resx +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.resx @@ -159,6 +159,9 @@ True + + True + True @@ -244,6 +247,21 @@ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + 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==