• R/O
  • SSH
  • HTTPS

mlapplication: Commit


Commit MetaInfo

Revision75 (tree)
Time2018-07-13 13:47:00
Authoryukio_miura

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/ML.DBAccess/DataBase/01.SQL/02 Trigger/D141.sql (revision 74)
+++ trunk/ML.DBAccess/DataBase/01.SQL/02 Trigger/D141.sql (revision 75)
@@ -107,6 +107,8 @@
107107 IF ISNULL(@D141M150CD1,'')!=''
108108 BEGIN
109109 EXEC Z131_CMP_CRE @D141M150CD1,@D141DATE1,1,@D141DPKB1,@D141DPNO1,@D141LNNO1,@D141SURY1
110+ EXEC D161_UPD_UPD @D141D161DP1,@D141D161LN1,
111+ D61_UPD.UPD(:OLD.D41_D60NO1,:OLD.D41_D60LN1,:OLD.D41_M47CD1,:OLD.D41_M30CD1,:OLD.D41_SURY1*(-1));
110112 END
111113 -- Lxx
112114 IF ISNULL(@SDT,'')!=''
--- trunk/ML.DBAccess/DataBase/01.SQL/03 TransactSQL/_bat.sql (revision 74)
+++ trunk/ML.DBAccess/DataBase/01.SQL/03 TransactSQL/_bat.sql (revision 75)
@@ -3,8 +3,10 @@
33 @LAST_DAY
44 @D110_UPD
55 @D111_UPD
6+@D131_UPD
67 @D140_UPD
78 @D141_UPD
9+@D161_UPD
810 @D180_CMP
911 @L110_CMP
1012 @L120_CMP
--- trunk/ML.DBAccess/DataBase/01.SQL/03 TransactSQL/D131_UPD.sql (revision 0)
+++ trunk/ML.DBAccess/DataBase/01.SQL/03 TransactSQL/D131_UPD.sql (revision 75)
@@ -0,0 +1,83 @@
1+/* 受注明細売上数量更新 */
2+/* 作成日:2018/07/13 */
3+/* 更新日:2018/07/13 */
4+if exists (select * from sysobjects where id = object_id('D131_UPD_UPD'))
5+ Drop Procedure D131_UPD_UPD
6+GO
7+/*========================================================================================*/
8+/* D131の受注伝票行番号を使用してD111の売上数量を更新 */
9+/* 商品コードが不一致の場合は更新しない・完了区分も更新 */
10+/* DP:伝票番号 LN:行番号 CD:商品コード SU:売上数量 */
11+/*========================================================================================*/
12+Create Procedure D131_UPD_UPD
13+ (
14+ @DP numeric(7),
15+ @LN numeric(3),
16+ @CD nvarchar(34),
17+ @DT datetime,
18+ @SU numeric(11,3)
19+ )
20+As
21+DECLARE
22+ @D131DPNO1 numeric(7),
23+ @D131LNNO1 numeric(3),
24+ @D131M150CD1 nvarchar(34),
25+ @D131SURY1 numeric(11,3),
26+ @D131SURY2 numeric(11,3),
27+ @D131KUBN1 numeric(1)
28+
29+ -- 受注番号・コード未指定は更新しない
30+ IF @DP IS NULL
31+ BEGIN
32+ RETURN;
33+ END
34+ IF @LN IS NULL
35+ BEGIN
36+ RETURN;
37+ END
38+ IF @CD IS NULL
39+ BEGIN
40+ RETURN;
41+ END
42+
43+ -- D131
44+ DECLARE D131_CUR CURSOR LOCAL FOR
45+ SELECT D131_DPNO1,D131_LNNO1,D131_M150CD1,D131_SURY1,D131_SURY2,D131_KUBN1
46+ FROM D131_F D131
47+ WHERE D131_DPNO1 = @DP
48+ AND D131_LNNO1 = @LN
49+ OPEN D131_CUR
50+ FETCH NEXT FROM D161_CUR INTO
51+ @D131DPNO1
52+ ,@D131LNNO1
53+ ,@D131M150CD1
54+ ,@D131SURY1
55+ ,@D131SURY2
56+ ,@D131KUBN1
57+ IF @@FETCH_STATUS=0
58+ BEGIN
59+ IF @D131M150CD1 = @CD
60+ BEGIN
61+ SET @D131SURY2 = @D131SURY2 + ISNULL(@SU,0)
62+ IF @D131KUBN1 != 2
63+ BEGIN
64+ IF @D131SURY2 >= @D131SURY1
65+ BEGIN
66+ SET @D131KUBN1 = 1
67+ END
68+ ELSE
69+ BEGIN
70+ SET @D131KUBN1 = 0
71+ END
72+ END
73+ UPDATE D131_F
74+ SET D131_SURY2 = @D131SURY2
75+ ,D131_KUBN1 = @D131KUBN1
76+ WHERE D131_DPNO1 = @DP
77+ AND D131_LNNO1 = @LN
78+ END
79+ END
80+ CLOSE D131_CUR
81+ DEALLOCATE D131_CUR
82+GO
83+
\ No newline at end of file
--- trunk/ML.DBAccess/DataBase/01.SQL/03 TransactSQL/D161_UPD.sql (revision 0)
+++ trunk/ML.DBAccess/DataBase/01.SQL/03 TransactSQL/D161_UPD.sql (revision 75)
@@ -0,0 +1,83 @@
1+/* 発注明細仕入数量更新 */
2+/* 作成日:2018/07/09 */
3+/* 更新日:2018/07/09 */
4+if exists (select * from sysobjects where id = object_id('D161_UPD_UPD'))
5+ Drop Procedure D161_UPD_UPD
6+GO
7+/*========================================================================================*/
8+/* D141の発注伝票行番号を使用してD161の仕入数量を更新 */
9+/* 商品コードが不一致の場合は更新しない・完了区分も更新 */
10+/* DP:伝票番号 LN:行番号 CD:商品コード SU:仕入数量 */
11+/*========================================================================================*/
12+Create Procedure D161_UPD_UPD
13+ (
14+ @DP numeric(7),
15+ @LN numeric(3),
16+ @CD nvarchar(34),
17+ @DT datetime,
18+ @SU numeric(13,3)
19+ )
20+As
21+DECLARE
22+ @D161DPNO1 numeric(7),
23+ @D161LNNO1 numeric(3),
24+ @D161M150CD1 nvarchar(34),
25+ @D161SURY1 numeric(11,3),
26+ @D161SURY2 numeric(11,3),
27+ @D161KUBN1 numeric(1)
28+
29+ -- 発注番号・コード未指定は更新しない
30+ IF @DP IS NULL
31+ BEGIN
32+ RETURN;
33+ END
34+ IF @LN IS NULL
35+ BEGIN
36+ RETURN;
37+ END
38+ IF @CD IS NULL
39+ BEGIN
40+ RETURN;
41+ END
42+
43+ -- D161
44+ DECLARE D161_CUR CURSOR LOCAL FOR
45+ SELECT D161_DPNO1,D161_LNNO1,D161_M150CD1,D161_SURY1,D161_SURY2,D161_KUBN1
46+ FROM D161_F D161
47+ WHERE D161_DPNO1 = @DP
48+ AND D161_LNNO1 = @LN
49+ OPEN D161_CUR
50+ FETCH NEXT FROM D161_CUR INTO
51+ @D161DPNO1
52+ ,@D161LNNO1
53+ ,@D161M150CD1
54+ ,@D161SURY1
55+ ,@D161SURY2
56+ ,@D161KUBN1
57+ IF @@FETCH_STATUS=0
58+ BEGIN
59+ IF @D161M150CD1 = @CD
60+ BEGIN
61+ SET @D161SURY2 = @D161SURY2 + ISNULL(@SU,0)
62+ IF @D161KUBN1 != 2
63+ BEGIN
64+ IF @D161SURY2 >= @D161SURY1
65+ BEGIN
66+ SET @D161KUBN1 = 1
67+ END
68+ ELSE
69+ BEGIN
70+ SET @D161KUBN1 = 0
71+ END
72+ END
73+ UPDATE D161_F
74+ SET D161_SURY2 = @D161SURY2
75+ ,D161_KUBN1 = @D161KUBN1
76+ WHERE D161_DPNO1 = @DP
77+ AND D161_LNNO1 = @LN
78+ END
79+ END
80+ CLOSE D161_CUR
81+ DEALLOCATE D161_CUR
82+GO
83+
\ No newline at end of file
--- trunk/MLApp.TRN9000/TRN9150.Designer.vb (revision 74)
+++ trunk/MLApp.TRN9000/TRN9150.Designer.vb (revision 75)
@@ -29,6 +29,7 @@
2929 Me.lblDispMode = New ML.Controls.uc6Label()
3030 Me.C140_CP1 = New ML.Controls.uc6DataGridViewTextBoxColumn()
3131 Me.C140_REPID = New ML.Controls.uc6DataGridViewTextBoxColumn()
32+ Me.C140_REPNM = New ML.Controls.uc6DataGridViewTextBoxColumn()
3233 Me.C140_PRTNAME = New System.Windows.Forms.DataGridViewComboBoxColumn()
3334 Me.C140_TOPM = New ML.Controls.uc6DataGridViewNumColumn()
3435 Me.C140_BTMM = New ML.Controls.uc6DataGridViewNumColumn()
@@ -100,7 +101,7 @@
100101 Me.dgvTRN9150S1.ColumnHeaderRowCount = 1
101102 Me.dgvTRN9150S1.ColumnHeaderRowHeight = 30
102103 Me.dgvTRN9150S1.ColumnHeadersHeight = 32
103- Me.dgvTRN9150S1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.C140_CP1, Me.C140_REPID, Me.C140_PRTNAME, Me.C140_TOPM, Me.C140_BTMM, Me.C140_LFTM, Me.C140_RGHM, Me.C140UPD1DataGridViewTextBoxColumn})
104+ Me.dgvTRN9150S1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.C140_CP1, Me.C140_REPID, Me.C140_REPNM, Me.C140_PRTNAME, Me.C140_TOPM, Me.C140_BTMM, Me.C140_LFTM, Me.C140_RGHM, Me.C140UPD1DataGridViewTextBoxColumn})
104105 Me.dgvTRN9150S1.DataMember = "C140_F"
105106 Me.dgvTRN9150S1.DataSource = Me.C1_TRNDataSet
106107 DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -165,7 +166,19 @@
165166 Me.C140_REPID.ReadOnly = True
166167 Me.C140_REPID.Resizable = System.Windows.Forms.DataGridViewTriState.[True]
167168 Me.C140_REPID.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
169+ Me.C140_REPID.Width = 80
168170 '
171+ 'C140_REPNM
172+ '
173+ Me.C140_REPNM.DataPropertyName = "C140_REPNM"
174+ Me.C140_REPNM.HeaderText = "レポート名"
175+ Me.C140_REPNM.ImeMode = System.Windows.Forms.ImeMode.NoControl
176+ Me.C140_REPNM.MaxLength = 0
177+ Me.C140_REPNM.Name = "C140_REPNM"
178+ Me.C140_REPNM.ReadOnly = True
179+ Me.C140_REPNM.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic
180+ Me.C140_REPNM.Width = 120
181+ '
169182 'C140_PRTNAME
170183 '
171184 Me.C140_PRTNAME.DataPropertyName = "C140_PRTNAME"
@@ -268,6 +281,7 @@
268281 Friend WithEvents Cmn_TRNDataSet As MLApp.DataModel.Cmn_TRNDataSet
269282 Friend WithEvents C140_CP1 As ML.Controls.uc6DataGridViewTextBoxColumn
270283 Friend WithEvents C140_REPID As ML.Controls.uc6DataGridViewTextBoxColumn
284+ Friend WithEvents C140_REPNM As ML.Controls.uc6DataGridViewTextBoxColumn
271285 Friend WithEvents C140_PRTNAME As System.Windows.Forms.DataGridViewComboBoxColumn
272286 Friend WithEvents C140_TOPM As ML.Controls.uc6DataGridViewNumColumn
273287 Friend WithEvents C140_BTMM As ML.Controls.uc6DataGridViewNumColumn
--- trunk/ML.Common.Message/My Project/MsgResource_W.Designer.vb (revision 74)
+++ trunk/ML.Common.Message/My Project/MsgResource_W.Designer.vb (revision 75)
@@ -144,5 +144,14 @@
144144 Return ResourceManager.GetString("MSG_W_0009", resourceCulture)
145145 End Get
146146 End Property
147+
148+ '''<summary>
149+ ''' 未登録の{0}か完了済の{0}です に類似しているローカライズされた文字列を検索します。
150+ '''</summary>
151+ Public Shared ReadOnly Property MSG_W_0010() As String
152+ Get
153+ Return ResourceManager.GetString("MSG_W_0010", resourceCulture)
154+ End Get
155+ End Property
147156 End Class
148157 End Namespace
Show on old repository browser