From b98a125f78251c35328c492f677de6006e288a34 Mon Sep 17 00:00:00 2001
From: chi <chikyun.kim@amkor.co.kr>
Date: Thu, 17 Aug 2023 11:55:09 +0900
Subject: [PATCH] ..

---
 SubProject/FEQ0000/Purchase/fPurchaseNR.cs   |  8 ++++++-
 SubProject/FEQ0000/Purchase/fSIDCheckNR.cs   |  4 ++--
 SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs | 22 +++++++++++++-------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs
index 8b65261..04e1e52 100644
--- a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchaseNR.cs
@@ -1329,7 +1329,13 @@ namespace FEQ0000
                 foreach (var idx in f.chklist)
                 {
                     var dr = newlist.Where(t => t.idx == idx).FirstOrDefault();
-                    if (dr != null) { cnt += 1; dr.chk2 = true; dr.EndEdit(); }
+                    if (dr != null)
+                    {
+                        cnt += 1;
+                        dr.chk2 = true;
+                        if (dr.IspumqtyNull() || dr.pumqty == 0) dr.pumqty = dr.pumqtyReq;
+                        dr.EndEdit();
+                    }
                 }
                 FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다");
             }
diff --git a/SubProject/FEQ0000/Purchase/fSIDCheckNR.cs b/SubProject/FEQ0000/Purchase/fSIDCheckNR.cs
index d86699d..9df0174 100644
--- a/SubProject/FEQ0000/Purchase/fSIDCheckNR.cs
+++ b/SubProject/FEQ0000/Purchase/fSIDCheckNR.cs
@@ -29,7 +29,7 @@ namespace FEQ0000.Purchase
                 newdr.pumname = item.pumname;
                 newdr.pumscale = item.pumscale;
                 newdr.pumunit = item.pumunit;
-                newdr.pumqty = item.pumqty;
+                newdr.pumqty = item.pumqtyReq;
                 newdr.pumprice = item.pumprice;
                 newdr.pumamt = item.pumamt;
                 newdr.supply = item.supply;
@@ -60,7 +60,7 @@ namespace FEQ0000.Purchase
                 newdr.pumname = item.pumname;
                 newdr.pumscale = item.pumscale;
                 newdr.pumunit = item.pumunit;
-                newdr.pumqty = item.pumqty;
+                newdr.pumqty = item.pumqtyReq;
                 newdr.pumprice = item.pumprice;
                 newdr.pumamt = item.pumamt;
                 newdr.supply = item.supply;
diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs
index be01f38..b683df5 100644
--- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs
+++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs
@@ -126,11 +126,11 @@ namespace FEQ0000
                 cmbState.Items.Add(item.Value);
             cmbState.Items.Add("<=Received");
             this.cmbState.SelectedIndex = 0;    //all기본 - 양진원
-            //this.cmbCr.SelectedIndex = 1;
+                                                //this.cmbCr.SelectedIndex = 1;
 
             //일반사용자의경우에는 상태를 변경하지 못한다.
-            
-            
+
+
             fpSpread1.ActiveSheet.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange;
             fpSpread1.ActiveSheet.OperationMode = FarPoint.Win.Spread.OperationMode.Normal;
             fpSpread1.ActiveSheet.SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Cell;
@@ -1220,7 +1220,7 @@ namespace FEQ0000
                     return;
                 }
             }
-            var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx,string.Empty);
+            var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx, string.Empty);
             if (f.ShowDialog() == DialogResult.OK)
             {
                 refreshData();
@@ -1250,8 +1250,8 @@ namespace FEQ0000
             //if (fi.Directory.Exists == false) fi.Directory.Create();
 
 
-           // var xlsrow = 0;
-           // var xlscol = 0;
+            // var xlsrow = 0;
+            // var xlscol = 0;
             var sb = new System.Text.StringBuilder();
             Dictionary<string, int> userlist = new Dictionary<string, int>();
             foreach (var idx in selidx)
@@ -1277,7 +1277,7 @@ namespace FEQ0000
                 }
 
                 data[0] = sid;
-                data[3-1] = qty.ToString();
+                data[3 - 1] = qty.ToString();
                 data[8 - 1] = plant;
                 data[12 - 1] = requestname;
                 data[13 - 1] = eecode;
@@ -1329,7 +1329,13 @@ namespace FEQ0000
                 foreach (var idx in f.chklist)
                 {
                     var dr = newlist.Where(t => t.idx == idx).FirstOrDefault();
-                    if (dr != null) { cnt += 1; dr.chk2 = true; dr.EndEdit(); }
+                    if (dr != null)
+                    {
+                        cnt += 1;
+                        dr.chk2 = true;
+                        if(dr.IspumqtyNull() || dr.pumqty == 0) dr.pumqty = dr.pumqtyReq;
+                        dr.EndEdit();
+                    }
                 }
                 FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다");
             }