From 283597f6129e5af2e8442cbb9ddd3053d0469eee Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 7 Feb 2024 14:21:09 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EA=B0=80=200=20=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=EB=B6=88=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 ++-- .../FPJ0000/Project/fProjectPartToPurchaseCR.cs | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 88a73be..f3e994a 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("24.02.01.1350")] -[assembly: AssemblyFileVersion("24.02.01.1350")] +[assembly: AssemblyVersion("24.02.07.1430")] +[assembly: AssemblyFileVersion("24.02.07.1430")] diff --git a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs index b52ad2f..71ca537 100644 --- a/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs +++ b/SubProject/FPJ0000/Project/fProjectPartToPurchaseCR.cs @@ -239,16 +239,25 @@ namespace FPJ0000 foreach (DataGridViewRow row in this.dv1.Rows) { var spmval = row.Cells["dvc_spm"].Value.ToString(); + var sidval = row.Cells["dvc_sid"].Value.ToString();//dvc_price + var prival = row.Cells["dvc_price"].Value.ToString().Replace(",", "");//dvc_price if (spmval.isEmpty()) { FCOMMON.Util.MsgE("SPM검사가 완료되지 않았습니다"); return false; } - - - + //if (sidval.Length != 9) + { + decimal.TryParse(prival, out decimal price); + if (price < 2) + { + FCOMMON.Util.MsgE("단가를 입력해야 합니다\n신규 품목이라면 견적서의 단가를 입력하세요\n기존 품목 중 단가를 알 수 없다면 [구매담당]에게 문의하세요"); + return false; + } + } } + if (this.dv1.Rows.Count < 1) { FCOMMON.Util.MsgE("자료가 없습니다"); @@ -451,11 +460,13 @@ namespace FPJ0000 newdr.wdate = DateTime.Now; newdr.orderno = tbCr.Text.Trim(); newdr.bigo = item.Cells["dvc_remark"].Value.ToString();//dr.memo.Trim(); + newdr.chk1 = true; newdr.EndEdit(); dtNR.AddPurchaseRow(newdr); } else { + 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();