kjs
/
ERP-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,038 Commits 35 Branches 0 Tags 170 MiB
Commit Graph

2038 Commits

Author SHA1 Message Date
leeheejin d09c8e0787 파일업로드 수정 2025-12-10 18:38:16 +09:00
leeheejin fa6c00b6be 모달 잘리는거 해결 2025-12-10 17:41:41 +09:00
leeheejin bc10f2101a Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj 
; Please enter a commit message to explain why this merge is necessary,
; especially if it merges an updated upstream into a topic branch.
;
; Lines starting with ';' will be ignored, and an empty message aborts
; the commit.
 2025-12-10 16:48:19 +09:00
leeheejin 65c1855eba 기본정보 눌렀을때 뜨는 오류해결 2025-12-10 16:47:48 +09:00
hyeonsu d0801e2ccc Merge pull request 'common/feat/dashboard-map' (#270) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/270
 2025-12-10 16:25:51 +09:00
dohyeons 48300146e6 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-10 15:54:09 +09:00
hjlee 5cd3bc52e3 Merge pull request 'lhj' (#269) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/269
 2025-12-10 15:53:33 +09:00
leeheejin 6707e2afd2 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj 
; Please enter a commit message to explain why this merge is necessary,
; especially if it merges an updated upstream into a topic branch.
;
; Lines starting with ';' will be ignored, and an empty message aborts
; the commit.
 2025-12-10 15:53:11 +09:00
dohyeons 90db4756e8 3D 야드 자재 개수 표시 버그 수정 및 빈 Location 표시 추가 2025-12-10 15:41:43 +09:00
dohyeons e6b8212d39 외부 커넥션 모달에 스크롤 생성 2025-12-10 15:40:33 +09:00
leeheejin d1c9aeca18 리스트위젯 조금 더 개선된 버전 2025-12-10 15:29:23 +09:00
leeheejin f75c3e43ed 리스트 위젯 업그레이드 2025-12-10 15:15:06 +09:00
dohyeons d7e96327a7 변경 이력 모달의 작업 컬럼 스타일을 수정 2025-12-10 15:11:46 +09:00
hyeonsu 9998045013 Merge pull request '플로우 위젯 체크박스 선택 버그 수정 - 인덱스 기반에서 Primary Key 기반으로 변경' (#268) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/268
 2025-12-10 14:39:38 +09:00
dohyeons c7ae04859d 플로우 위젯 체크박스 선택 버그 수정 - 인덱스 기반에서 Primary Key 기반으로 변경 2025-12-10 14:28:11 +09:00
leeheejin c64c94c07b 최근이동한 내역들 2025-12-10 13:48:57 +09:00
hjlee 28ca4f2088 Merge pull request '중간저장' (#267) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/267
 2025-12-10 10:30:41 +09:00
leeheejin 3608d9f9c3 중간저장 2025-12-10 10:27:54 +09:00
hjlee 990f667481 Merge pull request '테이블 툴바 설정 제대로 됩니당' (#266) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/266
 2025-12-10 09:17:32 +09:00
leeheejin dde65a2d1e 테이블 툴바 설정 제대로 됩니당 2025-12-10 09:17:11 +09:00
hjlee d11ffb1b00 Merge pull request '툴바 선택' (#265) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/265
 2025-12-09 18:26:55 +09:00
leeheejin 93ec294be3 툴바 선택 2025-12-09 18:26:36 +09:00
hjlee 74da2cd97f Merge pull request '데이터 증식하는 문제 해결' (#264) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/264
 2025-12-09 17:04:12 +09:00
leeheejin 36a7529da2 데이터 증식하는 문제 해결 2025-12-09 16:54:47 +09:00
hyeonsu 893ae06f19 Merge pull request 'common/feat/dashboard-map' (#263) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/263
 2025-12-09 16:43:21 +09:00
dohyeons 8b200ba9f3 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-09 16:42:37 +09:00
dohyeons 94b371ca0f 공차등록/운행알림 기능 개선 - vehicles 테이블 출발지/도착지 저장 및 운행종료 시 초기화 2025-12-09 16:38:47 +09:00
hjlee 0f8817835e Merge pull request '테이블리스트로 세금계산서 만들기' (#262) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/262
 2025-12-09 15:13:16 +09:00
leeheejin a8cbc289f6 테이블리스트로 세금계산서 만들기 2025-12-09 15:12:59 +09:00
hyeonsu a2e99b30e6 Merge pull request '작동하지 않는 버튼 비활성화' (#261) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/261
 2025-12-09 12:16:47 +09:00
dohyeons 2479e3a0c4 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-09 12:16:39 +09:00
dohyeons 167c3cd26b 작동하지 않는 버튼 비활성화 2025-12-09 12:14:32 +09:00
hyeonsu 6de40bea0c Merge pull request 'UTC DB 환경인 실 서비스에서의 9시간 지연 표시 문제 해결' (#260) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/260
 2025-12-09 12:05:33 +09:00
dohyeons 612b46236f UTC DB 환경인 실 서비스에서의 9시간 지연 표시 문제 해결 2025-12-09 12:05:12 +09:00
hyeonsu d7e03d6b83 Merge pull request 'flowExecutionService 트랜잭션 처리 개선 및 데이터 변경 추적 로직 수정' (#259) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/259
 2025-12-09 11:16:36 +09:00
dohyeons 3cf99dbad9 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-09 11:16:23 +09:00
dohyeons 0aaab45329 flowExecutionService 트랜잭션 처리 개선 및 데이터 변경 추적 로직 수정 2025-12-09 11:15:18 +09:00
hyeonsu aa78c0c0cb Merge pull request 'common/feat/dashboard-map' (#258) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/258
 2025-12-09 10:38:05 +09:00
dohyeons 8d07458c94 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-09 10:36:49 +09:00
hjlee 84f47a021b Merge pull request '지역 필터링 기능 추가' (#257) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/257
 2025-12-09 10:34:24 +09:00
leeheejin 469c8b2e57 지역 필터링 기능 추가 2025-12-09 10:18:07 +09:00
SeongHyun Kim 7ac6bbc2c6 Merge remote-tracking branch 'origin/main' into ksh 2025-12-09 09:24:33 +09:00
SeongHyun Kim fa59235cd2 fix(split-panel-layout2): 좌측 패널 항목 선택 상태 비교 로직 개선 
- idColumn 자동 감지 로직 추가 (id > dept_code > code 순 폴백)
- isSelected 비교 시 객체 동일성 및 undefined 체크 추가
- hierarchyConfig.idColumn 미설정 시에도 정상 동작
 2025-12-09 09:22:10 +09:00
SeongHyun Kim d908de7f66 fix(numbering-rule): 채번규칙 저장 시 allocateNumberingCode로 실제 순번 할당 
- generateNumberingCode를 allocateNumberingCode로 변경 (순번 실제 증가)

- saveSingleRow/saveMultipleRows/saveWithMultiTable 모두 적용

- NumberingRuleCard: 파트 타입 변경 시 defaultAutoConfig 적용

- NumberingRuleDesigner: 저장 시 partsWithDefaults로 기본값 병합

- sequenceLength/numberLength 기본값 4에서 3으로 변경

- 불필요한 console.log 제거
 2025-12-08 19:10:07 +09:00
kjs 531ba3ffdb Merge pull request '빌드 에러 수정' (#256) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/256
 2025-12-08 18:26:56 +09:00
kjs fb4c9574d3 Merge branch 'main' into feature/screen-management 2025-12-08 18:26:49 +09:00
kjs e53515481b 빌드 에러 수정 2025-12-08 18:26:38 +09:00
SeongHyun Kim b15b6e21ea fix(UniversalFormModal): 반복 섹션 linkedFieldGroup 매핑 및 서브 테이블 저장 로직 개선 
- renderFieldWithColumns()에 repeatContext 파라미터 추가

- linkedFieldGroup 선택 시 repeatContext 유무에 따라 formData/repeatSections 분기 저장

- multiTableSave: UPSERT 대신 SELECT-UPDATE/INSERT 명시적 분기로 변경

- ON CONFLICT 조건 불일치 에러 방지

- 서브 테이블 저장 상세 로그 추가
 2025-12-08 18:23:28 +09:00
hjlee 37fb9a13f8 Merge pull request 'lhj' (#255) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/255
 2025-12-08 18:21:51 +09:00
leeheejin a20712d48e Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj 
; Please enter a commit message to explain why this merge is necessary,
; especially if it merges an updated upstream into a topic branch.
;
; Lines starting with ';' will be ignored, and an empty message aborts
; the commit.
 2025-12-08 18:17:27 +09:00