diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 85fd38b..c798787 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("22.12.07.0955")] -[assembly: AssemblyFileVersion("22.12.07.0955")] +[assembly: AssemblyVersion("22.12.12.0950")] +[assembly: AssemblyFileVersion("22.12.12.0950")] diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc b/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc index efecebc..f7ac60f 100644 --- a/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc +++ b/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc @@ -346,13 +346,16 @@ 2.20896cm - 3.16146cm + 1.8cm - 2.5cm + 1.8cm - 2.5cm + 1.8cm + + + 1.8cm @@ -648,6 +651,63 @@ iif(sum(Fields!DrDay.Value) >0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi + + + + true + true + + + + + =Sum(Fields!DrDay.Value)-Sum(Fields!CrDay.Value) + + + + + + + DrDay4 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + @@ -998,6 +1058,63 @@ iif(sum(Fields!DrDay.Value) >0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi + + + + true + true + + + + + =Sum(Fields!DrDay.Value)-Sum(Fields!CrDay.Value) + + + + + + + DrDay5 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + @@ -1349,6 +1466,63 @@ iif(sum(Fields!DrDay.Value) >0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi + + + + true + true + + + + + =Sum(Fields!DrDay.Value)-Sum(Fields!CrDay.Value) + + + + + + + Textbox20 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + @@ -1405,7 +1579,6 @@ iif(sum(Fields!DrDay.Value) >0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi 2pt - true @@ -1921,6 +2094,67 @@ iif(sum(Fields!DrDay.Value) >0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi + + + 0.6cm + + + true + true + + + + + 잔여일 + + + + + + + Textbox1 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + 0.6cm @@ -2319,7 +2553,7 @@ iif(sum(Fields!DrDay.Value) >0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi true DataSet1 3.81167cm - 21.94439cm + 20.98294cm @@ -2330,7 +2564,7 @@ iif(sum(Fields!DrDay.Value) >0, Math.Round( (sum(fields!CrDay.Value) / sum(Fi 1.50066in