Compare commits

...

3 Commits

Author SHA1 Message Date
guanxiangwei
553148202c 20260515指摘対応3 2026-05-15 18:33:15 +09:00
guanxiangwei
fa8bd26757 20260515指摘対応2 2026-05-15 16:59:40 +09:00
guanxiangwei
5930d49cf2 20260515指摘対応 2026-05-15 15:13:00 +09:00
21 changed files with 358 additions and 59 deletions

2
data/fuy_test.csv Normal file
View File

@@ -0,0 +1,2 @@
職員番号,扶養親族1氏名,扶養親族1続柄,扶養親族1生年月日,扶養親族1事実発生年月日,扶養親族1認定簿印字無,扶養親族1提出年月日,扶養親族1受理年月日,扶養親族1支給の始期,扶養親族1届出の事由,扶養親族1届出の備考,扶養親族1同居区分,扶養親族1重度心身障害者,扶養親族1収入,扶養親族1所得の種類,扶養親族1所得の金額,扶養親族1住居手当支給要件,扶養親族2氏名,扶養親族2続柄,扶養親族2生年月日,扶養親族2事実発生年月日,扶養親族2認定簿印字無,扶養親族2提出年月日,扶養親族2受理年月日,扶養親族2支給の始期,扶養親族2届出の事由,扶養親族2届出の備考,扶養親族2同居区分,扶養親族2重度心身障害者,扶養親族2収入,扶養親族2所得の種類,扶養親族2所得の金額,扶養親族2住居手当支給要件,扶養親族3氏名,扶養親族3続柄,扶養親族3生年月日,扶養親族3事実発生年月日,扶養親族3認定簿印字無,扶養親族3提出年月日,扶養親族3受理年月日,扶養親族3支給の始期,扶養親族3届出の事由,扶養親族3届出の備考,扶養親族3同居区分,扶養親族3重度心身障害者,扶養親族3収入,扶養親族3所得の種類,扶養親族3所得の金額,扶養親族3住居手当支給要件,扶養親族4氏名,扶養親族4続柄,扶養親族4生年月日,扶養親族4事実発生年月日,扶養親族4認定簿印字無,扶養親族4提出年月日,扶養親族4受理年月日,扶養親族4支給の始期,扶養親族4届出の事由,扶養親族4届出の備考,扶養親族4同居区分,扶養親族4重度心身障害者,扶養親族4収入,扶養親族4所得の種類,扶養親族4所得の金額,扶養親族4住居手当支給要件,支給の始期,配偶者の有無,配偶者扶養該当,父母等人数,子の人数,うち加算対象人数,扶養手当月額,金額直接入力,認定年月日,認定等の事由,(各庁の長)官職コード
24400852,山田一郎,01,2018-03-15,2018-04-01,0,2025-04-01,2025-04-01,2025-05-01,01,生子出生,1,1,1,01,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2025-05-01,1,2,2,1,1,65000,0,2025-04-01,01,001
1 職員番号 扶養親族1)氏名 扶養親族1)続柄 扶養親族1)生年月日 扶養親族1)事実発生年月日 扶養親族1)認定簿印字無 扶養親族1)提出年月日 扶養親族1)受理年月日 扶養親族1)支給の始期 扶養親族1)届出の事由 扶養親族1)届出の備考 扶養親族1)同居区分 扶養親族1)重度心身障害者 扶養親族1)収入 扶養親族1)所得の種類 扶養親族1)所得の金額 扶養親族1)住居手当支給要件 扶養親族2)氏名 扶養親族2)続柄 扶養親族2)生年月日 扶養親族2)事実発生年月日 扶養親族2)認定簿印字無 扶養親族2)提出年月日 扶養親族2)受理年月日 扶養親族2)支給の始期 扶養親族2)届出の事由 扶養親族2)届出の備考 扶養親族2)同居区分 扶養親族2)重度心身障害者 扶養親族2)収入 扶養親族2)所得の種類 扶養親族2)所得の金額 扶養親族2)住居手当支給要件 扶養親族3)氏名 扶養親族3)続柄 扶養親族3)生年月日 扶養親族3)事実発生年月日 扶養親族3)認定簿印字無 扶養親族3)提出年月日 扶養親族3)受理年月日 扶養親族3)支給の始期 扶養親族3)届出の事由 扶養親族3)届出の備考 扶養親族3)同居区分 扶養親族3)重度心身障害者 扶養親族3)収入 扶養親族3)所得の種類 扶養親族3)所得の金額 扶養親族3)住居手当支給要件 扶養親族4)氏名 扶養親族4)続柄 扶養親族4)生年月日 扶養親族4)事実発生年月日 扶養親族4)認定簿印字無 扶養親族4)提出年月日 扶養親族4)受理年月日 扶養親族4)支給の始期 扶養親族4)届出の事由 扶養親族4)届出の備考 扶養親族4)同居区分 扶養親族4)重度心身障害者 扶養親族4)収入 扶養親族4)所得の種類 扶養親族4)所得の金額 扶養親族4)住居手当支給要件 支給の始期 配偶者の有無 配偶者扶養該当 父母等人数 子の人数 うち加算対象人数 扶養手当月額 金額直接入力 認定年月日 認定等の事由 (各庁の長)官職コード
2 24400852 山田一郎 01 2018-03-15 2018-04-01 0 2025-04-01 2025-04-01 2025-05-01 01 生子出生 1 1 1 01 0 0 2025-05-01 1 2 2 1 1 65000 0 2025-04-01 01 001

View File

@@ -0,0 +1,78 @@
DELETE FROM sh_csv_item_definition WHERE CODE = 'FUY';
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 1, '職員番号', '' ,TRUE, 'CHAR', 8, NULL, FALSE, FALSE, '' ,TRUE, NULL, NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 2, '扶養親族1氏名', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, FALSE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 3, '扶養親族1続柄', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '209', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 4, '扶養親族1生年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 5, '扶養親族1事実発生年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 6, '扶養親族1認定簿印字無', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0, 1}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 7, '扶養親族1提出年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 8, '扶養親族1受理年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 9, '扶養親族1支給の始期', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 10, '扶養親族1届出の事由', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '207', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 11, '扶養親族1届出の備考', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 12, '扶養親族1同居区分', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 13, '扶養親族1重度心身障害者', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 14, '扶養親族1収入', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 15, '扶養親族1所得の種類', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '613', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 16, '扶養親族1所得の金額', '' ,FALSE, 'NUMBER', 8, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 17, '扶養親族1住居手当支給要件', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0, 1}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 18, '扶養親族2氏名', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, FALSE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 19, '扶養親族2続柄', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '209', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 20, '扶養親族2生年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 21, '扶養親族2事実発生年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 22, '扶養親族2認定簿印字無', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0, 1}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 23, '扶養親族2提出年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 24, '扶養親族2受理年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 25, '扶養親族2支給の始期', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 26, '扶養親族2届出の事由', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '207', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 27, '扶養親族2届出の備考', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 28, '扶養親族2同居区分', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 29, '扶養親族2重度心身障害者', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 30, '扶養親族2収入', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 31, '扶養親族2所得の種類', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '613', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 32, '扶養親族2所得の金額', '' ,FALSE, 'NUMBER', 8, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 33, '扶養親族2住居手当支給要件', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0, 1}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 34, '扶養親族3氏名', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, FALSE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 35, '扶養親族3続柄', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '209', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 36, '扶養親族3生年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 37, '扶養親族3事実発生年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 38, '扶養親族3認定簿印字無', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0, 1}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 39, '扶養親族3提出年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 40, '扶養親族3受理年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 41, '扶養親族3支給の始期', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 42, '扶養親族3届出の事由', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '207', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 43, '扶養親族3届出の備考', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 44, '扶養親族3同居区分', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 45, '扶養親族3重度心身障害者', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 46, '扶養親族3収入', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 47, '扶養親族3所得の種類', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '613', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 48, '扶養親族3所得の金額', '' ,FALSE, 'NUMBER', 8, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 49, '扶養親族3住居手当支給要件', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0, 1}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 50, '扶養親族4氏名', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, FALSE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 51, '扶養親族4続柄', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '209', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 52, '扶養親族4生年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 53, '扶養親族4事実発生年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 54, '扶養親族4認定簿印字無', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0, 1}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 55, '扶養親族4提出年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 56, '扶養親族4受理年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 57, '扶養親族4支給の始期', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 58, '扶養親族4届出の事由', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '207', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 59, '扶養親族4届出の備考', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 60, '扶養親族4同居区分', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 61, '扶養親族4重度心身障害者', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 62, '扶養親族4収入', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 63, '扶養親族4所得の種類', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '613', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 64, '扶養親族4所得の金額', '' ,FALSE, 'NUMBER', 8, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 65, '扶養親族4住居手当支給要件', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0, 1}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 66, '支給の始期', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 67, '配偶者の有無', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 68, '配偶者扶養該当', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1, 2}', NULL, TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 69, '父母等人数', '' ,FALSE, 'NUMBER', 2, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 70, '子の人数', '' ,FALSE, 'NUMBER', 2, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 71, 'うち加算対象人数', '' ,FALSE, 'NUMBER', 2, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 72, '扶養手当月額', '' ,FALSE, 'NUMBER', 8, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 73, '金額直接入力', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0, 1}', NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 74, '認定年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 75, '認定等の事由', '' ,FALSE, 'MASTER', 2, NULL, TRUE, FALSE, '' ,TRUE, NULL, '208', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 76, '俸給表及び級', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('FUY', 77, '(各庁の長)官職コード', '' ,FALSE, 'MASTER', 3, NULL, TRUE, FALSE, '' ,TRUE, NULL, '507', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);

View File

@@ -1,4 +1,4 @@
DELETE FROM SH_CSV_ITEM_DEFINITION WHERE CODE = 'JUK'; DELETE FROM sh_csv_item_definition WHERE CODE = 'JUK';
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 1, '職員番号', '' ,TRUE, 'CHAR', 8, NULL, FALSE, FALSE, '' ,TRUE, NULL, NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 1, '職員番号', '' ,TRUE, 'CHAR', 8, NULL, FALSE, FALSE, '' ,TRUE, NULL, NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 2, '事実発生年月日', '' ,TRUE, 'DATE', NULL, NULL, FALSE, TRUE, '' ,FALSE, NULL, NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 2, '事実発生年月日', '' ,TRUE, 'DATE', NULL, NULL, FALSE, TRUE, '' ,FALSE, NULL, NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 3, '提出年月日', '' ,FALSE, 'DATE', NULL, NULL, FALSE, TRUE, '' ,FALSE, NULL, NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 3, '提出年月日', '' ,FALSE, 'DATE', NULL, NULL, FALSE, TRUE, '' ,FALSE, NULL, NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
@@ -23,18 +23,18 @@ INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 21, '配偶者)所在地2'
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 22, '配偶者)家賃等月額', '' ,FALSE, 'NUMBER', 8, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 22, '配偶者)家賃等月額', '' ,FALSE, 'NUMBER', 8, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 23, '配偶者家賃区分_光熱費込', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0,1}', NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 23, '配偶者家賃区分_光熱費込', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0,1}', NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 24, '配偶者家賃区分_まかない付き', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0,1}', NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 24, '配偶者家賃区分_まかない付き', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{0,1}', NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 25, '自宅)所有者情報', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1,2,3,4}', NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 25, '自宅)所有者情報', '' ,FALSE, 'ENUM', 1, NULL, TRUE, FALSE, '' ,TRUE, '{1,2,3,4}', NULL, FALSE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 26, '自宅)所在地1', '' ,FALSE, 'VARCHAR', 60, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 26, '自宅)所在地1', '' ,FALSE, 'VARCHAR', 60, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 27, '自宅)所在地2', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 27, '自宅)所在地2', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 28, '自宅)入居日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 28, '自宅)入居日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 29, '自宅)取得理由', '' ,FALSE, 'MASTER', 1, NULL, TRUE, FALSE, '' ,TRUE, NULL, '216', TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 29, '自宅)取得理由', '' ,FALSE, 'MASTER', 1, NULL, TRUE, FALSE, '' ,TRUE, NULL, '216', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 30, '自宅)新築・購入年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 30, '自宅)新築・購入年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 31, '自宅)購入後5年経過日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 31, '自宅)購入後5年経過日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 32, '該当条文1', '' ,FALSE, 'MASTER', 1, NULL, TRUE, FALSE, '' ,TRUE, NULL, '217', FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 32, '該当条文1', '' ,FALSE, 'MASTER', 1, NULL, TRUE, FALSE, '' ,TRUE, NULL, '217', FALSE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 33, '該当条文2', '' ,FALSE, 'MASTER', 1, NULL, TRUE, FALSE, '' ,TRUE, NULL, '217', FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 33, '該当条文2', '' ,FALSE, 'MASTER', 1, NULL, TRUE, FALSE, '' ,TRUE, NULL, '217', FALSE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 34, '支給の始期', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 34, '支給の始期', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 35, '住居手当の月額', '' ,FALSE, 'NUMBER', 8, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 35, '住居手当の月額', '' ,FALSE, 'NUMBER', 8, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 36, '備考', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 36, '備考', '' ,FALSE, 'VARCHAR', 40, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 37, '所属コード', '' ,FALSE, 'VARCHAR', 10, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, FALSE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 37, '所属コード', '' ,FALSE, 'VARCHAR', 10, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, FALSE, TRUE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 38, '認定年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 38, '認定年月日', '' ,FALSE, 'DATE', NULL, NULL, TRUE, TRUE, '' ,FALSE, NULL, NULL, TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP);
INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 39, '(各庁の長)官職コード', '' ,FALSE, 'MASTER', 3, NULL, TRUE, FALSE, '' ,TRUE, NULL, '507', TRUE, FALSE, 'updsv7', CURRENT_TIMESTAMP); INSERT INTO SH_CSV_ITEM_DEFINITION VALUES ('JUK', 39, '(各庁の長)官職コード', '' ,FALSE, 'MASTER', 3, NULL, TRUE, FALSE, '' ,TRUE, NULL, '507', TRUE, TRUE, 'updsv7', CURRENT_TIMESTAMP);

View File

@@ -6,8 +6,8 @@ Sub ImportModulesAndSheets_Safe()
Set fso = CreateObject("Scripting.FileSystemObject") Set fso = CreateObject("Scripting.FileSystemObject")
Const PROJECT_PATH As String = "D:\Project\upds7\vba\" Const PROJECT_PATH As String = "D:\Project\upds7\vba\"
Const MODULE_PATH As String = PROJECT_PATH & "src\module" Const MODULE_PATH As String = PROJECT_PATH & "src\sh\tuk\module"
Const SHEET_PATH As String = PROJECT_PATH & "src\sheet" Const SHEET_PATH As String = PROJECT_PATH & "src\sh\tuk\sheet"
' --- Phase 1: Validation --- ' --- Phase 1: Validation ---
Debug.Print "[LOG] Starting validation phase..." Debug.Print "[LOG] Starting validation phase..."

View File

@@ -31,8 +31,22 @@ Sub Fit_Button()
End Sub End Sub
Sub RefreshCache_Button() Sub RefreshCache_Button()
Dim cacheSheets As Variant: cacheSheets = Array("M1", "M2", "Z1", "Z2", "Z3", "Z4", "T1", "T2", "T3", "O1","O2") Dim activeSheetName As String: activeSheetName = ActiveSheet.CodeName
' Determine which cache sheets to refresh based on ActiveSheet
Dim cacheSheets As Variant
If activeSheetName = "C1" Then
cacheSheets = Array("M1", "M2", "Z1", "Z2", "Z3", "Z4", "T1", "T2", "T3", "O1", "O2")
ElseIf activeSheetName = "M1" Then
cacheSheets = Array("Z1", "Z2", "Z3", "Z4", "T1", "T2", "T3", "O1", "O2")
ElseIf activeSheetName = "M2" Then
cacheSheets = Array("M1", "Z1", "Z2", "Z3", "Z4", "T1", "T2", "T3", "O1", "O2")
Else
MsgBox "This sheet does not support cache refresh.", vbExclamation
Exit Sub
End If
' Validate and refresh cache
Dim sheetName As Variant Dim sheetName As Variant
Dim ws As Worksheet Dim ws As Worksheet
For Each sheetName In cacheSheets For Each sheetName In cacheSheets
@@ -49,8 +63,25 @@ Sub RefreshCache_Button()
End If End If
Next sheetName Next sheetName
Dim result As Boolean: result = RefreshAllCache() ' Refresh cache based on activeSheet
Dim result As Boolean: result = RefreshAllCache(activeSheetName)
If result = True Then If result = True Then
' Call active sheet's Refresh method
If ProcedureExists(activeSheetName, "Refresh") Then
On Error Resume Next
Set ws = ActiveSheet
On Error GoTo 0
If Not ws Is Nothing Then
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
Dim sheetConf As Object: Set sheetConf = sheetConfDict(activeSheetName)
Dim startRow As Long: startRow = sheetConf("StartRow")
Dim lastDataRow As Long: lastDataRow = GetLastDataRowInRange(ws)
Application.Run activeSheetName & ".Refresh", ws, startRow, lastDataRow
End If
Else
MsgBox "Sheet " & activeSheetName & " does not implement Refresh method.", vbExclamation
End If
MsgBox "master data reload successfully." MsgBox "master data reload successfully."
End If End If
End Sub End Sub
@@ -141,6 +172,8 @@ Private Sub Do_Validation(ws As Excel.Worksheet)
MsgBox "Validation complete. Errors: 0", vbInformation MsgBox "Validation complete. Errors: 0", vbInformation
End If End If
Do_Fit ws
Exit Sub Exit Sub
ErrorHandler: ErrorHandler:
@@ -288,7 +321,8 @@ Private Sub Do_Fit(ws As Excel.Worksheet)
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig() Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName) Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
Dim startCol As String: startCol = sheetConf("StartCol") ' 2026-05-15 adjust width function contains error column
Dim startCol As String: startCol = sheetConf("ErrorCol")
Dim endCol As String: endCol = sheetConf("EndCol") Dim endCol As String: endCol = sheetConf("EndCol")
ws.Columns(startCol & ":" & endCol).AutoFit ws.Columns(startCol & ":" & endCol).AutoFit

View File

@@ -313,17 +313,37 @@ Function CheckHeaderEdit(ByVal ws As Worksheet, ByVal Target As Range) As Boolea
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig() Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()
Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName) Dim sheetConf As Object: Set sheetConf = sheetConfDict(ws.CodeName)
Dim headerRow As Long: headerRow = sheetConf("HeaderRow") Dim headerRow As Long: headerRow = sheetConf("HeaderRow")
Dim filterRow As Long: filterRow = sheetConf("FilterRow")
' Check header row (headerRow) cannot be edited ' Check header row (headerRow) cannot be edited
If Target.Row = headerRow Then Dim r As Long
For r = Target.Row To Target.Row + Target.Rows.Count - 1
If r = headerRow Or r = filterRow Then
Application.EnableEvents = False Application.EnableEvents = False
MsgBox "Header row can not be edit", vbExclamation MsgBox "Header or type definition row cannot be edited.", vbExclamation
Application.Undo Application.Undo
Application.EnableEvents = True Application.EnableEvents = True
CheckHeaderEdit = True CheckHeaderEdit = True
Exit Function Exit Function
End If End If
Next r
' filterRow color is not equals to filterRow + 1
If Target.Row = filterRow + 1 Then
Dim firstCell As Range: Set firstCell = Target.Cells(1, 1)
Dim colIndex As Long: colIndex = firstCell.Column
Dim refCell As Range: Set refCell = ws.Cells(filterRow, colIndex)
If firstCell.Interior.Color = refCell.Interior.Color Then
Application.EnableEvents = False
MsgBox "Cannot autoFill from filterRow.", vbExclamation
Application.Undo
Application.EnableEvents = True
CheckHeaderEdit = True
Exit Function
End If
End If
CheckHeaderEdit = False CheckHeaderEdit = False
End Function End Function

View File

@@ -305,7 +305,7 @@ Private Sub RefreshSheetDict()
Set sheetConf = CreateObject("Scripting.Dictionary") Set sheetConf = CreateObject("Scripting.Dictionary")
sheetConf("StartCol") = "C" sheetConf("StartCol") = "C"
sheetConf("EndCol") = "BC" sheetConf("EndCol") = "BC"
sheetConf("ErrorCol") = "BD" sheetConf("ErrorCol") = "B"
sheetConf("StartRow") = 8 sheetConf("StartRow") = 8
sheetConf("HeaderRow") = 6 sheetConf("HeaderRow") = 6
sheetConf("CSV_Encoding") = "shift_jis" sheetConf("CSV_Encoding") = "shift_jis"
@@ -321,7 +321,7 @@ Private Sub RefreshSheetDict()
Set sheetConf = CreateObject("Scripting.Dictionary") Set sheetConf = CreateObject("Scripting.Dictionary")
sheetConf("StartCol") = "C" sheetConf("StartCol") = "C"
sheetConf("EndCol") = "N" sheetConf("EndCol") = "N"
sheetConf("ErrorCol") = "O" sheetConf("ErrorCol") = "B"
sheetConf("StartRow") = 7 sheetConf("StartRow") = 7
sheetConf("HeaderRow") = 5 sheetConf("HeaderRow") = 5
sheetConf("CacheName") = "m1Cache" sheetConf("CacheName") = "m1Cache"
@@ -340,15 +340,15 @@ Private Sub RefreshSheetDict()
Set sheetConf = CreateObject("Scripting.Dictionary") Set sheetConf = CreateObject("Scripting.Dictionary")
sheetConf("StartCol") = "C" sheetConf("StartCol") = "C"
sheetConf("EndCol") = "R" sheetConf("EndCol") = "R"
sheetConf("ErrorCol") = "S" sheetConf("ErrorCol") = "B"
sheetConf("StartRow") = 7 sheetConf("StartRow") = 8
sheetConf("HeaderRow") = 6 sheetConf("HeaderRow") = 6
sheetConf("CSV_Encoding") = "shift_jis" sheetConf("CSV_Encoding") = "shift_jis"
sheetConf("HasHeader") = True sheetConf("HasHeader") = True
sheetConf("ExpectedColumnCount") = 11 sheetConf("ExpectedColumnCount") = 11
sheetConf("HeaderColumns") = Array("C", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R") sheetConf("HeaderColumns") = Array("C", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R")
sheetConf("AlwaysQuote") = False sheetConf("AlwaysQuote") = False
sheetConf("FilterRow") = 6 sheetConf("FilterRow") = 7
Set sheetConfDict("M2") = sheetConf Set sheetConfDict("M2") = sheetConf
Debug.Print "RefreshSheetDict M2 ok." Debug.Print "RefreshSheetDict M2 ok."
@@ -482,11 +482,11 @@ Private Sub RefreshSheetDict()
Set sheetConf = CreateObject("Scripting.Dictionary") Set sheetConf = CreateObject("Scripting.Dictionary")
sheetConf("StartCol") = "C" sheetConf("StartCol") = "C"
sheetConf("EndCol") = "F" sheetConf("EndCol") = "F"
sheetConf("ErrorCol") = "" sheetConf("ErrorCol") = "B"
sheetConf("StartRow") = 6 sheetConf("StartRow") = 6
sheetConf("HeaderRow") = "" sheetConf("HeaderRow") = "5"
sheetConf("CSV_Encoding") = "utf-8" sheetConf("CSV_Encoding") = "shift_jis"
sheetConf("HasHeader") = False sheetConf("HasHeader") = True
sheetConf("ExpectedColumnCount") = 4 sheetConf("ExpectedColumnCount") = 4
sheetConf("HeaderColumns") = Array("C", "D", "E", "F") sheetConf("HeaderColumns") = Array("C", "D", "E", "F")
sheetConf("AlwaysQuote") = True sheetConf("AlwaysQuote") = True
@@ -498,9 +498,9 @@ Private Sub RefreshSheetDict()
Set sheetConf = CreateObject("Scripting.Dictionary") Set sheetConf = CreateObject("Scripting.Dictionary")
sheetConf("StartCol") = "C" sheetConf("StartCol") = "C"
sheetConf("EndCol") = "O" sheetConf("EndCol") = "O"
sheetConf("ErrorCol") = "" sheetConf("ErrorCol") = "B"
sheetConf("StartRow") = 6 sheetConf("StartRow") = 6
sheetConf("HeaderRow") = "" sheetConf("HeaderRow") = "5"
sheetConf("CSV_Encoding") = "utf-8" sheetConf("CSV_Encoding") = "utf-8"
sheetConf("HasHeader") = False sheetConf("HasHeader") = False
sheetConf("ExpectedColumnCount") = 13 sheetConf("ExpectedColumnCount") = 13
@@ -573,15 +573,32 @@ Public Function GetSheetConfig() As Object
Set GetSheetConfig = sheetConfDict Set GetSheetConfig = sheetConfDict
End Function End Function
Public Function RefreshAllCache() As Boolean Public Function RefreshAllCache(Optional ByVal activeSheetName As String = "") As Boolean
' refresh ' Fixed cache names
Dim refreshCacheNames As Variant Dim fixedCaches As Variant
refreshCacheNames = Array("Z1", "Z2", "Z3", "Z4", "T1", "T2", "T3", "M1", "M1KukanDCache", "M2", "O1","O2", _ fixedCaches = Array("Z1", "Z2", "Z3", "Z4", "T1", "T2", "T3", "O1", "O2", _
"tokubetuList", "kenshuList", "oufukuList", "koutaiList", "higaitouList", "errorList") "tokubetuList", "kenshuList", "oufukuList", "koutaiList", "higaitouList", "errorList")
Dim refreshCacheName As Variant
For Each refreshCacheName In refreshCacheNames ' Dynamic cache names based on activeSheet
Call RefreshCache(refreshCacheName) Dim dynamicCaches As Variant
Next refreshCacheName If activeSheetName = "C1" Then
dynamicCaches = Array("M1", "M1KukanDCache", "M2")
ElseIf activeSheetName = "M2" Then
dynamicCaches = Array("M1", "M1KukanDCache")
Else
dynamicCaches = Array()
End If
' Refresh fixed caches
Dim cacheName As Variant
For Each cacheName In fixedCaches
Call RefreshCache(CStr(cacheName))
Next cacheName
' Refresh dynamic caches
For Each cacheName In dynamicCaches
Call RefreshCache(CStr(cacheName))
Next cacheName
RefreshAllCache = True RefreshAllCache = True
End Function End Function

View File

@@ -165,3 +165,24 @@ Private Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As
' Validation passed - clear error ' Validation passed - clear error
ws.Cells(rowNum, errorCol).ClearContents ws.Cells(rowNum, errorCol).ClearContents
End Sub End Sub
' obtain z1 master data, and update column E
Private Sub Refresh(ws As Worksheet, ByVal startRow As Long, ByVal lastDataRow As Long)
Dim z1Cache As Object: Set z1Cache = GetCache("Z1")
If z1Cache Is Nothing Then Exit Sub
Application.EnableEvents = False
On Error GoTo Finally
Dim r As Long
For r = startRow To lastDataRow
Dim dVal As String: dVal = Trim(ws.Cells(r, 4).Value) ' Column D
If dVal <> "" And z1Cache.Exists(dVal) Then
Dim valsD As Variant: valsD = z1Cache(dVal)
ws.Cells(r, 5).Value = valsD(0) ' Column E
End If
Next r
Finally:
Application.EnableEvents = True
End Sub

View File

@@ -36,7 +36,7 @@ Private Sub Worksheet_Change(ByVal Target As Range)
Call ClearRowData(Me, cell.Row) Call ClearRowData(Me, cell.Row)
GoTo Finally GoTo Finally
Else Else
Call FillFromM1(cell.Row) Call FillFromM1(Me, cell.Row)
End If End If
Next Next
End If End If
@@ -57,7 +57,7 @@ Private Sub Worksheet_Change(ByVal Target As Range)
If Target.Column = 10 Then If Target.Column = 10 Then
Dim cellJ As Range Dim cellJ As Range
For Each cellJ In Target For Each cellJ In Target
Call FillKFromJ(cellJ.Row) Call FillKFromJ(Me, cellJ.Row)
Next Next
End If End If
@@ -87,13 +87,13 @@ Finally:
Application.EnableEvents = True ' Application.EnableEvents = True '
End Sub End Sub
Private Sub FillKFromJ(ByVal rowNum As Long) Private Sub FillKFromJ(ByVal ws As Worksheet, ByVal rowNum As Long)
Dim iValue As String: iValue = Trim(Me.Range("I" & rowNum).Value) Dim iValue As String: iValue = Trim(ws.Range("I" & rowNum).Value)
Dim jValue As String: jValue = Trim(Me.Range("J" & rowNum).Value) Dim jValue As String: jValue = Trim(ws.Range("J" & rowNum).Value)
Dim code As String: code = GetCode(jValue) Dim code As String: code = GetCode(jValue)
If jValue = "" Then If jValue = "" Then
Me.Range("K" & rowNum).ClearContents ws.Range("K" & rowNum).ClearContents
Exit Sub Exit Sub
End If End If
@@ -116,23 +116,23 @@ Private Sub FillKFromJ(ByVal rowNum As Long)
If cache.Exists(code) Then If cache.Exists(code) Then
Dim cacheVal As Variant: cacheVal = cache(code) Dim cacheVal As Variant: cacheVal = cache(code)
Me.Range("J" & rowNum).Value = Trim(code) ws.Range("J" & rowNum).Value = Trim(code)
Me.Range("K" & rowNum).Value = Trim(cacheVal(0)) ws.Range("K" & rowNum).Value = Trim(cacheVal(0))
End If End If
Select Case iValue Select Case iValue
Case "1" Case "1"
Exit Sub Exit Sub
Case "2" Case "2"
Me.Range("L" & rowNum).Value = Trim(cacheVal(2)) ws.Range("L" & rowNum).Value = Trim(cacheVal(2))
Me.Range("M" & rowNum).Value = Trim(cacheVal(3)) ws.Range("M" & rowNum).Value = Trim(cacheVal(3))
Me.Range("N" & rowNum).Value = Trim(cacheVal(4)) ws.Range("N" & rowNum).Value = Trim(cacheVal(4))
Me.Range("O" & rowNum).Value = Trim(cacheVal(5)) ws.Range("O" & rowNum).Value = Trim(cacheVal(5))
Me.Range("P" & rowNum).Value = Trim(cacheVal(6)) ws.Range("P" & rowNum).Value = Trim(cacheVal(6))
Me.Range("Q" & rowNum).Value = Trim(cacheVal(7)) ws.Range("Q" & rowNum).Value = Trim(cacheVal(7))
Case "3" Case "3"
Me.Range("L" & rowNum).Value = Trim(cacheVal(1)) ws.Range("L" & rowNum).Value = Trim(cacheVal(1))
Me.Range("M" & rowNum).Value = Trim(cacheVal(2)) ws.Range("M" & rowNum).Value = Trim(cacheVal(2))
Case Else Case Else
Exit Sub Exit Sub
End Select End Select
@@ -190,9 +190,7 @@ Private Sub CreateJDropdown(ByVal rowNum As Long)
End If End If
End Sub End Sub
Private Sub FillFromM1(ByVal rowNum As Long) Private Sub FillFromM1(ByVal ws As Worksheet, ByVal rowNum As Long)
Set ws = Me
Dim m1Cache As Object: Set m1Cache = GetCache("M1") Dim m1Cache As Object: Set m1Cache = GetCache("M1")
Dim cValue As String: cValue = Trim(ws.Range("C" & rowNum).Value) Dim cValue As String: cValue = Trim(ws.Range("C" & rowNum).Value)
@@ -395,6 +393,39 @@ Public Sub ImportCSVAndTriggerChange(ws As Worksheet, ByVal lastDataRow As Long)
Dim startRow As Long: startRow = sheetConf("StartRow") Dim startRow As Long: startRow = sheetConf("StartRow")
Dim i As Long Dim i As Long
For i = startRow To lastDataRow For i = startRow To lastDataRow
Call FillFromM1(i) Call FillFromM1(ws, i)
Next i Next i
End Sub End Sub
' obtain T1/T2/T3 cache data, and update column K
Private Sub Refresh(ws As Worksheet, ByVal startRow As Long, ByVal lastDataRow As Long)
Dim kenshuList As Object: Set kenshuList = GetCache("kenshuList")
If kenshuList Is Nothing Then Exit Sub
Application.EnableEvents = False
On Error GoTo Finally
Dim r As Long
For r = startRow To lastDataRow
Dim cValue As String: cValue = Trim(ws.Cells(r, 3).Value) ' Column C
' Skip if C column is empty
If cValue = "" Then
GoTo NextRow
End If
' Reuse FillFromM1 method to fill D-H columns
Call FillFromM1(ws, r)
' Reuse FillKFromJ method to fill J-K columns
Dim iValue As String: iValue = Trim(ws.Cells(r, 9).Value) ' Column I
If iValue <> "" And kenshuList.Exists(iValue) Then
Call FillKFromJ(ws, r)
End If
NextRow:
Next r
Finally:
Application.EnableEvents = True
End Sub

View File

@@ -2,4 +2,14 @@
' Module Name: Master_address ' Module Name: Master_address
' Module Desc: O1 address master data management ' Module Desc: O1 address master data management
' Module Methods: ' Module Methods:
' - Worksheet_Change
' ============================================================ ' ============================================================
' ============================================================
' Event Handlers
' ============================================================
Private Sub Worksheet_Change(ByVal Target As Range)
Dim HasHeaderEdit As Boolean: HasHeaderEdit = CheckHeaderEdit(Me, Target)
If HasHeaderEdit = True Then Exit Sub
End Sub

View File

@@ -2,5 +2,14 @@
' Module Name: Master_507 ' Module Name: Master_507
' Module Desc: O2 master data management (507) ' Module Desc: O2 master data management (507)
' Module Methods: ' Module Methods:
' - Worksheet_Change
' ============================================================ ' ============================================================
' ====== (507) =======
' ============================================================
' Event Handlers
' ============================================================
Private Sub Worksheet_Change(ByVal Target As Range)
Dim HasHeaderEdit As Boolean: HasHeaderEdit = CheckHeaderEdit(Me, Target)
If HasHeaderEdit = True Then Exit Sub
End Sub

View File

@@ -2,8 +2,19 @@
' Module Name: Master_244 ' Module Name: Master_244
' Module Desc: T1 master data management (244) ' Module Desc: T1 master data management (244)
' Module Methods: ' Module Methods:
' - Worksheet_Change
' - Validate ' - Validate
' ============================================================ ' ============================================================
' ============================================================
' Event Handlers
' ============================================================
Private Sub Worksheet_Change(ByVal Target As Range)
Dim HasHeaderEdit As Boolean: HasHeaderEdit = CheckHeaderEdit(Me, Target)
If HasHeaderEdit = True Then Exit Sub
End Sub
' '
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long) Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)

View File

@@ -2,8 +2,19 @@
' Module Name: Master_245 ' Module Name: Master_245
' Module Desc: T2 master data management (245) ' Module Desc: T2 master data management (245)
' Module Methods: ' Module Methods:
' - Worksheet_Change
' - Validate ' - Validate
' ============================================================ ' ============================================================
' ============================================================
' Event Handlers
' ============================================================
Private Sub Worksheet_Change(ByVal Target As Range)
Dim HasHeaderEdit As Boolean: HasHeaderEdit = CheckHeaderEdit(Me, Target)
If HasHeaderEdit = True Then Exit Sub
End Sub
' '
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long) Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)

View File

@@ -2,8 +2,19 @@
' Module Name: Master_246 ' Module Name: Master_246
' Module Desc: T3 master data management (246) ' Module Desc: T3 master data management (246)
' Module Methods: ' Module Methods:
' - Worksheet_Change
' - Validate ' - Validate
' ============================================================ ' ============================================================
' ============================================================
' Event Handlers
' ============================================================
Private Sub Worksheet_Change(ByVal Target As Range)
Dim HasHeaderEdit As Boolean: HasHeaderEdit = CheckHeaderEdit(Me, Target)
If HasHeaderEdit = True Then Exit Sub
End Sub
' '
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long) Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)

View File

@@ -2,8 +2,19 @@
' Module Name: Master_222 ' Module Name: Master_222
' Module Desc: Z1 master data management (222) ' Module Desc: Z1 master data management (222)
' Module Methods: ' Module Methods:
' - Worksheet_Change
' - Validate ' - Validate
' ============================================================ ' ============================================================
' ============================================================
' Event Handlers
' ============================================================
Private Sub Worksheet_Change(ByVal Target As Range)
Dim HasHeaderEdit As Boolean: HasHeaderEdit = CheckHeaderEdit(Me, Target)
If HasHeaderEdit = True Then Exit Sub
End Sub
' '
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long) Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)

View File

@@ -2,8 +2,19 @@
' Module Name: Master_223 ' Module Name: Master_223
' Module Desc: Z2 master data management (223) ' Module Desc: Z2 master data management (223)
' Module Methods: ' Module Methods:
' - Worksheet_Change
' - Validate ' - Validate
' ============================================================ ' ============================================================
' ============================================================
' Event Handlers
' ============================================================
Private Sub Worksheet_Change(ByVal Target As Range)
Dim HasHeaderEdit As Boolean: HasHeaderEdit = CheckHeaderEdit(Me, Target)
If HasHeaderEdit = True Then Exit Sub
End Sub
' '
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long) Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)

View File

@@ -2,8 +2,19 @@
' Module Name: Master_Z3_224 ' Module Name: Master_Z3_224
' Module Desc: Z3 master data management (224) ' Module Desc: Z3 master data management (224)
' Module Methods: ' Module Methods:
' - Worksheet_Change
' - Validate ' - Validate
' ============================================================ ' ============================================================
' ============================================================
' Event Handlers
' ============================================================
Private Sub Worksheet_Change(ByVal Target As Range)
Dim HasHeaderEdit As Boolean: HasHeaderEdit = CheckHeaderEdit(Me, Target)
If HasHeaderEdit = True Then Exit Sub
End Sub
' '
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long) Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig() Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()

View File

@@ -2,8 +2,19 @@
' Module Name: Master_Z4_220 ' Module Name: Master_Z4_220
' Module Desc: Z4 master data management (220) ' Module Desc: Z4 master data management (220)
' Module Methods: ' Module Methods:
' - Worksheet_Change
' - Validate ' - Validate
' ============================================================ ' ============================================================
' ============================================================
' Event Handlers
' ============================================================
Private Sub Worksheet_Change(ByVal Target As Range)
Dim HasHeaderEdit As Boolean: HasHeaderEdit = CheckHeaderEdit(Me, Target)
If HasHeaderEdit = True Then Exit Sub
End Sub
' '
Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long) Public Sub Validate(ws As Worksheet, ByVal rowNum As Long, ByVal lastDataRow As Long)
Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig() Dim sheetConfDict As Object: Set sheetConfDict = GetSheetConfig()

Binary file not shown.

Binary file not shown.