diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 8d025b5..73b4481 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("23.11.23.1006")] -[assembly: AssemblyFileVersion("23.11.23.1006")] +[assembly: AssemblyVersion("23.11.27.0950")] +[assembly: AssemblyFileVersion("23.11.27.0950")] diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc b/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc index 4317544..c4c13b3 100644 --- a/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc +++ b/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc @@ -1210,7 +1210,7 @@ - = iif(sum(Fields!drday.Value) = 0 , 0 , (sum(Fields!crday.Value) / sum(Fields!drday.Value)) * 100) + = iif(sum(Fields!dr.Value) = 0 , 0 , (sum(Fields!cr.Value) / sum(Fields!dr.Value)) * 100) + true diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs index b03e828..e98437e 100644 --- a/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs @@ -819,7 +819,7 @@ namespace FEQ0000 { if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal vpriced) == true) { - applyDollerToWon(); + //applyDollerToWon(); } } @@ -1183,29 +1183,29 @@ namespace FEQ0000 { //단가에 금액이 없는경우에는 환율을 곱해준다. //if ( decimal.TryParse(tbPumPrice.Text, out decimal result) == false || result == 0) - if (binit) - { - if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced) == true) - { - applyDollerToWon(); - } - else - { - //달러입력값도 이상하니 처리 못함 - tbPumPrice.Text = "0"; - } - } + //if (binit) + //{ + // if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced) == true) + // { + // applyDollerToWon(); + // } + // else + // { + // //달러입력값도 이상하니 처리 못함 + // tbPumPrice.Text = "0"; + // } + //} } - void applyDollerToWon() - { - if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) - { - var price = FCOMMON.info.dollertowon * (double)priced; - tbPumPrice.Text = (Math.Ceiling(price)).ToString(); - } - else tbPumPrice.Text = "0"; - } + //void applyDollerToWon() + //{ + // if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) + // { + // var price = FCOMMON.info.dollertowon * (double)priced; + // tbPumPrice.Text = (Math.Ceiling(price)).ToString(); + // } + // else tbPumPrice.Text = "0"; + //} private void btSIDChk_Click(object sender, EventArgs e) {