Commit Graph

4134 Commits

Author SHA1 Message Date
SeongHyun Kim
684d23cc38 feat: 불량 수량 입력에 숫자 키패드 모달 추가 2026-04-06 15:35:55 +09:00
SeongHyun Kim
fb3ecff02d fix: newTotalInput 변수 스코프 오류 수정 2026-04-06 15:29:41 +09:00
SeongHyun Kim
e21c672f09 fix: 리워크 접수 버그 2건 수정
- 리워크 전량 접수 시 status→in_progress (재접수 방지)
- 리워크 접수 시 master input_qty 덮어쓰기 방지
- 재고 중복: location_code 차이 (NULL vs "01") — 정상 동작이지만 주의 필요
2026-04-06 15:11:30 +09:00
SeongHyun Kim
fab29b720d fix: 불량 처리 시 공정 선택 UI 연결 — processList를 DefectTypeModal에 전달 2026-04-06 15:00:34 +09:00
SeongHyun Kim
cff733e568 fix: 완료/진행중 탭에서 마스터 행 제외 — SPLIT만 표시 2026-04-06 14:45:43 +09:00
SeongHyun Kim
5c9447a321 fix: 공정실행 카드 표시 3건 수정
- 분할접수 카드 구분: 같은 공정 복수 SPLIT 시 "접수 #1", "접수 #2" 표시
- 재작업 카드 전공정 표시: is_rework='Y' 카드는 공정 필터 무시, 모든 공정에서 표시
- 대기/완료 탭: 선택한 공정 기준으로만 카드 표시 (기존 동작 확인)
- DefectTypeModal: 전공정/지정공정 UI 이미 구현 확인 (수정 불필요)
2026-04-06 14:27:49 +09:00
SeongHyun Kim
d1d823d5ca fix: 재작업 카드 접수 — 자체 input_qty 기반 접수 가능 (앞공정 무관) 2026-04-06 14:07:11 +09:00
SeongHyun Kim
507264a718 fix: completed master 재활성화 — 새 양품 들어오면 acceptable로 복귀 2026-04-06 13:54:29 +09:00
SeongHyun Kim
b8c9d94a73 feat: 재작업 카드를 지정 공정에 생성
- target_process_code가 있으면 해당 공정의 마스터를 찾아서 재작업 카드 생성
- 없으면 기존처럼 같은 공정에 생성
- 지정 공정의 seq_no, process_code, routing_detail_id 사용
2026-04-06 13:47:51 +09:00
SeongHyun Kim
c8f24d60f3 fix: batch_id 컬럼 없을 때 fallback + 트랜잭션 안전 처리
- batch_id 컬럼 존재 여부를 사전 확인 후 INSERT 쿼리 분기
- 트랜잭션 내 try-catch fallback 대신 조건부 컬럼 방식으로 변경
- 배포 DB에 ALTER TABLE 권한 없어도 정상 동작
2026-04-06 12:20:09 +09:00
SeongHyun Kim
32f99fba63 feat: 배치(로트) 추적 — batch_id 컬럼 + 카드 진행률 표시
- work_order_process에 batch_id 컬럼 자동 추가 (ALTER TABLE IF NOT EXISTS)
- 접수 시 batch_id 자동 생성 (BATCH-timestamp-random)
- 다음 공정 접수 시 batch_id 전달 가능 (이어받기)
- 완료 카드: 같은 batch_id의 SPLIT 추적으로 정확한 진행률 표시
- 예: seq1만 완료 → ✓○○ (1/3), 전체 완료 → ✓✓✓ (전체 완료)
2026-04-06 12:08:35 +09:00
SeongHyun Kim
32a372a9b3 fix: 완료 카드 공정 표시를 해당 카드의 seq 기준으로 변경
- 이전: 완료 카드는 모든 공정을 ✓로 표시 (전체 완료)
- 이후: 카드의 seq_no 이하만 ✓, 이후는 ○ 표시
- 예: seq1 완료 → ✓○○ (1/3 완료), seq3 완료 → ✓✓✓ (전체 완료)
2026-04-06 11:53:55 +09:00
SeongHyun Kim
78f959c091 fix: 접수가능 이중 집계 버그 수정 + 바텀바 삭제
- available-qty: master+SPLIT 이중 합산 → SPLIT만 합산 (5곳)
- 원인: master에 합산된 good_qty와 SPLIT의 good_qty가 중복 카운트
- PopShell: 하단 footer(copyright/version/긴급연락) 삭제
2026-04-06 11:47:13 +09:00
SeongHyun Kim
ac913990a3 feat: POP 설정 저장소를 screen_layouts_pop으로 전환
- usePopSettings: pop_settings 테이블 대신 screen_layouts_pop.popConfig에서 읽기
- 화면별 독립 설정 (URL→screen_id 자동 매핑)
- PC 설정 페이지: layout-pop API로 저장/조회
- "같은 유형의 모든 화면에 적용" 동기화 체크박스
- pop_settings 400 에러 완전 제거
- 신규 화면 등록: 판매출고(5), 출고유형(6), 공정실행(7), 생산관리(8)
2026-04-06 10:46:37 +09:00
SeongHyun Kim
b844eb8eb8 fix: 바코드 스캔 개선 + POP 에러 3건 수정
- 바코드 모달: 카메라 자동 실행 제거 (버튼 클릭 시 실행)
- 바코드 모달: 수동 입력 필드 추가 (외장 스캐너/직접 입력)
- 바코드 모달: facingMode fallback (후면→전면 카메라)
- usePopSettings: pop_settings 테이블 없을 때 400 에러 무시
- RecentActivity: key 중복 에러 수정 (인덱스 추가)
2026-04-06 10:12:50 +09:00
SeongHyun Kim
aba2de7ee3 feat: POP 설정 페이지 v3 — 상단 화면 선택 + 스키마 기반 설정폼
- 오버레이 클릭존 제거 (위치 불일치 문제 근본 해결)
- 상단: 메뉴 그룹 (입고/출고/생산/홈/PLC) 접기/펼치기
- 왼쪽: iframe POP 미리보기
- 오른쪽: 스키마 기반 동적 설정폼 (7가지 타입)
- /pop/admin 페이지 삭제 (PC 설정으로 일원화)
2026-04-05 21:51:25 +09:00
SeongHyun Kim
9ea59e94df Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev
Some checks failed
Build and Push Images / build-and-push (push) Failing after 1m29s
2026-04-05 17:45:55 +09:00
SeongHyun Kim
c10468a8c3 Merge feature/pop-screen-merge: POP 기능 병합 (PC 무변경) 2026-04-05 17:45:37 +09:00
SeongHyun Kim
a04ddd15ec feat: POP 기능 병합 (pop-screen → main, PC 무변경 46건)
- POP 생산: 재고 관리, 재작업 이력, BOM 자재투입 기능 추가
- POP 설정: 설정 시스템 + 관리 페이지 (/pop/admin)
- POP 화면: 버그 수정 + 설정 연동 + 다음공정 활성화 수정
- PC 코드 무변경 (보류 6건: app.ts, 출고/입고/작업지시 컨트롤러, 레이아웃)
2026-04-05 17:45:33 +09:00
DDD1542
8d95d3b0ed Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev
Some checks failed
Build and Push Images / build-and-push (push) Failing after 1m3s
2026-04-03 12:10:52 +09:00
DDD1542
c6cccc0a03 fix: update table styles and improve column sorting logic in logistics info page 2026-04-03 12:10:50 +09:00
8c70d4d9fb Merge pull request 'feat: Enhance logging and configuration for Smart Factory integration' (#7) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 50s
Reviewed-on: #7
2026-04-03 02:24:17 +00:00
5032f5c83f Merge branch 'main' into jskim-node 2026-04-03 02:24:12 +00:00
kjs
ca7b145c7f feat: Enhance logging and configuration for Smart Factory integration
- Added companyCode to the AuthController for improved logging.
- Updated sendSmartFactoryLog function to support company-specific API keys.
- Configured environment variables for company-specific Smart Factory API keys in Docker Compose files.

This update ensures that logs are more informative and that the correct API keys are used based on the company context.
2026-04-03 11:23:02 +09:00
f4e455bf1e Merge pull request 'jskim-node' (#6) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 1m27s
Reviewed-on: #6
2026-04-03 01:50:49 +00:00
kjs
41e278099e Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-03 10:44:43 +09:00
kjs
092a9736d9 Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-03 10:44:27 +09:00
kjs
218fd73d5b Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-03 10:26:55 +09:00
kjs
6bdfd26fa2 [agent-pipeline] pipe-20260403004704-gib0 round-2 2026-04-03 09:51:46 +09:00
kjs
d0b8ab02b3 [agent-pipeline] pipe-20260403004704-gib0 round-1 2026-04-03 09:48:39 +09:00
DDD1542
d54c99cc04 Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev
Some checks failed
Build and Push Images / build-and-push (push) Failing after 1m31s
; Conflicts:
;	frontend/app/globals.css
;	frontend/components/layout/AdminPageRenderer.tsx
2026-04-03 09:30:16 +09:00
DDD1542
d03f92947d feat: Implement dynamic search filter in Shipping Plan page
- Integrated DynamicSearchFilter component to manage search filters.
- Removed individual search state variables and replaced with a single searchFilters state.
- Updated fetchData function to handle new filter structure.
- Refactored search filter UI to utilize DynamicSearchFilter.
- Adjusted table header styles for better visibility and consistency.

style: Update global styles for improved UI consistency

- Unified font size across the application to 16px, excluding buttons.
- Adjusted header padding and font size for better readability.
- Enhanced dark mode styles for checkboxes to ensure visibility.

feat: Add Options Setting page for category and numbering configurations

- Created a new OptionsSettingPage component with tabs for category and numbering settings.
- Implemented drag-to-resize functionality for the category column list.
- Integrated CategoryColumnList and CategoryValueManager components for managing categories.

feat: Introduce useTableSettings hook for table configuration management

- Developed useTableSettings hook to manage column visibility, order, and width.
- Implemented localStorage persistence for table settings.
- Enhanced TableSettingsModal to accept defaultVisibleKeys for initial column visibility.

chore: Update AdminPageRenderer to include new COMPANY_16 routes

- Added new routes for COMPANY_16 master-data options and other pages.
2026-04-03 09:28:59 +09:00
DDD1542
f179a575ab feat: add shipping plan page with search and detail editing functionality
- Implemented the ShippingPlanPage component for managing shipment plans.
- Added search filters for date range, status, customer, and keywords.
- Integrated table for displaying shipment plans with grouping and selection features.
- Included detail panel for editing plan quantity, date, and memo with validation.
- Enhanced table readability with CSS adjustments for cell padding and hover effects.

style: improve global styles for table readability

- Adjusted padding and font sizes for table cells and headers.
- Added striped background for even rows and hover effects for better visibility.

fix: update TableSettingsModal for better overflow handling

- Modified modal layout to ensure proper scrolling for content overflow.
- Ensured drag-and-drop functionality for column settings remains intact.

chore: register new routes for COMPANY_7 and COMPANY_16 features

- Added dynamic imports for new pages related to purchase, logistics, quality, and design for COMPANY_7 and COMPANY_16.
2026-04-03 09:28:43 +09:00
2b358d998e Merge pull request 'jskim-node' (#5) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 48s
Reviewed-on: #5
2026-04-02 09:30:04 +00:00
kjs
1de5c24dc9 Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-02 18:04:07 +09:00
kjs
bf8c351082 Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-02 17:43:30 +09:00
kjs
148f20c7c5 Update menu assignment logic and enhance dynamic search filter rendering
- Modified the menu assignment logic to ensure that screen assignments are only deactivated if the menu URL is either empty or not a valid screen URL, improving the accuracy of screen management.
- Updated the rendering of active filters in the DynamicSearchFilter component to include a key for each filter, enhancing React's rendering performance and preventing potential issues with list updates.

These changes improve the functionality and performance of the admin interface, ensuring a more reliable user experience.
2026-04-02 17:42:45 +09:00
SeongHyun Kim
9b7b88ff7c feat: POP 하드코딩 화면 추가 (PC 코드 무변경 재병합)
Some checks failed
Build and Push Images / build-and-push (push) Failing after 1m30s
- POP 전용 39개 파일 추가 (홈/입고/출고/생산)
- 백엔드 INSERT에 id gen_random_uuid 추가 (5개 파일)
- POP 전용 API 7개 추가 (창고/위치/입고/동기화)
- PC 코드 구조/순서/로직 변경 없음 (AppLayout, UserDropdown 미수정)
2026-04-02 17:39:42 +09:00
kjs
9749234c30 Refactor password reset logic and update UI components for better user experience
- Removed the minimum password length validation from the backend, simplifying the password reset process.
- Updated the password encryption method to utilize `EncryptUtil`, enhancing security and maintainability.
- Adjusted the `UserPasswordResetModal` component to reset alert states upon closing, improving user feedback.
- Modified the z-index values in the `Popover` and `Select` components for better layering and visibility in the UI.

These changes streamline the password reset functionality and enhance the overall user interface, ensuring a more intuitive experience for administrators.
2026-04-02 17:22:21 +09:00
kjs
ce99001970 Add quote management functionality with API and UI integration
- Introduced a new `quote` module, including routes, controllers, and services for managing quotes.
- Implemented API endpoints for listing, creating, updating, and deleting quotes, ensuring proper company code filtering for data access.
- Developed a comprehensive UI for quote management, allowing users to create, edit, and view quotes seamlessly.
- Enhanced the admin layout to include the new quote management page, improving navigation and accessibility for users.

These additions significantly enhance the application's capabilities in managing quotes, providing users with essential tools for their sales processes.
2026-04-02 15:30:44 +09:00
kjs
d8aaacb8f7 Enhance SUPER_ADMIN middleware and permission utility for improved access control
- Updated the `requireSuperAdmin` middleware to allow users with `userType` as 'SUPER_ADMIN' to access management functionalities, even if their `companyCode` is not '*'.
- Modified the `isSuperAdmin` utility function to recognize users as SUPER_ADMIN based solely on their `userType`, simplifying the access validation logic.
- These changes ensure that SUPER_ADMIN users maintain their management capabilities across company transitions, enhancing the flexibility and security of the application.
2026-04-02 10:05:38 +09:00
kjs
775d698d06 Add new pages for design management, including change management, design requests, my work, project management, task management, equipment info, and material status
- Introduced multiple new pages to enhance design management functionalities, allowing users to manage design requests, track their work, and oversee project and task statuses.
- Implemented UI components such as tables, dialogs, and forms to facilitate user interactions and data management.
- Integrated necessary API calls for fetching and manipulating design-related data, ensuring a seamless user experience across the new pages.

These additions significantly expand the design management capabilities of the application, providing users with comprehensive tools for managing their design workflows.
2026-04-02 09:43:59 +09:00
kjs
4276b33e37 Merge branch 'ycshin-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-01 16:38:36 +09:00
kjs
948ddbe832 Refactor Dashboard Management to Use Tab Store for Navigation
- Removed the useRouter hook and replaced it with the useTabStore for managing tab navigation in the Dashboard List and Dashboard Designer pages.
- Updated button and row click handlers to utilize the openTab function, enhancing the user experience by allowing for tabbed navigation instead of direct routing.
- This change improves the overall structure and maintainability of the dashboard management functionality, aligning with the new tab management system.
2026-04-01 16:37:21 +09:00
kjs
7c402532b4 Update Barcode Label Management Page UI for Consistency
- Changed background color of the main container from white to card style for better visual consistency with the overall design.
- Updated the CardHeader background to a muted style, enhancing the aesthetic appeal and aligning with the new design guidelines.

These changes improve the user interface of the Barcode Label Management page, ensuring a cohesive look and feel across the application.
2026-04-01 16:28:59 +09:00
kjs
540b6290c4 Implement multi-language support in audit log, system notices, collection management, and common code management pages
- Integrated multi-language functionality across the audit log, system notices, collection management, and common code management components, enhancing accessibility for diverse users.
- Updated UI elements to utilize translation keys, ensuring that all text is dynamically translated based on user preferences.
- Improved error handling messages to be localized, providing a better user experience in case of issues.

These changes significantly enhance the usability and internationalization of the management features, making the application more inclusive.
2026-04-01 16:16:40 +09:00
kjs
1d49fc7ac7 Implement multi-language support in user management and system management pages
- Integrated multi-language functionality across various user management components, including user list, roles list, and user authorization pages, enhancing accessibility for diverse users.
- Updated UI elements to utilize translation keys, ensuring that all text is dynamically translated based on user preferences.
- Improved error handling messages to be localized, providing a better user experience in case of issues.

These changes significantly enhance the usability and internationalization of the user management features, making the application more inclusive.
2026-04-01 15:57:12 +09:00
kjs
2ff01456dc Enhance user management with SUPER_ADMIN access control
- Updated the user list retrieval logic to ensure proper filtering based on company codes, enhancing security for user data access.
- Implemented checks to restrict access to company management APIs, allowing only SUPER_ADMIN users to perform actions related to company data.
- Adjusted the user interface to reflect access restrictions for non-SUPER_ADMIN users, providing clear feedback when access is denied.

These changes strengthen the integrity of user management and ensure that sensitive company information is only accessible to authorized personnel.
2026-04-01 15:49:49 +09:00
a085b8149d [RAPID-micro] 메일 작성 다이얼로그에 보내는 사람 계정 선택 추가
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
2026-04-01 15:29:00 +09:00
545b206f4c [RAPID-micro] 메일관리 IMAP 서비스 프리셋 추가 (Gmail, Naver, Outlook 등)
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
2026-04-01 15:28:59 +09:00