kjs 57b64653c0 merge: resolve conflicts accepting incoming changes ...

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-04-07 14:44:17 +09:00

..

adminService.ts

Merge branch 'ksh-function-stabilization' into ksh-v2-work

2026-03-09 15:36:53 +09:00

auditLogService.ts

Enhance user management and token invalidation features

2026-03-25 18:47:50 +09:00

authService.ts

Enhance user management and token invalidation features

2026-03-25 18:47:50 +09:00

barcodeLabelService.ts

바코드 기능 커밋밋

2026-03-04 20:51:00 +09:00

batchExecutionLogService.ts

REST API→DB 토큰 배치 및 auth_tokens 저장 구현

2025-11-27 11:32:19 +09:00

batchExternalDbService.ts

타입스크립트 에러 수정

2025-12-01 15:30:25 +09:00

batchManagementService.ts

플로우 위젝 라벨표시 및 , 배치관리 회사별 분리

2025-10-28 12:06:54 +09:00

batchSchedulerService.ts

Enhance batch management functionality by adding node flow execution support and improving batch configuration creation. Introduce new API endpoint for retrieving node flows and update existing batch services to handle execution types. Update frontend components to support new scheduling options and node flow selection.

2026-03-19 15:07:07 +09:00

batchService.ts

Enhance batch management functionality by adding node flow execution support and improving batch configuration creation. Introduce new API endpoint for retrieving node flows and update existing batch services to handle execution types. Update frontend components to support new scheduling options and node flow selection.

2026-03-19 15:07:07 +09:00

bomService.ts

Merge branch 'jskim-node' of http://39.117.244.52:3000/kjs/ERP-node into gbpark-node

2026-02-27 10:39:51 +09:00

bookingService.ts

배포용 수정

2025-10-16 10:33:21 +09:00

categoryTreeService.ts

feat: Integrate audit logging for various operations

2026-03-04 13:49:08 +09:00

collectionService.ts

feat: Phase 3.6 CollectionService 전환 완료 및 Phase 3.7-3.9 계획서 작성

2025-10-01 11:20:21 +09:00

commonCodeService.ts

공통코드 계층구조 구현

2025-12-23 09:31:18 +09:00

componentStandardService.ts

docs: Phase 3.3 ComponentStandardService 완료 문서 업데이트 및 코드 포맷 정리

2025-10-01 10:51:09 +09:00

crawlService.ts

feat: add web crawling management functionality

2026-03-26 16:30:53 +09:00

DashboardService.ts

feat: 대시보드 목록에 생성자 컬럼 추가

2025-12-01 11:07:35 +09:00

dataflowControlService.ts

모달창 올리기

2025-10-29 11:26:00 +09:00

dataflowDiagramService.ts

feat: Phase 3.5 DataflowDiagramService Raw Query 전환 완료

2025-10-01 11:12:41 +09:00

dataflowService.ts

테이블 간 조인 관계 조회 기능 추가

2026-01-22 11:16:23 +09:00

dataMappingService.ts

feat: Phase 3.16 데이터 관리 서비스 Raw Query 전환 완료

2025-10-01 12:27:32 +09:00

dataService.ts

Merge branch 'jskim-node' of http://39.117.244.52:3000/kjs/ERP-node into gbpark-node

2026-02-22 20:54:59 +09:00

dbConnectionManager.ts

스크롤 기능 포함

2025-09-23 10:45:53 +09:00

dbQueryBuilder.ts

플로우 외부연결 중간커밋

2025-10-21 13:19:18 +09:00

dbTypeCategoryService.ts

fix: dbTypeCategoryService 타입 에러 수정

2025-10-01 14:47:29 +09:00

ddlAuditLogger.ts

fix: DDLAuditLogger 변수명 충돌 해결

2025-10-01 12:03:14 +09:00

ddlExecutionService.ts

fix: 화면 복제 기능 개선 및 관련 버그 수정

2026-01-28 11:24:25 +09:00

ddlSafetyValidator.ts

테이블 추가기능 수정사항

2025-09-23 10:40:21 +09:00

deliveryService.ts

배송/화물현황과 리스크/알림(api 활용, 공공데이터 복구시 대체될 가능성 있음)

2025-10-14 16:36:00 +09:00

DigitalTwinTemplateService.ts

에디터 속성 편집 성능 최적화 (디바운스 적용)

2025-11-26 16:05:33 +09:00

documentService.ts

투두리스트, 예약요청, 정비,문서

2025-10-14 17:21:28 +09:00

dynamicFormService.ts

Enhance dynamic form service error handling and add pagination to DataGrid component

2026-03-31 11:18:41 +09:00

encryptionService.ts

feat: 사용자 메일 관리 IMAP 구현

2026-03-30 17:17:20 +09:00

enhancedDataflowControlService.ts

빌드에러해결

2025-10-29 11:33:46 +09:00

enhancedDynamicFormService.ts

docs: 다양한 문서 및 가이드 업데이트

2026-01-28 17:36:19 +09:00

entityJoinService.ts

Implement Comma Value Resolution in Entity Join Service

2026-03-16 11:43:26 +09:00

eventTriggerService.ts

feat: Phase 3.10 EventTriggerService Raw Query 전환 완료

2025-10-01 11:43:19 +09:00

excelMappingService.ts

엑셀 업로드 템플릿 기능 구현

2026-01-08 11:45:39 +09:00

externalCallConfigService.ts

feat: Phase 3.12 ExternalCallConfigService Raw Query 전환 완료

2025-10-01 12:07:14 +09:00

externalCallService.ts

데이터 매핑 설정 중간커밋

2025-09-26 17:52:11 +09:00

externalDbConnectionPoolService.ts

분할 패널 RepeaterFieldGroup 저장 및 DB webType 자동 매핑 구현

2025-12-15 15:40:29 +09:00

externalDbConnectionService.ts

외부 연결 목록에 회사명 표시 기능 추가

2025-12-02 17:36:28 +09:00

externalDbHelper.ts

플로우 로그기능 수정

2025-10-21 14:21:29 +09:00

externalRestApiConnectionService.ts

restapi 도 경로보기 가능, 출발지목적지 동시에 같은거 못하게, 자물쇠걸면 컬럼 수정 못함 tablelistcomponent

2025-12-08 10:23:54 +09:00

flowConditionParser.ts

feat: Implement company code validation in flow management

2026-03-03 10:38:38 +09:00

flowConnectionService.ts

각 회사별 데이터 분리

2025-10-27 16:40:59 +09:00

flowDataMoveService.ts

feat: Add procedure and function management in flow controller

2026-03-03 14:33:17 +09:00

flowDefinitionService.ts

feat: Implement company code validation in flow management

2026-03-03 10:38:38 +09:00

flowExecutionService.ts

feat: Implement company code validation in flow management

2026-03-03 10:38:38 +09:00

flowExternalDbConnectionService.ts

플로우 외부db연결

2025-10-20 17:50:27 +09:00

flowExternalDbIntegrationService.ts

플로우 외부db연결

2025-10-20 17:50:27 +09:00

flowProcedureService.ts

feat: Add procedure and function management in flow controller

2026-03-03 14:33:17 +09:00

flowStepService.ts

feat: Add express-async-errors for improved error handling

2026-02-12 11:42:52 +09:00

imapConnectionPool.ts

feat: 사용자 메일 관리 IMAP 구현

2026-03-30 17:17:20 +09:00

inputTypeService.ts

테이블 추가기능 수정사항

2025-09-23 10:40:21 +09:00

layoutService.ts

feat: Phase 3.7 LayoutService Raw Query 전환 완료

2025-10-01 11:25:08 +09:00

mailAccountFileService.ts

배포용 수정

2025-10-16 10:33:21 +09:00

mailCache.ts

feat: 사용자 메일 관리 IMAP 구현

2026-03-30 17:17:20 +09:00

mailReceiveBasicService.ts

메일관리

2025-10-22 17:07:38 +09:00

mailSendSimpleService.ts

메일관련된거 커밋

2025-11-28 11:34:48 +09:00

mailSentHistoryService.ts

메일관리

2025-10-22 17:07:38 +09:00

mailTemplateFileService.ts

메일관련된거 커밋

2025-11-28 11:34:48 +09:00

maintenanceService.ts

투두리스트, 예약요청, 정비,문서

2025-10-14 17:21:28 +09:00

mapDataService.ts

차량위치 위젯 기존꺼 분할 완료

2025-10-15 10:29:15 +09:00

masterDetailExcelService.ts

feat: Add Numbering Rule APIs and Frontend Integration

2026-03-09 14:10:08 +09:00

menuCopyService.ts

refactor: Update references from table_column_category_values to category_values

2026-03-09 13:46:38 +09:00

menuScreenSyncService.ts

feat: Enhance menu copy and screen sync services with new fields

2026-03-04 23:42:43 +09:00

menuService.ts

화면 분할 패널 기능

2025-11-28 14:56:11 +09:00

messengerService.ts

[RAPID-micro] 새 대화 모달 z-index 메신저 위로 상향 (10000/10001)

2026-04-01 12:20:41 +09:00

multiConnectionQueryService.ts

fix: 화면 복제 기능 개선 및 관련 버그 수정

2026-01-28 11:24:25 +09:00

multilangService.ts

Merge branch 'mhkim-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node

2026-03-26 09:30:17 +09:00

multiTableExcelService.ts

docs: add DB table creation rules and guidelines

2026-03-11 15:04:05 +09:00

nodeFlowExecutionService.ts

fix: update file handling and improve query logging

2026-03-18 17:43:03 +09:00

numberingRuleService.ts

Merge branch 'jskim-node' of http://39.117.244.52:3000/kjs/ERP-node into gbpark-node

2026-03-16 16:39:02 +09:00

productionPlanService.ts

feat: Enhance process and work standard management functionalities

2026-04-06 15:50:33 +09:00

quoteService.ts

Add quote management functionality with API and UI integration

2026-04-02 15:30:44 +09:00

referenceCacheService.ts

fix: 화면 복제 기능 개선 및 관련 버그 수정

2026-01-28 11:24:25 +09:00

reportService.ts

feat: 리포트 타입 에러 수정

2026-03-12 18:47:42 +09:00

riskAlertCacheService.ts

알림 api 수정

2025-10-21 12:51:57 +09:00

riskAlertService.ts

Add environment variable example and update .gitignore

2026-04-01 12:12:15 +09:00

roleService.ts

Enhance user management and token invalidation features

2026-03-25 18:47:50 +09:00

sampleService.ts

[agent-pipeline] pipe-20260403004704-gib0 round-1

2026-04-03 09:48:39 +09:00

scheduleService.ts

refactor: 코드 정리 및 불필요한 로그 제거

2026-02-05 17:35:13 +09:00

screenManagementService.ts

feat: POP 회사별 자동 세팅 — 메뉴 활성화 시 레이아웃 자동 생성

2026-04-07 10:46:54 +09:00

tableCategoryValueService.ts

feat: enhance v2 components and entity join functionality

2026-03-25 09:54:18 +09:00

tableManagementService.ts

feat: COMPANY_29 및 COMPANY_7 고객 관리 및 부서 관리 페이지 개선

2026-03-30 11:51:12 +09:00

taxInvoiceService.ts

세금계산서 업그레이드

2025-12-08 16:18:44 +09:00

templateStandardService.ts

feat: Phase 3.9 TemplateStandardService Raw Query 전환 완료

2025-10-01 11:40:48 +09:00

todoService.ts

todo 오류 있던거 수정 이젠 디비꺼도 지워짐

2025-10-20 18:04:49 +09:00

tokenInvalidationService.ts

Enhance user management and token invalidation features

2026-03-25 18:47:50 +09:00

userMailAccountService.ts

feat: 사용자 메일 관리 IMAP 구현

2026-03-30 17:17:20 +09:00

userMailImapService.ts

[RAPID-micro] 메일 작성 다이얼로그에 보내는 사람 계정 선택 추가

2026-04-01 15:29:00 +09:00

userMailSmtpService.ts

feat: 사용자 메일 관리 IMAP 구현

2026-03-30 17:17:20 +09:00

vehicleReportService.ts

공차관련수정사항들

2025-12-02 09:53:08 +09:00

vehicleTripService.ts

공차관련수정사항들

2025-12-02 09:53:08 +09:00

workHistoryService.ts

작업 이력 통계 위젯 추가

2025-10-20 14:07:08 +09:00

YardLayoutService.ts

저장 버튼을 누르기 전 저장 x

2025-10-20 11:26:50 +09:00