• R/O
  • SSH
  • HTTPS

mlapplication: Commit


Commit MetaInfo

Revision67 (tree)
Time2017-06-30 13:25:52
Authoryukio_miura

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/MLApp.Base/TRNBaseSearchForm.vb (revision 66)
+++ trunk/MLApp.Base/TRNBaseSearchForm.vb (revision 67)
@@ -28,6 +28,9 @@
2828 ''' <summary>フリガナフィールド名</summary>
2929 Protected m_FuriganaFieldName As String
3030
31+ ''' <summary>条件式</summary>
32+ Protected m_ConditionSQL As String
33+
3134 ''' <summary>選択されたコード</summary>
3235 Protected m_RetCode As String
3336
@@ -118,6 +121,16 @@
118121 End Set
119122 End Property
120123
124+ ''' <summary>条件式</summary>
125+ Public Property ConditionSQL As String
126+ Get
127+ Return Me.m_ConditionSQL
128+ End Get
129+ Set(value As String)
130+ Me.m_ConditionSQL = value
131+ End Set
132+ End Property
133+
121134 ''' <summary>選択されたコード</summary>
122135 Public ReadOnly Property RetCode As String
123136 Get
@@ -257,6 +270,11 @@
257270 End If
258271 End If
259272
273+ '' 必須条件式
274+ If Me.m_ConditionSQL <> String.Empty Then
275+ sSQL &= " AND " & Me.m_ConditionSQL
276+ End If
277+
260278 '' 戻り値を返す
261279 Return sSQL
262280 End Function
--- trunk/MLApp.Base/ucSearchBox.vb (revision 66)
+++ trunk/MLApp.Base/ucSearchBox.vb (revision 67)
@@ -52,6 +52,9 @@
5252 ''' <summary>フィールド名[フリガナ]</summary>
5353 Protected m_FuriganaFieldName As String
5454
55+ ''' <summary>条件式</summary>
56+ Protected m_ConditionSQL As String
57+
5558 ''' <summary>ロガーインスタンス</summary>
5659 Protected Logger As New ML.Common.Logger.CoreLogger
5760
@@ -111,6 +114,16 @@
111114 End Set
112115 End Property
113116
117+ ''' <summary>条件式</summary>
118+ Public Property ConditionSQL As String
119+ Get
120+ Return Me.m_ConditionSQL
121+ End Get
122+ Set(value As String)
123+ Me.m_ConditionSQL = value
124+ End Set
125+ End Property
126+
114127 ''' <summary>データソースインスタンス</summary>
115128 Public WriteOnly Property RecordSource As MLApp.DataModel.DataSourceSQL
116129 Set(value As MLApp.DataModel.DataSourceSQL)
@@ -253,6 +266,7 @@
253266 .NameFieldName = Me.m_NameFieldName1
254267 .NameFieldName2 = Me.m_NameFieldName2
255268 .FuriganaFieldName = Me.m_FuriganaFieldName
269+ .ConditionSQL = Me.m_ConditionSQL
256270 .RecordSource = Me.m_DataSource
257271 .ShowDialog()
258272 If .ReturnCode = TRNBaseSearchForm.enReturnCode.Selected Then
--- trunk/MLApp.Const/KubunMGCode.vb (revision 66)
+++ trunk/MLApp.Const/KubunMGCode.vb (revision 67)
@@ -245,6 +245,25 @@
245245
246246 End Class
247247
248+ ''' <summary>(014)在庫調整区分</summary>
249+ Public Class ZaikoTyouseiKbn
250+
251+ ''' <summary>グループコード</summary>
252+ Public Const GroupCode As String = "014"
253+
254+ ''' <summary>在庫調整区分列挙体</summary>
255+ Public Enum enZaikoTyouseiKbn
256+
257+ ''' <summary>入庫調整</summary>
258+ Nyuuko = 51
259+
260+ ''' <summary>出庫調整</summary>
261+ Syukko = 52
262+
263+ End Enum
264+
265+ End Class
266+
248267 ''' <summary>(204)ユーザー区分</summary>
249268 Public Class UserKubun
250269
Show on old repository browser