Commit Graph

4520 Commits

Author SHA1 Message Date
kjs
0746db5eff Enhance Item Search Functionality in Sales Order Page
- Updated the item search logic to include additional filters for both item name and item number, improving search accuracy.
- Implemented an API call to fetch item information based on the search keyword, allowing for dynamic filtering of results.
- Adjusted the state management to handle cases where no items are found, ensuring a smooth user experience.

(TASK: ERP-031)
2026-05-08 17:01:54 +09:00
kjs
a8457de52f Merge branch 'mhkim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node
# Conflicts:
#	backend-node/src/controllers/outboundController.ts
2026-05-08 16:22:47 +09:00
kjs
ffba1ba72c Merge branch 'mhkim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-08 16:18:36 +09:00
kjs
998f4c7f2f Merge branch 'mhkim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-08 16:17:33 +09:00
kjs
b4f6139151 Implement Subcontractor Stock Management Features
- Added new routes and controller for subcontractor stock management, including endpoints for vendor summaries, stock details, history, adjustments, and scrap management.
- Integrated the subcontractor stock service to handle business logic related to inventory adjustments and history tracking.
- Developed frontend components for managing subcontractor stock, including modals for adjustments and history viewing, enhancing user interaction and data management.

(TASK: ERP-026)
2026-05-08 16:17:06 +09:00
kmh
212616d966 Migrate POP inventory adjust to v2 and remove legacy POP modules
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-08 16:07:41 +09:00
kjs
80148a0593 Update Receiving Page to Include Inventory Unit Field
- Modified the receiving controller to include the `inventory_unit` field in the item selection query.
- Updated the frontend components across multiple company pages to reference the new `inventory_unit` field instead of the previous `unit` field, ensuring consistency in data handling.
- Removed hardcoded company code from API calls to allow for dynamic fetching of item information.

(TASK: ERP-030)
2026-05-08 11:19:34 +09:00
kjs
b4346b5617 Implement Outsourcing Purchase Status Pages and Detail Modal for COMPANY_10, COMPANY_16, COMPANY_28, and COMPANY_29
- Created a detailed modal for viewing outsourcing purchase order details, including basic information and status rows for processes, vendors, and shipping vs. receiving.
- Developed an integrated status page for outsourcing purchase orders, featuring a dynamic search filter and a comprehensive table displaying order, process, vendor, and material information.
- Implemented Excel export functionality for the integrated status page, allowing users to download order data easily.

(TASK: ERP-025)
2026-05-08 09:59:23 +09:00
kjs
2e686f059d Implement Order Status Integration for Outsourcing Purchase Management
- Added a new endpoint `listOrderStatus` in the `outsourcePurchaseController` to retrieve integrated order status information, including filtering options for source type, order status, and date range.
- Updated the `outsourcePurchaseService` to handle the new order status retrieval logic, ensuring proper filtering and data aggregation.
- Introduced a new route for accessing the order status information in `outsourcePurchaseRoutes`.
- Created a detailed modal for viewing outsourcing purchase order details, enhancing the user interface for better data presentation.
- Developed a registration modal for creating and editing outsourcing purchase orders, featuring a tabbed interface for improved user experience.

(TASK: ERP-025, ERP-019)
2026-05-07 18:33:38 +09:00
kjs
ec1c95b8c5 Enhance Work Item Detail Management with Inspection and Material Fields
- Added new fields for inspection count application and material equipment details in the process work item detail controller and related functions.
- Updated the frontend components to include inspection count and material equipment options, improving the management of inspection processes and material inputs.
- Implemented logic to handle inspection count and material PLC data collection.

(TASK: ERP-021, ERP-022)
2026-05-07 17:24:15 +09:00
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
kmh
f2b3762f8c Filter POP defect-types to 공정검사 master only
- Drop item_inspection_info branch in getDefectTypes
- Always source from defect_standard_mng with inspection_type containing 공정검사 (CAT_MMEBA4LJ_UFJ9)
- Fix is_active filter to category code CAT_DA_01 ('사용') — old 'Y' literal returned zero rows

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-30 12:31:19 +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