Commit Graph

4259 Commits

Author SHA1 Message Date
7c7dc61977 Merge pull request 'jskim-node' (#16) from jskim-node into main
Reviewed-on: jskim/vexplor_dev#16
2026-04-09 06:59:06 +00: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개 화면 + 버그 수정 + 자동 창고 매칭
- 구매입고: 검사기준 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 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
185ff36e63 1 2026-04-09 13:56:37 +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
d1272bcdf0 123321 2026-04-09 12:42:56 +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
3ac1321953 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-09 11:15:17 +09:00
DDD1542
4e05ee5e21 11 2026-04-09 11:14:29 +09:00
DDD1542
b22feca8b5 Merge branch 'jskim-node' of origin into jskim-node
Resolve conflict in AppLayout.tsx - keep both sidebar collapse and hasPopMenus state

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-09 11:14:00 +09:00
DDD1542
9ed293e572 11 2026-04-09 11:08:49 +09:00
8a4a57e36c Merge pull request 'jskim-node' (#15) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 50s
Reviewed-on: jskim/vexplor_dev#15
2026-04-08 08:59:11 +00: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
SeongHyun Kim
0d62af8c8b feat: 작업상세 헤더+사이드바 글자 위계 조정 (산업현장 1m 거리 기준)
옵션 B 적용 — 메인 본문은 그대로, 헤더와 사이드바만 한 단계 위계 업그레이드

상단 헤더:
- 라벨 (작업지시/품목/공정/지시): 12px → 14px
- 값 (CODE-00003 등): 14px → 16px
- 접수 수량 (가장 중요): 14px → 18px
- 상태/재작업 배지: 12px → 13px

사이드바:
- Phase 라벨 (작업 전/중/후, 실적, 입고): 12px → 16px
- Phase 카운터: 12px → 13px
- 그룹 항목 (베셀 상태 확인 등): 12px → 14px
- 그룹 카운터: 12px → 13px
- 섹션 (자재 투입/실적 입력/재고 입고): 12px → 14px

메인 영역(Timer/Quantity/Register)은 위계가 이미 잘 잡혀있어 변경 없음
2026-04-08 12:21:34 +09:00
SeongHyun Kim
cdea6297e7 fix: 품목+설비명 합쳐서 한 줄 슬라이드 (둘 다 길 때 대응) 2026-04-08 11:17:53 +09:00
SeongHyun Kim
659bd9caad feat: 공정실행 카드 긴 텍스트 자동 슬라이드
AutoScrollText 컴포넌트: 텍스트가 영역을 넘으면 자동 마키 애니메이션
- 제품명(제품코드) 긴 경우 자동 슬라이드
- 짧으면 정지 상태로 표시
- 접수가능 카드 + 진행중 카드 모두 적용
2026-04-08 11:16:24 +09:00
SeongHyun Kim
a96d5ac2c1 fix: 공정실행 카드에 제품명(제품코드) 형식으로 표시 2026-04-08 11:06:50 +09:00
3421d95e4e Merge pull request 'jskim-node' (#14) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 50s
Reviewed-on: jskim/vexplor_dev#14
2026-04-08 01:42:14 +00:00
ff79411c35 Merge branch 'main' into jskim-node 2026-04-08 01:42:08 +00:00
kjs
0dd35a73d5 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-08 10:41:33 +09: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 2026-04-08 10:19:55 +09:00
SeongHyun Kim
6139542fde merge: feature/pop-outbound-cart-settings → pop-dev
- 출고 장바구니 설정 추가 (screen_id 7010)
- 채번규칙 장바구니 화면에서만 표시
- iframe 매칭 URL 우선순위 수정
- 입고/출고 상태값 PC와 동일하게 수정
2026-04-08 10:19:34 +09:00
SeongHyun Kim
71abfebb51 fix: POP 입고 확정 시 inbound_status를 '입고완료'로 전달
기존: inbound_status 미전달 → 백엔드 기본값 '대기'
수정: '입고완료' 명시적 전달
2026-04-08 10:04:44 +09:00
SeongHyun Kim
126f11354e fix: POP 출고 확정 시 outbound_status를 '출고완료'로 변경
기존: '대기' 하드코딩 → 출고 확정해도 상태 미갱신
수정: '출고완료'로 → 출고 확정 시 정상 상태 반영
2026-04-08 09:57:57 +09:00
d59c43554f Merge pull request 'jskim-node' (#13) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 48s
Reviewed-on: jskim/vexplor_dev#13
2026-04-08 00:47:01 +00:00
63bd0a555a Merge branch 'main' into jskim-node 2026-04-08 00:46:54 +00:00
kjs
97ef3a4675 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-08 09:46:35 +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
dc674dab27 Merge pull request 'jskim-node' (#12) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 56s
Reviewed-on: jskim/vexplor_dev#12
2026-04-07 09:21:27 +00:00
6688265bbc Merge branch 'main' into jskim-node 2026-04-07 09:21:23 +00:00
kjs
e45df7d59e Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-07 18:21:10 +09:00
kjs
8f228bc7c3 refactor: Update smart factory log scheduling behavior
- Removed immediate plan generation on server start to prevent sending logs for past timestamps.
- Updated the upsertSchedule response message to clarify that the schedule will take effect from the next day at 00:05.

These changes aim to enhance the reliability of the smart factory log scheduling system by ensuring that logs are sent at the correct times and reducing the risk of sending outdated logs.
2026-04-07 18:21:08 +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
09eb39a3b7 Merge pull request 'jskim-node' (#11) from jskim-node into main
All checks were successful
Build and Push Images / build-and-push (push) Successful in 17m32s
Reviewed-on: jskim/vexplor_dev#11
2026-04-07 08:29:24 +00:00