구매수량없이 구매신청되지 않게 함

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("24.02.07.1430")]
+[assembly: AssemblyVersion("24.02.08.0950")]
-[assembly: AssemblyFileVersion("24.02.07.1430")]
+[assembly: AssemblyFileVersion("24.02.08.0950")]

SubProject/FCOMMON/DataBaseManager.cs

@@ -183,9 +183,25 @@ namespace FCOMMON
                 " isnull(sum(isnull(pumqty,pumqtyreq)) - sum(inqty),0) as Total_Remain" +
                 " from EETGW_PurchaseCR" +
                 " where gcode = @gcode and state <> 'Cancled'" +
+                " and projectidx = @project" +
+                 (sid == null ? string.Empty : " and sid = @sid") +
+                " and isnull(isdel,0) = 0" +
+                " union all" +
+                " 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] = 'Received' then inqty else 0 end),0) as Received," +
+                " isnull(sum(isnull(pumqty,pumqtyreq)),0) as Total_Request," +
+                " isnull(sum(inqty),0) as Total_Buy," +
+                " isnull(sum(isnull(pumqty,pumqtyreq)) - sum(inqty),0) as Total_Remain" +
+                " from Purchase" +
+                " where gcode = @gcode and state <> 'Cancled'" +
                 " and projectidx = @project" +
                  (sid == null ? string.Empty : " and sid = @sid") +
                 " and isnull(isdel,0) = 0";
+
+
             var cn = getCn();
             var cmd = new SqlCommand(sql, cn);
             cmd.Parameters.Add("gcode", System.Data.SqlDbType.VarChar).Value = FCOMMON.info.Login.gcode;
@@ -208,14 +224,14 @@ namespace FCOMMON
                 var o_totalbuy = rdr["Total_Buy"];
                 var o_totalremain = rdr["Total_Remain"];
 
-                if (o_request != null) retval.Request = int.Parse(o_request.ToString());
+                if (o_request != null) retval.Request += int.Parse(o_request.ToString());
-                if (o_pr != null) retval.PR = int.Parse(o_pr.ToString());
+                if (o_pr != null) retval.PR += int.Parse(o_pr.ToString());
-                if (o_po != null) retval.PO = int.Parse(o_po.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_received != null) retval.Received += int.Parse(o_received.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_totalrequest != null) retval.Total_Request += int.Parse(o_totalrequest.ToString());
-                if (o_totalbuy != null) retval.Total_Ipko = 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());
+                if (o_totalremain != null) retval.Total_Remain += int.Parse(o_totalremain.ToString());
             }
             rdr.Close();
             cn.Dispose();

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Add.cs

@@ -793,7 +793,11 @@ namespace FEQ0000
             {
                 dr.pumpriceD = priced;
             }
-            else dr.SetpumpriceDNull();
+            else
+            {
+                dr.SetpumpriceDNull();
+                dr.currency = "KRW";
+            }
 
             if (vqtyreal > 0) dr.pumamt = dr.pumqty * dr.pumprice;
             else dr.pumamt = dr.pumqtyReq * dr.pumprice;

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_ConfRequest.Designer.cs

@@ -30,11 +30,11 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseCR_ConfRequest));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             this.dsPurchase = new FEQ0000.dsPurchase();
             this.bs = new System.Windows.Forms.BindingSource(this.components);
             this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager();
@@ -57,8 +57,16 @@
             this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
             this.tbFind = new System.Windows.Forms.ToolStripTextBox();
             this.btFind = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.richTextBox2 = new System.Windows.Forms.RichTextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.ta = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter();
             this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.requestNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.sidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -72,14 +80,6 @@
             this.supplyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bigo2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bigoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.richTextBox2 = new System.Windows.Forms.RichTextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.ta = new FEQ0000.dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -182,6 +182,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";
@@ -273,6 +274,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, 31);
             this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -287,6 +289,20 @@
             this.btFind.Text = "toolStripButton2";
             this.btFind.Click += new System.EventHandler(this.btFind_Click);
             // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
+            // 
+            // toolStripButton2
+            // 
+            this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
+            this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton2.Name = "toolStripButton2";
+            this.toolStripButton2.Size = new System.Drawing.Size(163, 28);
+            this.toolStripButton2.Text = "구매수량 일괄 업데이트";
+            this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
+            // 
             // toolStrip1
             // 
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
@@ -317,14 +333,14 @@
             this.bigo2DataGridViewTextBoxColumn,
             this.bigoDataGridViewTextBoxColumn});
             this.dataGridView1.DataSource = this.bs;
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle10;
+            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle5;
             this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dataGridView1.Location = new System.Drawing.Point(0, 25);
             this.dataGridView1.Name = "dataGridView1";
@@ -333,105 +349,6 @@
             this.dataGridView1.Size = new System.Drawing.Size(1219, 426);
             this.dataGridView1.TabIndex = 8;
             // 
-            // pdateDataGridViewTextBoxColumn
-            // 
-            this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate";
-            this.pdateDataGridViewTextBoxColumn.HeaderText = "요청일";
-            this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn";
-            this.pdateDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // requestNameDataGridViewTextBoxColumn
-            // 
-            this.requestNameDataGridViewTextBoxColumn.DataPropertyName = "requestName";
-            this.requestNameDataGridViewTextBoxColumn.HeaderText = "구매신청";
-            this.requestNameDataGridViewTextBoxColumn.Name = "requestNameDataGridViewTextBoxColumn";
-            this.requestNameDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // sidDataGridViewTextBoxColumn
-            // 
-            this.sidDataGridViewTextBoxColumn.DataPropertyName = "sid";
-            this.sidDataGridViewTextBoxColumn.HeaderText = "SID";
-            this.sidDataGridViewTextBoxColumn.Name = "sidDataGridViewTextBoxColumn";
-            this.sidDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumnameDataGridViewTextBoxColumn
-            // 
-            this.pumnameDataGridViewTextBoxColumn.DataPropertyName = "pumname";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.pumnameDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6;
-            this.pumnameDataGridViewTextBoxColumn.HeaderText = "품명";
-            this.pumnameDataGridViewTextBoxColumn.Name = "pumnameDataGridViewTextBoxColumn";
-            this.pumnameDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumscaleDataGridViewTextBoxColumn
-            // 
-            this.pumscaleDataGridViewTextBoxColumn.DataPropertyName = "pumscale";
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.pumscaleDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7;
-            this.pumscaleDataGridViewTextBoxColumn.HeaderText = "모델/규격";
-            this.pumscaleDataGridViewTextBoxColumn.Name = "pumscaleDataGridViewTextBoxColumn";
-            this.pumscaleDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumunitDataGridViewTextBoxColumn
-            // 
-            this.pumunitDataGridViewTextBoxColumn.DataPropertyName = "pumunit";
-            this.pumunitDataGridViewTextBoxColumn.HeaderText = "단위";
-            this.pumunitDataGridViewTextBoxColumn.Name = "pumunitDataGridViewTextBoxColumn";
-            this.pumunitDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumqtyDataGridViewTextBoxColumn
-            // 
-            this.pumqtyDataGridViewTextBoxColumn.DataPropertyName = "pumqty";
-            this.pumqtyDataGridViewTextBoxColumn.HeaderText = "신청수량";
-            this.pumqtyDataGridViewTextBoxColumn.Name = "pumqtyDataGridViewTextBoxColumn";
-            this.pumqtyDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumqtyReqDataGridViewTextBoxColumn
-            // 
-            this.pumqtyReqDataGridViewTextBoxColumn.DataPropertyName = "pumqtyReq";
-            this.pumqtyReqDataGridViewTextBoxColumn.HeaderText = "구매수량";
-            this.pumqtyReqDataGridViewTextBoxColumn.Name = "pumqtyReqDataGridViewTextBoxColumn";
-            this.pumqtyReqDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumpriceDataGridViewTextBoxColumn
-            // 
-            this.pumpriceDataGridViewTextBoxColumn.DataPropertyName = "pumprice";
-            this.pumpriceDataGridViewTextBoxColumn.HeaderText = "단가";
-            this.pumpriceDataGridViewTextBoxColumn.Name = "pumpriceDataGridViewTextBoxColumn";
-            this.pumpriceDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumamtDataGridViewTextBoxColumn
-            // 
-            this.pumamtDataGridViewTextBoxColumn.DataPropertyName = "pumamt";
-            this.pumamtDataGridViewTextBoxColumn.HeaderText = "금액";
-            this.pumamtDataGridViewTextBoxColumn.Name = "pumamtDataGridViewTextBoxColumn";
-            this.pumamtDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // supplyDataGridViewTextBoxColumn
-            // 
-            this.supplyDataGridViewTextBoxColumn.DataPropertyName = "supply";
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.supplyDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8;
-            this.supplyDataGridViewTextBoxColumn.HeaderText = "공급";
-            this.supplyDataGridViewTextBoxColumn.Name = "supplyDataGridViewTextBoxColumn";
-            this.supplyDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // bigo2DataGridViewTextBoxColumn
-            // 
-            this.bigo2DataGridViewTextBoxColumn.DataPropertyName = "chkremark";
-            this.bigo2DataGridViewTextBoxColumn.HeaderText = "비고(구매담당)";
-            this.bigo2DataGridViewTextBoxColumn.Name = "bigo2DataGridViewTextBoxColumn";
-            this.bigo2DataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // bigoDataGridViewTextBoxColumn
-            // 
-            this.bigoDataGridViewTextBoxColumn.DataPropertyName = "bigo";
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.bigoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9;
-            this.bigoDataGridViewTextBoxColumn.HeaderText = "비고(구매요청)";
-            this.bigoDataGridViewTextBoxColumn.Name = "bigoDataGridViewTextBoxColumn";
-            this.bigoDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
             // tableLayoutPanel1
             // 
             this.tableLayoutPanel1.ColumnCount = 2;
@@ -496,19 +413,104 @@
             // 
             this.ta.ClearBeforeFill = true;
             // 
-            // toolStripSeparator2
+            // pdateDataGridViewTextBoxColumn
             // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
+            this.pdateDataGridViewTextBoxColumn.HeaderText = "요청일";
+            this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn";
+            this.pdateDataGridViewTextBoxColumn.ReadOnly = true;
             // 
-            // toolStripButton2
+            // requestNameDataGridViewTextBoxColumn
             // 
-            this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
+            this.requestNameDataGridViewTextBoxColumn.DataPropertyName = "requestName";
-            this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.requestNameDataGridViewTextBoxColumn.HeaderText = "구매신청";
-            this.toolStripButton2.Name = "toolStripButton2";
+            this.requestNameDataGridViewTextBoxColumn.Name = "requestNameDataGridViewTextBoxColumn";
-            this.toolStripButton2.Size = new System.Drawing.Size(163, 28);
+            this.requestNameDataGridViewTextBoxColumn.ReadOnly = true;
-            this.toolStripButton2.Text = "구매수량 일괄 업데이트";
+            // 
-            this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
+            // sidDataGridViewTextBoxColumn
+            // 
+            this.sidDataGridViewTextBoxColumn.DataPropertyName = "sid";
+            this.sidDataGridViewTextBoxColumn.HeaderText = "SID";
+            this.sidDataGridViewTextBoxColumn.Name = "sidDataGridViewTextBoxColumn";
+            this.sidDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumnameDataGridViewTextBoxColumn
+            // 
+            this.pumnameDataGridViewTextBoxColumn.DataPropertyName = "pumname";
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.pumnameDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
+            this.pumnameDataGridViewTextBoxColumn.HeaderText = "품명";
+            this.pumnameDataGridViewTextBoxColumn.Name = "pumnameDataGridViewTextBoxColumn";
+            this.pumnameDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumscaleDataGridViewTextBoxColumn
+            // 
+            this.pumscaleDataGridViewTextBoxColumn.DataPropertyName = "pumscale";
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.pumscaleDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
+            this.pumscaleDataGridViewTextBoxColumn.HeaderText = "모델/규격";
+            this.pumscaleDataGridViewTextBoxColumn.Name = "pumscaleDataGridViewTextBoxColumn";
+            this.pumscaleDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumunitDataGridViewTextBoxColumn
+            // 
+            this.pumunitDataGridViewTextBoxColumn.DataPropertyName = "pumunit";
+            this.pumunitDataGridViewTextBoxColumn.HeaderText = "단위";
+            this.pumunitDataGridViewTextBoxColumn.Name = "pumunitDataGridViewTextBoxColumn";
+            this.pumunitDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumqtyDataGridViewTextBoxColumn
+            // 
+            this.pumqtyDataGridViewTextBoxColumn.DataPropertyName = "pumqtyReq";
+            this.pumqtyDataGridViewTextBoxColumn.HeaderText = "신청수량";
+            this.pumqtyDataGridViewTextBoxColumn.Name = "pumqtyDataGridViewTextBoxColumn";
+            this.pumqtyDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumqtyReqDataGridViewTextBoxColumn
+            // 
+            this.pumqtyReqDataGridViewTextBoxColumn.DataPropertyName = "pumqty";
+            this.pumqtyReqDataGridViewTextBoxColumn.HeaderText = "구매수량";
+            this.pumqtyReqDataGridViewTextBoxColumn.Name = "pumqtyReqDataGridViewTextBoxColumn";
+            this.pumqtyReqDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumpriceDataGridViewTextBoxColumn
+            // 
+            this.pumpriceDataGridViewTextBoxColumn.DataPropertyName = "pumprice";
+            this.pumpriceDataGridViewTextBoxColumn.HeaderText = "단가";
+            this.pumpriceDataGridViewTextBoxColumn.Name = "pumpriceDataGridViewTextBoxColumn";
+            this.pumpriceDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumamtDataGridViewTextBoxColumn
+            // 
+            this.pumamtDataGridViewTextBoxColumn.DataPropertyName = "pumamt";
+            this.pumamtDataGridViewTextBoxColumn.HeaderText = "금액";
+            this.pumamtDataGridViewTextBoxColumn.Name = "pumamtDataGridViewTextBoxColumn";
+            this.pumamtDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // supplyDataGridViewTextBoxColumn
+            // 
+            this.supplyDataGridViewTextBoxColumn.DataPropertyName = "supply";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.supplyDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
+            this.supplyDataGridViewTextBoxColumn.HeaderText = "공급";
+            this.supplyDataGridViewTextBoxColumn.Name = "supplyDataGridViewTextBoxColumn";
+            this.supplyDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // bigo2DataGridViewTextBoxColumn
+            // 
+            this.bigo2DataGridViewTextBoxColumn.DataPropertyName = "chkremark";
+            this.bigo2DataGridViewTextBoxColumn.HeaderText = "비고(구매담당)";
+            this.bigo2DataGridViewTextBoxColumn.Name = "bigo2DataGridViewTextBoxColumn";
+            this.bigo2DataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // bigoDataGridViewTextBoxColumn
+            // 
+            this.bigoDataGridViewTextBoxColumn.DataPropertyName = "bigo";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.bigoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
+            this.bigoDataGridViewTextBoxColumn.HeaderText = "비고(구매요청)";
+            this.bigoDataGridViewTextBoxColumn.Name = "bigoDataGridViewTextBoxColumn";
+            this.bigoDataGridViewTextBoxColumn.ReadOnly = true;
             // 
             // fPurchaseCR_ConfRequest
             // 
@@ -560,6 +562,15 @@
         private System.Windows.Forms.ToolStripButton btEdit;
         private System.Windows.Forms.ToolStripButton btSave;
         private System.Windows.Forms.DataGridView dataGridView1;
+        private System.Windows.Forms.ToolStripButton toolStripButton1;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.RichTextBox richTextBox2;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        private dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter ta;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.ToolStripButton toolStripButton2;
         private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn requestNameDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn sidDataGridViewTextBoxColumn;
@@ -573,14 +584,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn supplyDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn bigo2DataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn bigoDataGridViewTextBoxColumn;
-        private System.Windows.Forms.ToolStripButton toolStripButton1;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.RichTextBox richTextBox1;
-        private System.Windows.Forms.RichTextBox richTextBox2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
-        private dsPurchaseTableAdapters.EETGW_PurchaseCRTableAdapter ta;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-        private System.Windows.Forms.ToolStripButton toolStripButton2;
     }
 }

SubProject/FEQ0000/PurchaseCR/fPurchaseCR_ConfRequest.cs

@@ -374,7 +374,7 @@ namespace FEQ0000
                 if (qty < 1)
                 {
                     Util.MsgE($"[{dr.sid}] {dr.pumname}의 구매 수량이 없습니다");
-                    break;
+                    return;
                 }
                 //if(qty > qtyreq)
                 //{
@@ -508,6 +508,8 @@ namespace FEQ0000
         {
             this.Validate();
             this.bs.EndEdit();
+            var dlg = FCOMMON.Util.MsgQ("입력되지 않은 구매수량을 신청수량으로 일괄 업데이트 할까요?");
+            if (dlg != DialogResult.Yes) return;
             foreach (DataGridViewRow row in this.dataGridView1.Rows)
             {
                 var dr = row.DataBoundItem as dsPurchase.EETGW_PurchaseCRRow;

SubProject/FEQ0000/PurchaseEB/fPurchaseEB_Add.cs

@@ -594,7 +594,11 @@ namespace FEQ0000
             {
                 dr.pumpriceD = priced;
             }
-            else dr.SetpumpriceDNull();
+            else
+            {
+                dr.SetpumpriceDNull();
+                dr.currency = "KRW";
+            }
 
             if (vqtyreal > 0) dr.pumamt = dr.pumqty * dr.pumprice;
             else dr.pumamt = dr.pumqtyReq * dr.pumprice;

SubProject/FEQ0000/PurchaseEB/fPurchaseEB_ConfRequest.cs

@@ -366,7 +366,7 @@ namespace FEQ0000
                 if(qty < 1)
                 {
                     Util.MsgE($"[{dr.sid}] {dr.pumname}의 구매 수량이 없습니다");
-                    break;
+                    return; 
                 }
                 //if(qty > qtyreq)
                 //{
@@ -499,6 +499,8 @@ namespace FEQ0000
         {
             this.Validate();
             this.bs.EndEdit();
+            var dlg = FCOMMON.Util.MsgQ("입력되지 않은 구매수량을 신청수량으로 일괄 업데이트 할까요?");
+            if (dlg != DialogResult.Yes) return;
             foreach (DataGridViewRow row in this.dataGridView1.Rows)
             {
                 var dr = row.DataBoundItem as dsPurchase.EETGW_PurchaseEBRow;

SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs

@@ -480,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(234, 30);
+            this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
             this.메일전송ToolStripMenuItem.Text = "메일 전송";
             // 
             // 현재목록ToolStripMenuItem
@@ -520,7 +520,7 @@
             // 
             this.엑셀에서가져오기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("엑셀에서가져오기ToolStripMenuItem.Image")));
             this.엑셀에서가져오기ToolStripMenuItem.Name = "엑셀에서가져오기ToolStripMenuItem";
-            this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(234, 30);
+            this.엑셀에서가져오기ToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
             this.엑셀에서가져오기ToolStripMenuItem.Text = "엑셀에서 가져오기";
             this.엑셀에서가져오기ToolStripMenuItem.Click += new System.EventHandler(this.엑셀에서가져오기ToolStripMenuItem_Click);
             // 
@@ -528,19 +528,19 @@
             // 
             this.견적서폴더열기ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("견적서폴더열기ToolStripMenuItem.Image")));
             this.견적서폴더열기ToolStripMenuItem.Name = "견적서폴더열기ToolStripMenuItem";
-            this.견적서폴더열기ToolStripMenuItem.Size = new System.Drawing.Size(234, 30);
+            this.견적서폴더열기ToolStripMenuItem.Size = new System.Drawing.Size(226, 22);
             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);
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(223, 6);
             // 
             // btMakeItemsData
             // 
             this.btMakeItemsData.Name = "btMakeItemsData";
-            this.btMakeItemsData.Size = new System.Drawing.Size(234, 30);
+            this.btMakeItemsData.Size = new System.Drawing.Size(226, 22);
             this.btMakeItemsData.Text = "구매내역에서 품목정보 생성";
             this.btMakeItemsData.Click += new System.EventHandler(this.구매내역에서품목정보생성ToolStripMenuItem_Click);
             // 

SubProject/FEQ0000/PurchaseNR/fPurchaseNR_ConfRequest.Designer.cs

@@ -56,8 +56,17 @@
             this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
             this.tbFind = new System.Windows.Forms.ToolStripTextBox();
             this.btFind = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.richTextBox2 = new System.Windows.Forms.RichTextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
+            this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager();
             this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.requestNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.sidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -71,15 +80,6 @@
             this.supplyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bigo2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.bigoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.richTextBox2 = new System.Windows.Forms.RichTextBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
-            this.tam = new FEQ0000.dsPurchaseTableAdapters.TableAdapterManager();
-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
-            this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -280,6 +280,20 @@
             this.btFind.Text = "toolStripButton2";
             this.btFind.Click += new System.EventHandler(this.btFind_Click);
             // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
+            // 
+            // toolStripButton2
+            // 
+            this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
+            this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton2.Name = "toolStripButton2";
+            this.toolStripButton2.Size = new System.Drawing.Size(163, 28);
+            this.toolStripButton2.Text = "구매수량 일괄 업데이트";
+            this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
+            // 
             // toolStrip1
             // 
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30);
@@ -325,105 +339,6 @@
             this.dataGridView1.Size = new System.Drawing.Size(1219, 426);
             this.dataGridView1.TabIndex = 8;
             // 
-            // pdateDataGridViewTextBoxColumn
-            // 
-            this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate";
-            this.pdateDataGridViewTextBoxColumn.HeaderText = "요청일";
-            this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn";
-            this.pdateDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // requestNameDataGridViewTextBoxColumn
-            // 
-            this.requestNameDataGridViewTextBoxColumn.DataPropertyName = "requestName";
-            this.requestNameDataGridViewTextBoxColumn.HeaderText = "구매신청";
-            this.requestNameDataGridViewTextBoxColumn.Name = "requestNameDataGridViewTextBoxColumn";
-            this.requestNameDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // sidDataGridViewTextBoxColumn
-            // 
-            this.sidDataGridViewTextBoxColumn.DataPropertyName = "sid";
-            this.sidDataGridViewTextBoxColumn.HeaderText = "SID";
-            this.sidDataGridViewTextBoxColumn.Name = "sidDataGridViewTextBoxColumn";
-            this.sidDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumnameDataGridViewTextBoxColumn
-            // 
-            this.pumnameDataGridViewTextBoxColumn.DataPropertyName = "pumname";
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.pumnameDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
-            this.pumnameDataGridViewTextBoxColumn.HeaderText = "품명";
-            this.pumnameDataGridViewTextBoxColumn.Name = "pumnameDataGridViewTextBoxColumn";
-            this.pumnameDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumscaleDataGridViewTextBoxColumn
-            // 
-            this.pumscaleDataGridViewTextBoxColumn.DataPropertyName = "pumscale";
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.pumscaleDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
-            this.pumscaleDataGridViewTextBoxColumn.HeaderText = "모델/규격";
-            this.pumscaleDataGridViewTextBoxColumn.Name = "pumscaleDataGridViewTextBoxColumn";
-            this.pumscaleDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumunitDataGridViewTextBoxColumn
-            // 
-            this.pumunitDataGridViewTextBoxColumn.DataPropertyName = "pumunit";
-            this.pumunitDataGridViewTextBoxColumn.HeaderText = "단위";
-            this.pumunitDataGridViewTextBoxColumn.Name = "pumunitDataGridViewTextBoxColumn";
-            this.pumunitDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumqtyDataGridViewTextBoxColumn
-            // 
-            this.pumqtyDataGridViewTextBoxColumn.DataPropertyName = "pumqty";
-            this.pumqtyDataGridViewTextBoxColumn.HeaderText = "신청수량";
-            this.pumqtyDataGridViewTextBoxColumn.Name = "pumqtyDataGridViewTextBoxColumn";
-            this.pumqtyDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumqtyReqDataGridViewTextBoxColumn
-            // 
-            this.pumqtyReqDataGridViewTextBoxColumn.DataPropertyName = "pumqtyReq";
-            this.pumqtyReqDataGridViewTextBoxColumn.HeaderText = "구매수량";
-            this.pumqtyReqDataGridViewTextBoxColumn.Name = "pumqtyReqDataGridViewTextBoxColumn";
-            this.pumqtyReqDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumpriceDataGridViewTextBoxColumn
-            // 
-            this.pumpriceDataGridViewTextBoxColumn.DataPropertyName = "pumprice";
-            this.pumpriceDataGridViewTextBoxColumn.HeaderText = "단가";
-            this.pumpriceDataGridViewTextBoxColumn.Name = "pumpriceDataGridViewTextBoxColumn";
-            this.pumpriceDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // pumamtDataGridViewTextBoxColumn
-            // 
-            this.pumamtDataGridViewTextBoxColumn.DataPropertyName = "pumamt";
-            this.pumamtDataGridViewTextBoxColumn.HeaderText = "금액";
-            this.pumamtDataGridViewTextBoxColumn.Name = "pumamtDataGridViewTextBoxColumn";
-            this.pumamtDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // supplyDataGridViewTextBoxColumn
-            // 
-            this.supplyDataGridViewTextBoxColumn.DataPropertyName = "supply";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.supplyDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
-            this.supplyDataGridViewTextBoxColumn.HeaderText = "공급";
-            this.supplyDataGridViewTextBoxColumn.Name = "supplyDataGridViewTextBoxColumn";
-            this.supplyDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // bigo2DataGridViewTextBoxColumn
-            // 
-            this.bigo2DataGridViewTextBoxColumn.DataPropertyName = "chkremark";
-            this.bigo2DataGridViewTextBoxColumn.HeaderText = "비고(구매담당)";
-            this.bigo2DataGridViewTextBoxColumn.Name = "bigo2DataGridViewTextBoxColumn";
-            this.bigo2DataGridViewTextBoxColumn.ReadOnly = true;
-            // 
-            // bigoDataGridViewTextBoxColumn
-            // 
-            this.bigoDataGridViewTextBoxColumn.DataPropertyName = "bigo";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.bigoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
-            this.bigoDataGridViewTextBoxColumn.HeaderText = "비고(구매요청)";
-            this.bigoDataGridViewTextBoxColumn.Name = "bigoDataGridViewTextBoxColumn";
-            this.bigoDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
             // tableLayoutPanel1
             // 
             this.tableLayoutPanel1.ColumnCount = 2;
@@ -496,19 +411,104 @@
             this.tam.PurchaseTableAdapter = this.ta;
             this.tam.UpdateOrder = FEQ0000.dsPurchaseTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
             // 
-            // toolStripSeparator2
+            // pdateDataGridViewTextBoxColumn
             // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
+            this.pdateDataGridViewTextBoxColumn.HeaderText = "요청일";
+            this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn";
+            this.pdateDataGridViewTextBoxColumn.ReadOnly = true;
             // 
-            // toolStripButton2
+            // requestNameDataGridViewTextBoxColumn
             // 
-            this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
+            this.requestNameDataGridViewTextBoxColumn.DataPropertyName = "requestName";
-            this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.requestNameDataGridViewTextBoxColumn.HeaderText = "구매신청";
-            this.toolStripButton2.Name = "toolStripButton2";
+            this.requestNameDataGridViewTextBoxColumn.Name = "requestNameDataGridViewTextBoxColumn";
-            this.toolStripButton2.Size = new System.Drawing.Size(163, 28);
+            this.requestNameDataGridViewTextBoxColumn.ReadOnly = true;
-            this.toolStripButton2.Text = "구매수량 일괄 업데이트";
+            // 
-            this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
+            // sidDataGridViewTextBoxColumn
+            // 
+            this.sidDataGridViewTextBoxColumn.DataPropertyName = "sid";
+            this.sidDataGridViewTextBoxColumn.HeaderText = "SID";
+            this.sidDataGridViewTextBoxColumn.Name = "sidDataGridViewTextBoxColumn";
+            this.sidDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumnameDataGridViewTextBoxColumn
+            // 
+            this.pumnameDataGridViewTextBoxColumn.DataPropertyName = "pumname";
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.pumnameDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
+            this.pumnameDataGridViewTextBoxColumn.HeaderText = "품명";
+            this.pumnameDataGridViewTextBoxColumn.Name = "pumnameDataGridViewTextBoxColumn";
+            this.pumnameDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumscaleDataGridViewTextBoxColumn
+            // 
+            this.pumscaleDataGridViewTextBoxColumn.DataPropertyName = "pumscale";
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.pumscaleDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
+            this.pumscaleDataGridViewTextBoxColumn.HeaderText = "모델/규격";
+            this.pumscaleDataGridViewTextBoxColumn.Name = "pumscaleDataGridViewTextBoxColumn";
+            this.pumscaleDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumunitDataGridViewTextBoxColumn
+            // 
+            this.pumunitDataGridViewTextBoxColumn.DataPropertyName = "pumunit";
+            this.pumunitDataGridViewTextBoxColumn.HeaderText = "단위";
+            this.pumunitDataGridViewTextBoxColumn.Name = "pumunitDataGridViewTextBoxColumn";
+            this.pumunitDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumqtyDataGridViewTextBoxColumn
+            // 
+            this.pumqtyDataGridViewTextBoxColumn.DataPropertyName = "pumqtyReq";
+            this.pumqtyDataGridViewTextBoxColumn.HeaderText = "신청수량";
+            this.pumqtyDataGridViewTextBoxColumn.Name = "pumqtyDataGridViewTextBoxColumn";
+            this.pumqtyDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumqtyReqDataGridViewTextBoxColumn
+            // 
+            this.pumqtyReqDataGridViewTextBoxColumn.DataPropertyName = "pumqty";
+            this.pumqtyReqDataGridViewTextBoxColumn.HeaderText = "구매수량";
+            this.pumqtyReqDataGridViewTextBoxColumn.Name = "pumqtyReqDataGridViewTextBoxColumn";
+            this.pumqtyReqDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumpriceDataGridViewTextBoxColumn
+            // 
+            this.pumpriceDataGridViewTextBoxColumn.DataPropertyName = "pumprice";
+            this.pumpriceDataGridViewTextBoxColumn.HeaderText = "단가";
+            this.pumpriceDataGridViewTextBoxColumn.Name = "pumpriceDataGridViewTextBoxColumn";
+            this.pumpriceDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // pumamtDataGridViewTextBoxColumn
+            // 
+            this.pumamtDataGridViewTextBoxColumn.DataPropertyName = "pumamt";
+            this.pumamtDataGridViewTextBoxColumn.HeaderText = "금액";
+            this.pumamtDataGridViewTextBoxColumn.Name = "pumamtDataGridViewTextBoxColumn";
+            this.pumamtDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // supplyDataGridViewTextBoxColumn
+            // 
+            this.supplyDataGridViewTextBoxColumn.DataPropertyName = "supply";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.supplyDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
+            this.supplyDataGridViewTextBoxColumn.HeaderText = "공급";
+            this.supplyDataGridViewTextBoxColumn.Name = "supplyDataGridViewTextBoxColumn";
+            this.supplyDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // bigo2DataGridViewTextBoxColumn
+            // 
+            this.bigo2DataGridViewTextBoxColumn.DataPropertyName = "chkremark";
+            this.bigo2DataGridViewTextBoxColumn.HeaderText = "비고(구매담당)";
+            this.bigo2DataGridViewTextBoxColumn.Name = "bigo2DataGridViewTextBoxColumn";
+            this.bigo2DataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // bigoDataGridViewTextBoxColumn
+            // 
+            this.bigoDataGridViewTextBoxColumn.DataPropertyName = "bigo";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.bigoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
+            this.bigoDataGridViewTextBoxColumn.HeaderText = "비고(구매요청)";
+            this.bigoDataGridViewTextBoxColumn.Name = "bigoDataGridViewTextBoxColumn";
+            this.bigoDataGridViewTextBoxColumn.ReadOnly = true;
             // 
             // fPurchaseNR_ConfRequest
             // 
@@ -561,6 +561,14 @@
         private System.Windows.Forms.ToolStripButton btEdit;
         private System.Windows.Forms.ToolStripButton btSave;
         private System.Windows.Forms.DataGridView dataGridView1;
+        private System.Windows.Forms.ToolStripButton toolStripButton1;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.RichTextBox richTextBox2;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.ToolStripButton toolStripButton2;
         private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn requestNameDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn sidDataGridViewTextBoxColumn;
@@ -574,13 +582,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn supplyDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn bigo2DataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn bigoDataGridViewTextBoxColumn;
-        private System.Windows.Forms.ToolStripButton toolStripButton1;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.RichTextBox richTextBox1;
-        private System.Windows.Forms.RichTextBox richTextBox2;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-        private System.Windows.Forms.ToolStripButton toolStripButton2;
     }
 }

SubProject/FEQ0000/PurchaseNR/fPurchaseNR_ConfRequest.cs

@@ -372,7 +372,7 @@ namespace FEQ0000
                 if (qty < 1)
                 {
                     Util.MsgE($"[{dr.sid}] {dr.pumname}의 구매 수량이 없습니다");
-                    break;
+                    return;
                 }
                 //if(qty > qtyreq)
                 //{
@@ -505,6 +505,8 @@ namespace FEQ0000
         {
             this.Validate();
             this.bs.EndEdit();
+            var dlg = FCOMMON.Util.MsgQ("입력되지 않은 구매수량을 신청수량으로 일괄 업데이트 할까요?");
+            if (dlg != DialogResult.Yes) return;
             foreach (DataGridViewRow row in this.dataGridView1.Rows)
             {
                 var dr = row.DataBoundItem as dsPurchase.EETGW_PurchaseEBRow;

SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             System.Windows.Forms.Label processLabel;
             System.Windows.Forms.Label receiveLabel;
             System.Windows.Forms.Label scLabel;
@@ -82,6 +81,7 @@
             this.chkExp = new System.Windows.Forms.CheckBox();
             this.btSaveAdd = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.lbcurrentwon = new System.Windows.Forms.Label();
             this.tbPumIDX = new System.Windows.Forms.Button();
             this.tbStorage = new System.Windows.Forms.ComboBox();
             this.cmbRemark = new System.Windows.Forms.ComboBox();
@@ -112,12 +112,11 @@
             this.button4 = new System.Windows.Forms.Button();
             this.tbOrderNo = new System.Windows.Forms.TextBox();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+            this.toolTip1 = new System.Windows.Forms.ToolTip();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.timer1 = new System.Windows.Forms.Timer();
             this.dsPurchase = new FEQ0000.dsPurchase();
-            this.bs = new System.Windows.Forms.BindingSource(this.components);
+            this.bs = new System.Windows.Forms.BindingSource();
             this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter();
-            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();
@@ -748,6 +747,19 @@
             this.groupBox1.Text = "필수입력";
             this.groupBox1.Enter += new System.EventHandler(this.groupBox1_Enter);
             // 
+            // 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(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);
+            // 
             // tbPumIDX
             // 
             this.tbPumIDX.Location = new System.Drawing.Point(410, 79);
@@ -1003,6 +1015,7 @@
             this.tbManager.Name = "tbManager";
             this.tbManager.Size = new System.Drawing.Size(286, 28);
             this.tbManager.TabIndex = 47;
+            this.tbManager.SelectedIndexChanged += new System.EventHandler(this.tbManager_SelectedIndexChanged);
             // 
             // btEQModel
             // 
@@ -1139,19 +1152,6 @@
             // 
             this.ta.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(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
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);

SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs

@@ -857,6 +857,7 @@ namespace FEQ0000
             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;
@@ -872,8 +873,11 @@ namespace FEQ0000
                     dr.pumprice = vpumprice;
                 }
             }
-            else dr.SetpumpriceDNull();
+            else
-
+            {
+                dr.SetpumpriceDNull();
+                dr.currency = "KRW";
+            }
             if (vqtyreal > 0) dr.pumamt = dr.pumqty * dr.pumprice;
             else dr.pumamt = dr.pumqtyReq * dr.pumprice;
 
@@ -1474,5 +1478,10 @@ namespace FEQ0000
         {
             FCOMMON.Util.MsgI("환율을 입력하려면 공용코드(68)의 Fvalue 에 값을 입력하세요");
         }
+
+        private void tbManager_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }

SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.Designer.cs

@@ -35,16 +35,20 @@
             System.Windows.Forms.Label label6;
             System.Windows.Forms.Label label7;
             System.Windows.Forms.Label label2;
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = 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.Label label17;
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.label4 = new System.Windows.Forms.Label();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.label5 = new System.Windows.Forms.Label();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.label8 = new System.Windows.Forms.Label();
-            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();
@@ -61,18 +65,6 @@
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.dv1 = new arCtl.arDatagridView();
-            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            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.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();
@@ -82,12 +74,30 @@
             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.toolStrip1 = new System.Windows.Forms.ToolStrip();
+            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.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButton6 = 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.btEQManu = new System.Windows.Forms.Button();
+            this.btEQProc = new System.Windows.Forms.Button();
+            this.btEQModel = new System.Windows.Forms.Button();
+            this.tbManager = new System.Windows.Forms.ComboBox();
             projectLabel = new System.Windows.Forms.Label();
             label1 = new System.Windows.Forms.Label();
             label3 = new System.Windows.Forms.Label();
             label6 = new System.Windows.Forms.Label();
             label7 = new System.Windows.Forms.Label();
             label2 = new System.Windows.Forms.Label();
+            label17 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             this.groupBox1.SuspendLayout();
@@ -110,7 +120,7 @@
             // label1
             // 
             label1.AutoSize = true;
-            label1.Location = new System.Drawing.Point(7, 28);
+            label1.Location = new System.Drawing.Point(34, 28);
             label1.Name = "label1";
             label1.Size = new System.Drawing.Size(47, 17);
             label1.TabIndex = 0;
@@ -146,12 +156,39 @@
             // label2
             // 
             label2.AutoSize = true;
-            label2.Location = new System.Drawing.Point(7, 58);
+            label2.Location = new System.Drawing.Point(34, 59);
             label2.Name = "label2";
             label2.Size = new System.Drawing.Size(47, 17);
             label2.TabIndex = 3;
             label2.Text = "요청자";
             // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(275, 59);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(34, 17);
+            this.label4.TabIndex = 5;
+            this.label4.Text = "공정";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(8, 90);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(73, 17);
+            this.label5.TabIndex = 7;
+            this.label5.Text = "장비제조사";
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(249, 90);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(60, 17);
+            this.label8.TabIndex = 9;
+            this.label8.Text = "장비모델";
+            // 
             // tbProject
             // 
             this.tbProject.BackColor = System.Drawing.SystemColors.Control;
@@ -177,7 +214,7 @@
             // 
             // dtPdate
             // 
-            this.dtPdate.Location = new System.Drawing.Point(65, 24);
+            this.dtPdate.Location = new System.Drawing.Point(88, 24);
             this.dtPdate.Name = "dtPdate";
             this.dtPdate.Size = new System.Drawing.Size(251, 25);
             this.dtPdate.TabIndex = 1;
@@ -188,9 +225,9 @@
             this.cmbRequest.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
             this.cmbRequest.FormattingEnabled = true;
             this.cmbRequest.ImeMode = System.Windows.Forms.ImeMode.Hangul;
-            this.cmbRequest.Location = new System.Drawing.Point(65, 55);
+            this.cmbRequest.Location = new System.Drawing.Point(88, 55);
             this.cmbRequest.Name = "cmbRequest";
-            this.cmbRequest.Size = new System.Drawing.Size(251, 25);
+            this.cmbRequest.Size = new System.Drawing.Size(155, 25);
             this.cmbRequest.TabIndex = 2;
             // 
             // textBox2
@@ -278,6 +315,14 @@
             // 
             // groupBox2
             // 
+            this.groupBox2.Controls.Add(this.tbManager);
+            this.groupBox2.Controls.Add(label17);
+            this.groupBox2.Controls.Add(this.btEQModel);
+            this.groupBox2.Controls.Add(this.btEQProc);
+            this.groupBox2.Controls.Add(this.btEQManu);
+            this.groupBox2.Controls.Add(this.label8);
+            this.groupBox2.Controls.Add(this.label5);
+            this.groupBox2.Controls.Add(this.label4);
             this.groupBox2.Controls.Add(label2);
             this.groupBox2.Controls.Add(this.cmbRequest);
             this.groupBox2.Controls.Add(label1);
@@ -285,7 +330,7 @@
             this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox2.Location = new System.Drawing.Point(493, 3);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(481, 155);
+            this.groupBox2.Size = new System.Drawing.Size(572, 155);
             this.groupBox2.TabIndex = 24;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "구매 등록 정보";
@@ -297,7 +342,7 @@
             this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox3.Location = new System.Drawing.Point(5, 168);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(974, 441);
+            this.groupBox3.Size = new System.Drawing.Size(1065, 441);
             this.groupBox3.TabIndex = 26;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "파트리스트";
@@ -324,24 +369,96 @@
             this.dvc_amt,
             this.dvc_spm,
             this.dvc_remark});
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle45.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle45.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle45.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle45.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle45.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dv1.DefaultCellStyle = dataGridViewCellStyle9;
+            this.dv1.DefaultCellStyle = dataGridViewCellStyle45;
             this.dv1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dv1.Location = new System.Drawing.Point(3, 21);
             this.dv1.Name = "dv1";
             this.dv1.RowTemplate.Height = 23;
-            this.dv1.Size = new System.Drawing.Size(968, 370);
+            this.dv1.Size = new System.Drawing.Size(1059, 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);
             // 
+            // dvc_sid
+            // 
+            dataGridViewCellStyle37.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dvc_sid.DefaultCellStyle = dataGridViewCellStyle37;
+            this.dvc_sid.HeaderText = "SID";
+            this.dvc_sid.Name = "dvc_sid";
+            this.dvc_sid.ReadOnly = true;
+            // 
+            // dvc_name
+            // 
+            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle38.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dvc_name.DefaultCellStyle = dataGridViewCellStyle38;
+            this.dvc_name.HeaderText = "품명";
+            this.dvc_name.Name = "dvc_name";
+            this.dvc_name.ReadOnly = true;
+            // 
+            // dvc_model
+            // 
+            dataGridViewCellStyle39.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dvc_model.DefaultCellStyle = dataGridViewCellStyle39;
+            this.dvc_model.HeaderText = "모델";
+            this.dvc_model.Name = "dvc_model";
+            this.dvc_model.ReadOnly = true;
+            // 
+            // dvc_price
+            // 
+            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle40.Format = "N0";
+            this.dvc_price.DefaultCellStyle = dataGridViewCellStyle40;
+            this.dvc_price.HeaderText = "단가";
+            this.dvc_price.Name = "dvc_price";
+            // 
+            // dvc_qtyreq
+            // 
+            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle41.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.dvc_qtyreq.DefaultCellStyle = dataGridViewCellStyle41;
+            this.dvc_qtyreq.HeaderText = "구매요청";
+            this.dvc_qtyreq.Name = "dvc_qtyreq";
+            this.dvc_qtyreq.ReadOnly = true;
+            // 
+            // dvc_qty
+            // 
+            dataGridViewCellStyle42.Format = "N0";
+            this.dvc_qty.DefaultCellStyle = dataGridViewCellStyle42;
+            this.dvc_qty.HeaderText = "구매신청";
+            this.dvc_qty.Name = "dvc_qty";
+            // 
+            // dvc_amt
+            // 
+            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle43.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            dataGridViewCellStyle43.Format = "N0";
+            this.dvc_amt.DefaultCellStyle = dataGridViewCellStyle43;
+            this.dvc_amt.HeaderText = "구매금액";
+            this.dvc_amt.Name = "dvc_amt";
+            this.dvc_amt.ReadOnly = true;
+            // 
+            // dvc_spm
+            // 
+            this.dvc_spm.HeaderText = "SPM";
+            this.dvc_spm.Name = "dvc_spm";
+            // 
+            // dvc_remark
+            // 
+            this.dvc_remark.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.dvc_remark.DefaultCellStyle = dataGridViewCellStyle44;
+            this.dvc_remark.HeaderText = "비고";
+            this.dvc_remark.Name = "dvc_remark";
+            // 
             // toolStrip1
             // 
             this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -352,10 +469,11 @@
             this.toolStripButton8,
             this.toolStripButton1,
             this.toolStripButton3,
-            this.toolStripButton5});
+            this.toolStripButton5,
+            this.toolStripButton6});
             this.toolStrip1.Location = new System.Drawing.Point(3, 391);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(968, 47);
+            this.toolStrip1.Size = new System.Drawing.Size(1059, 47);
             this.toolStrip1.TabIndex = 26;
             this.toolStrip1.Text = "toolStrip1";
             // 
@@ -407,6 +525,24 @@
             this.toolStripButton3.Visible = false;
             this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
             // 
+            // toolStripButton5
+            // 
+            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);
+            // 
+            // toolStripButton6
+            // 
+            this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
+            this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton6.Name = "toolStripButton6";
+            this.toolStripButton6.Size = new System.Drawing.Size(135, 44);
+            this.toolStripButton6.Text = "견적서폴더열기";
+            this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
+            // 
             // panel1
             // 
             this.panel1.Controls.Add(this.groupBox2);
@@ -416,7 +552,7 @@
             this.panel1.Location = new System.Drawing.Point(5, 5);
             this.panel1.Name = "panel1";
             this.panel1.Padding = new System.Windows.Forms.Padding(0, 3, 0, 5);
-            this.panel1.Size = new System.Drawing.Size(974, 163);
+            this.panel1.Size = new System.Drawing.Size(1065, 163);
             this.panel1.TabIndex = 0;
             // 
             // panel3
@@ -431,7 +567,7 @@
             // 
             this.statusStrip1.Location = new System.Drawing.Point(5, 609);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(974, 22);
+            this.statusStrip1.Size = new System.Drawing.Size(1065, 22);
             this.statusStrip1.TabIndex = 28;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -443,93 +579,65 @@
             // 
             this.taPart.ClearBeforeFill = true;
             // 
-            // toolStripButton5
+            // btEQManu
             // 
-            this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
+            this.btEQManu.Location = new System.Drawing.Point(88, 86);
-            this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btEQManu.Name = "btEQManu";
-            this.toolStripButton5.Name = "toolStripButton5";
+            this.btEQManu.Size = new System.Drawing.Size(155, 25);
-            this.toolStripButton5.Size = new System.Drawing.Size(136, 44);
+            this.btEQManu.TabIndex = 13;
-            this.toolStripButton5.Text = "SPM사이트열기";
+            this.btEQManu.Text = "공용코드06";
-            this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
+            this.btEQManu.UseVisualStyleBackColor = true;
+            this.btEQManu.Click += new System.EventHandler(this.cmbManu_Click);
             // 
-            // dvc_sid
+            // btEQProc
             // 
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.btEQProc.Location = new System.Drawing.Point(315, 55);
-            this.dvc_sid.DefaultCellStyle = dataGridViewCellStyle1;
+            this.btEQProc.Name = "btEQProc";
-            this.dvc_sid.HeaderText = "SID";
+            this.btEQProc.Size = new System.Drawing.Size(144, 25);
-            this.dvc_sid.Name = "dvc_sid";
+            this.btEQProc.TabIndex = 14;
-            this.dvc_sid.ReadOnly = true;
+            this.btEQProc.Text = " 공용코드08";
+            this.btEQProc.UseVisualStyleBackColor = true;
+            this.btEQProc.Click += new System.EventHandler(this.cmbProcess_Click);
             // 
-            // dvc_name
+            // btEQModel
             // 
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            this.btEQModel.Location = new System.Drawing.Point(315, 86);
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.btEQModel.Name = "btEQModel";
-            this.dvc_name.DefaultCellStyle = dataGridViewCellStyle2;
+            this.btEQModel.Size = new System.Drawing.Size(144, 25);
-            this.dvc_name.HeaderText = "품명";
+            this.btEQModel.TabIndex = 15;
-            this.dvc_name.Name = "dvc_name";
+            this.btEQModel.Text = "공용코드07";
-            this.dvc_name.ReadOnly = true;
+            this.btEQModel.UseVisualStyleBackColor = true;
+            this.btEQModel.Click += new System.EventHandler(this.cmbModel_Click);
             // 
-            // dvc_model
+            // tbManager
             // 
-            dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.tbManager.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
-            this.dvc_model.DefaultCellStyle = dataGridViewCellStyle3;
+            this.tbManager.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
-            this.dvc_model.HeaderText = "모델";
+            this.tbManager.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.dvc_model.Name = "dvc_model";
+            this.tbManager.FormattingEnabled = true;
-            this.dvc_model.ReadOnly = true;
+            this.tbManager.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+            this.tbManager.Location = new System.Drawing.Point(88, 116);
+            this.tbManager.Margin = new System.Windows.Forms.Padding(4);
+            this.tbManager.Name = "tbManager";
+            this.tbManager.Size = new System.Drawing.Size(155, 25);
+            this.tbManager.TabIndex = 49;
             // 
-            // dvc_price
+            // label17
             // 
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            label17.AutoSize = true;
-            dataGridViewCellStyle4.Format = "N0";
+            label17.Location = new System.Drawing.Point(8, 119);
-            this.dvc_price.DefaultCellStyle = dataGridViewCellStyle4;
+            label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.dvc_price.HeaderText = "단가";
+            label17.Name = "label17";
-            this.dvc_price.Name = "dvc_price";
+            label17.Size = new System.Drawing.Size(73, 17);
-            // 
+            label17.TabIndex = 48;
-            // dvc_qtyreq
+            label17.Text = "구매담당자";
-            // 
-            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
-            // 
-            dataGridViewCellStyle6.Format = "N0";
-            this.dvc_qty.DefaultCellStyle = dataGridViewCellStyle6;
-            this.dvc_qty.HeaderText = "구매신청";
-            this.dvc_qty.Name = "dvc_qty";
-            // 
-            // dvc_amt
-            // 
-            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;
-            // 
-            // dvc_spm
-            // 
-            this.dvc_spm.HeaderText = "SPM";
-            this.dvc_spm.Name = "dvc_spm";
-            // 
-            // dvc_remark
-            // 
-            this.dvc_remark.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            this.dvc_remark.DefaultCellStyle = dataGridViewCellStyle8;
-            this.dvc_remark.HeaderText = "비고";
-            this.dvc_remark.Name = "dvc_remark";
             // 
             // fProjectPartToPurchaseCR
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
-            this.ClientSize = new System.Drawing.Size(984, 636);
+            this.ClientSize = new System.Drawing.Size(1075, 636);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.statusStrip1);
@@ -596,5 +704,13 @@
         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 toolStripButton6;
+        private System.Windows.Forms.Button btEQModel;
+        private System.Windows.Forms.Button btEQProc;
+        private System.Windows.Forms.Button btEQManu;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.ComboBox tbManager;
     }
 }

SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs

@@ -36,6 +36,18 @@ namespace FPJ0000
             this.Text = isCR ? "파트리스트 CR등록" : "파트리스트 NR등록";
             this.panel1.BackColor = isCR ? Color.FromArgb(192, 192, 255) : Color.FromArgb(192, 255, 255);
             toolStripButton4.Text = isCR ? "CR구매등록" : "NR구매등록";
+            toolStripButton6.Visible = isCR == false;
+
+            if (isCR)
+            {
+                btEQManu.Visible = false;
+                btEQModel.Visible = false;
+                btEQProc.Visible = false;
+                label4.Visible = false;
+                label8.Visible = false;
+                label5.Visible = false;
+            }
+
         }
 
         int Col_Price = -1;
@@ -73,7 +85,12 @@ namespace FPJ0000
             {
                 if (this.IDXList.Contains(dr.idx) == false) continue;
 
-                if (dr.IsItemSidNull() || dr.ItemSid.Length != 9)
+                if (dr.IsItemSidNull())
+                {
+                    emptycount += 1;
+                    continue;
+                }
+                else if (dr.ItemSid.Length != 9 && isCR)    //cR은 신규를 허용하지 않는다.
                 {
                     emptycount += 1;
                     continue;
@@ -118,14 +135,30 @@ namespace FPJ0000
             this.tbProjectIndex.Text = drPrj.idx.ToString();
             this.textBox1.Text = drPrj.remark_ans;
             this.tbProject.Text = drPrj.name;
+            this.btEQProc.Text = drPrj.process; //공정 240207
+            this.btEQProc.Tag = "";
+            this.btEQManu.Tag = "";
+            this.btEQModel.Tag = "";
             this.tbCr.Text = drPrj.orderno;
             //this.tbOrderNo.Text = drPrj.orderno;
 
+            //구매-담당
+            var LstMan = FCOMMON.DBM.getCodeTable("65");
+            this.tbManager.DisplayMember = "Value";
+            this.tbManager.ValueMember = "Value";
+            this.tbManager.DataSource = LstMan;
+
             //파트리스트 합계금액
             var dtPart = taPart.GetData(this.ProjectIndex);
             MakeList(dtPart);
 
 
+            if (tbManager.Text.isEmpty() && tbManager.Items.Count == 1)
+            {
+                tbManager.Text = (tbManager.Items[0] as DataRowView)["Value"].ToString();
+            }
+
+
             ////상태
             //var stateList = FCOMMON.DBM.getCodeTable("04");
             //this.cmbState.DisplayMember = "Value";
@@ -280,8 +313,26 @@ namespace FPJ0000
                     return false;
                 }
             }
+            else
+            {
+                if (btEQProc.Tag.ToString() == "")
+                {
+                    FCOMMON.Util.MsgE("장비 공정을 선택하세요");
+                    return false;
+                }
+                if (btEQManu.Tag.ToString() == "")
+                {
+                    FCOMMON.Util.MsgE("장비 제조사를 선택하세요");
+                    return false;
+                }
+            }
 
-
+            if (tbManager.Text.isEmpty())
+            {
+                FCOMMON.Util.MsgE("구매담당자를 선택 하세요");
+                tbManager.Focus();
+                return false;
+            }
 
             int itemCount = 0;
             decimal itemAmt = 0;
@@ -397,7 +448,11 @@ namespace FPJ0000
                         newdr.wdate = DateTime.Now;
                         newdr.orderno = tbCr.Text.Trim();
                         newdr.bigo = item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim();
+                   //     if (newdr.bigo.isEmpty()) newdr.bigo = tbProject.Text;
                         newdr.chk1 = true;
+                        newdr.currency = "KRW";
+              
+
                         newdr.EndEdit();
                         dtCR.AddEETGW_PurchaseCRRow(newdr);
                     }
@@ -405,7 +460,15 @@ namespace FPJ0000
                     {
                         newdr.pumqtyReq += v_qty;// (int)item.Cells[Col_Qty].Value;// dr.qty;      //SQL = SQL.Replace("{qty}", dr.qty.ToString());   //일반수량이 아닌 필요수량으로
                         newdr.pumamt += v_price * v_qty;// (decimal)item.Cells["dvc_amt"].Value;// dr.amt;  //SQL = SQL.Replace("{amt}", dr.amt.ToString());
-                        newdr.bigo += "," + item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim();
+                        if (newdr.bigo.isEmpty() == false) newdr.bigo += ",";
+                        newdr.bigo += item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim();
+                        if (newdr.IscurrencyNull() || newdr.currency.isEmpty())
+                            newdr.currency = "KRW";
+
+                 //       if (newdr.bigo.isEmpty()) newdr.bigo = tbProject.Text;
+
+             
+
                         newdr.chk1 = true;
                         newdr.EndEdit();
                     }
@@ -426,7 +489,7 @@ namespace FPJ0000
                 {
                     var newdr = dtNR.Where(t => t.sid == sid).FirstOrDefault();
                     //insert query
-                    if (newdr == null)
+                    if (newdr == null || sid.Equals("신규"))
                     {
                         newdr = dtNR.NewPurchaseRow();
                         newadd = true;
@@ -439,6 +502,7 @@ namespace FPJ0000
 
                     if (newadd)
                     {
+                        newdr.process = FCOMMON.info.Login.process;
                         newdr.gcode = FCOMMON.info.Login.gcode;
                         newdr.pdate = dtPdate.Value.ToShortDateString();
                         newdr.state = "---";// cmbState.Text.Trim();
@@ -459,8 +523,14 @@ namespace FPJ0000
                         newdr.wuid = FCOMMON.info.Login.no;
                         newdr.wdate = DateTime.Now;
                         newdr.orderno = tbCr.Text.Trim();
+                        newdr.purchase_manager = tbManager.Text.Trim();
+                        newdr.currency = "KRW";
                         newdr.bigo = item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim();
+                        if (newdr.bigo.isEmpty()) newdr.bigo = $"[{tbProject.Text}]";
                         newdr.chk1 = true;
+                        newdr.dept = btEQProc.Tag.ToString();
+                        newdr.manuproc = btEQManu.Tag.ToString();
+                        newdr.asset = btEQModel.Tag.ToString();
                         newdr.EndEdit();
                         dtNR.AddPurchaseRow(newdr);
                     }
@@ -469,7 +539,18 @@ namespace FPJ0000
                         newdr.chk1 = true;
                         newdr.pumqtyReq += v_qty;// (int)item.Cells[Col_Qty].Value;// dr.qty;      //SQL = SQL.Replace("{qty}", dr.qty.ToString());   //일반수량이 아닌 필요수량으로
                         newdr.pumamt += v_price * v_qty;// (decimal)item.Cells["dvc_amt"].Value;// dr.amt;  //SQL = SQL.Replace("{amt}", dr.amt.ToString());
-                        newdr.bigo += "," + item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim();
+                        newdr.process = FCOMMON.info.Login.process;
+                        if (newdr.bigo.isEmpty() == false) newdr.bigo += ",";
+                        newdr.bigo += item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim();
+                        //if (newdr.bigo.isEmpty()) newdr.bigo = $"[{tbProject.Text}]";
+
+                        if (newdr.IscurrencyNull() || newdr.currency.isEmpty())
+                            newdr.currency = "KRW";
+                        newdr.dept = btEQProc.Tag.ToString();
+                        newdr.manuproc = btEQManu.Tag.ToString();
+                        newdr.asset = btEQModel.Tag.ToString();
+                        //newdr.bigo += "," + item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim();
+                        newdr.purchase_manager = tbManager.Text.Trim();
                         newdr.EndEdit();
                     }
 
@@ -614,6 +695,7 @@ namespace FPJ0000
             {
                 FCOMMON.Util.MsgI($"{ecnt} 개의 자료가 SPM에서 자료가 검색되었습니다\n각 수량을 클릭해서 내용을 확인하세요");
             }
+            this.dv1.AutoResizeColumns();
         }
 
         private void toolStripButton3_Click(object sender, EventArgs e)
@@ -701,5 +783,71 @@ namespace FPJ0000
             }
             else dv1.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.DimGray;
         }
+
+        private void toolStripButton6_Click(object sender, EventArgs e)
+        {
+            var datapath = FCOMMON.DBM.getCodeSvalue("55", "02");
+            if (datapath.isEmpty())
+            {
+                FCOMMON.Util.MsgE("견적서 기본폴더 공용코드 55-02 값을 입력하세요");
+                return;
+            }
+            string path = System.IO.Path.Combine(datapath, DateTime.Now.Year.ToString("0000") + "년");// "\\\\k4fs3201n\\ee1t$\\1. 장비기술1파트\\24_Project & Overhaul 예산 사용 실적\\구매 견적서\\" + DateTime.Now.Year.ToString("0000") + "년";
+            if (System.IO.Directory.Exists(path) == false)
+                FCOMMON.Util.RunExplorer(datapath);
+            else
+                FCOMMON.Util.RunExplorer(path);
+        }
+
+        private void cmbProcess_Click(object sender, EventArgs e)
+        {
+            var bt = sender as Button;
+            var guun = "08";// bt.Tag.ToString();
+            var f = new FCM0000.fCode(guun);
+            var dlg = f.ShowDialog();
+            if (dlg == DialogResult.OK)
+            {
+                //장비기술공정;
+                bt.Text = f.SelectedTitle;// cbProcess.SelectedIndex = -1;
+                bt.Tag = f.SelectedTitle;
+            }
+        }
+
+        private void cmbManu_Click(object sender, EventArgs e)
+        {
+            var bt = sender as Button;
+            var guun = "06";// bt.Tag.ToString();
+            var f = new FCM0000.fCode(guun);
+            var dlg = f.ShowDialog();
+            if (dlg == DialogResult.OK)
+            {
+                //장비기술공정;
+                bt.Text = f.SelectedTitle;// cbProcess.SelectedIndex = -1;
+                bt.Tag = f.SelectedTitle;
+            }
+        }
+
+        private void cmbModel_Click(object sender, EventArgs e)
+        {
+            if (btEQManu.Text.isEmpty())
+            {
+                FCOMMON.Util.MsgE("장비 제조사가 선택되지 않았습니다");
+                btEQManu.Focus();
+                return;
+            }
+
+            string filter = "svalue='" + btEQManu.Text.Replace("'", "''") + "'";
+
+            var bt = sender as Button;
+            var guun = "07";// bt.Tag.ToString();
+            var f = new FCM0000.fCode(guun, filter);
+            var dlg = f.ShowDialog();
+            if (dlg == DialogResult.OK)
+            {
+                //장비기술공정;
+                bt.Text = f.SelectedTitle;// cbProcess.SelectedIndex = -1;
+                bt.Tag = f.SelectedTitle;
+            }
+        }
     }
 }

SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.resx

@@ -138,6 +138,9 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>257, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>257, 17</value>
+  </metadata>
   <metadata name="dsPurchase.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -147,6 +150,12 @@
   <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>195, 17</value>
   </metadata>
+  <metadata name="label17.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>656, 17</value>
+  </metadata>
   <metadata name="dvc_sid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -262,6 +271,21 @@
         mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
         kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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==
 </value>
   </data>
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">