Commit Graph

644 Commits

Author SHA1 Message Date
DDD1542
29c42cbb79 123 2026-04-10 10:43:12 +09:00
DDD1542
1b4555f0af 11 2026-04-09 18:44:12 +09:00
kjs
ef50c89b05 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-09 18:09:19 +09:00
kjs
2733685df7 feat: Refactor table components for improved layout and usability
- Updated the BOM management page to streamline the layout by moving the edit button to the top right for better accessibility.
- Enhanced the DataGrid and EDataTable components to support a no-wrapper option, allowing for sticky headers to function correctly with parent overflow settings.
- Adjusted the Sales Order page to utilize the new noWrapper feature for the table, ensuring consistent styling and behavior.
- Enabled sticky headers in the V2 table list definition for improved data visibility during scrolling.

These changes aim to enhance the user experience by providing a more intuitive and organized interface for managing BOM and sales order data across multiple companies.
2026-04-09 18:09:17 +09:00
dd66a5a09b Merge branch 'main' into jskim-node 2026-04-09 06:59:00 +00:00
kjs
4424071e47 feat: Enhance equipment monitoring page with process tracking
- Added `wi_id` and `work_instruction_no` fields to the `WorkInstruction` interface for better tracking of work instructions.
- Introduced a new `ProcessRow` interface to manage work order process statuses, including acceptable, in progress, and completed states.
- Updated data fetching logic to include process data from the work order process API, improving the accuracy of equipment status determination.
- Enhanced the inferred status logic to utilize process data for more accurate equipment status representation.
- Refined summary statistics and filtering mechanisms to reflect the new process tracking capabilities.

These changes aim to provide a more comprehensive and accurate monitoring experience for equipment operations across multiple companies.
2026-04-09 15:46:22 +09:00
kjs
6998195ca8 feat: Update production monitoring logic to enhance progress status handling
- Added `progress_status` field to the `WorkInstruction` interface to track the state of work instructions (대기 / 진행중 / 완료).
- Enhanced the `computeProgress` function to prioritize `progress_status` over existing logic, improving accuracy in determining the current status of work instructions.
- Updated grouping logic in the production monitoring page to reflect the highest status from master and split rows, ensuring better representation of process steps.
- Refined UI elements to improve clarity and user experience in monitoring production progress across multiple companies.

These changes aim to provide a more robust and user-friendly interface for monitoring production operations.
2026-04-09 15:29:11 +09:00
kjs
518990171e feat: Enhance monitoring pages with dynamic settings and themes
- Integrated monitoring settings and theme management into the Equipment, Production, and Quality monitoring pages.
- Updated auto-refresh functionality to utilize user-defined settings for refresh intervals.
- Improved UI elements with dynamic theming for better visual consistency across COMPANY_10, COMPANY_16, and COMPANY_29.
- Added settings button to access monitoring configuration, enhancing user experience in managing monitoring preferences.

These changes aim to provide a more customizable and user-friendly interface for monitoring operations across multiple companies.
2026-04-09 15:12:36 +09:00
SeongHyun Kim
327b4d01c2 feat: POP 시연 준비 — 5개 화면 + 버그 수정 + 자동 창고 매칭
Some checks failed
Build and Push Images / build-and-push (push) Failing after 49s
- 구매입고: 검사기준 API 수정, 검사결과 DB 저장, 검사 미완료 확정 차단
- 판매출고: 재고 부족 사전 검증, 수주상세 ship_qty 반영, 에러 메시지 개선
- 공정실행: seq_no 비순차 대응(3곳), 자재투입 자동 창고 매칭 재고차감, 불필요 버튼 제거
- 검사관리+입출고관리: 신규 화면 (quality, inventory)
- 공통: ConfirmModal 커스텀 모달 (native confirm 대체)
2026-04-09 14:38:28 +09:00
SeongHyun Kim
1b62dae277 Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev
Some checks failed
Build and Push Images / build-and-push (push) Failing after 48s
2026-04-09 14:30:32 +09:00
SeongHyun Kim
bfac350ed4 feat: POP 시연 준비 — 5개 화면 + 버그 수정 + 재고검증 2026-04-09 14:28:57 +09:00
kjs
9200c58d2e feat: Add hardcoded inbound-outbound management page for multiple companies
- Implemented a new hardcoded page for managing inbound and outbound logistics, based on the inventory_history table.
- The page includes features for grouping, searching, and exporting data to Excel, enhancing user experience in managing logistics operations.
- Integrated dynamic search filters and improved data loading mechanisms to ensure efficient retrieval and display of logistics data.

These changes aim to provide a comprehensive interface for monitoring and managing inbound and outbound logistics across COMPANY_10, COMPANY_16, COMPANY_29, COMPANY_30, COMPANY_7, COMPANY_8, and COMPANY_9.
2026-04-09 14:21:26 +09:00
kjs
b57a56e097 fix: Enhance grouping logic in production result pages for multiple companies
- Updated the grouping logic in the ProductionResultPage component to include category resolution for 'work_team' and 'status' fields.
- This change ensures that the grouping functionality correctly categorizes work instructions based on the specified criteria, improving data organization and clarity across COMPANY_10, COMPANY_16, COMPANY_29, COMPANY_30, COMPANY_7, COMPANY_8, and COMPANY_9.

These enhancements aim to provide a more accurate representation of production results and facilitate better management of work instructions.
2026-04-09 13:56:06 +09:00
kjs
a180c3f209 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-09 13:51:08 +09:00
kjs
735cba2936 feat: Add production result management page for COMPANY_10, COMPANY_16, COMPANY_29, COMPANY_30, COMPANY_7, and COMPANY_8
- Implemented a new hardcoded page for managing production results, featuring a work instruction list on the left and detailed process results on the right.
- Included summary cards displaying total quantities, good and defective items, and achievement rates.
- Added tabs for viewing performance details and defect records, along with a detailed modal for further insights.
- Integrated dynamic search filters to enhance user experience in navigating work instructions.

These changes aim to provide a comprehensive interface for monitoring and managing production performance across multiple companies.
2026-04-09 13:51:07 +09:00
DDD1542
c79dcf6b6d Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-09 12:35:36 +09:00
DDD1542
b982cb8db2 123213213 2026-04-09 12:35:34 +09:00
kjs
a9d2df48bf fix: Improve numbering rule handling and item routing functionality
- Added temporary debug response in `numberingRuleController` for better troubleshooting.
- Refactored SQL queries in `NumberingRuleService` to enhance parameter handling and improve clarity.
- Updated `ItemInfoPage` to correctly handle manual input values for user-generated codes.
- Implemented sorting logic in `ItemRoutingTab` to prioritize default routing versions and added functionality to set a version as default.

These changes aim to enhance the reliability and user experience in managing numbering rules and item routing processes.
2026-04-09 12:18:26 +09:00
kjs
51eddc6d84 refactor: Enhance numbering rule handling and BOM management
- Updated the `NumberingRuleService` to support manual values in the computation of non-sequence values.
- Improved the `ItemInfoPage` to parse preview codes into parts, allowing for better handling of manual inputs and dynamic code generation.
- Refactored BOM management to streamline the retrieval of category options for both division and unit, enhancing data consistency.
- Added utility functions to resolve unit labels from category options, improving the clarity of displayed data.

These changes aim to improve the functionality and user experience in managing item information and BOM processes.
2026-04-09 11:52:40 +09:00
kjs
6ef30f4e45 refactor: Update item number handling and improve sales order filtering
- Changed item number field type from 'text' to 'numbering' in item info forms for better clarity.
- Enhanced the logic for loading numbering previews, including handling manual input values and category changes.
- Updated sales order page to filter items based on customer pricing rules, ensuring only relevant items are displayed.
- Improved date handling in sales order page to ensure consistent formatting.

These changes aim to enhance the user experience and data integrity across the application.
2026-04-09 11:28:55 +09:00
kjs
0345926698 fix: Correct SQL parameter indexing and improve date handling in various components
- Updated SQL query in `productionPlanService.ts` to fix parameter indexing for company code.
- Refactored date handling in `department/page.tsx`, `customer/page.tsx`, and `sales-item/page.tsx` to ensure consistent date formatting.
- Enhanced equipment list state management in `production/plan-management/page.tsx` to use more descriptive property names.

These changes aim to improve the reliability of SQL operations and ensure consistent date handling across the application.
2026-04-08 17:45:28 +09:00
kjs
2a23cadb41 feat: Enhance user management and reporting features
- Added `end_date` field to user management for better tracking of user status.
- Updated SQL queries in `adminController` to include `end_date` during user save operations.
- Improved purchase report data handling by refining the logic for received quantities.
- Enhanced file preview functionality to streamline file path handling.
- Updated outbound and receiving controllers to ensure accurate updates to shipment and purchase order details.

These changes aim to improve the overall functionality and user experience in managing user data and reporting processes.
2026-04-08 15:33:09 +09:00
ff79411c35 Merge branch 'main' into jskim-node 2026-04-08 01:42:08 +00:00
kjs
d90a3a9aff feat: Update smart factory log scheduling and enhance item info page
- Modified the upsertSchedule function to regenerate today's plan immediately after schedule changes, ensuring that already sent users are automatically excluded.
- Increased the data size limit for item info page requests from 500 to 99999 for better data handling across multiple companies.
- Added new pages for design request management, task management, and equipment info, providing comprehensive tools for managing design and equipment processes.

These updates aim to improve the efficiency and usability of the smart factory log and item management systems, enhancing user experience and operational effectiveness.
2026-04-08 10:41:32 +09:00
SeongHyun Kim
add2e34291 Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev
Some checks failed
Build and Push Images / build-and-push (push) Failing after 56s
2026-04-08 10:19:55 +09:00
kjs
f9f5a7e7e5 feat: Add inspection management page for COMPANY_16 and COMPANY_29
- Introduced a new inspection management page for both COMPANY_16 and COMPANY_29, featuring a comprehensive table for managing inspection standards.
- Implemented dynamic category loading and user options for enhanced functionality.
- Integrated various UI components such as buttons, inputs, and dialogs to facilitate user interactions.
- Established state management for inspections, defects, and equipment, ensuring a smooth user experience.

These additions aim to improve the quality management processes within the application, providing users with the necessary tools to manage inspections effectively.
2026-04-08 09:46:34 +09:00
SeongHyun Kim
a7b914407c feat: 채번규칙 필드를 입고/출고 장바구니 화면에서만 표시
- SettingField에 showOnlyForScreens 옵션 추가
- 입고번호 채번: inbound-cart에서만 표시
- 출고번호 채번: outbound-cart에서만 표시
- 구매입고/판매출고/유형선택 등 다른 화면에서는 채번 필드 숨김

이로써 채번 설정의 컨텍스트가 명확해짐
2026-04-07 18:46:18 +09:00
SeongHyun Kim
dad8df7b10 fix: POP 화면설정 iframe 매칭 — 정확/길이 긴 url 우선
문제: /pop/outbound/cart 진입 시 startsWith 매칭으로
      /pop/outbound(출고유형선택)가 먼저 잡혀 selectedScreen이 잘못 설정됨

해결: 정확 일치 1순위 + url 길이 긴 항목 startsWith 우선
2026-04-07 18:23:36 +09:00
SeongHyun Kim
444f0f95f3 feat: POP 화면설정에 출고 장바구니 항목 추가
- screen_definitions에 7010 (POP_OUTBOUND_CART) 신규 등록
- popSettingsMng SCREEN_GROUPS의 outbound에 outbound-cart 추가
- OutboundCartPage 채번규칙 조회 screen_id를 5 → 7010으로 변경

이로써 POP 설정 페이지에서 출고 장바구니 화면도 미리보기 + 채번규칙 설정 가능
2026-04-07 17:55:40 +09:00
kjs
fc61a66287 feat: Enhance smart factory schedule management
- Added dailyCount parameter to the upsertSchedule function, allowing for the configuration of daily access limits for users.
- Updated the smartFactoryLog interface to include daily_count, ensuring proper data handling for schedule management.
- Removed the runScheduleNowHandler function from the smartFactoryLogController and adminRoutes, streamlining the API for schedule management.
- Modified the frontend SmartFactoryLogPage to support dailyCount selection, improving user experience in managing schedules.

These changes aim to enhance the flexibility and usability of the smart factory schedule management system, allowing for better control over user access and scheduling operations.
2026-04-07 17:29:03 +09:00
SeongHyun Kim
1abc6645fb fix: 채번규칙 셀렉트 — camelCase 응답 구조 반영 2026-04-07 17:01:11 +09:00
SeongHyun Kim
31e225f6d3 feat: POP 화면설정 채번규칙 셀렉트 박스 구현
- 새 type "numbering-rule" 추가
- NumberingRuleSelect 컴포넌트: 회사별 채번규칙 목록 자동 로드
- 입고/출고 설정에서 inbound/outbound 키워드로 필터링
- 등록된 채번규칙이 없으면 안내 메시지 표시
2026-04-07 16:59:25 +09:00
SeongHyun Kim
2f675660b4 feat: POP 화면설정 — 채번규칙 필드 추가 + 미구현 항목 표기
- 입고/출고 설정에 채번규칙(numberingRuleId) 텍스트 필드 추가
- 하드코딩 POP에 미연동된 설정 항목에 (미구현) 라벨 추가
- 구현 완료: 배너(ON/OFF+텍스트), 자재투입, 그룹별사진
- 미구현: 바코드, 검사필수, 사진첨부, 포장, PLC, 날짜필터 등
2026-04-07 16:50:17 +09:00
kjs
1b7842c305 feat: Implement smart factory log management features
- Added new API endpoints for retrieving company-specific user lists and sending immediate logs for selected users.
- Enhanced the smartFactoryLogController with functions to handle user retrieval and immediate log sending, improving operational efficiency.
- Updated adminRoutes to include routes for the new functionalities, ensuring proper access control for super admins.
- Refactored the sendSmartFactoryLog function to improve logging and error handling, providing better insights into the log transmission process.

These changes aim to enhance the smart factory log management capabilities, facilitating better user interaction and operational tracking.
2026-04-07 16:45:52 +09:00
kjs
57b64653c0 merge: resolve conflicts accepting incoming changes
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-07 14:44:17 +09:00
kjs
e8bd4e8136 feat: Add quote management pages for multiple companies
- Introduced new quote management pages for COMPANY_7, COMPANY_8, COMPANY_10, COMPANY_16.
- Implemented functionality for creating, editing, deleting, and viewing quotes.
- Integrated dynamic search filters and data grid for displaying quotes.
- Enhanced user experience with modals for item and customer searches, as well as report generation.

These changes aim to provide comprehensive quote management capabilities tailored for different companies, improving operational efficiency and user interaction.
2026-04-07 14:42:12 +09:00
kjs
69544e16e2 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-07 14:28:06 +09:00
kjs
8e63c9b481 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-07 14:21:45 +09:00
DDD1542
b54a23d18f Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-07 14:21:30 +09:00
kjs
c3e973bb1a feat: Implement smart factory schedule management functionality
- Added new API endpoints for managing smart factory schedules, including retrieval, creation, updating, and deletion of schedules.
- Integrated schedule management into the smart factory log controller, enhancing the overall functionality.
- Implemented a scheduler initialization process to automate daily plan generation and scheduled sends.
- Developed a frontend page for monitoring equipment, production, and quality, with real-time data fetching and auto-refresh capabilities.

These changes aim to provide comprehensive scheduling capabilities for smart factory operations, improving efficiency and operational visibility for users.
2026-04-07 14:16:26 +09:00
SeongHyun Kim
4b62817bf5 revert: inspection 관리 페이지 제거 (의존성 부족)
jskim-node에서 가져온 inspection page.tsx가 EDataTable 등 main에 없는
컴포넌트에 의존하여 화면 크래시 발생. 일단 제거하여 안정화.

POP UI judgment_criteria 매핑은 detail_type 폴백으로 동작하므로
판단기준 마스터 등록 화면 없이도 정상 작동함.

inspection 마스터 관리는 추후 EDataTable 등 의존성 함께 가져온 후 재도입.
2026-04-07 12:18:17 +09:00
SeongHyun Kim
b497db9987 chore: Playwright 의존성 제거 + jskim-node에서 inspection 관리 페이지 cherry-pick
- playwright, @playwright/test 제거 (cmux browser만 사용)
- inspection page.tsx: 판단기준(judgment_criteria) Select UI 포함 버전으로 업데이트
2026-04-07 12:10:56 +09:00
kjs
9aa8ca136b feat: Add monitoring pages for equipment, production, and quality
- Introduced three new pages for monitoring: Equipment Monitoring, Production Monitoring, and Quality Monitoring.
- Implemented real-time data fetching and auto-refresh functionality for each monitoring page.
- Enhanced user experience with summary statistics and filtering options for work instructions and inspection data.
- Integrated various UI components for displaying equipment status, production progress, and quality inspection results.

These changes aim to provide comprehensive monitoring capabilities for equipment, production processes, and quality inspections, enhancing operational visibility for users.
2026-04-07 12:02:10 +09:00
DDD1542
77d5b52265 11 2026-04-07 11:52:13 +09:00
kjs
822f9ac35a feat: Implement smart factory log functionality
- Added a new controller for managing smart factory logs, including retrieval and statistics endpoints.
- Integrated smart factory log migration to set up the necessary database structure.
- Enhanced the authentication controller to include user name in log submissions.
- Developed a frontend page for displaying and filtering smart factory logs, accessible only to super admins.
- Implemented API calls for fetching logs and statistics, improving data visibility and management.

These changes aim to provide comprehensive logging capabilities for smart factory activities, enhancing monitoring and analysis for administrators.
2026-04-07 10:35:16 +09:00
kjs
2494a96bad feat: Add image upload functionality to item info page
- Integrated ImageUpload component for handling item images in the item info form.
- Updated the data table to include an image column, allowing for image display.
- Enhanced form fields to support image uploads, improving the user experience for managing item images.

These changes aim to provide a more comprehensive item management experience by allowing users to upload and view images directly within the item info page.
2026-04-07 09:53:30 +09:00
kjs
f2ebd6ae1b feat: Implement searchable category combobox in item info page
- Added a new CategoryCombobox component for improved category selection.
- Integrated the combobox into the item info form, replacing the previous select component.
- Enhanced data handling to support multiple category selections with comma separation.
- Updated selling and standard price fields to format numbers correctly.

These changes aim to enhance user experience by providing a more intuitive and flexible category selection method.
2026-04-06 18:24:21 +09:00
kjs
5e9544f31d Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-06 18:09:00 +09:00
DDD1542
00b388c3ab Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-06 17:23:21 +09:00
DDD1542
19e3f7adc2 feat: 공급업체 및 거래처 관리 페이지에서 거래유형 라벨 수정 및 메인 설정 로직 개선 2026-04-06 17:23:19 +09:00