diff --git a/ArinWarev1/MdiMain.vb b/ArinWarev1/MdiMain.vb index 43b1688..9d186e5 100644 --- a/ArinWarev1/MdiMain.vb +++ b/ArinWarev1/MdiMain.vb @@ -711,155 +711,7 @@ Public Class MdiMain Frm_Work.Label1.Text = "µ¥ÀÌÅ͸¦ È®ÀÎÇϰí ÀÖ½À´Ï´Ù" Frm_Work.Show() - If DSET1.tbl_buha.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_buha.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_bunbae.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_bunbae.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_kongjo.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_kongjo.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_kongkub.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_kongkub.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_myoun.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_myoun.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_nanbangkiki.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_nanbangkiki.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_nangbangkiki.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_nangbangkiki.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_nbunbae.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_nbunbae.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_new.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_new.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_profile.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_profile.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_weather.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_weather.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_zone.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_zone.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_yk.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_yk.Rows.Add(New String() {"0", "(¾øÀ½)"}) - If DSET1.tbl_Desc.Rows.Count < 1 Then - MsgBox("°Ç¹°°³¿äµ¥ÀÌÅͰ¡ ¾øÀ¸¹Ç·Î ÃʱâÀڷḦ »ý¼ºÇÕ´Ï´Ù", MsgBoxStyle.Critical, "È®ÀÎ") - Dim newdescdr As DS.tbl_DescRow = DSET1.tbl_Desc.NewRow - newdescdr.name = "¿À·ù" - newdescdr.buildarea = "010100" - DSET1.tbl_Desc.Addtbl_DescRow(newdescdr) - DSET1.tbl_Desc.AcceptChanges() - Else - If isNew Then '//½Å±ÔÀÛ¼ºÆÄÀÏÀÌ ¤¤°æ¿ì - Dim drDesc1 As DS.tbl_DescRow = DSET1.tbl_Desc.Rows(0) - drDesc1.buildarea = "010100" '//¼­¿ï·Î ÁöÁ¤ - drDesc1.EndEdit() - End If - - End If - - - '//°Ç¹°¿ëµµ±âº»°ª - Dim ¿ëµµ As String = DSET1.tbl_Desc.Rows(0)("isjugo").ToString - If IsNumeric(¿ëµµ) = False Then - pLog.Add(String.Format("°Ç¹°°³¿äÀÇ ¿ëµµ°ªÀÌ ¼ýÀÚ°¡¾Æ´Ï¹Ç·Î 1·Î ¼³Á¤ÇÕ´Ï´Ù")) - DSET1.tbl_Desc.Rows(0)("isjugo") = "1" - End If - - '//±×·ì¸íÀ̾ø´Â°æ¿ì ó¸®ÇÔ(130810:arin) - For Each dr As DS.tbl_zoneRow In DSET1.tbl_zone.Select("isnull(±×·ì,'')=''") - pLog.Add(String.Format("±×·ì¸íÀ̾ø´Â °æ¿ìÀ̹ǷΠ'±âº»'À¸·Î ¼³Á¤ÇÕ´Ï´Ù Zone Code={0}", dr.code)) - dr.±×·ì = "±âº»" - Next - - '//¿ùº°¿¡³ÊÁö»ç¿ë·®µ¥ÀÌÅÍ¿µ¿ª»ý¼º(130819:arin) - If DSET1.tbl_monuse.Rows.Count = 0 Then - For y As Integer = 1 To 3 - Dim idx As String = y.ToString("0000") - For i As Integer = 1 To 12 - DSET1.tbl_monuse.Rows.Add(New String() {y.ToString() + "Â÷³âµµ", i.ToString("00"), "0", "0", "0", idx}) '//³â,¿ù,µµ½Ã°¡½º,Àü·Â,Áö¿ª³­¹æ,ÄÚµå - Next - Next - End If - - '//140808 µ¥ÀÌÅÍ ±âº»°ª ó¸® - '//ÀÔ·ÂÁ¸ - If Not DSET1 Is Nothing Then - For i As Integer = 1 To DSET1.tbl_zone.Rows.Count - - '//¼ø½ÇüÀû Àç°è»ê 150111 - '¼ø½ÇüÀûNTb.Text = TOST(TOSG(¸éÀûNTb.Text) * TOSG(õÀå°íNTb.Text)) - Dim ¸éÀû As String = "" - Dim õÀå°í As String = "" - Dim ¼ø½ÇüÀû As String = "" - Try - ¸éÀû = DSET1.tbl_zone.Rows(i - 1)("¸éÀû").ToString - Catch ex As Exception - ¸éÀû = "" - End Try - Try - õÀå°í = DSET1.tbl_zone.Rows(i - 1)("õÀå°íp").ToString - Catch ex As Exception - õÀå°í = "" - End Try - Try - ¼ø½ÇüÀû = DSET1.tbl_zone.Rows(i - 1)("¼ø½ÇüÀû").ToString - Catch ex As Exception - ¼ø½ÇüÀû = "" - End Try - If IsNumeric(¸éÀû) AndAlso IsNumeric(õÀå°í) Then - If Not IsNumeric(¼ø½ÇüÀû) Then - ' MsgBox("¼ø½ÇüÀû°ªÀÌ ¾øÀ¸¹Ç·Î Àç°è»ê ÇÕ´Ï´Ù", MsgBoxStyle.Information, "È®ÀÎ") - DSET1.tbl_zone.Rows(i - 1)("¼ø½ÇüÀû") = CSng(¸éÀû) * CSng(õÀå°í) - End If - End If - If DSET1.tbl_zone.Rows(i - 1).RowState = DataRowState.Deleted OrElse _ - DSET1.tbl_zone.Rows(i - 1).RowState = DataRowState.Detached Then - Continue For - End If - Dim StrCode As String = DSET1.tbl_zone.Rows(i - 1)("code").ToString - If StrCode.Length = 4 Then - DSET1.tbl_zone.Rows(i - 1)("code") = "0" + StrCode - End If - Next - DSET1.tbl_zone.AcceptChanges() - End If - - If Not DSET2 Is Nothing Then - For i As Integer = 1 To DSET2.tbl_zone.Rows.Count - If DSET2.tbl_zone.Rows(i - 1).RowState = DataRowState.Deleted OrElse _ - DSET2.tbl_zone.Rows(i - 1).RowState = DataRowState.Detached Then - Continue For - End If - Dim StrCode As String = DSET2.tbl_zone.Rows(i - 1)("code").ToString - If StrCode.Length = 4 Then - DSET2.tbl_zone.Rows(i - 1)("code") = "0" + StrCode - End If - Next - DSET2.tbl_zone.AcceptChanges() - End If - - '//ÀԷ¸é - If Not DSET1 Is Nothing Then - For i As Integer = 1 To DSET1.tbl_myoun.Rows.Count - If DSET1.tbl_myoun.Rows(i - 1).RowState = DataRowState.Deleted OrElse _ - DSET1.tbl_myoun.Rows(i - 1).RowState = DataRowState.Detached Then - Continue For - End If - Dim StrCode As String = DSET1.tbl_myoun.Rows(i - 1)("code").ToString - If StrCode.Length = 4 Then - DSET1.tbl_myoun.Rows(i - 1)("code") = "0" + StrCode - End If - - Dim StrCode2 As String = DSET1.tbl_myoun.Rows(i - 1)("Á¸ºÐ·ù").ToString - If StrCode2.Length = 4 Then - DSET1.tbl_myoun.Rows(i - 1)("Á¸ºÐ·ù") = "0" + StrCode2 - End If - Next - DSET1.tbl_myoun.AcceptChanges() - End If - - If Not DSET2 Is Nothing Then - For i As Integer = 1 To DSET2.tbl_myoun.Rows.Count - If DSET2.tbl_myoun.Rows(i - 1).RowState = DataRowState.Deleted OrElse _ - DSET2.tbl_myoun.Rows(i - 1).RowState = DataRowState.Detached Then - Continue For - End If - Dim StrCode As String = DSET2.tbl_myoun.Rows(i - 1)("code").ToString - If StrCode.Length = 4 Then - DSET2.tbl_myoun.Rows(i - 1)("code") = "0" + StrCode - End If - - Dim StrCode2 As String = DSET2.tbl_myoun.Rows(i - 1)("Á¸ºÐ·ù").ToString - If StrCode2.Length = 4 Then - DSET2.tbl_myoun.Rows(i - 1)("Á¸ºÐ·ù") = "0" + StrCode2 - End If - - Next - DSET2.tbl_myoun.AcceptChanges() - End If + FixData(isNew) '//221218 chi import ±â´É°ú °øÀ¯Çϱâ À§ÇØ µ¥ÀÌÅÍ º¸Á¤±â´ÉÀ» ºÐ¸® Frm_Work.Close() @@ -999,10 +851,6 @@ Public Class MdiMain End If - - - - Read_WeatherFile() Menu_°Ç¹°°³¿ä() @@ -1077,6 +925,160 @@ Public Class MdiMain End Sub + Sub FixData(isNew As Boolean) + + If DSET1.tbl_buha.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_buha.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_bunbae.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_bunbae.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_kongjo.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_kongjo.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_kongkub.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_kongkub.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_myoun.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_myoun.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_nanbangkiki.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_nanbangkiki.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_nangbangkiki.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_nangbangkiki.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_nbunbae.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_nbunbae.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_new.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_new.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_profile.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_profile.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_weather.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_weather.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_zone.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_zone.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_yk.Select("code='0'").GetUpperBound(0) = -1 Then DSET1.tbl_yk.Rows.Add(New String() {"0", "(¾øÀ½)"}) + If DSET1.tbl_Desc.Rows.Count < 1 Then + MsgBox("°Ç¹°°³¿äµ¥ÀÌÅͰ¡ ¾øÀ¸¹Ç·Î ÃʱâÀڷḦ »ý¼ºÇÕ´Ï´Ù", MsgBoxStyle.Critical, "È®ÀÎ") + Dim newdescdr As DS.tbl_DescRow = DSET1.tbl_Desc.NewRow + newdescdr.name = "¿À·ù" + newdescdr.buildarea = "010100" + DSET1.tbl_Desc.Addtbl_DescRow(newdescdr) + DSET1.tbl_Desc.AcceptChanges() + Else + If isNew Then '//½Å±ÔÀÛ¼ºÆÄÀÏÀÌ ¤¤°æ¿ì + Dim drDesc1 As DS.tbl_DescRow = DSET1.tbl_Desc.Rows(0) + drDesc1.buildarea = "010100" '//¼­¿ï·Î ÁöÁ¤ + drDesc1.EndEdit() + End If + + End If + + + '//°Ç¹°¿ëµµ±âº»°ª + Dim ¿ëµµ As String = DSET1.tbl_Desc.Rows(0)("isjugo").ToString + If IsNumeric(¿ëµµ) = False Then + pLog.Add(String.Format("°Ç¹°°³¿äÀÇ ¿ëµµ°ªÀÌ ¼ýÀÚ°¡¾Æ´Ï¹Ç·Î 1·Î ¼³Á¤ÇÕ´Ï´Ù")) + DSET1.tbl_Desc.Rows(0)("isjugo") = "1" + End If + + '//±×·ì¸íÀ̾ø´Â°æ¿ì ó¸®ÇÔ(130810:arin) + For Each dr As DS.tbl_zoneRow In DSET1.tbl_zone.Select("isnull(±×·ì,'')=''") + pLog.Add(String.Format("±×·ì¸íÀ̾ø´Â °æ¿ìÀ̹ǷΠ'±âº»'À¸·Î ¼³Á¤ÇÕ´Ï´Ù Zone Code={0}", dr.code)) + dr.±×·ì = "±âº»" + Next + + '//¿ùº°¿¡³ÊÁö»ç¿ë·®µ¥ÀÌÅÍ¿µ¿ª»ý¼º(130819:arin) + If DSET1.tbl_monuse.Rows.Count = 0 Then + For y As Integer = 1 To 3 + Dim idx As String = y.ToString("0000") + For i As Integer = 1 To 12 + DSET1.tbl_monuse.Rows.Add(New String() {y.ToString() + "Â÷³âµµ", i.ToString("00"), "0", "0", "0", idx}) '//³â,¿ù,µµ½Ã°¡½º,Àü·Â,Áö¿ª³­¹æ,ÄÚµå + Next + Next + End If + + '//140808 µ¥ÀÌÅÍ ±âº»°ª ó¸® + '//ÀÔ·ÂÁ¸ + If Not DSET1 Is Nothing Then + For i As Integer = 1 To DSET1.tbl_zone.Rows.Count + + '//¼ø½ÇüÀû Àç°è»ê 150111 + '¼ø½ÇüÀûNTb.Text = TOST(TOSG(¸éÀûNTb.Text) * TOSG(õÀå°íNTb.Text)) + Dim ¸éÀû As String = "" + Dim õÀå°í As String = "" + Dim ¼ø½ÇüÀû As String = "" + Try + ¸éÀû = DSET1.tbl_zone.Rows(i - 1)("¸éÀû").ToString + Catch ex As Exception + ¸éÀû = "" + End Try + Try + õÀå°í = DSET1.tbl_zone.Rows(i - 1)("õÀå°íp").ToString + Catch ex As Exception + õÀå°í = "" + End Try + Try + ¼ø½ÇüÀû = DSET1.tbl_zone.Rows(i - 1)("¼ø½ÇüÀû").ToString + Catch ex As Exception + ¼ø½ÇüÀû = "" + End Try + If IsNumeric(¸éÀû) AndAlso IsNumeric(õÀå°í) Then + If Not IsNumeric(¼ø½ÇüÀû) Then + ' MsgBox("¼ø½ÇüÀû°ªÀÌ ¾øÀ¸¹Ç·Î Àç°è»ê ÇÕ´Ï´Ù", MsgBoxStyle.Information, "È®ÀÎ") + DSET1.tbl_zone.Rows(i - 1)("¼ø½ÇüÀû") = CSng(¸éÀû) * CSng(õÀå°í) + End If + End If + If DSET1.tbl_zone.Rows(i - 1).RowState = DataRowState.Deleted OrElse _ + DSET1.tbl_zone.Rows(i - 1).RowState = DataRowState.Detached Then + Continue For + End If + Dim StrCode As String = DSET1.tbl_zone.Rows(i - 1)("code").ToString + If StrCode.Length = 4 Then + DSET1.tbl_zone.Rows(i - 1)("code") = "0" + StrCode + End If + Next + DSET1.tbl_zone.AcceptChanges() + End If + + If Not DSET2 Is Nothing Then + For i As Integer = 1 To DSET2.tbl_zone.Rows.Count + If DSET2.tbl_zone.Rows(i - 1).RowState = DataRowState.Deleted OrElse _ + DSET2.tbl_zone.Rows(i - 1).RowState = DataRowState.Detached Then + Continue For + End If + Dim StrCode As String = DSET2.tbl_zone.Rows(i - 1)("code").ToString + If StrCode.Length = 4 Then + DSET2.tbl_zone.Rows(i - 1)("code") = "0" + StrCode + End If + Next + DSET2.tbl_zone.AcceptChanges() + End If + + '//ÀԷ¸é + If Not DSET1 Is Nothing Then + For i As Integer = 1 To DSET1.tbl_myoun.Rows.Count + If DSET1.tbl_myoun.Rows(i - 1).RowState = DataRowState.Deleted OrElse _ + DSET1.tbl_myoun.Rows(i - 1).RowState = DataRowState.Detached Then + Continue For + End If + Dim StrCode As String = DSET1.tbl_myoun.Rows(i - 1)("code").ToString + If StrCode.Length = 4 Then + DSET1.tbl_myoun.Rows(i - 1)("code") = "0" + StrCode + End If + + Dim StrCode2 As String = DSET1.tbl_myoun.Rows(i - 1)("Á¸ºÐ·ù").ToString + If StrCode2.Length = 4 Then + DSET1.tbl_myoun.Rows(i - 1)("Á¸ºÐ·ù") = "0" + StrCode2 + End If + Next + DSET1.tbl_myoun.AcceptChanges() + End If + + If Not DSET2 Is Nothing Then + For i As Integer = 1 To DSET2.tbl_myoun.Rows.Count + If DSET2.tbl_myoun.Rows(i - 1).RowState = DataRowState.Deleted OrElse _ + DSET2.tbl_myoun.Rows(i - 1).RowState = DataRowState.Detached Then + Continue For + End If + Dim StrCode As String = DSET2.tbl_myoun.Rows(i - 1)("code").ToString + If StrCode.Length = 4 Then + DSET2.tbl_myoun.Rows(i - 1)("code") = "0" + StrCode + End If + + Dim StrCode2 As String = DSET2.tbl_myoun.Rows(i - 1)("Á¸ºÐ·ù").ToString + If StrCode2.Length = 4 Then + DSET2.tbl_myoun.Rows(i - 1)("Á¸ºÐ·ù") = "0" + StrCode2 + End If + + Next + DSET2.tbl_myoun.AcceptChanges() + End If + + End Sub + Public Sub Open_File_Only_weather(ByVal FileName As String, Optional ByVal SyncServer As Boolean = False, Optional checkVersion As Boolean = True, Optional silent As Boolean = False, Optional isNew As Boolean = False) @@ -2484,6 +2486,10 @@ ENDSTAT: '// End Sub Private Sub ¿­±âToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles btOpen.Click + OpenFile() + End Sub + + Sub OpenFile() If Prj.LoginTime = "" Then MsgBox("¸ÕÀú ·Î±×ÀÎÀ» Çϼ¼¿ä", MsgBoxStyle.Information, "È®ÀÎ") Frm_Intro.Activate() @@ -2800,7 +2806,7 @@ ENDSTAT: '// End Sub Private Sub ToolStripButton2_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton2.Click - btOpen.PerformClick() + OpenFile() End Sub @@ -3392,6 +3398,12 @@ ENDSTAT: '// Pub.DSET1.AcceptChanges() Dim xr As XmlReadMode = Pub.DSET1.ReadXml(od.FileName) Pub.DSET1.AcceptChanges() + + FixData(False) '//µ¥ÀÌÅͺ¸Á¤ + Calc.validation() '//nullº¸Á¤ + Menu_°Ç¹°°³¿ä() + Me.RefreshMenuList("") + Catch ex As Exception MsgboxE("¿ÜºÎÆÄÀÏ °¡Á®¿À±â ½ÇÆÐ\n" + ex.Message) End Try