962 Commits

Author SHA1 Message Date
ef89cef862 Merge pull request 'materialJob open' (#182) from dev into dev-deploy
Reviewed-on: #182
2025-07-16 08:39:43 +09:00
cha
9642dc2d30 materialJob open 2025-07-16 08:37:34 +09:00
00e46f204e Merge pull request 'materialJob open' (#179) from dev into dev-deploy
Reviewed-on: #179
2025-07-15 18:39:39 +09:00
cha
d3a66e31ad materialJob open 2025-07-15 18:38:46 +09:00
15a827d54c Merge pull request '주석제거' (#177) from dev into dev-deploy
Reviewed-on: #177
2025-07-15 17:55:05 +09:00
cha
c7fe1b878b 주석제거 2025-07-15 17:54:07 +09:00
2fc9a85c7d Merge pull request '[1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다 - 저장 및 출력부분2' (#175) from dev into dev-deploy
Reviewed-on: #175
2025-07-15 16:17:16 +09:00
cha
54020c135f [1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다 - 저장 및 출력부분2 2025-07-15 16:16:25 +09:00
30dc11b37a Merge pull request '[1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다 - 저장 및 출력부분' (#173) from dev into dev-deploy
Reviewed-on: #173
2025-07-15 15:54:36 +09:00
cha
b92709b13d [1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다 - 저장 및 출력부분 2025-07-15 15:53:36 +09:00
48dff518b3 Merge pull request '운영 job 스케줄 실행' (#171) from dev into dev-deploy
Reviewed-on: #171
2025-07-15 13:46:44 +09:00
cha
6a7d370385 운영 job 스케줄 실행 2025-07-15 13:45:40 +09:00
8c73455cb1 Merge pull request '[1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다 - setQcastCustPrdId 추가' (#170) from dev into dev-deploy
Reviewed-on: #170
2025-07-15 13:04:10 +09:00
cha
b068db7b95 [1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다 - setQcastCustPrdId 추가 2025-07-15 13:03:38 +09:00
01a6139b57 Merge pull request '[1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다 - qcast_cust_prd_id 추가' (#169) from dev into dev-deploy
Reviewed-on: #169
2025-07-15 11:16:06 +09:00
cha
485a5d831c [1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다 - qcast_cust_prd_id 추가 2025-07-15 11:15:23 +09:00
1756d74afc Merge pull request '[1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다 - qcastCustPrdId 추가' (#167) from dev into dev-deploy
Reviewed-on: #167
2025-07-15 09:42:35 +09:00
cha
cf7a5ceb17 [1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다 - qcastCustPrdId 추가 2025-07-15 09:41:38 +09:00
2f17256e1b Merge pull request '[1157] DESING 견적 출력 시 중량표가 출력되지 않음 - 합계계산추가, 조건추가' (#165) from dev into dev-deploy
Reviewed-on: #165
2025-07-14 13:27:39 +09:00
cha
2b1bbc75ad [1157] DESING 견적 출력 시 중량표가 출력되지 않음 - 합계계산추가, 조건추가 2025-07-14 13:26:38 +09:00
0a20f718b3 Merge pull request '[1157] DESING 견적 출력 시 중량표가 출력되지 않음 - 계산추가' (#163) from dev into dev-deploy
Reviewed-on: #163
2025-07-10 17:32:01 +09:00
cha
b213960d9a [1157] DESING 견적 출력 시 중량표가 출력되지 않음 - 계산추가 2025-07-10 17:29:48 +09:00
96f950e46d Merge pull request '[1157] DESING 견적 출력 시 중량표가 출력되지 않음' (#161) from dev into dev-deploy
Reviewed-on: #161
2025-07-09 09:23:56 +09:00
cha
5ec23f7243 [1157] DESING 견적 출력 시 중량표가 출력되지 않음 2025-07-09 09:22:48 +09:00
97874c34e6 Merge pull request 'dev' (#159) from dev into dev-deploy
Reviewed-on: #159
2025-07-04 14:13:52 +09:00
cha
0636711957 Merge remote-tracking branch 'origin/dev' into feature/ysCha 2025-07-04 14:12:40 +09:00
cha
6100a68bfa [1167] 출력 Excel의 주의사항이 모두 표시되지 않습니다 2025-07-04 14:11:53 +09:00
c43a7e1f94 Merge pull request 'dev' (#157) from dev into dev-deploy
Reviewed-on: #157
2025-07-04 13:29:20 +09:00
23c0b6d24b Merge pull request '[1171] 출력 Excel 표시 물건명에 반영' (#156) from feature/ysCha into dev
Reviewed-on: #156
2025-07-04 13:28:56 +09:00
cha
48cc20fbbc [1171] 출력 Excel 표시 물건명에 반영 2025-07-04 13:27:18 +09:00
1679859acb Merge pull request 'dev' (#154) from dev into dev-deploy
Reviewed-on: #154
2025-07-04 13:22:58 +09:00
cha
984cef2695 Merge remote-tracking branch 'origin/dev' into feature/ysCha 2025-07-04 13:21:07 +09:00
cha
56f19e5faa [1171] 출력 Excel 표시 물건명에 반영 2025-07-04 13:13:36 +09:00
8c4b1cb930 Merge pull request '[1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다.' (#152) from dev into dev-deploy
Reviewed-on: #152
2025-07-03 16:14:55 +09:00
d41afb6545 Merge pull request '[1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다.' (#151) from feature/cha into dev
Reviewed-on: #151
2025-07-03 16:14:08 +09:00
cha
bce18006c8 [1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다. 2025-07-03 16:11:37 +09:00
d22eaac274 Merge pull request 'dev' (#149) from dev into dev-deploy
Reviewed-on: #149
2025-06-27 18:48:26 +09:00
f035763209 Merge pull request '[1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE => T_SIMULATION_PREFECTURE)' (#148) from feature/cha into dev
Reviewed-on: #148
2025-06-27 18:48:04 +09:00
cha
363753745c [1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE => T_SIMULATION_PREFECTURE) 2025-06-27 18:40:51 +09:00
94fb14e732 Merge pull request 'dev [1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE_AREA => T_SIMULATION_AREA)' (#146) from dev into dev-deploy
Reviewed-on: #146
2025-06-27 10:55:17 +09:00
b285e398af Merge pull request '[1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE_AREA => T_SIMULATION_AREA)' (#145) from feature/cha into dev
Reviewed-on: #145
2025-06-27 10:54:25 +09:00
cha
4bf86e1040 [1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE_AREA => T_SIMULATION_AREA) 2025-06-27 10:51:08 +09:00
b4142e112d Merge pull request 'dev' (#143) from dev into dev-deploy
Reviewed-on: #143
2025-06-26 09:27:51 +09:00
b842e0ce4a Merge pull request '[1122]DESINGの見積excel様式の追加 - 견적서 추가' (#142) from feature/cha into dev
Reviewed-on: #142
2025-06-26 09:27:09 +09:00
cha
c14080bd05 [1122]DESINGの見積excel様式の追加 - 견적서 추가 2025-06-26 09:26:30 +09:00
a12a753ec5 Merge pull request '[1122]DESINGの見積excel様式の追加 - 견적서 추가' (#141) from feature/cha into dev
Reviewed-on: #141
2025-06-25 17:33:44 +09:00
cha
473adf36e4 [1122]DESINGの見積excel様式の追加 - 견적서 추가 2025-06-25 17:31:58 +09:00
7dbc8b367d Merge pull request 'dev [1128]文字修正 - excel, pdf' (#139) from dev into dev-deploy
Reviewed-on: #139
2025-06-25 13:16:01 +09:00
815c9363f1 Merge pull request '[1128]文字修正 - excel, pdf' (#138) from feature/cha into dev
Reviewed-on: #138
2025-06-25 13:15:36 +09:00
cha
1ad6b672b2 [1128]文字修正 - excel, pdf 2025-06-25 11:36:18 +09:00