Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
chi
2023-12-04 08:29:58 +09:00
parent 6e88e7bdb4
commit 69495927b9
3 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/Properties/AssemblyInfo.cs
View File

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

5
SubProject/FBS0000/Holiday/rHolidaySummary.rdlc
View File

@@ -1210,7 +1210,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>= iif(sum(Fields!drday.Value) = 0 , 0 , (sum(Fields!crday.Value) / sum(Fields!drday.Value)) * 100)</Value> <Value>= iif(sum(Fields!dr.Value) = 0 , 0 , (sum(Fields!cr.Value) / sum(Fields!dr.Value)) * 100)</Value>
<Style> <Style>
<FontFamily>맑은 고딕</FontFamily> <FontFamily>맑은 고딕</FontFamily>
<FontSize>9pt</FontSize> <FontSize>9pt</FontSize>
@@ -1802,7 +1802,7 @@
<Paragraph> <Paragraph>
<TextRuns> <TextRuns>
<TextRun> <TextRun>
<Value>= iif(sum(Fields!drday.Value) = 0 , 0 , (sum(Fields!crday.Value) / sum(Fields!drday.Value)) * 100)</Value> <Value>= iif(sum(Fields!dr.Value) = 0 , 0 , (sum(Fields!cr.Value) / sum(Fields!dr.Value)) * 100)</Value>
<Style> <Style>
<FontFamily>맑은 고딕</FontFamily> <FontFamily>맑은 고딕</FontFamily>
<FontSize>9pt</FontSize> <FontSize>9pt</FontSize>
@@ -1849,6 +1849,7 @@
<PaddingBottom>2pt</PaddingBottom> <PaddingBottom>2pt</PaddingBottom>
</Style> </Style>
</Textbox> </Textbox>
<rd:Selected>true</rd:Selected>
</CellContents> </CellContents>
</TablixCell> </TablixCell>
<TablixCell> <TablixCell>

44
SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs
View File

@@ -819,7 +819,7 @@ namespace FEQ0000
{ {
if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal vpriced) == true) 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 ( decimal.TryParse(tbPumPrice.Text, out decimal result) == false || result == 0)
if (binit) //if (binit)
{ //{
if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced) == true) // if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced) == true)
{ // {
applyDollerToWon(); // applyDollerToWon();
} // }
else // else
{ // {
//달러입력값도 이상하니 처리 못함 // //달러입력값도 이상하니 처리 못함
tbPumPrice.Text = "0"; // tbPumPrice.Text = "0";
} // }
} //}
} }
void applyDollerToWon() //void applyDollerToWon()
{ //{
if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) // if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced))
{ // {
var price = FCOMMON.info.dollertowon * (double)priced; // var price = FCOMMON.info.dollertowon * (double)priced;
tbPumPrice.Text = (Math.Ceiling(price)).ToString(); // tbPumPrice.Text = (Math.Ceiling(price)).ToString();
} // }
else tbPumPrice.Text = "0"; // else tbPumPrice.Text = "0";
} //}
private void btSIDChk_Click(object sender, EventArgs e) private void btSIDChk_Click(object sender, EventArgs e)
{ {