• R/O
  • SSH
  • HTTPS

mlapplication: Commit


Commit MetaInfo

Revision82 (tree)
Time2018-07-18 19:34:36
Authoryukio_miura

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/ML.DBAccess/DataBase/01.SQL/03 TransactSQL/D180_CMP.sql (revision 81)
+++ trunk/ML.DBAccess/DataBase/01.SQL/03 TransactSQL/D180_CMP.sql (revision 82)
@@ -28,9 +28,9 @@
2828 DECLARE D180_CUR CURSOR LOCAL READ_ONLY FOR
2929 SELECT D180.D180_M150CD1,D180.D180_SURY1,Z130.Z130_SURY51-Z130.Z130_SURY42 SU
3030 FROM D180_F D180
31- INNER JOIN Z130_F Z130
32- ON D180.D180_M150CD1 = Z130.Z130_M150CD1
33- AND D180.D180_DATE1 = Z130.Z130_DATE1
31+ LEFT JOIN Z130_F Z130
32+ ON D180.D180_M150CD1 = Z130.Z130_M150CD1
33+ AND D180.D180_DATE1 = Z130.Z130_DATE1
3434 WHERE D180.D180_DATE1 = @DT
3535 OPEN D180_CUR
3636 FETCH NEXT FROM D180_CUR INTO @D180M150CD1,@D180SURY1,@SU1
--- trunk/MLApp.TRN5000/TRN5710.vb (revision 81)
+++ trunk/MLApp.TRN5000/TRN5710.vb (revision 82)
@@ -34,24 +34,6 @@
3434 '' DB-Open
3535 db.Open()
3636
37- '' D180_DATE1の最大値を画面上に表示する
38- sSQL = "SELECT MAX(D180_DATE1) D180_DT1_MAX"
39- sSQL &= " FROM " & MLApp.Const.MLAppConst.TableName.D180_F
40- sSQL &= " WHERE 1=1"
41- rD180 = db.OpenRecordset(sSQL)
42- If Not rD180.EOF Then
43-
44- If Not rD180.Fields("D180_DT1_MAX").Value Is DBNull.Value Then
45-
46- Dim sMaxInventoriesDate As String = String.Format(ML.Common.Const.Fmt.fmtDateYYYY_MM_DD, CDate(rD180.Fields("D180_DT1_MAX").Value))
47- Me.cmbInventoriesDate.Text = sMaxInventoriesDate
48- Me.txtLastInventoriesDate.Text = sMaxInventoriesDate
49-
50- End If
51-
52- End If
53- rD180.Close()
54-
5537 '' 棚卸日付の値リスト設定
5638 sSQL = "SELECT "
5739 sSQL &= " ROW_NUMBER() OVER (ORDER BY D180_DATE1) ROW_NUM"
@@ -59,7 +41,7 @@
5941 sSQL &= " FROM ("
6042 sSQL &= "SELECT "
6143 sSQL &= " D180_DATE1"
62- sSQL &= " FROM " & MLApp.Const.MLAppConst.TableName.D180_F
44+ sSQL &= " FROM " & MLApp.TRNLib.TRNConst.TableName.D.D180_F
6345 sSQL &= " GROUP BY D180_DATE1 "
6446 sSQL &= ") MAIN"
6547 sSQL &= " ORDER BY D180_DATE1"
@@ -71,6 +53,24 @@
7153 End If
7254 rD180.Close()
7355
56+ '' D180_DATE1の最大値を画面上に表示する
57+ sSQL = "SELECT MAX(D180_DATE1) D180_DT1_MAX"
58+ sSQL &= " FROM " & MLApp.TRNLib.TRNConst.TableName.D.D180_F
59+ sSQL &= " WHERE 1=1"
60+ rD180 = db.OpenRecordset(sSQL)
61+ If Not rD180.EOF Then
62+
63+ If Not rD180.Fields("D180_DT1_MAX").Value Is DBNull.Value Then
64+
65+ Dim sMaxInventoriesDate As String = String.Format(ML.Common.Const.Fmt.fmtDateYYYY_MM_DD, CDate(rD180.Fields("D180_DT1_MAX").Value))
66+ Me.cmbInventoriesDate.Text = sMaxInventoriesDate
67+ Me.txtLastInventoriesDate.Text = sMaxInventoriesDate
68+
69+ End If
70+
71+ End If
72+ rD180.Close()
73+
7474 '' DB-Close
7575 db.Close()
7676
@@ -104,7 +104,7 @@
104104 ''' <summary>実行ボタンクリック時イベント</summary>
105105 Protected Overrides Sub cmdF1_Click(sender As Object, e As System.EventArgs)
106106 Try
107- '' 実行チェック
107+ '' 実行前チェック
108108 If Me.CheckBeforeProc = False Then
109109 Exit Sub
110110 End If
--- trunk/MLApp.TRN9000/TRN9120.vb (revision 81)
+++ trunk/MLApp.TRN9000/TRN9120.vb (revision 82)
@@ -489,7 +489,7 @@
489489 '' カレンダー設定
490490 Me.cmbCalNo.SetValueList( _
491491 (New MLApp.DataModel.M9_TRNDataSet.M921_FDataTable).GetData(
492- MLApp.Const.MLAppConst.TableName.GetKubnMTblWhereSQL(
492+ MLApp.TRNLib.TRNConst.KubnMaster.GetKubnMTblWhereSQL(
493493 MLApp.Const.KubunMGCode.CalSetting.GroupCode)))
494494
495495 '' 稼働区分
@@ -499,7 +499,7 @@
499499
500500 CType(cTarget, ML.Controls.uc6ComboBox).SetValueList( _
501501 (New MLApp.DataModel.M9_TRNDataSet.M921_FDataTable).GetData(
502- MLApp.Const.MLAppConst.TableName.GetKubnMTblWhereSQL(
502+ MLApp.TRNLib.TRNConst.KubnMaster.GetKubnMTblWhereSQL(
503503 MLApp.Const.KubunMGCode.WorkKubn.GroupCode)))
504504
505505 End If
@@ -711,7 +711,7 @@
711711 db.BeginTrans()
712712
713713 '' C150-更新
714- sSQL = "SELECT * FROM " & MLApp.Const.MLAppConst.TableName.C150_F
714+ sSQL = "SELECT * FROM " & MLApp.TRNLib.TRNConst.TableName.C.C150_F
715715 sSQL &= " WHERE C150_CALNO=" & Me.cmbCalNo.SelectedValue.ToString.ToTextStr
716716 sSQL &= " AND C150_YYMM1=" & CDate(Me.dtcYYMM1.Value).GetFirstDay.ToString.ToTextStr
717717 rC150 = db.OpenRecordset(sSQL)
@@ -832,7 +832,7 @@
832832 sWHR = "M921_CODE1<>" & Me.cmbCalNo.SelectedValue.ToString.ToTextStr
833833 Me.cmbCalNoDest.SetValueList(
834834 (New MLApp.DataModel.M9_TRNDataSet.M921_FDataTable).GetData(
835- MLApp.Const.MLAppConst.TableName.GetKubnMTblWhereSQL(
835+ MLApp.TRNLib.TRNConst.KubnMaster.GetKubnMTblWhereSQL(
836836 MLApp.Const.KubunMGCode.CalSetting.GroupCode, , , , sWHR)))
837837
838838 End If
@@ -839,7 +839,7 @@
839839
840840 Me.cmbCalNoDest.SetValueList(
841841 (New MLApp.DataModel.M9_TRNDataSet.M921_FDataTable).GetData(
842- MLApp.Const.MLAppConst.TableName.GetKubnMTblWhereSQL(
842+ MLApp.TRNLib.TRNConst.KubnMaster.GetKubnMTblWhereSQL(
843843 MLApp.Const.KubunMGCode.CalSetting.GroupCode, , , , sWHR)))
844844
845845 End Sub
--- trunk/MLApp.TRN9600/TRN9630.vb (revision 81)
+++ trunk/MLApp.TRN9600/TRN9630.vb (revision 82)
@@ -83,11 +83,19 @@
8383
8484 '' 在庫再集計
8585 If Me.ExecProc = False Then
86- Exit Sub
86+ '' 異常通知
87+ Me.Messenger.ErrorOKOnly.Show( _
88+ ML.Common.Message.Resource.E.MSG_E_0006, _
89+ "処理失敗", _
90+ "在庫再集計処理")
91+ Else
92+ '' 完了通知
93+ Me.Messenger.InfoOKOnly.Show( _
94+ ML.Common.Message.Resource.I.MSG_I_0001, _
95+ "処理完了", _
96+ "在庫再集計処理")
8797 End If
8898
89- '' 完了通知
90-
9199 End Sub
92100
93101 ''' <summary>在庫再集計</summary>
--- trunk/MLApp.TRN0000/TRN0020.vb (revision 81)
+++ trunk/MLApp.TRN0000/TRN0020.vb (revision 82)
@@ -165,7 +165,7 @@
165165
166166 '' メニュー数の最大値を超えたらループを抜ける
167167 If dr.M910_ORDER1 > _
168- MLApp.Const.MLAppConst.SystemInfo.MAX_SYSTEM_GROUP_COUNT Then
168+ MLApp.TRNLib.TRNConst.SystemInfo.MAX_SYSTEM_GROUP_COUNT Then
169169 Exit For
170170 End If
171171
--- trunk/MLApp.Base/TRNBaseForm.vb (revision 81)
+++ trunk/MLApp.Base/TRNBaseForm.vb (revision 82)
@@ -344,7 +344,7 @@
344344
345345 Try
346346 '' コードゼロサプレス設定を取得する
347- Dim sWHR = MLApp.Const.MLAppConst.TableName.GetKubnMTblWhereSQL( _
347+ Dim sWHR = MLApp.TRNLib.TRNConst.KubnMaster.GetKubnMTblWhereSQL( _
348348 KubunMGCode.CodeZeroSup.GroupCode, _
349349 sMasterKey)
350350 Dim sCodeFormat As String = Me.m_dtM9.DLookUp("M921_KBVAL2", sWHR)
--- trunk/MLApp.Base/TRNBaseMenuForm.vb (revision 81)
+++ trunk/MLApp.Base/TRNBaseMenuForm.vb (revision 82)
@@ -163,7 +163,7 @@
163163
164164 '' メニュー数の最大値を超えたらループを抜ける
165165 If dr.M911_ORDER1 > _
166- MLApp.Const.MLAppConst.SystemInfo.MAX_SYSTEM_GROUP_COUNT Then
166+ MLApp.TRNLib.TRNConst.SystemInfo.MAX_SYSTEM_GROUP_COUNT Then
167167 Exit For
168168 End If
169169
--- trunk/ML.Common.Message/My Project/MsgResource_Q.Designer.vb (revision 81)
+++ trunk/ML.Common.Message/My Project/MsgResource_Q.Designer.vb (revision 82)
@@ -1,7 +1,7 @@
11 '------------------------------------------------------------------------------
22 ' <auto-generated>
33 ' このコードはツールによって生成されました。
4-' ランタイム バージョン:4.0.30319.34209
4+' ランタイム バージョン:4.0.30319.42000
55 '
66 ' このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
77 ' コードが再生成されるときに損失したりします。
@@ -99,5 +99,23 @@
9999 Return ResourceManager.GetString("MSG_Q_0004", resourceCulture)
100100 End Get
101101 End Property
102+
103+ '''<summary>
104+ ''' {0}ではありません。続行しますか? に類似しているローカライズされた文字列を検索します。
105+ '''</summary>
106+ Public Shared ReadOnly Property MSG_Q_0005() As String
107+ Get
108+ Return ResourceManager.GetString("MSG_Q_0005", resourceCulture)
109+ End Get
110+ End Property
111+
112+ '''<summary>
113+ ''' {0}です。続行しますか? に類似しているローカライズされた文字列を検索します。
114+ '''</summary>
115+ Public Shared ReadOnly Property MSG_Q_0006() As String
116+ Get
117+ Return ResourceManager.GetString("MSG_Q_0006", resourceCulture)
118+ End Get
119+ End Property
102120 End Class
103121 End Namespace
--- trunk/MLApp.TRN8000/TRN8210.vb (revision 81)
+++ trunk/MLApp.TRN8000/TRN8210.vb (revision 82)
@@ -595,7 +595,7 @@
595595 Dim iMaxOrderNo As Integer = ML.Common.Function.df6.NVL(Me.M1_TRNDataSet.M130_F.DMax("M130_ORDER1")) + 1
596596
597597 '' M130-更新
598- sSQL = "SELECT * FROM " & MLApp.Const.MLAppConst.TableName.M130_F
598+ sSQL = "SELECT * FROM " & MLApp.TRNLib.TRNConst.TableName.M.M130_F
599599 sSQL &= " WHERE M130_CODE1=" & Me.txtM130_CODE1.Text.ToTextStr
600600 rM130 = db.OpenRecordset(sSQL)
601601 If rM130.EOF Then
@@ -754,7 +754,7 @@
754754 db.BeginTrans()
755755
756756 '' M130_F - 削除フラグ
757- sSQL = "UPDATE " & MLApp.Const.MLAppConst.TableName.M130_F
757+ sSQL = "UPDATE " & MLApp.TRNLib.TRNConst.TableName.M.M130_F
758758 sSQL &= " SET M130_KUBN91=1"
759759 sSQL &= " ,M130_UPD1=" & Me.m_LInfo.GetUpdInfo.ToTextStr
760760 sSQL &= " WHERE M130_CODE1=" & Me.txtM130_CODE1.Text.ToTextStr
--- trunk/MLApp.TRN8000/TRN8220.vb (revision 81)
+++ trunk/MLApp.TRN8000/TRN8220.vb (revision 82)
@@ -559,7 +559,7 @@
559559 Dim iMaxOrderNo As Integer = ML.Common.Function.df6.NVL(Me.M1_TRNDataSet.M140_F.DMax("M140_ORDER1")) + 1
560560
561561 '' M140-更新
562- sSQL = "SELECT * FROM " & MLApp.Const.MLAppConst.TableName.M140_F
562+ sSQL = "SELECT * FROM " & MLApp.TRNLib.TRNConst.TableName.M.M140_F
563563 sSQL &= " WHERE M140_CODE1=" & Me.txtM140_CODE1.Text.ToTextStr
564564 rM140 = db.OpenRecordset(sSQL)
565565 If rM140.EOF Then
@@ -695,7 +695,7 @@
695695 db.BeginTrans()
696696
697697 '' M140_F - 削除フラグ
698- sSQL = "UPDATE " & MLApp.Const.MLAppConst.TableName.M140_F
698+ sSQL = "UPDATE " & MLApp.TRNLib.TRNConst.TableName.M.M140_F
699699 sSQL &= " SET M140_KUBN91=1"
700700 sSQL &= " ,M140_UPD1=" & Me.m_LInfo.GetUpdInfo.ToTextStr
701701 sSQL &= " WHERE M140_CODE1=" & Me.txtM140_CODE1.Text.ToTextStr
--- trunk/MLApp.TRN8000/TRN8110.vb (revision 81)
+++ trunk/MLApp.TRN8000/TRN8110.vb (revision 82)
@@ -639,7 +639,7 @@
639639 Dim iMaxOrderNo As Integer = ML.Common.Function.df6.NVL(Me.M1_TRNDataSet.M120_F.DMax("M120_ORDER1")) + 1
640640
641641 '' M120-更新
642- sSQL = "SELECT * FROM " & MLApp.Const.MLAppConst.TableName.M120_F
642+ sSQL = "SELECT * FROM " & MLApp.TRNLib.TRNConst.TableName.M.M120_F
643643 sSQL &= " WHERE M120_CODE1=" & Me.txtM120_CODE1.Text.ToTextStr
644644 rM120 = db.OpenRecordset(sSQL)
645645 If rM120.EOF Then
@@ -773,7 +773,7 @@
773773 db.BeginTrans()
774774
775775 '' M120_F - 削除フラグ
776- sSQL = "UPDATE " & MLApp.Const.MLAppConst.TableName.M120_F
776+ sSQL = "UPDATE " & MLApp.TRNLib.TRNConst.TableName.M.M120_F
777777 sSQL &= " SET M120_KUBN12=1"
778778 sSQL &= " ,M120_UPD1=" & Me.m_LInfo.GetUpdInfo.ToTextStr
779779 sSQL &= " WHERE M120_CODE1=" & Me.txtM120_CODE1.Text.ToTextStr
--- trunk/MLApp.TRN8000/TRN8910.vb (revision 81)
+++ trunk/MLApp.TRN8000/TRN8910.vb (revision 82)
@@ -554,7 +554,7 @@
554554 Dim iMaxOrderNo As Integer = ML.Common.Function.df6.NVL(Me.M9_TRNDataSet.M920_F.DMax("M920_ORDER1")) + 1
555555
556556 '' M920-更新
557- sSQL = "SELECT * FROM " & MLApp.Const.MLAppConst.TableName.M920_F
557+ sSQL = "SELECT * FROM " & MLApp.TRNLib.TRNConst.TableName.M.M920_F
558558 sSQL &= " WHERE M920_CODE1=" & Me.txtM920_CODE1.Text.ToTextStr
559559 rM920 = db.OpenRecordset(sSQL)
560560 If rM920.EOF Then
@@ -676,7 +676,7 @@
676676 db.BeginTrans()
677677
678678 '' M920_F - 削除
679- sSQL = "DELETE FROM " & MLApp.Const.MLAppConst.TableName.M920_F
679+ sSQL = "DELETE FROM " & MLApp.TRNLib.TRNConst.TableName.M.M920_F
680680 sSQL &= " WHERE M920_CODE1=" & Me.txtM920_CODE1.Text.ToTextStr
681681 db.Execute(sSQL)
682682
--- trunk/MLApp.TRN8000/TRN8920.vb (revision 81)
+++ trunk/MLApp.TRN8000/TRN8920.vb (revision 82)
@@ -523,7 +523,7 @@
523523 Me.dgvTRN8920S1.RowPosition, "M920_CODE1").ToString
524524
525525 '' M921-削除
526- sSQL = "DELETE FROM " & MLApp.Const.MLAppConst.TableName.M921_F
526+ sSQL = "DELETE FROM " & MLApp.TRNLib.TRNConst.TableName.M.M921_F
527527 sSQL &= " WHERE M921_M920CD1=" & sSelM920CD1.ToTextStr
528528 db.Execute(sSQL)
529529
@@ -531,7 +531,7 @@
531531 For Each dgvRow As DataGridViewRow In Me.dgvTRN8920S2.Rows
532532
533533 '' M921-追加
534- sSQL = "SELECT * FROM " & MLApp.Const.MLAppConst.TableName.M921_F
534+ sSQL = "SELECT * FROM " & MLApp.TRNLib.TRNConst.TableName.M.M921_F
535535 sSQL &= " WHERE M921_M920CD1=" & dgvRow.Cells("M921_M920CD1").Value
536536 sSQL &= " AND M921_SEQ=" & dgvRow.Cells("M921_SEQ").Value
537537 rM921 = db.OpenRecordset(sSQL)
--- trunk/MLApp.Const/MLAppConst.vb (revision 81)
+++ trunk/MLApp.Const/MLAppConst.vb (revision 82)
@@ -10,146 +10,147 @@
1010 ''' |更新者 |日付 |連番 |変更内容 |
1111 ''' +------------+-----------+-----+-------------------------------------------+
1212 ''' y.miura 2015.05.17 001 新規作成
13+''' y.miura 2018.07.18 002 MLApp.TRNLib.TRNConstクラスに統合した為、廃止
1314 ''' </history>
1415 Public Class MLAppConst
1516
16- ''' <summary>システム情報定数</summary>
17- Public Class SystemInfo
17+ '' ''' <summary>システム情報定数</summary>
18+ ''Public Class SystemInfo
1819
19- ''' <summary>設定可能なシステムグループの最大数</summary>
20- Public Const MAX_SYSTEM_GROUP_COUNT As Integer = 14
20+ '' ''' <summary>設定可能なシステムグループの最大数</summary>
21+ '' Public Const MAX_SYSTEM_GROUP_COUNT As Integer = 14
2122
22- End Class
23+ ''End Class
2324
24- ''' <summary>テーブル名定数</summary>
25- Public Class TableName
25+ '' ''' <summary>テーブル名定数</summary>
26+ ''Public Class TableName
2627
27- '''<Summary>棚卸明細(D180_F)</Summary>
28- Public Const D180_F As String = "D180_F"
28+ '' '' '''<Summary>棚卸明細(D180_F)</Summary>
29+ '' ''Public Const D180_F As String = "D180_F"
2930
30- '''<Summary>見積件名(D710_F)</Summary>
31- Public Const D710_F As String = "D710_F"
31+ '' '' '''<Summary>見積件名(D710_F)</Summary>
32+ '' ''Public Const D710_F As String = "D710_F"
3233
33- '''<Summary>見積項目(D711_F)</Summary>
34- Public Const D711_F As String = "D711_F"
34+ '' '' '''<Summary>見積項目(D711_F)</Summary>
35+ '' ''Public Const D711_F As String = "D711_F"
3536
36- '''<Summary>見積明細(D712_F)</Summary>
37- Public Const D712_F As String = "D712_F"
37+ '' '' '''<Summary>見積明細(D712_F)</Summary>
38+ '' ''Public Const D712_F As String = "D712_F"
3839
39- '''<Summary>見積付帯(D713_F)</Summary>
40- Public Const D713_F As String = "D713_F"
40+ '' '' '''<Summary>見積付帯(D713_F)</Summary>
41+ '' ''Public Const D713_F As String = "D713_F"
4142
42- '''<Summary>排他管理(DA10_F)</Summary>
43- Public Const DA10_F As String = "DA10_F"
43+ '' '' '''<Summary>排他管理(DA10_F)</Summary>
44+ '' ''Public Const DA10_F As String = "DA10_F"
4445
45- '''<Summary>グループマスタ(M110_F)</Summary>
46- Public Const M110_F As String = "M110_F"
46+ '' '' '''<Summary>グループマスタ(M110_F)</Summary>
47+ '' ''Public Const M110_F As String = "M110_F"
4748
48- '''<Summary>ユーザーマスタ(M120_F)</Summary>
49- Public Const M120_F As String = "M120_F"
49+ '' '' '''<Summary>ユーザーマスタ(M120_F)</Summary>
50+ '' ''Public Const M120_F As String = "M120_F"
5051
51- '''<Summary>得意先マスタ(M130_F)</Summary>
52- Public Const M130_F As String = "M130_F"
52+ '' '' '''<Summary>得意先マスタ(M130_F)</Summary>
53+ '' ''Public Const M130_F As String = "M130_F"
5354
54- '''<Summary>仕入先マスタ(M140_F)</Summary>
55- Public Const M140_F As String = "M140_F"
55+ '' '' '''<Summary>仕入先マスタ(M140_F)</Summary>
56+ '' ''Public Const M140_F As String = "M140_F"
5657
57- '''<Summary>サブシステムマスタ(M910_F)</Summary>
58- Public Const M910_F As String = "M910_F"
58+ '' '' '''<Summary>サブシステムマスタ(M910_F)</Summary>
59+ '' ''Public Const M910_F As String = "M910_F"
5960
60- '''<Summary>プログラムマスタ(M911_F)</Summary>
61- Public Const M911_F As String = "M911_F"
61+ '' '' '''<Summary>プログラムマスタ(M911_F)</Summary>
62+ '' ''Public Const M911_F As String = "M911_F"
6263
63- '''<Summary>権限マスタ(M912_F)</Summary>
64- Public Const M912_F As String = "M912_F"
64+ '' '' '''<Summary>権限マスタ(M912_F)</Summary>
65+ '' ''Public Const M912_F As String = "M912_F"
6566
66- '''<Summary>プログラム別権限マスタ(M913_F)</Summary>
67- Public Const M913_F As String = "M913_F"
67+ '' '' '''<Summary>プログラム別権限マスタ(M913_F)</Summary>
68+ '' ''Public Const M913_F As String = "M913_F"
6869
69- '''<Summary>区分グループマスタ(M920_F)</Summary>
70- Public Const M920_F As String = "M920_F"
70+ '' '' '''<Summary>区分グループマスタ(M920_F)</Summary>
71+ '' ''Public Const M920_F As String = "M920_F"
7172
72- '''<Summary>区分マスタ(M921_F)</Summary>
73- Public Const M921_F As String = "M921_F"
73+ '' '' '''<Summary>区分マスタ(M921_F)</Summary>
74+ '' ''Public Const M921_F As String = "M921_F"
7475
75- '''<Summary>区分カテゴリマスタ(M922_F)</Summary>
76- Public Const M922_F As String = "M922_F"
76+ '' '' '''<Summary>区分カテゴリマスタ(M922_F)</Summary>
77+ '' ''Public Const M922_F As String = "M922_F"
7778
78- '''<Summary>自社情報設定(C110_F)</Summary>
79- Public Const C110_F As String = "C110_F"
79+ '' '' '''<Summary>自社情報設定(C110_F)</Summary>
80+ '' ''Public Const C110_F As String = "C110_F"
8081
81- '''<Summary>税率設定(C111_F)</Summary>
82- Public Const C111_F As String = "C111_F"
82+ '' '' '''<Summary>税率設定(C111_F)</Summary>
83+ '' ''Public Const C111_F As String = "C111_F"
8384
84- '''<Summary>自社締日設定(C120_F)</Summary>
85- Public Const C120_F As String = "C120_F"
85+ '' '' '''<Summary>自社締日設定(C120_F)</Summary>
86+ '' ''Public Const C120_F As String = "C120_F"
8687
87- '''<Summary>請求先締日設定(C121_F)</Summary>
88- Public Const C121_F As String = "C121_F"
88+ '' '' '''<Summary>請求先締日設定(C121_F)</Summary>
89+ '' ''Public Const C121_F As String = "C121_F"
8990
90- '''<Summary>支払先締切日設定(C122_F)</Summary>
91- Public Const C122_F As String = "C122_F"
91+ '' '' '''<Summary>支払先締切日設定(C122_F)</Summary>
92+ '' ''Public Const C122_F As String = "C122_F"
9293
93- '''<Summary>管理締日設定(C123_F)</Summary>
94- Public Const C123_F As String = "C123_F"
94+ '' '' '''<Summary>管理締日設定(C123_F)</Summary>
95+ '' ''Public Const C123_F As String = "C123_F"
9596
96- '''<Summary>締切設定(C129_F)</Summary>
97- Public Const C129_F As String = "C129_F"
97+ '' '' '''<Summary>締切設定(C129_F)</Summary>
98+ '' ''Public Const C129_F As String = "C129_F"
9899
99- '''<Summary>伝票番号設定(C130_F)</Summary>
100- Public Const C130_F As String = "C130_F"
100+ '' '' '''<Summary>伝票番号設定(C130_F)</Summary>
101+ '' ''Public Const C130_F As String = "C130_F"
101102
102- '''<Summary>カレンダー設定(C130_F)</Summary>
103- Public Const C150_F As String = "C150_F"
103+ '' '' '''<Summary>カレンダー設定(C130_F)</Summary>
104+ '' ''Public Const C150_F As String = "C150_F"
104105
105- '''<Summary>区分マスタテーブルSQL取得</Summary>
106- '''<param name="sGrpCd">区分グループコード</param>
107- Public Shared Function GetKubnMTblSQL(sGrpCd As String) As String
108- Return "(SELECT * FROM " & M921_F & " WHERE " & GetKubnMTblWhereSQL(sGrpCd) & ")"
109- End Function
106+ '' '' '''<Summary>区分マスタテーブルSQL取得</Summary>
107+ '' '' '''<param name="sGrpCd">区分グループコード</param>
108+ '' ''Public Shared Function GetKubnMTblSQL(sGrpCd As String) As String
109+ '' '' Return "(SELECT * FROM M921_F WHERE " & GetKubnMTblWhereSQL(sGrpCd) & ")"
110+ '' ''End Function
110111
111- '''<Summary>区分マスタテーブルSQL取得(WHERE句のみ)</Summary>
112- '''<param name="sGrpCd">区分グループコード</param>
113- '''<param name="sKeyCd1">コード1</param>
114- '''<param name="sKeyCd2">コード2</param>
115- '''<param name="sKeyCd3">コード3</param>
116- '''<param name="sWhere">追加条件</param>
117- Public Shared Function GetKubnMTblWhereSQL(sGrpCd As String, _
118- Optional sKeyCd1 As String = "",
119- Optional sKeyCd2 As String = "",
120- Optional sKeyCd3 As String = "",
121- Optional sWhere As String = "") As String
122- Dim sRetWhere As String
123- sRetWhere = "M921_M920CD1 = " & sGrpCd.ToTextStr
124- If sKeyCd1 <> String.Empty Then
125- sRetWhere &= " AND M921_CODE1=" & sKeyCd1.ToTextStr
126- End If
127- If sKeyCd2 <> String.Empty Then
128- sRetWhere &= " AND M921_CODE2=" & sKeyCd2.ToTextStr
129- End If
130- If sKeyCd3 <> String.Empty Then
131- sRetWhere &= " AND M921_CODE3=" & sKeyCd3.ToTextStr
132- End If
133- If sWhere <> String.Empty Then
134- sRetWhere &= " AND " & sWhere
135- End If
136- Return sRetWhere
137- End Function
112+ '' '' '''<Summary>区分マスタテーブルSQL取得(WHERE句のみ)</Summary>
113+ '' '' '''<param name="sGrpCd">区分グループコード</param>
114+ '' '' '''<param name="sKeyCd1">コード1</param>
115+ '' '' '''<param name="sKeyCd2">コード2</param>
116+ '' '' '''<param name="sKeyCd3">コード3</param>
117+ '' '' '''<param name="sWhere">追加条件</param>
118+ '' ''Public Shared Function GetKubnMTblWhereSQL(sGrpCd As String, _
119+ '' '' Optional sKeyCd1 As String = "",
120+ '' '' Optional sKeyCd2 As String = "",
121+ '' '' Optional sKeyCd3 As String = "",
122+ '' '' Optional sWhere As String = "") As String
123+ '' '' Dim sRetWhere As String
124+ '' '' sRetWhere = "M921_M920CD1 = " & sGrpCd.ToTextStr
125+ '' '' If sKeyCd1 <> String.Empty Then
126+ '' '' sRetWhere &= " AND M921_CODE1=" & sKeyCd1.ToTextStr
127+ '' '' End If
128+ '' '' If sKeyCd2 <> String.Empty Then
129+ '' '' sRetWhere &= " AND M921_CODE2=" & sKeyCd2.ToTextStr
130+ '' '' End If
131+ '' '' If sKeyCd3 <> String.Empty Then
132+ '' '' sRetWhere &= " AND M921_CODE3=" & sKeyCd3.ToTextStr
133+ '' '' End If
134+ '' '' If sWhere <> String.Empty Then
135+ '' '' sRetWhere &= " AND " & sWhere
136+ '' '' End If
137+ '' '' Return sRetWhere
138+ '' ''End Function
138139
139- End Class
140+ ''End Class
140141
141- ''' <summary>画面モード列挙体</summary>
142- Public Enum enDispMode
142+ '' ''' <summary>画面モード列挙体</summary>
143+ ''Public Enum enDispMode
143144
144- ''' <summary>検索画面モード</summary>
145- SearchMode = 0
145+ '' ''' <summary>検索画面モード</summary>
146+ '' SearchMode = 0
146147
147- ''' <summary>通常画面モード</summary>
148- DefaultMode
148+ '' ''' <summary>通常画面モード</summary>
149+ '' DefaultMode
149150
150- ''' <summary>その他モード</summary>
151- OtherMode
151+ '' ''' <summary>その他モード</summary>
152+ '' OtherMode
152153
153- End Enum
154+ ''End Enum
154155
155156 End Class
--- trunk/MLApp.TRNLib/Class/ExlAppReportBase.vb (revision 81)
+++ trunk/MLApp.TRNLib/Class/ExlAppReportBase.vb (revision 82)
@@ -58,7 +58,7 @@
5858 Dim sWHR As String
5959
6060 '' 区分マスタからテンプレートファイル格納パスを取得する
61- sWHR = MLApp.Const.MLAppConst.TableName.GetKubnMTblWhereSQL( _
61+ sWHR = MLApp.TRNLib.TRNConst.KubnMaster.GetKubnMTblWhereSQL( _
6262 KubunMGCode.SystemConfig.GroupCode, _
6363 KubunMGCode.SystemConfig.MasterKeyCode005)
6464 sTempalateFilePath = Me.m_dtM9.DLookUp("M921_KBVAL2", sWHR)
@@ -79,7 +79,7 @@
7979 Dim sWHR As String
8080
8181 '' 区分マスタからテンプレートファイル格納パスを取得する
82- sWHR = MLApp.Const.MLAppConst.TableName.GetKubnMTblWhereSQL( _
82+ sWHR = MLApp.TRNLib.TRNConst.KubnMaster.GetKubnMTblWhereSQL( _
8383 KubunMGCode.SystemConfig.GroupCode, _
8484 KubunMGCode.SystemConfig.MasterKeyCode006)
8585 sOutputExcelFilePath = Me.m_dtM9.DLookUp("M921_KBVAL2", sWHR)
--- trunk/MLApp.TRNLib/Class/dba/Trigger.vb (revision 81)
+++ trunk/MLApp.TRNLib/Class/dba/Trigger.vb (revision 82)
@@ -231,7 +231,7 @@
231231 '' トリガー作成バッチファイルが格納されているディレクトリを取得する
232232 Dim sWHR As String
233233 Dim sBatTriggerFilePath As String
234- sWHR = MLApp.Const.MLAppConst.TableName.GetKubnMTblWhereSQL(
234+ sWHR = MLApp.TRNLib.TRNConst.KubnMaster.GetKubnMTblWhereSQL(
235235 MLApp.Const.KubunMGCode.SystemConfig.GroupCode,
236236 MLApp.Const.KubunMGCode.SystemConfig.MasterKeyCode007)
237237 Me.m_dtM9.GetData()
--- trunk/MLApp.TRNLib/Class/dba/ExecProc.vb (revision 81)
+++ trunk/MLApp.TRNLib/Class/dba/ExecProc.vb (revision 82)
@@ -1,5 +1,6 @@
11 
22 Imports ML.Common.Extensions.StringExtension
3+Imports ML.Common.Extensions.DateTimeExtension
34
45 ''' <summary>
56 ''' 【クラス名】ExecProcBase
@@ -22,6 +23,151 @@
2223
2324 End Class
2425
26+Namespace D180
27+
28+ ''' <summary>
29+ ''' D180 - 棚卸計算
30+ ''' </summary>
31+ Public Class ExecProc
32+ Inherits ExecProcBase
33+
34+ ''' <summary>棚卸日</summary>
35+ Private m_InventoriesDate As Date
36+
37+ ''' <summary>トランザクション開始フラグ</summary>
38+ Private m_bTranFlg As Boolean = False
39+
40+ ''' <summary>棚卸日</summary>
41+ Public WriteOnly Property InventoriesDate As Date
42+ Set(value As Date)
43+ Me.m_InventoriesDate = value
44+ End Set
45+ End Property
46+
47+ ''' <summary>コンストラクタ</summary>
48+ Public Sub New(_db As ML.DBAccess.Base.Db5)
49+
50+ Me.m_db = _db
51+
52+ Me.m_bTranFlg = True
53+
54+ End Sub
55+
56+ ''' <summary>コンストラクタ</summary>
57+ Public Sub New()
58+
59+ Me.m_bTranFlg = False
60+
61+ End Sub
62+
63+ ''' <summary>[D180_CMP_CMP]ストアドプロシージャ実行処理</summary>
64+ ''' <returns>処理結果</returns>
65+ Public Overrides Function Recmp() As Boolean
66+ Dim bRet As Boolean = False
67+
68+ Try
69+
70+ If Me.m_bTranFlg = False Then
71+
72+ '' DB-Open
73+ Me.m_db.Open()
74+
75+ '' トランザクションの開始
76+ Me.m_db.BeginTrans()
77+
78+ End If
79+
80+ '' D180_CMP_CMP実行
81+ Dim sParam As String = String.Format(ML.Common.Const.Fmt.fmtDateYYYY_MM_DD, Me.m_InventoriesDate).ToDateStr
82+ Dim sSQL As String = String.Format(TRNConst.ProcudureName.D180_CMP_CMP, Me.m_db.DataBaseName, Me.m_db.OwnerName) & sParam
83+ Me.m_db.Execute(sSQL)
84+
85+ If Me.m_bTranFlg = False Then
86+
87+ '' コミット
88+ Me.m_db.CommitTrans()
89+
90+ End If
91+
92+ '' 処理結果をセットする
93+ bRet = True
94+
95+ Catch ex As Exception
96+
97+ Throw ex
98+
99+ Finally
100+
101+ If Me.m_bTranFlg = False Then
102+
103+ '' DB-Close
104+ Me.m_db.Close()
105+
106+ End If
107+
108+ End Try
109+
110+ '' 戻り値を返す
111+ Return bRet
112+ End Function
113+
114+ ''' <summary>棚卸データ削除処理</summary>
115+ ''' <returns>処理結果</returns>
116+ Public Function DelData() As Boolean
117+ Dim bRet As Boolean = False
118+
119+ Try
120+
121+ If Me.m_bTranFlg = False Then
122+
123+ '' DB-Open
124+ Me.m_db.Open()
125+
126+ '' トランザクションの開始
127+ Me.m_db.BeginTrans()
128+
129+ End If
130+
131+ '' D180_F - 削除
132+ Dim sSQL As String = String.Empty
133+
134+ sSQL = "DELETE FROM " & MLApp.TRNLib.TRNConst.TableName.D.D180_F
135+ sSQL &= " WHERE D180_DATE1<=" & Me.m_InventoriesDate.ToString.ToDateStr
136+ Me.m_db.Execute(sSQL)
137+
138+ If Me.m_bTranFlg = False Then
139+
140+ '' コミット
141+ Me.m_db.CommitTrans()
142+
143+ End If
144+
145+ '' 処理結果をセットする
146+ bRet = True
147+
148+ Catch ex As Exception
149+
150+ Throw ex
151+
152+ Finally
153+
154+ If Me.m_bTranFlg = False Then
155+
156+ '' DB-Close
157+ Me.m_db.Close()
158+
159+ End If
160+
161+ End Try
162+
163+ '' 戻り値を返す
164+ Return bRet
165+ End Function
166+
167+ End Class
168+
169+End Namespace
170+
25171 Namespace Z110
26172
27173 End Namespace
--- trunk/MLApp.TRNLib/Class/CmnEnum.vb (revision 81)
+++ trunk/MLApp.TRNLib/Class/CmnEnum.vb (revision 82)
@@ -30,4 +30,18 @@
3030
3131 End Enum
3232
33+ ''' <summary>画面モード列挙体</summary>
34+ Public Enum enDispMode
35+
36+ ''' <summary>検索画面モード</summary>
37+ SearchMode = 0
38+
39+ ''' <summary>通常画面モード</summary>
40+ DefaultMode
41+
42+ ''' <summary>その他モード</summary>
43+ OtherMode
44+
45+ End Enum
46+
3347 End Class
--- trunk/MLApp.TRNLib/Class/Numbering.vb (revision 81)
+++ trunk/MLApp.TRNLib/Class/Numbering.vb (revision 82)
@@ -34,7 +34,7 @@
3434 Dim sSQL As String
3535
3636 '' C130-参照
37- sSQL = "SELECT * FROM " & MLApp.Const.MLAppConst.TableName.C130_F
37+ sSQL = "SELECT * FROM " & MLApp.TRNLib.TRNConst.TableName.C.C130_F
3838 sSQL &= " WHERE C130_KEY1=" & sC130_KEY1.ToTextStr
3939 rC130 = Me.m_db.OpenRecordset(sSQL)
4040 If Not rC130.EOF Then
--- trunk/MLApp.TRNLib/Class/TRNConst.vb (revision 81)
+++ trunk/MLApp.TRNLib/Class/TRNConst.vb (revision 82)
@@ -1,4 +1,6 @@
11 
2+Imports ML.Common.Extensions
3+
24 ''' <summary>
35 ''' 【クラス名】TRNConst
46 ''' 【機能概要】システム定数クラス
@@ -9,6 +11,7 @@
911 ''' +------------+-----------+-----+-------------------------------------------+
1012 ''' y.miura 2016.01.18 001 新規作成
1113 ''' y.miura 2016.12.21 002 テーブル名定数クラスをテーブル種別ごとにクラス分け
14+''' y.miura 2018.07.18 003 区分マスタ定数クラスを作成(MLAppConstから移動)
1215 ''' </history>
1316 Public Class TRNConst
1417
@@ -15,6 +18,14 @@
1518 ''' <summary>当期の最大月数</summary>
1619 Public Const MAX_SIME_LENGTH As Integer = 15
1720
21+ ''' <summary>システム情報定数</summary>
22+ Public Class SystemInfo
23+
24+ ''' <summary>設定可能なシステムグループの最大数</summary>
25+ Public Const MAX_SYSTEM_GROUP_COUNT As Integer = 14
26+
27+ End Class
28+
1829 ''' <summary>
1930 ''' 【クラス名】ProcudureName
2031 ''' 【機能概要】プロシージャ名定数クラス
@@ -21,6 +32,9 @@
2132 ''' </summary>
2233 Public Class ProcudureName
2334
35+ '''<Summary>棚卸計算</Summary>
36+ Public Const D180_CMP_CMP As String = "EXEC {0}.{1}.D180_CMP_CMP "
37+
2438 '''<Summary>在庫再集計</Summary>
2539 Public Const Z130_CMP_RECMP As String = "EXEC {0}.{1}.Z130_CMP_RECMP "
2640
@@ -103,11 +117,66 @@
103117 '''<Summary>プリンタ設定(C140_F)</Summary>
104118 Public Const C140_F As String = "C140_F"
105119
120+ '''<Summary>カレンダー設定(C150_F)</Summary>
121+ Public Const C150_F As String = "C150_F"
122+
106123 End Class
107124
125+ ''' <summary>
126+ ''' 【クラス名】D
127+ ''' 【機能概要】テーブル名定数クラス(トランザクション)
128+ ''' </summary>
129+ Public Class D
130+
131+ '''<Summary>棚卸明細(D180_F)</Summary>
132+ Public Const D180_F As String = "D180_F"
133+
134+ End Class
135+
108136 End Class
109137
138+ ''' <summary>
139+ ''' 【クラス名】KubnMaster
140+ ''' 【機能概要】区分マスタ定数クラス
141+ ''' </summary>
142+ Public Class KubnMaster
110143
144+ '''<Summary>区分マスタテーブルSQL取得</Summary>
145+ '''<param name="sGrpCd">区分グループコード</param>
146+ Public Shared Function GetKubnMTblSQL(sGrpCd As String) As String
147+ Return "(SELECT * FROM M921_F WHERE " & GetKubnMTblWhereSQL(sGrpCd) & ")"
148+ End Function
149+
150+ '''<Summary>区分マスタテーブルSQL取得(WHERE句のみ)</Summary>
151+ '''<param name="sGrpCd">区分グループコード</param>
152+ '''<param name="sKeyCd1">コード1</param>
153+ '''<param name="sKeyCd2">コード2</param>
154+ '''<param name="sKeyCd3">コード3</param>
155+ '''<param name="sWhere">追加条件</param>
156+ Public Shared Function GetKubnMTblWhereSQL(sGrpCd As String, _
157+ Optional sKeyCd1 As String = "",
158+ Optional sKeyCd2 As String = "",
159+ Optional sKeyCd3 As String = "",
160+ Optional sWhere As String = "") As String
161+ Dim sRetWhere As String
162+ sRetWhere = "M921_M920CD1 = " & sGrpCd.ToTextStr
163+ If sKeyCd1 <> String.Empty Then
164+ sRetWhere &= " AND M921_CODE1=" & sKeyCd1.ToTextStr
165+ End If
166+ If sKeyCd2 <> String.Empty Then
167+ sRetWhere &= " AND M921_CODE2=" & sKeyCd2.ToTextStr
168+ End If
169+ If sKeyCd3 <> String.Empty Then
170+ sRetWhere &= " AND M921_CODE3=" & sKeyCd3.ToTextStr
171+ End If
172+ If sWhere <> String.Empty Then
173+ sRetWhere &= " AND " & sWhere
174+ End If
175+ Return sRetWhere
176+ End Function
177+
178+ End Class
179+
111180 End Class
112181
113182
Show on old repository browser