Commit Graph

4509 Commits

Author SHA1 Message Date
kjs
c9441edfc9 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-07 14:25:20 +09:00
kjs
93a7214678 Enhance Work Item Detail Management with Loss Quantity Fields
- Added new fields for loss quantity auto-collection and PLC data in the process work item detail controller and related functions.
- Updated the frontend components to include loss quantity options in the production result section, allowing for better tracking and management of production losses.
- Implemented multi-upload functionality for images in the inspection management page.

(TASK: ERP-023)
2026-05-07 14:25:18 +09:00
f3b1eaab1b Merge branch 'main' into jskim-node 2026-05-07 04:47:29 +00:00
kjs
faafb4c8e3 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-07 13:47:19 +09:00
kjs
528782a94b Refactor AdminPageRenderer to update Monitoring Settings page import
- Changed the import path for the Monitoring Settings page from the app directory to the components directory for better organization and maintainability.

(TASK:ERP-022)
2026-05-07 13:47:18 +09:00
9d1c0e0a86 Merge pull request 'jskim-node' (#46) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 48s
Reviewed-on: jskim/vexplor_dev#46
2026-05-07 04:31:05 +00:00
c002c0ba5a Merge branch 'main' into jskim-node 2026-05-07 04:31:01 +00:00
kjs
7dc73c1c61 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-07 13:30:47 +09:00
kjs
a5e9d13100 Implement Outsourcing Purchase Order Management Features
- Added `DetailModal` for viewing detailed information of outsourcing purchase orders, including master, process, and material details.
- Created `RegistrationModal` for registering and editing outsourcing purchase orders with a tabbed interface for source selection and item mapping.
- Introduced `ReleaseRequestModal` for handling material release requests, grouping by subcontractor and allowing batch processing.
- Updated the main page to integrate these modals and provide a comprehensive management interface for outsourcing purchase orders.

(TASK:ERP-019)
2026-05-07 13:30:46 +09:00
adba37b11c Merge pull request 'jskim-node' (#45) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 42s
Reviewed-on: jskim/vexplor_dev#45
2026-05-07 03:47:56 +00:00
edfa524a30 Merge branch 'main' into jskim-node 2026-05-07 03:47:50 +00:00
kjs
9cfd446504 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-07 12:47:39 +09:00
kjs
c28e626dd5 Update Dockerfiles to increase Node.js memory limit
- Added `NODE_OPTIONS="--max-old-space-size=8192"` to both frontend Dockerfiles to allow Node.js to utilize more memory during the build process.
- This change aims to prevent memory-related issues during the application build.

(TASK:ERP-021)
2026-05-07 12:47:38 +09:00
924eb9475c Merge pull request 'jskim-node' (#44) from jskim-node into main
Reviewed-on: jskim/vexplor_dev#44
2026-05-07 03:01:29 +00:00
1aee185d51 Merge branch 'main' into jskim-node 2026-05-07 03:01:22 +00:00
kjs
629bc25cd5 Implement BOM base quantity retrieval functionality
- Added a new endpoint `/work-instruction/bom-base-qty` to retrieve base quantities for items based on their codes.
- Introduced the `getBomBaseQtyMap` function in the `workInstructionController` to handle the logic for fetching base quantities.
- Updated the frontend to call the new API and integrate base quantity mapping into the work instruction registration process.
- Enhanced the work instruction page to calculate batch counts and split quantities based on the retrieved base quantities.

(TASK:ERP-020)
2026-05-07 12:01:03 +09:00
kjs
20c76d3478 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-07 09:30:00 +09:00
kjs
2d27fb9967 Merge branch 'gbpark-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-07 09:29:58 +09:00
5d9695dba4 Merge pull request 'jskim-node' (#43) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 43s
Reviewed-on: jskim/vexplor_dev#43
2026-05-06 09:38:41 +00:00
ce372bbc93 Merge branch 'main' into jskim-node 2026-05-06 09:38:33 +00:00
kjs
91dc6a6d90 Merge branch 'gbpark-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-06 18:33:54 +09:00
kjs
4b83feb327 Merge branch 'mhkim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-06 18:33:47 +09:00
kjs
fa0a28df42 Add preview functionality for outsource purchase order numbers
- Introduced a new endpoint `/preview-order-no` to generate order numbers based on registered numbering rules without incrementing the sequence.
- Implemented the `previewOrderNo` function in the `outsourcePurchaseController` to handle the logic for generating the preview order number.
- Updated the `outsourcePurchaseRoutes` to include the new route for previewing order numbers.
- Enhanced the `RegistrationModal` component to automatically fill the order number input with the preview value when the modal opens.
- Added a new API function `previewOrderNo` in the frontend to call the backend endpoint.

(TASK:ERP-019)
2026-05-06 18:33:23 +09:00
kjs
970a8f708a Implement process materials auto-fill functionality for outsource purchase orders
- Added a new endpoint to retrieve process materials based on routing details and work order ID.
- Introduced the `getProcessMaterials` function in the `outsourcePurchaseController` to handle the logic for fetching materials.
- Updated the `outsourcePurchaseRoutes` to include the new route for process materials.
- Enhanced the `RegistrationModal` component to toggle material needs and automatically fill materials when required.

(TASK:ERP-019)
2026-05-06 18:09:23 +09:00
DDD1542
17173be350 feat(bom): COMPANY_7 BOM에 대체 품목 관리 기능 추가
- bom_detail_substitute 테이블 신규 (varchar PK, FK 미설정 / 코드 조인)
- 백엔드: 단일 행 substitute CRUD + BOM 단위 갯수 맵 API 5종 추가
- 프론트(COMPANY_7): 트리 행에 '대체 N' 뱃지 + 대체 품목 모달
  · 드래그앤드롭으로 우선순위 변경 + 자동 채번/재할당
  · 250ms debounce 실시간 검색, 결과 클릭 시 자동 행 추가
  · inline blur 저장, zebra 행 구분, sticky 헤더 단색 처리
- 트리뷰 액션 버튼 통합: 가상 루트 선택 시 1레벨, 일반 행 선택 시 하위로 추가

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-06 17:32:10 +09:00
kjs
bd182386e6 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-06 16:16:14 +09:00
kjs
4ad669361d Implement outsource purchase management functionality
- Added routes for outsource purchase management, including CRUD operations and additional features such as auto-processes and release requests.
- Created the `outsourcePurchaseController` to handle business logic for managing outsource purchase orders.
- Introduced the `outsourcePurchaseService` for service layer operations related to outsource purchases.
- Updated `app.ts` to include the new routes for outsource purchase management.

(TASK:ERP-019)
2026-05-06 16:16:13 +09:00
62c198e30c Merge pull request 'jskim-node' (#42) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 54s
Reviewed-on: jskim/vexplor_dev#42
2026-04-30 01:55:55 +00:00
45d3ccb004 Merge branch 'main' into jskim-node 2026-04-30 01:55:47 +00:00
kjs
92f73af633 Merge branch 'mhkim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-30 10:55:12 +09:00
kmh
ce9516802a Bundle POP sales outbound + inspection wiring
- outbound: wire 판매출고 to shipment_instruction with customer_mng JOIN, add customer filter, auto-transition shipment_instruction.status to COMPLETED/IN_PROGRESS based on remaining qty
- inspection: fix is_active filter ('Y' -> '사용') and JOIN inspection_standard to expose judgment_criteria
- POP InspectionModal (7 companies): hide measured-value input when judgment_criteria == CAT_JC_03 (O/X)
- POP SalesOutbound (7 companies): connect to /outbound/source/shipment-instructions, fix stale-closure bug in saveToDb via ref
- COMPANY_16/30 main: temporarily comment out 품질/안전관리 menu entries
2026-04-30 10:54:21 +09:00
kjs
d37e66bfb7 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-30 10:52:35 +09:00
kjs
0d4fcfb871 Remove 'source_type' column from GRID_COLUMNS in receiving pages for multiple companies to streamline data display. 2026-04-30 10:52:34 +09:00
81cd91dd82 Merge pull request 'jskim-node' (#41) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 47s
Reviewed-on: jskim/vexplor_dev#41
2026-04-29 12:13:45 +00:00
f702f3913e Merge branch 'main' into jskim-node 2026-04-29 12:13:37 +00:00
kjs
372b97a313 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-29 21:13:14 +09:00
kjs
8daf26af2a Merge branch 'mhkim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node
receivingController: production-receiving query 충돌 해소 — mhkim-node 채택 (raw row 기반 + is_rework/prev_skipped 노출). wopr_agg JOIN은 미사용 상태로 유지.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-29 21:13:01 +09:00
kjs
d6730109cf Merge branch 'mhkim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-29 21:06:56 +09:00
f85e8d5599 Merge pull request 'jskim-node' (#40) from jskim-node into main
Reviewed-on: jskim/vexplor_dev#40
2026-04-29 12:06:06 +00:00
e17fbe1a80 Merge branch 'main' into jskim-node 2026-04-29 12:06:00 +00:00
kjs
d549947fac Refactor analytics report and production plan services for improved data handling
- Updated the `getQualityReportData` function to utilize `inspection_result_mng` for quality report generation, enhancing data accuracy by aggregating inspection results.
- Refined date handling in the `getOrderSummary` function to improve filtering logic and ensure accurate stock calculations.
- Implemented virtual scrolling in the `TimelineScheduler` component to optimize performance when rendering large datasets.

These changes enhance data retrieval efficiency and user experience across analytics and production planning modules.
2026-04-29 21:05:38 +09:00
kmh
854366453c Bundle pending POP work: production / inventory inout / inbound
진행 중이던 POP 관련 변경사항을 한 번에 묶어 커밋.

- backend
  - popProductionController: 생산공정 처리/접수 로직 대폭 갱신 (+663)
  - receivingController, popInventoryRoutes, adminService 보강
  - popInOutDetailController / popInOutHistoryController 신규
- frontend (POP)
  - 생산 화면 (DefectTypeModal / ProcessWork / WorkOrderList / main page)
    COMPANY_7/8/9/10/16/29/30 동기화
  - 입출고 이력·디테일 화면 신규 (inventory/page, inventory/inout-manage,
    InOutDetailModal) 7개사
  - COMPANY_7 입고 화면 (InboundCartPage / ProductionInbound /
    inbound/production/page) 보강
  - COMPANY_7 재고조정 화면 (inventory/adjust) UI 골격 신규
- frontend lib
  - popInOutDetail / popInOutHistory API 클라이언트 신규

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-29 18:54:54 +09:00
kmh
5a2fd87b3d Connect 판매출고 거래처 selector to customer_mng (COMPANY_7/8/9/30)
영업관리 > 거래처관리 화면과 동일한 customer_mng 테이블을 사용하도록
SalesOutbound 의 두 거래처 입력 경로를 연결.

- fetchAllCustomers: 빈 배열 → POST /table-management/tables/customer_mng/data
  (page 1, size 500, autoFilter, sort customer_code desc)
- <SupplierModal />: default supplier_mng 사용 중지, source prop 으로
  customer_mng 매핑 전달 (code/name/business_number/contact_phone/address)
- 4사 동일 패치, 패치 후 md5 일치 확인
- COMPANY_7 풀검증 + COMPANY_8 spot 검증 (인라인+모달 customer_mng 200 OK,
  supplier_mng 호출 0건, 콘솔 에러 0건)
- POP.md 작업 로그 갱신

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-29 18:53:40 +09:00
kjs
5f9c876f9e Enhance logistics and production pages with additional mappings and data aggregation
- Added Korean labels for `shipmentInstruction` and `purchase_detail` in the logistics pages to improve clarity.
- Introduced a new constant `WOPR_TABLE` in the production result page for better data management.
- Implemented daily aggregation of `work_order_process_result` data to enrich the `work_order_process` rows, enhancing data accuracy and user experience.

These updates improve the usability and data handling in the logistics and production modules.
2026-04-29 18:48:05 +09:00
kjs
6ddc84f285 Update date handling in inventory and sales order pages
- Refactored date handling in the InventoryStatusPage to use `toLocaleString` for transaction dates and last in dates, ensuring correct timezone formatting.
- Introduced FormDatePicker in SalesOrderPage for date inputs, enhancing user experience with automatic formatting and improved date handling.
- Added a checkbox for filtering items by customer in SalesOrderPage, allowing users to view only items registered for the selected customer.

This update improves date accuracy and user interaction in the inventory and sales order modules.
2026-04-29 18:20:01 +09:00
kjs
ef11b4d83b Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-29 13:59:53 +09:00
kjs
198cb92a91 Refactor production plan service to handle empty due dates
- Updated the `getOrderSummary` function to use `NULLIF` for `due_date` to ensure proper handling of empty values.
- Added pagination state management in the Equipment Inspection Record page across multiple company components, including `page`, `pageSize`, and `total` state variables.

This refactor improves data accuracy and user experience in the production planning and equipment inspection modules.
2026-04-29 13:59:52 +09:00
2cd32e312e Merge pull request 'jskim-node' (#39) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 51s
Reviewed-on: jskim/vexplor_dev#39
2026-04-28 11:20:32 +00:00
86ad6690a6 Merge branch 'main' into jskim-node 2026-04-28 11:20:27 +00:00
kjs
bb17cd0c33 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-28 20:20:11 +09:00