Commit Graph

4544 Commits

Author SHA1 Message Date
0cb286661a Merge pull request 'jskim-node' (#52) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 52s
Reviewed-on: #52
2026-05-14 03:03:33 +00:00
ff36952a50 Merge branch 'main' into jskim-node 2026-05-14 03:03:29 +00:00
kjs
bb82fe3910 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-14 12:03:05 +09:00
kjs
823f9034a8 Enhance Production Plan Date Calculation Logic
- Introduced helper functions to calculate working days while skipping weekends, improving the accuracy of date calculations in production planning.
- Updated the logic for determining start and end dates based on lead time and production capacity, ensuring that weekend days are excluded from the calculations.
- Refactored existing date calculation code in the `previewSchedule` and `generateSchedule` functions to utilize the new helper methods for better maintainability and clarity.

(TASK: ERP-XXX)
2026-05-14 12:03:04 +09:00
32fab54588 Merge pull request 'jskim-node' (#51) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 44s
Reviewed-on: #51
2026-05-13 07:41:54 +00:00
1c5ce7cc99 Merge branch 'main' into jskim-node 2026-05-13 07:41:48 +00:00
kjs
91d47d2345 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-13 16:40:50 +09:00
kjs
44f923df56 Add New Pages for COMPANY_31 in Admin Page Renderer
- Introduced multiple new routes for COMPANY_31, including master data management for item info, department, company, options, and various sales and production pages.
- Each route is dynamically imported to enhance performance and user experience.
- Updated the admin page renderer to accommodate the new COMPANY_31 structure, ensuring seamless navigation and access to the new functionalities.

(TASK: ERP-XXX)
2026-05-13 16:40:49 +09:00
c012339b35 Merge pull request 'jskim-node' (#50) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 1m24s
Reviewed-on: #50
2026-05-13 06:41:35 +00:00
ceff19cae0 Merge branch 'main' into jskim-node 2026-05-13 06:41:29 +00:00
kjs
d714077ddc Add New Design Management Pages for COMPANY_31
- Introduced multiple new pages for design management, including Change Management, Design Request, My Work, Project, Task Management, Equipment Info, and Inspection Record.
- Each page includes relevant UI components such as tables, forms, and modals for managing design-related tasks and equipment inspections.
- Implemented state management and API integration for fetching and manipulating design requests and equipment data.
- Enhanced user experience with dynamic search filters and responsive layouts.

(TASK: ERP-XXX)
2026-05-13 15:38:24 +09:00
kjs
bd978ff80c Enhance Shipping Order and Plan Functionality
- Updated the shipping order controller to improve customer name retrieval by removing unnecessary partner_id fallback.
- Implemented shipment plan number allocation logic in the shipping plan controller, ensuring unique numbering based on defined rules or fallback mechanisms.
- Enhanced the batch save functionality to include the new shipment plan number in the database insertions.
- Added new state management for production and shipment plans in the Cutting Plan page, allowing for better organization and retrieval of related data.
- Introduced delivery location field in the sales order page, improving data entry for shipping details.

(TASK: ERP-XXX)
2026-05-12 16:24:33 +09:00
kjs
1003273709 Implement Work Standard Copy Functionality for Items
- Added new API endpoints to retrieve the work standard tree by item and to copy work standards from a source item to target items, supporting conflict strategies.
- Enhanced the backend logic to handle the retrieval and copying of work standards, including validation for required parameters and error handling.
- Introduced a new modal component in the frontend for managing the copy operation, allowing users to select target items and define conflict resolution strategies.

(TASK: ERP-029)
2026-05-11 18:02:39 +09:00
kjs
12fc9818cf Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-11 15:06:15 +09:00
kjs
663a51e94d Add All BOM Substitutes API and Update BOM Management
- Introduced a new API endpoint to retrieve all substitutes for a given BOM ID, allowing for bulk retrieval of substitute items.
- Enhanced the BOM service to support the new functionality, including company code filtering and versioning options.
- Updated the BOM management page to integrate the new substitute retrieval feature, enabling users to manage substitutes more effectively during the copy process.
- Added necessary state management and UI elements for handling substitutes in the copy modal.

(TASK: ERP-028)
2026-05-11 15:06:13 +09:00
30b38b7790 Merge pull request 'jskim-node' (#49) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 48s
Reviewed-on: #49
2026-05-11 04:28:19 +00:00
8d5e73d8e4 Merge branch 'main' into jskim-node 2026-05-11 04:28:13 +00:00
kjs
571d4fab83 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-05-11 13:27:58 +09:00
kjs
5a4a6d5a5b Add BOM Copy Functionality to BOM Management
- Introduced a new API endpoint to copy a BOM tree to multiple target items, allowing for efficient duplication of BOM structures.
- Implemented payload validation to ensure correct data format and integrity during the copy process.
- Added a modal in the frontend for managing the BOM copy operation, including options for conflict resolution and progress tracking.
- Enhanced the BOM service with necessary logic for handling BOM copies, including versioning and error handling.

(TASK: ERP-028)
2026-05-11 13:27:57 +09:00
0bb23b39d2 Merge pull request 'jskim-node' (#48) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 1m23s
Reviewed-on: #48
2026-05-11 03:05:50 +00:00
ff0ce02c39 Merge branch 'main' into jskim-node 2026-05-11 03:05:43 +00:00
kmh
2a6577701b Add POP Inventory Move Feature and Update Shared POP Components
- New POP inventory move page and API (popInventoryMoveController, popInventoryMove client) deployed across COMPANY_7/8/9/10/16/29/30
- Updates to shared POP components (PopShell, AcceptProcessModal, ProcessWork) and inout-manage/inventory pages
- COMPANY_7 POP.md updated with new scope notes

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-11 12:03:02 +09:00
kjs
d5320d86e7 Add Internal Manager Field and Smart Select Component to Customer Management Page
- Introduced a new field for '담당영업사원' (Internal Manager) in the customer management table, enhancing data visibility.
- Integrated the SmartSelect component for selecting internal managers, allowing users to easily choose from a list of employees.
- Updated data mapping to include internal manager information in the customer data structure, ensuring accurate display and functionality.
- Added UI elements for managing the internal manager selection, including a clear button to reset the selection.

(TASK: ERP-XXX)
2026-05-11 10:50:42 +09:00
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
d27699f3f4 Merge pull request 'jskim-node' (#47) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 1m26s
Reviewed-on: #47
2026-05-07 04:47:34 +00: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 1m43s
Reviewed-on: #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 1m34s
Reviewed-on: #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
Some checks failed
Build and Push Images / build-and-push (push) Failing after 1m32s
Reviewed-on: #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