Commit Graph

4240 Commits

Author SHA1 Message Date
SeongHyun Kim
cdea504d90 fix: POP sync detail fallback + 사이드바 카드 UI
- sync: header에 routing 없으면 detail에서 자동 가져오기 (PC→POP 연동 수정)
- sync: header routing/qty/item_id 자동 보정 (detail → header 동기화)
- 사이드바: 체크리스트/자재투입 카드 형태 UI로 변경
2026-04-09 18:09:30 +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
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
c64e837114 Merge branch 'main' into jskim-node 2026-04-07 08:29:18 +00:00
kjs
b62b1c1267 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-07 17:29:04 +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
d795c74dbd feat: POP 입고/출고 채번규칙을 화면설정과 연동
백엔드:
- receiving/generate-number: ?ruleId 쿼리 받아 numberingRuleService.allocateCode 사용
- outbound/generate-number: 동일
- ruleId 없거나 실패 시 기존 하드코딩 채번으로 폴백

프론트:
- InboundCartPage: 확정 시 화면설정의 popConfig.inbound.numberingRuleId 읽어 ruleId 전달
- OutboundCartPage: 확정 시 화면설정의 popConfig.outbound.numberingRuleId 읽어 ruleId 전달

POP 화면설정에서 채번규칙 선택 → 입고/출고 확정 시 자동 적용
2026-04-07 17:11:39 +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
c33cae15de Merge pull request 'feat: Implement smart factory log management features' (#10) from jskim-node into main
All checks were successful
Build and Push Images / build-and-push (push) Successful in 18m38s
Reviewed-on: jskim/vexplor_dev#10
2026-04-07 07:47:24 +00:00
7698091f81 Merge branch 'main' into jskim-node 2026-04-07 07:47:17 +00: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
SeongHyun Kim
73199876fd feat: POP 배너를 화면설정에서 관리 가능하도록 연동
PopShell에서 하드코딩 배너 → popConfig.bannerEnabled/bannerText 읽기
- 설정에서 배너 OFF → 배너 숨김
- 설정에서 텍스트 입력 → 해당 텍스트 표시
- 설정 없으면 기존 기본 문구 유지 (폴백)
2026-04-07 16:30:53 +09:00
SeongHyun Kim
acd30d3c83 Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev
Some checks failed
Build and Push Images / build-and-push (push) Failing after 46s
2026-04-07 15:47:40 +09:00
SeongHyun Kim
fae84efe39 fix: /api prefix 없는 요청도 라우팅 (배포 환경 호환) 2026-04-07 15:47:16 +09:00
18980e874b Merge pull request 'feat: Add userId retrieval in deleteReceiving function' (#9) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 49s
Reviewed-on: jskim/vexplor_dev#9
2026-04-07 05:52:33 +00:00
3be2b57c04 Merge branch 'main' into jskim-node 2026-04-07 05:52:26 +00:00
kjs
96cee05945 feat: Add userId retrieval in deleteReceiving function
- Enhanced the deleteReceiving function in the receivingController to retrieve the userId from the request object.
- This addition will facilitate better tracking and auditing of delete operations by associating them with the user performing the action.
2026-04-07 14:51:50 +09:00
b02b637b28 Merge pull request 'jskim-node' (#8) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 46s
Reviewed-on: jskim/vexplor_dev#8
2026-04-07 05:46:24 +00: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