Commit Graph

2063 Commits

Author SHA1 Message Date
kjs
215242b676 검색필터 분할패널 데이터 합산기능 추가 2025-12-11 14:25:28 +09:00
kjs
fc5ffb03b2 엔티티 조인컬럼 표시문제 수정 2025-12-11 12:01:00 +09:00
kjs
2327dbe35c Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-12-11 11:41:39 +09:00
kjs
b9ee860e71 분할 패널 수정,삭제버튼 on,off기능 2025-12-11 11:41:38 +09:00
kjs
91f9bb9d12 Merge branch 'main' into feature/screen-management 2025-12-11 11:37:52 +09:00
kjs
2b747a1030 소스필드 못찾는 버그 수정 2025-12-11 11:37:40 +09:00
6735142db4 Merge pull request '모바일 환경 세션 타임아웃 연장 (30분 → 24시간)' (#274) from common/feat/dashboard-map into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/274
2025-12-11 11:18:47 +09:00
dohyeons
c4e81dd740 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-11 11:18:30 +09:00
dohyeons
7725cd1e87 모바일 환경 세션 타임아웃 연장 (30분 → 24시간) 2025-12-11 11:17:52 +09:00
d729d299a9 Merge pull request 'common/feat/dashboard-map' (#273) from common/feat/dashboard-map into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/273
2025-12-11 10:50:02 +09:00
dohyeons
d6c5b3418d Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-11 10:49:12 +09:00
dohyeons
bccb8a6330 리스트 위젯 REST API 기능 개선 2025-12-11 10:48:48 +09:00
kjs
288e553221 Merge pull request 'feature/screen-management' (#272) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/272
2025-12-11 10:44:16 +09:00
kjs
5bbbd37553 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-12-11 10:43:09 +09:00
kjs
f272f0c4c7 제어관리 회사코드 저장 안되는 문제 수정 2025-12-11 10:41:28 +09:00
kjs
088596480f 수식 노드 구현 2025-12-10 18:28:27 +09:00
e84764dc2b Merge pull request 'lhj' (#271) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/271
2025-12-10 16:49:21 +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
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
kjs
3188bc0513 입고테이블 생성날짜 저장에러ㅏ 수정 2025-12-10 16:06:47 +09:00
kjs
08575c296e 연쇄 통합관리 2025-12-10 15:59:04 +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
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
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
kjs
c71b958a05 연쇄관계 관리 2025-12-10 13:53:44 +09:00
leeheejin
c64c94c07b 최근이동한 내역들 2025-12-10 13:48:57 +09:00
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
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
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
kjs
ba817980f0 투명색 설정 가능하게 구현 2025-12-09 17:08:10 +09:00
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
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
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
kjs
1506389757 메일발송기능 데이터 모달로 전달 2025-12-09 14:17:45 +09:00
kjs
ece7f21bd3 메일 본문 내용 사용자 경험 개선 2025-12-09 13:50:17 +09:00