Commit Graph

3631 Commits

Author SHA1 Message Date
SeongHyun Kim 224338d75f Merge branch 'ksh-v2-work' into main
POP 디자이너 GRID-V6 + BLOCK DETAIL Phase 2~3 + 낙관적 잠금 기능을 main에 통합한다.
주요 병합 내용:
- GRID-V6 정사각형 블록 그리드 시스템 (842ac27d)
- POP 그리드 명칭 통일 + Dead Code 제거 (320100c4)
- BLOCK DETAIL Phase 2: 생산 공정 백엔드 API (create-work-processes, timer)
- BLOCK DETAIL Phase 3: pop-work-detail 컴포넌트 + 모달 캔버스 시스템
- 낙관적 잠금 + 소유자 기반 액션 제어 + 디자이너 설정 UI
- LOCK-OWNER 카드 비활성화 UI 보완
충돌 해결: 0건 (자동 병합 완료)
2026-03-16 10:37:31 +09:00
SeongHyun Kim 138f309c09 Merge branch 'ksh-partial-quantity-flow' into ksh-v2-work
BLOCK DETAIL Phase 2~3 + 낙관적 잠금 기능을 ksh-v2-work에 통합한다.
주요 병합 내용:
- BLOCK DETAIL Phase 2: 생산 공정 관리 백엔드 API (create-work-processes, timer)
- BLOCK DETAIL Phase 3: pop-work-detail 컴포넌트 + 모달 캔버스 시스템
- 낙관적 잠금 + 소유자 기반 액션 제어 + 디자이너 설정 UI
- LOCK-OWNER 카드 비활성화 UI 누락분 반영
충돌 해결: 0건 (자동 병합 완료)
2026-03-16 10:34:04 +09:00
SeongHyun Kim 3bd0eff82e feat: BLOCK DETAIL Phase 3 - pop-work-detail 컴포넌트 + 모달 캔버스 시스템
세부진행화면(4502)의 프론트엔드 구현: pop-work-detail 컴포넌트 신규 생성과
디자이너 모달 캔버스 편집을 통해, 카드 클릭 시 공정별 체크리스트/검사/실적 상세
작업 화면을 내부 모달로 표시할 수 있게 한다.
[신규] pop-work-detail 컴포넌트 (4파일)
- PopWorkDetailComponent: parentRow → 현재 공정 추출 → process_work_result 조회,
  좌측 사이드바(PRE/IN/POST 3단계 작업항목 그룹) + 우측 체크리스트(5종: check/inspect/
  input/procedure/material) + 타이머 제어(start/pause/resume) + 수량 등록 + 공정 완료
- PopWorkDetailConfig: showTimer/showQuantityInput/phaseLabels 설정 패널
- PopWorkDetailPreview: 디자이너 프리뷰
- index.tsx: PopComponentRegistry 등록 (category: display, touchOptimized)
[모달 캔버스 시스템] PopDesigner.tsx 대규모 리팩토링
- handleMoveComponent/handleResizeComponent/handleRequestResize:
  layout 직접 참조 → setLayout(prev => ...) 함수형 업데이트로 전환
  + activeCanvasId 분기: main이면 기존 로직, modal-*이면 modals 배열 내 해당 모달 수정
- PopCardListV2Config: 모달 캔버스 생성/열기 버튼 (usePopDesignerContext 연동)
- PopCardListV2Component: modal-* screenId → setSharedData + __pop_modal_open__ 이벤트
- PopViewerWithModals: parentRow prop + fullscreen 모달 지원 + flex 레이아웃
[기타]
- ComponentPalette: pop-work-detail 팔레트 항목 + ClipboardCheck 아이콘
- pop-layout.ts: PopComponentType에 pop-work-detail 추가, 기본 크기 38x26
- PopRenderer: COMPONENT_TYPE_LABELS에 pop-work-detail 추가
- types.ts: PopWorkDetailConfig 인터페이스
- PopCanvas.tsx: activeLayout.components 참조 수정 (모달 캔버스 호환)
DB 변경 0건. 백엔드 변경 0건.
2026-03-16 10:32:58 +09:00
kjs 2d7a30a6f5 Merge pull request 'jskim-node' (#417) from jskim-node into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/417
2026-03-16 09:35:46 +09:00
kjs 40620a5674 Merge branch 'main' into jskim-node 2026-03-16 09:35:39 +09:00
kjs 5908801823 Merge branch 'jskim-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node 2026-03-16 09:35:24 +09:00
kjs 79e3420ff3 refactor: update production controller to use AuthenticatedRequest
- Modified the production controller to replace the generic Request type with AuthenticatedRequest for better type safety and to ensure user authentication is handled correctly.
- This change enhances the security and clarity of the API endpoints related to production plan management, ensuring that user-specific data is accessed appropriately.

Made-with: Cursor
2026-03-16 09:35:23 +09:00
kjs 7b5c875ac0 Merge pull request 'jskim-node' (#416) from jskim-node into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/416
2026-03-16 09:29:41 +09:00
kjs af91cafc02 Merge branch 'main' into jskim-node 2026-03-16 09:29:33 +09:00
kjs ba39ebf341 Merge branch 'mhkim-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node 2026-03-16 09:28:46 +09:00
kjs 59a70b83aa Merge branch 'jskim-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node 2026-03-16 09:28:24 +09:00
kjs 17a5d2ff9b feat: implement production plan management functionality
- Added production plan management routes and controller to handle various operations including order summary retrieval, stock shortage checks, and CRUD operations for production plans.
- Introduced service layer for production plan management, encapsulating business logic for handling production-related data.
- Created API client for production plan management, enabling frontend interaction with the new backend endpoints.
- Enhanced button actions to support API calls for production scheduling and management tasks.

These changes aim to improve the management of production plans, enhancing usability and functionality within the ERP system.

Made-with: Cursor
2026-03-16 09:28:22 +09:00
kmh 8c12caf936 chore: update .gitignore and remove unused images
- Added support for ignoring PNG files in .gitignore to streamline file management.
- Deleted unused image files from the .playwright-mcp directory to reduce clutter and improve project organization.
- Enhanced column visibility handling in TableListComponent to include width adjustments and localStorage synchronization for better user experience.

Made-with: Cursor
2026-03-16 09:26:04 +09:00
DDD1542 6395f4d032 Implement Card Pulse Animation and UI Enhancements
- Added a new pulse animation for screen cards to enhance visual feedback.
- Updated the background of the screen management list for improved aesthetics.
- Refined the search input styling for better integration with the overall UI.
- Enhanced screen card hover effects with dynamic glow based on screen type.
- Adjusted layout spacing for a more consistent user experience.

Made-with: Cursor
2026-03-16 09:17:59 +09:00
DDD1542 cbd47184e7 Enhance Screen Management UI
- Updated the search input to include a clear button for easier user interaction.
- Improved the layout with a muted background for better visibility.
- Enhanced screen card display with dynamic type color and glow effects based on screen type.
- Adjusted text colors for better contrast and readability in dark mode.
- Refined connection indicators and button styles for improved UX.

Made-with: Cursor
2026-03-16 09:17:52 +09:00
DDD1542 fe3c6d3bce [agent-pipeline] rollback to 232650bc 2026-03-15 22:29:56 +09:00
DDD1542 015706b95a [agent-pipeline] pipe-20260315131310-l8kw round-2 2026-03-15 22:29:56 +09:00
DDD1542 232650bc07 [agent-pipeline] pipe-20260315131310-l8kw round-1 2026-03-15 22:19:35 +09:00
DDD1542 8ed7faf517 [agent-pipeline] pipe-20260315121506-3c5c round-2 2026-03-15 21:22:36 +09:00
DDD1542 009607f3f1 [agent-pipeline] pipe-20260315121506-3c5c round-1 2026-03-15 21:18:08 +09:00
DDD1542 3ef8cebf1a [agent-pipeline] pipe-20260315110231-zn60 round-2 2026-03-15 20:14:51 +09:00
DDD1542 558acd1f9b [agent-pipeline] pipe-20260315110231-zn60 round-1 2026-03-15 20:09:41 +09:00
DDD1542 c0be2f3528 feat: 접는 사이드바 구현 (v5 파이프라인 후속)
- sidebarCollapsed 상태 + 조건부 렌더링
- PanelLeftOpen/PanelLeftClose 아이콘 토글
- collapsed 시 아이콘 컬럼 표시

Made-with: Cursor
2026-03-15 19:57:17 +09:00
DDD1542 beb95bf2aa [agent-pipeline] pipe-20260315091327-kxyf round-4 2026-03-15 18:57:12 +09:00
DDD1542 2cb736dac1 [agent-pipeline] pipe-20260315091327-kxyf round-3 2026-03-15 18:46:28 +09:00
DDD1542 ffc7cb7933 [agent-pipeline] rollback to 784dc73a 2026-03-15 18:31:12 +09:00
DDD1542 d542e92021 [agent-pipeline] pipe-20260315091327-kxyf round-2 2026-03-15 18:31:12 +09:00
DDD1542 784dc73abf [agent-pipeline] pipe-20260315091327-kxyf round-1 2026-03-15 18:22:20 +09:00
DDD1542 27ce039fc8 [agent-pipeline] pipe-20260315080636-1tpd round-4 2026-03-15 17:22:24 +09:00
DDD1542 4c19d3a6eb [agent-pipeline] pipe-20260315080636-1tpd round-3 2026-03-15 17:18:18 +09:00
DDD1542 94a95b7dc1 [agent-pipeline] pipe-20260315080636-1tpd round-2 2026-03-15 17:13:37 +09:00
DDD1542 f711506671 [agent-pipeline] pipe-20260315080636-1tpd round-1 2026-03-15 17:10:04 +09:00
DDD1542 24b53b5b33 [agent-pipeline] pipe-20260315072335-zb1m round-5 2026-03-15 16:42:20 +09:00
DDD1542 bf509171db [agent-pipeline] pipe-20260315072335-zb1m round-4 2026-03-15 16:38:00 +09:00
DDD1542 0ac9db45a0 [agent-pipeline] pipe-20260315072335-zb1m round-3 2026-03-15 16:32:53 +09:00
DDD1542 bafc81b2a3 [agent-pipeline] pipe-20260315072335-zb1m round-2 2026-03-15 16:30:14 +09:00
DDD1542 21ca0f3a3c [agent-pipeline] pipe-20260315072335-zb1m round-1 2026-03-15 16:27:14 +09:00
DDD1542 265d79cc5a [agent-pipeline] pipe-20260315065015-rei8 round-5 2026-03-15 16:07:43 +09:00
DDD1542 bad3a002f3 [agent-pipeline] rollback to b1afe1bc 2026-03-15 16:05:07 +09:00
DDD1542 0db57fe01a [agent-pipeline] pipe-20260315065015-rei8 round-4 2026-03-15 16:05:06 +09:00
DDD1542 b1afe1bc8d [agent-pipeline] pipe-20260315065015-rei8 round-3 2026-03-15 16:01:43 +09:00
DDD1542 c4db3fbfd4 [agent-pipeline] pipe-20260315065015-rei8 round-2 2026-03-15 15:58:02 +09:00
DDD1542 015cd2c3ed [agent-pipeline] pipe-20260315065015-rei8 round-1 2026-03-15 15:54:04 +09:00
DDD1542 ea6aa6921c [agent-pipeline] rollback to f375252d 2026-03-15 15:36:53 +09:00
DDD1542 e963129e63 [agent-pipeline] pipe-20260315061036-2tnn round-6 2026-03-15 15:36:53 +09:00
DDD1542 f375252db1 [agent-pipeline] pipe-20260315061036-2tnn round-5 2026-03-15 15:33:19 +09:00
DDD1542 542663e9e6 [agent-pipeline] rollback to 501325e4 2026-03-15 15:30:47 +09:00
DDD1542 245580117e [agent-pipeline] pipe-20260315061036-2tnn round-4 2026-03-15 15:30:47 +09:00
DDD1542 501325e4b4 [agent-pipeline] pipe-20260315061036-2tnn round-3 2026-03-15 15:27:14 +09:00
DDD1542 92cd070749 [agent-pipeline] pipe-20260315061036-2tnn round-2 2026-03-15 15:22:16 +09:00