kjs
4f77c38207
권한기능 임시 비활성화
2026-01-06 10:27:54 +09:00
68017ed0e9
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.
2026-01-06 10:21:07 +09:00
hjjeong
338c885cfa
Merge pull request 'fix/daejin-bugs' ( #323 ) from fix/daejin-bugs into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/323
2026-01-06 09:20:44 +09:00
b3ee2b50e8
fix: 카테고리 Select 필드 저장 시 라벨값 대신 코드값 저장되도록 수정
...
- UniversalFormModalComponent.tsx: 카테고리 옵션 value를 valueLabel에서 valueCode로 변경
- 제어 로직 조건 비교 정상화 및 500 에러 해결
2026-01-05 18:41:49 +09:00
hjjeong
64105bf525
발주관리 수정시 공급처 표시 오류 수정
2026-01-05 18:21:29 +09:00
hjjeong
714698c20f
구매관리_발주관리 저장 시 마스터정보 품목에 전달
2026-01-05 17:08:47 +09:00
hjjeong
2a7066b6fd
테이블에 존재하는 컬럼만 업데이트
2026-01-05 17:08:03 +09:00
5fbc76f85d
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.
2026-01-05 14:47:26 +09:00
e747162058
Merge remote-tracking branch 'origin/main' into ksh
2026-01-05 13:58:56 +09:00
914f3d57f3
fix: TableList 카테고리 라벨 표시를 위한 멀티테넌시 fallback 로직 추가
...
getColumnInputTypes API에서 회사별 설정이 없을 때 기본설정() fallback 적용
table_type_columns, category_column_mapping 조회 시 DISTINCT ON + ORDER BY CASE WHEN 패턴 사용
영향 범위: 모든 TableList 컴포넌트의 카테고리 컬럼 표시
2026-01-05 13:58:13 +09:00
kjs
12baad75c9
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2026-01-05 13:54:42 +09:00
kjs
85519e302f
행선택시에만 버튼 활성화 기능 수정
2026-01-05 13:54:41 +09:00
kjs
98e96a1fb0
Merge pull request '즉시저장 액션 필수항목 체크 추가' ( #322 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/322
2026-01-05 13:38:09 +09:00
kjs
76d7d5149b
Merge branch 'main' into feature/screen-management
2026-01-05 13:38:02 +09:00
kjs
239e4800c7
즉시저장 액션 필수항목 체크 추가
2026-01-05 13:37:39 +09:00
6c75adb61d
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.
2026-01-05 10:10:23 +09:00
ad76bfe3b0
Merge remote-tracking branch 'origin/main' into ksh
2026-01-05 09:28:12 +09:00
4ad58ba942
feat: 폼 모달 자동 채번 기능 구현 및 임베디드 스크린 렌더링 최적화
...
UniversalFormModalComponent에 폼 초기화 시 채번 규칙을 가져와 적용하는 generateNumberingValues 구현
채번 생성 중복 호출 방지를 위한 useRef 로직 추가
데이터 업데이트 시 불필요한 리마운트 및 포커스 분실을 방지하기 위해 EmbeddedScreen 컴포넌트 key에서 formDataVersion 제거
2026-01-04 17:41:07 +09:00
36a723b1a0
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node
2026-01-01 02:29:57 +09:00
5a94afc1d5
기존 회사변경수정
2026-01-01 02:29:53 +09:00
2889e4c82c
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-31 14:53:06 +09:00
kjs
c15ec8f7b9
Merge pull request 'feature/screen-management' ( #321 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/321
2025-12-31 14:17:53 +09:00
kjs
eb868965df
조건부 계산식
2025-12-31 14:17:39 +09:00
kjs
417e1d297b
폼 조건별 계산식 설정기능
2025-12-31 13:53:30 +09:00
0b1dc98e5c
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-31 11:01:18 +09:00
kjs
fff10a1911
Merge pull request '범용 폼모달 제어로직 연동' ( #320 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/320
2025-12-31 10:54:28 +09:00
kjs
2842930dba
Merge branch 'main' into feature/screen-management
2025-12-31 10:54:20 +09:00
kjs
5bdc903b0d
범용 폼모달 제어로직 연동
2025-12-31 10:54:07 +09:00
kjs
4ce0411809
Merge pull request 'feature/screen-management' ( #319 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/319
2025-12-30 17:45:50 +09:00
kjs
bd49db16c6
1
2025-12-30 17:45:38 +09:00
kjs
113ef24bdf
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-12-30 15:51:26 +09:00
kjs
7d6bff49aa
폼 채번 오작동 문제 수정
2025-12-30 15:36:28 +09:00
7b773f57b4
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node
2025-12-30 15:28:13 +09:00
58233e51de
각각 별도 TSX 병합 및 회사선택기능 추가
2025-12-30 15:28:05 +09:00
kjs
4421ccaa71
Merge pull request 'feature/screen-management' ( #318 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/318
2025-12-30 14:19:44 +09:00
kjs
183f68e89a
Merge branch 'main' into feature/screen-management
2025-12-30 14:19:36 +09:00
kjs
fb82d2f5a1
분할패널에서 버튼 비활성화기능 수정
2025-12-30 14:19:15 +09:00
kjs
84a3956b02
버튼 버그 수정
2025-12-30 14:13:26 +09:00
kjs
c78326bae1
버튼 비활성화 로직
2025-12-30 14:11:42 +09:00
kjs
b45f4870e8
신규등록 버튼 버그 수정
2025-12-30 14:03:29 +09:00
kjs
fd58e9cce2
행추가,모달 동시입력기능 구현
2025-12-30 13:32:49 +09:00
kjs
c7efe8ec33
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-12-30 12:33:18 +09:00
kjs
3c4e251e9b
폼 다중테이블 저장 지원
2025-12-30 12:33:17 +09:00
kjs
e902987e44
Merge pull request '로그테이블 관련 내용 추가' ( #317 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/317
2025-12-30 10:54:31 +09:00
kjs
54ca51258c
Merge branch 'main' into feature/screen-management
2025-12-30 10:54:23 +09:00
kjs
06d5069566
로그테이블 관련 내용 추가
2025-12-30 10:54:06 +09:00
kjs
e1d6c1740f
Merge pull request '테이블 생성규칙' ( #316 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/316
2025-12-30 10:49:01 +09:00
kjs
c32bd8a4bf
테이블 생성규칙
2025-12-30 10:48:11 +09:00
e040b94a62
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-30 09:41:56 +09:00
6476a83d86
변경추가
2025-12-29 18:19:17 +09:00
kjs
leeheejin
hjjeong
SeongHyun Kim
DDD1542