ERP-node

Commit Graph

Select branches

Hide Pull Requests

add/레포트관리

common/feat/dashboard-map

dev

external-connections

feat/dashboard

feat/multilang

feat/rest-api

feat/screenDesinger

feat/screenMngConnection

feat/tableTypeMngHistFeat

feature/batch-management

feature/batch-testing-updates

feature/connection

feature/dashboard

feature/inbound-inventory-fix

feature/prisma-to-raw-query-phase1-complete

feature/report

feature/rest-api-integration

feature/screen-management

feature/unified-components-renewal

feature/v2-renewal

feature/v2-unified-renewal

fix/429error

fix/commcode

fix/daejin-bugs

fix/error

fix/modalError

fix/profileImage

fix/split-panel-edit-group-records

ksh

lhj

logi

logistream

main

reportMng

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#362

#363

#364

#367

#368

#369

#37

#370

#371

#372

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

a52ab0b206 refactor: pivot-grid 컴포넌트 개선 leeheejin 2026-01-08 17:11:46 +0900
551e893f15 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. leeheejin 2026-01-08 17:10:04 +0900
85f8637ce0 fix: 채번 규칙 할당 로직 개선 - 복사 시 품목코드 자동생성 수정 leeheejin 2026-01-08 17:06:28 +0900
b85b3cd578 그리드? 일단 추가랑 복사기능 되게 했음 leeheejin 2026-01-08 17:05:27 +0900
b8c8b31033 feat: 서브 테이블 조인 및 필터 관계 정보 개선 DDD1542 2026-01-08 16:20:51 +0900
0f57309d74 Merge pull request '분할패널 설정변경' (#342) from feature/screen-management into main kjs 2026-01-08 15:56:30 +0900
4dfa82d3dd 분할패널 설정변경 kjs 2026-01-08 15:56:06 +0900
34e48993e4 feat(SplitPanelLayout2): 개별 수정 버튼에 모달 화면 선택 UI 추가 SeongHyun Kim 2026-01-08 15:37:22 +0900
9821afe9cd Merge pull request 'feature/screen-management' (#341) from feature/screen-management into main kjs 2026-01-08 14:49:45 +0900
38599a1bef Merge branch 'main' into feature/screen-management kjs 2026-01-08 14:49:39 +0900
11e25694b9 엔티티타입 입력 셀렉트박스 다중선택 기능 kjs 2026-01-08 14:49:24 +0900
8928d851ca feat: 서브 테이블 정보 및 관계 시각화 개선 DDD1542 2026-01-08 14:24:33 +0900
3f81c449ad 코드병합기능 개선 kjs 2026-01-08 14:24:07 +0900
00006bf2e2 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node hjjeong 2026-01-08 14:15:53 +0900
3e9bf29bcf fix: SplitPanelLayout 그룹 삭제 시 groupByColumns 기준 삭제 및 멀티테넌시 보호 추가(영업관리_거래처별 품목 등록 등에서,,) hjjeong 2026-01-08 14:13:19 +0900
34ac1b0c42 Merge remote-tracking branch 'origin/main' into ksh SeongHyun Kim 2026-01-08 14:06:07 +0900
df94d73662 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. leeheejin 2026-01-08 12:34:39 +0900
dc449f6c69 글씨크기 조정 leeheejin 2026-01-08 12:34:19 +0900
dcf3a63d9b Merge pull request 'feature/screen-management' (#340) from feature/screen-management into main kjs 2026-01-08 12:33:15 +0900
a3c83c834e 드래그핸들 기능 수정 kjs 2026-01-08 12:32:50 +0900
980c929d83 리도,언도기능 kjs 2026-01-08 12:28:48 +0900
a146667615 드래그 핸들 수정 kjs 2026-01-08 12:25:52 +0900
2645d627da fix: 수주관리 수정 모달 저장 오류 수정 - UPDATE 폴백 로직 추가, 데이터 병합 순서 수정, 삭제 파라미터 순서 수정, id 타입 비교 통일 SeongHyun Kim 2026-01-08 12:25:35 +0900
f33d989202 복사된 셀 표시 kjs 2026-01-08 12:23:00 +0900
6a1343b847 복사 붙여넣기 기능 kjs 2026-01-08 12:14:04 +0900
b61cb17aea 자동 채우기 핸들 kjs 2026-01-08 12:04:31 +0900
83eb92cb27 엑셀 업로드 단계 통합 kjs 2026-01-08 11:51:02 +0900
5321ea5b80 엑셀 업로드 템플릿 기능 구현 kjs 2026-01-08 11:45:39 +0900
d90a403ed9 엑셀 업로드 카테고리 타입 자동 감지 kjs 2026-01-08 11:09:40 +0900
c181385f11 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-08 10:40:01 +0900
23ebae95d6 검색필터 틀고정기능 오류 수정 kjs 2026-01-08 10:39:48 +0900
17498b1b2b refactor: UniversalFormModalComponent 자체 저장 기능 제거 saveSingleRow, saveWithCustomApi, handleSave, handleReset 함수 삭제 saving 상태 및 저장/초기화 버튼 UI 삭제 설정 패널에서 저장 버튼 관련 설정 UI 삭제 ModalConfig 타입에서 버튼 관련 속성 삭제 저장 처리는 button-primary (action: save)로 위임 약 468줄 코드 삭제 SeongHyun Kim 2026-01-08 10:04:05 +0900
384106dd95 Merge remote-tracking branch 'origin/main' into ksh SeongHyun Kim 2026-01-07 18:27:00 +0900
6f4c9b7fdd ix: 부모-자식 모달 데이터 전달 문제 해결 및 미사용 multiRowSave 기능 제거 InteractiveScreenViewerDynamic: 생성 모드에서 formData를 initialData로 전달하도록 수정 UniversalFormModal: saveMultipleRows 함수 및 multiRowSave 관련 코드 전체 제거 types/config: MultiRowSaveConfig 인터페이스 및 기본값 제거 FieldDetailSettingsModal: receiveFromParent UI 옵션 제거 SaveSettingsModal: 저장 모드 설명 개선 DB: multiRowSave.enabled=true인 화면 3개 설정 수정 SeongHyun Kim 2026-01-07 17:42:40 +0900
26c61ee5b6 Merge pull request 'feature/screen-management' (#339) from feature/screen-management into main kjs 2026-01-07 16:11:15 +0900
d8ff49d1db Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-07 16:11:02 +0900
8c525673ab Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-07 16:10:12 +0900
47ac9ecd8a 범용폼모달 외부소스 지원 kjs 2026-01-07 16:10:11 +0900
1b633e55d2 Merge pull request 'lhj' (#338) from lhj into main hjlee 2026-01-07 16:07:50 +0900
b279f8d58d feat: 화면 관리 기능 개선 및 서브 테이블 정보 추가 DDD1542 2026-01-07 14:50:03 +0900
48e9840fa0 feat: 화면 그룹 생성 및 업데이트 기능 개선 DDD1542 2026-01-07 14:49:49 +0900
62226918a7 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. leeheejin 2026-01-07 14:32:23 +0900
df70538027 pop화면 leeheejin 2026-01-07 14:31:04 +0900
26020a29a0 Merge pull request 'feature/screen-management' (#337) from feature/screen-management into main kjs 2026-01-07 13:31:14 +0900
52df163fbb Merge branch 'main' into feature/screen-management kjs 2026-01-07 13:31:07 +0900
777429af48 Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-07 13:30:57 +0900
856db80a36 빌드 에러수정 kjs 2026-01-07 13:30:57 +0900
cd7adce874 Merge pull request '테이블에 존재하는지 확인하는 제어 추가' (#336) from feature/screen-management into main kjs 2026-01-07 11:55:53 +0900
ca260aa260 Merge branch 'main' into feature/screen-management kjs 2026-01-07 11:55:45 +0900
42d1a3fc5e Merge remote-tracking branch 'origin/main' into ksh SeongHyun Kim 2026-01-07 10:28:47 +0900
7c165a724e feat: 출고관리 수정 모달 저장 기능 개선 및 그룹화 컬럼 설정 UI 추가 ButtonConfigPanel: 수정 액션에 그룹화 컬럼 선택 드롭다운 추가 (영문/한글 검색 지원) ScreenSplitPanel/EmbeddedScreen: groupedData prop 전달 경로 추가 buttonActions: RepeaterFieldGroup 저장 시 공통 필드 우선 적용되도록 병합 순서 변경 SeongHyun Kim 2026-01-07 10:24:01 +0900
0ce0860dcc Merge pull request '입고 처리 시 재고 테이블 저장 및 재고이력 stock_id 전달 수정' (#335) from feature/inbound-inventory-fix into main hjjeong 2026-01-07 10:06:37 +0900
c6ff839e54 입고 처리 시 재고 테이블 저장 및 재고이력 stock_id 전달 수정 feature/inbound-inventory-fix hjjeong 2026-01-07 10:05:32 +0900
e308fd0ccc 테이블에 존재하는지 확인하는 제어 추가 kjs 2026-01-07 09:55:19 +0900
f2cb7d14ca Merge pull request 'lhj' (#334) from lhj into main hjlee 2026-01-07 09:48:46 +0900
b5b229122b 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. leeheejin 2026-01-07 09:37:16 +0900
126da9b46f 하이큐마그 점검항목 추가 후 주기명/점검방법명 오류 해결 leeheejin 2026-01-07 09:37:02 +0900
c365f06ed7 Merge remote-tracking branch 'origin/main' into ksh SeongHyun Kim 2026-01-07 09:06:29 +0900
563081fa1c Merge pull request 'lhj' (#333) from lhj into main hjlee 2026-01-06 17:57:31 +0900
24331687d4 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. leeheejin 2026-01-06 17:57:05 +0900
ea848b97ee 검색필터 업데이트 leeheejin 2026-01-06 17:56:31 +0900
15fc166683 Merge pull request 'lhj' (#332) from lhj into main hjlee 2026-01-06 17:40:25 +0900
26fdab5b4e 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. leeheejin 2026-01-06 17:39:53 +0900
12d3419b7f 구분 필터링 업데이트 leeheejin 2026-01-06 17:39:36 +0900
a2b701a4bf feat: 조건부 컨테이너 initialData 전달 체계 구현 InteractiveScreenViewerDynamic: originalData를 initialData로 추가 전달 DynamicComponentRenderer: initialData 우선순위 로직 추가 ConditionalContainerComponent: initialData props 추가 및 하위 전달 ConditionalSectionViewer: initialData props 추가 및 하위 전달 types.ts: initialData 타입 정의 추가 수정 모드에서 조건부 컨테이너 내부 컴포넌트 초기값 표시 지원 SeongHyun Kim 2026-01-06 17:29:41 +0900
2213ad51b2 Merge pull request '수정' (#331) from feature/screen-management into main kjs 2026-01-06 17:02:54 +0900
7120d5edc3 수정 kjs 2026-01-06 17:02:42 +0900
0eb005ce35 Merge pull request '창고코드 같이 올라가게 수정' (#330) from feature/screen-management into main kjs 2026-01-06 15:34:02 +0900
4828488c72 Merge branch 'main' into feature/screen-management kjs 2026-01-06 15:33:55 +0900
c1425be57f 창고코드 같이 올라가게 수정 kjs 2026-01-06 15:33:44 +0900
25b7e637de feat: 테이블 데이터 저장 시 존재하지 않는 컬럼 자동 필터링 SeongHyun Kim 2026-01-06 15:29:26 +0900
ad39374e54 Merge remote-tracking branch 'origin/main' into ksh SeongHyun Kim 2026-01-06 15:04:36 +0900
77bb917248 feat: RepeaterFieldGroup 상위 폼 필드 전달 방식 개선 SeongHyun Kim 2026-01-06 15:03:22 +0900
6bf914d9b1 Merge pull request '거래처 품목정보 거래처품번/단가 입력 없이 저장되도록' (#329) from fix/daejin-bugs into main hjjeong 2026-01-06 15:02:38 +0900
e08c50c771 거래처 품목정보 거래처품번/단가 입력 없이 저장되도록 fix/daejin-bugs hjjeong 2026-01-06 15:01:50 +0900
0f027f2382 Merge pull request 'lhj' (#328) from lhj into main hjlee 2026-01-06 14:45:07 +0900
09d574fb8a 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. leeheejin 2026-01-06 14:44:23 +0900
6ae0778b4c 필터의 라벨도 코드말고 설정한걸로 나오게 수정 leeheejin 2026-01-06 14:43:57 +0900
58b0e1b79b Merge pull request '범용 폼모달 라벨로 뜨게 수정' (#327) from feature/screen-management into main kjs 2026-01-06 14:24:52 +0900
f0322a49ad 범용 폼모달 라벨로 뜨게 수정 kjs 2026-01-06 14:24:30 +0900
5e27d21257 Merge pull request 'feature/screen-management' (#326) from feature/screen-management into main kjs 2026-01-06 13:46:00 +0900
efc9175fec Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-06 13:45:48 +0900
eb61506acd 분할패널 수정동작 수정 kjs 2026-01-06 13:43:47 +0900
75b5530d04 Merge remote-tracking branch 'origin/main' into ksh SeongHyun Kim 2026-01-06 13:23:00 +0900
cded99d644 로그 제거 kjs 2026-01-06 13:08:33 +0900
40fd5f9055 feat: 채번규칙 editable 옵션 수동 모드 감지 기능 구현 모달 오픈 시 채번 미리보기 원본값 저장 (numberingOriginalValues) handleFieldChange에서 원본값 비교하여 수동/자동 모드 전환 사용자 수정 시 ruleId 제거하여 저장 시 채번 스킵 원본값 복구 시 ruleId 복구하여 자동 모드 복원 handleSave에서 채번 할당 조건 분기 처리 SeongHyun Kim 2026-01-06 13:06:28 +0900
0709b8df25 Merge pull request '범용 폼 모달 사전필터 기능 수정' (#325) from feature/screen-management into main kjs 2026-01-06 11:43:38 +0900
6bfc1a97a3 범용 폼 모달 사전필터 기능 수정 kjs 2026-01-06 11:43:26 +0900
9ea0f1b84f Merge pull request 'feature/screen-management' (#324) from feature/screen-management into main kjs 2026-01-06 10:28:30 +0900
7cb8026979 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-06 10:28:17 +0900
4f77c38207 권한기능 임시 비활성화 kjs 2026-01-06 10:27:54 +0900
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. leeheejin 2026-01-06 10:21:07 +0900
7f9885f84e Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/v2-unified-renewal kjs 2026-01-06 09:22:45 +0900
338c885cfa Merge pull request 'fix/daejin-bugs' (#323) from fix/daejin-bugs into main hjjeong 2026-01-06 09:20:44 +0900
b3ee2b50e8 fix: 카테고리 Select 필드 저장 시 라벨값 대신 코드값 저장되도록 수정 SeongHyun Kim 2026-01-05 18:41:49 +0900
5e688ca28c Merge branch 'feature/v2-renewal' of http://39.117.244.52:3000/kjs/ERP-node into feature/v2-unified-renewal kjs 2026-01-05 18:23:14 +0900
6295b52e87 모달열기 기능 통합 kjs 2026-01-05 18:22:46 +0900
64105bf525 발주관리 수정시 공급처 표시 오류 수정 hjjeong 2026-01-05 18:21:29 +0900
6925e3af3f feat: 화면 서브 테이블 정보 조회 기능 추가 DDD1542 2026-01-05 18:18:26 +0900
a34230ae90 모달열기 액션 통합 kjs 2026-01-05 17:44:32 +0900