diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index e2d7e9c..5a88c04 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("21.07.16.1300")] -[assembly: AssemblyFileVersion("21.07.16.1300")] +[assembly: AssemblyVersion("21.07.16.1400")] +[assembly: AssemblyFileVersion("21.07.16.1400")] diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index 9a376f6..1d814dc 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -443,7 +443,7 @@ namespace FPJ0000.JobReport_ //신규상태이다 - if (this.dr.RowState == DataRowState.Added || this.dr.RowState == DataRowState.Detached) + //if (this.dr.RowState == DataRowState.Added || this.dr.RowState == DataRowState.Detached) { if (this.richTextBoxEx1.Text.isEmpty()) { @@ -451,12 +451,26 @@ namespace FPJ0000.JobReport_ } else { - //뭔가 자료가 있는가? - if (this.richTextBoxEx1.Text.Length < 10) + //뭔가 자료가 있는가? + var header = string.Empty; + + + var rt = new RichTextBoxEx.RichTextBoxEx(); + rt.Rtf = dr.body; + if (rt.Text.Length > 10) header = rt.Text.Substring(0, 10).Trim(); + else header = rt.Text.Trim(); + rt.Dispose(); + + if (this.richTextBoxEx1.Text.StartsWith(header) ==false) { - if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes) + //if (FCOMMON.Util.MsgQ("등록된 작성 양식이 있습니다. 적용할까요?") == DialogResult.Yes) { - this.richTextBoxEx1.Rtf = dr.body + this.richTextBoxEx1.Rtf; + var oldtext = this.richTextBoxEx1.Text; + this.richTextBoxEx1.Rtf = dr.body; + if (this.richTextBoxEx1.Text.isEmpty() == false) + this.richTextBoxEx1.Text += "\r\n\r\n"+oldtext; + + //this.richTextBoxEx1.Text += oldtext; } }