962 Commits

Author SHA1 Message Date
d99e6786fb Merge pull request '[1388] 지붕재 중복 순환 문제' (#302) from dev into dev-deploy
Reviewed-on: #302
2026-01-09 16:59:52 +09:00
d5bf607772 [1388] 지붕재 중복 순환 문제 2026-01-09 16:58:50 +09:00
a1192d4656 Merge pull request '[1393]Simulation 발전량 오류' (#300) from dev into dev-deploy
Reviewed-on: #300
2026-01-09 15:23:41 +09:00
65fe2f0d4e [1393]Simulation 발전량 오류 2026-01-09 15:09:57 +09:00
9641f7560d Merge pull request '[1394]Simulation 내용의 오류 - 엑셀다운로드' (#298) from dev into dev-deploy
Reviewed-on: #298
2026-01-09 09:42:17 +09:00
3f4b428fe7 [1394]Simulation 내용의 오류 - 엑셀다운로드 2026-01-09 09:40:59 +09:00
f4f493b7c2 Merge pull request 'dev' (#297) from dev into dev-deploy
Reviewed-on: #297
2026-01-08 16:59:37 +09:00
f4607d07e5 인증용량 STORAGE_BATTERY 2026-01-08 16:58:53 +09:00
10b0f3136c Merge remote-tracking branch 'origin/dev' into feature/ysCha 2026-01-08 11:00:45 +09:00
879af547fc 인증용량 AND I.POWER_COM_FLG = '1' 제거 2026-01-08 10:54:00 +09:00
02f3c9549f 북면 모듈 설치 여부 컬럼 추가 2026-01-07 17:00:33 +09:00
4788938c70 Merge pull request 'dev' (#295) from dev into dev-deploy
Reviewed-on: #295
2026-01-06 17:33:02 +09:00
b19e7298c1 인증용량 AND I.POWER_COM_FLG = '1' 제거 유보 2026-01-06 17:32:26 +09:00
f761c7a706 重量算出シート : 조건에 맞는 중량표 명칭변경 2026-01-06 17:29:56 +09:00
d195377619 배치잡 데드락 1분간격으로 3번 실행 2026-01-06 15:38:45 +09:00
81c15136cd 인증용량 AND I.POWER_COM_FLG = '1' 제거 2026-01-06 09:37:27 +09:00
3392d342b0 Merge pull request 'businessTeamCd -> businessChargerTeamCd' (#293) from dev into dev-deploy
Reviewed-on: #293
2026-01-05 14:52:46 +09:00
6944ff4b00 businessTeamCd -> businessChargerTeamCd 2026-01-05 14:51:49 +09:00
acec646754 Merge pull request 'QCAST_CUST_PRD_ID != PC_ITEM_ID 수정' (#291) from dev into dev-deploy
Reviewed-on: #291
2026-01-05 14:02:46 +09:00
d0908de86f QCAST_CUST_PRD_ID != PC_ITEM_ID 수정 2026-01-05 14:01:34 +09:00
aeefbdd7cc Merge pull request 'dev' (#289) from dev into dev-deploy
Reviewed-on: #289
2026-01-05 13:07:48 +09:00
5685caad47 QCAST_CUST_PRD_ID != PC_ITEM_ID 2026-01-05 13:06:50 +09:00
1a2963cd91 Merge remote-tracking branch 'origin/dev' into feature/ysCha
# Conflicts:
#	src/main/resources/mappers/estimate/estimateMapper.xml
2026-01-05 11:30:47 +09:00
c0a7c24bbb QCAST_CUST_PRD_ID != PC_ITEM_ID 2026-01-05 11:30:15 +09:00
0b13ab7c58 Merge pull request 'estimateMapper.xml' (#287) from dev into dev-deploy
Reviewed-on: #287
2026-01-02 15:44:26 +09:00
ac00a93719 estimateMapper.xml 2026-01-02 15:43:15 +09:00
109430e1d2 Merge pull request 'estimateMapper.xml' (#286) from dev into dev-deploy
Reviewed-on: #286
2026-01-02 14:23:04 +09:00
493f006d74 estimateMapper.xml 2026-01-02 14:21:22 +09:00
8152e029ce Merge pull request '배치가 멈춰있더라도 1시간만 지나면 별도의 조치 없이 다음 실행 때 자동으로 정상화' (#285) from dev into dev-deploy
Reviewed-on: #285
2025-12-31 14:56:17 +09:00
efb29f8eb6 배치가 멈춰있더라도 1시간만 지나면 별도의 조치 없이 다음 실행 때 자동으로 정상화 2025-12-31 14:55:49 +09:00
de9219cf56 Merge pull request 'resetFailedJobs가 실행되면서 DB에 끼어있던(STARTED) 상태들을 모두 실패(FAILED)로 바꿈' (#284) from dev into dev-deploy
Reviewed-on: #284
2025-12-31 14:23:32 +09:00
7de3098785 resetFailedJobs가 실행되면서 DB에 끼어있던(STARTED) 상태들을 모두 실패(FAILED)로 바꿈 2025-12-31 14:22:58 +09:00
fefde969db Merge pull request '"storeAdditionalJob","businessChargerJob","adminUserJob" 허용' (#283) from dev into dev-deploy
Reviewed-on: #283
2025-12-31 09:46:25 +09:00
063f2bd382 "storeAdditionalJob","businessChargerJob","adminUserJob" 허용 2025-12-31 09:45:05 +09:00
fcd47662cb Merge pull request 'dev' (#281) from dev into dev-deploy
Reviewed-on: #281
2025-12-30 14:30:48 +09:00
10f95281a3 Merge remote-tracking branch 'origin/dev' into feature/ysCha 2025-12-30 14:27:33 +09:00
47e02689f7 pcsMakerList 에 storeId 추가 2025-12-30 14:26:50 +09:00
dca4a83062 Merge pull request 'String으로 수정' (#279) from dev into dev-deploy
Reviewed-on: #279
2025-12-24 17:50:09 +09:00
2e1e027beb String으로 수정 2025-12-24 17:49:16 +09:00
9c5feef68d Merge pull request 'northModuleYn 컬럼 추가' (#277) from dev into dev-deploy
Reviewed-on: #277
2025-12-24 17:31:29 +09:00
c8cf6aec24 northModuleYn 컬럼 추가 2025-12-24 17:28:40 +09:00
c4eb97a02a Merge pull request '엑셀수정' (#276) from dev into dev-deploy
Reviewed-on: #276
2025-12-23 17:57:22 +09:00
bf9a9506fc 엑셀수정 2025-12-23 17:56:39 +09:00
cb18e2196a Merge pull request '특이사항 제거 ,excel, pdf' (#274) from dev into dev-deploy
Reviewed-on: #274
2025-12-22 11:24:20 +09:00
3b4b4aaba8 특이사항 제거 ,excel, pdf 2025-12-22 11:23:25 +09:00
14125fc2cc Merge pull request '엑셀사이즈변경' (#272) from dev into dev-deploy
Reviewed-on: #272
2025-12-19 13:10:08 +09:00
e232ba405d 엑셀사이즈변경 2025-12-19 13:09:34 +09:00
6f0d043603 Merge pull request '특이사항 제거 ,excel, pdf' (#270) from dev into dev-deploy
Reviewed-on: #270
2025-12-18 14:01:50 +09:00
3347d17a11 특이사항 제거 ,excel, pdf 2025-12-18 14:00:16 +09:00
cd91cc9006 Merge pull request '방위각 절대치 적용' (#268) from dev into dev-deploy
Reviewed-on: #268
2025-12-17 18:44:29 +09:00