Commit Graph

4409 Commits

Author SHA1 Message Date
a21eb49fef Merge pull request 'jskim-node' (#35) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 49s
Reviewed-on: jskim/vexplor_dev#35
2026-04-24 02:12:55 +00:00
f283196637 Merge branch 'main' into jskim-node 2026-04-24 02:12:50 +00:00
kjs
37ca354af9 feat: Implement cutting plan management and work instruction modal
- Introduced a new cutting plan management page for COMPANY_9, allowing users to manage cutting plans effectively.
- Added a Work Instruction Apply Modal to facilitate the application of work instructions linked to cutting plans.
- Enhanced data handling by incorporating additional fields such as condition_unit, condition_base_value, condition_tolerance, condition_auto_collect, and condition_plc_data in relevant controllers and database interactions.
- Updated UI components to support new features, including displaying batch numbers and item sizes in the work instruction page.

These changes aim to improve the efficiency and usability of cutting plan and work instruction management processes.
2026-04-24 11:12:32 +09:00
kjs
c01166263b feat: Implement sorting functionality in inspection management page
- Added sorting capabilities for equipment listings, allowing users to sort by various columns such as equipment code, name, type, and more.
- Introduced visual indicators for sort direction using icons (ArrowUp, ArrowDown, ArrowUpDown).
- Enhanced filtering logic to accommodate sorting, improving data retrieval and user experience.

These changes aim to provide users with better control over equipment data presentation and enhance overall usability in the inspection management workflow.
2026-04-24 09:29:41 +09:00
6834166fdd Merge pull request 'jskim-node' (#34) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 49s
Reviewed-on: jskim/vexplor_dev#34
2026-04-23 09:25:20 +00:00
kjs
4a9e3768a9 feat: Optimize batch management and improve performance
- Reduced timeout for RestApiConnector to 20 seconds to ensure timely feedback for previews.
- Implemented caching for external DB metadata to minimize connection overhead and improve response times.
- Enhanced internal DB table and column retrieval with TTL caching to prevent database pool exhaustion.
- Introduced error handling for external DB timeouts, providing clearer feedback to users.
- Updated batch management UI to improve user experience with better error messages and streamlined data handling.

These changes aim to enhance the efficiency and reliability of batch management processes.
2026-04-23 18:24:32 +09:00
kjs
c618283306 feat: Refactor work process and item inspection logic
- Updated SQL queries in `popProductionController` to separate work order process and result handling, ensuring batch_id is now managed in the work_order_process_result table.
- Enhanced `workInstructionController` to include id generation for work items and details, preventing NULL values during insertion.
- Implemented case-insensitive search functionality across various services, improving data retrieval accuracy.
- Added sorting functionality in the item inspection page, allowing users to sort by different columns with visual indicators for sort direction.

This refactor aims to improve data integrity and user experience across the production and inspection workflows.
2026-04-23 17:36:04 +09:00
kjs
cfa6ee0869 Merge branch 'gbpark-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-23 14:34:20 +09:00
DDD1542
2efe30e282 2026-04-23 14:32:52 +09:00
DDD1542
b3de4fc6d8 Merge remote-tracking branch 'origin/jskim-node' into gbpark-node 2026-04-23 14:03:57 +09:00
DDD1542
28c1c8c029 feat: Add cutting plan management for COMPANY_30
- Cutting optimization (Guillotine FFDH) with mixed/homogeneous modes
- Remnant management with persistence (cutting_plan_sheet.remnants JSONB)
- Work instruction creation linked via batch_no/cutting_plan_id

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-23 14:03:45 +09:00
f3a0466bab Merge pull request 'jskim-node' (#33) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 45s
Reviewed-on: jskim/vexplor_dev#33
2026-04-23 00:45:48 +00:00
f48af2aec5 Merge branch 'main' into jskim-node 2026-04-23 00:45:41 +00:00
kjs
1282955d15 feat: Enhance warehouse management page with drag-and-drop functionality
- Added GripVertical icon for visual representation of draggable segments.
- Introduced state management for rack segment order, allowing users to customize the order of segments (zone, row, level) via drag-and-drop.
- Updated location code generation logic to reflect the new segment order, improving the flexibility of location naming.
- Simplified modal handling by resetting segment order and labels upon opening the rack modal.
- Adjusted validation messages to focus on required fields, enhancing user experience during rack structure registration.
2026-04-23 09:44:50 +09:00
kjs
ad1180daa5 feat: Allow duplicate items at the same level in BOM management
- Updated the logic in the BomManagementPage to permit the registration of duplicate items at the same level, enabling separate rows for items with different requirements or processes.
- Removed the previous check for duplicate items at the same level, enhancing flexibility in item management within the BOM structure.
2026-04-22 18:09:57 +09:00
kjs
bf58ce3c07 feat: Implement multi-select functionality for work instruction items
- Added new fields to the SelectedItem interface for managing item schedules, equipment, work teams, and workers.
- Created a reusable MultiSelectPopover component to facilitate multi-selection of equipment, work teams, and workers.
- Enhanced the applyRegistration function to include start and end dates, as well as equipment and team assignments for work instruction items.
- Updated item handling logic to support production planning with optional scheduling details, improving the overall functionality of the work instruction page.
2026-04-22 15:44:42 +09:00
kjs
d9ced89a95 feat: Enhance packaging and work instruction functionality
- Updated SQL queries in the packaging and work instruction controllers to include additional fields such as `inventory_unit` and `material`, improving data retrieval for packaging items.
- Implemented new columns in the `work_instruction_detail` table for better tracking of item schedules, equipment, and personnel involved in work instructions.
- Enhanced frontend components to utilize the new data structure, including category options for inventory units and materials, improving user experience in the packaging and subcontractor item pages.
- Refactored item inspection display logic to format pass criteria more clearly, enhancing readability for inspection data.
2026-04-22 14:49:40 +09:00
kjs
af6c309a46 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-22 12:27:38 +09:00
kjs
84a3b12346 Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-22 12:27:36 +09:00
d18d207f56 Merge pull request 'jskim-node' (#32) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 49s
Reviewed-on: jskim/vexplor_dev#32
2026-04-22 00:28:26 +00:00
5fe0f202d0 Merge branch 'main' into jskim-node 2026-04-22 00:28:18 +00:00
kjs
3b796ca9e3 feat: Add outsourcing outbound functionality
- Introduced a new controller for managing outsourcing outbound processes, including automatic candidate retrieval and outbound list management.
- Implemented API routes for fetching candidates, listing outsourcing outbounds, and creating new outbound records.
- Enhanced the SQL queries to ensure proper filtering by company code and to utilize existing outbound management tables effectively.
- Added new routes for handling outsourcing outbound operations in the Express application, improving the overall functionality of the logistics module.
2026-04-22 09:27:45 +09:00
kjs
08e601eab8 feat: Refactor production report data retrieval logic
- Updated the `getProductionReportData` function to utilize the `work_order_process` table for accurate production data retrieval.
- Enhanced the SQL query to include new fields such as `process_name`, `equipment_name`, and `plan_qty`, improving the detail and accuracy of the production report.
- Adjusted date and company filters to align with the new data structure, ensuring proper data segregation and retrieval based on company codes.
- Improved handling of equipment and item information by incorporating lateral joins for better data accuracy and representation.
2026-04-21 14:15:57 +09:00
kjs
a863427c4f feat: Update equipment handling in process management
- Enhanced the `getProcessEquipments` function to support matching both legacy equipment codes and new IDs, improving data retrieval accuracy.
- Updated the `availableEquipments` logic in the `ProcessMasterTab` component to handle both equipment codes and IDs, ensuring a seamless user experience when adding equipment.
- Improved error handling for equipment selection, providing user feedback when a selected equipment cannot be found.
- Refactored the display of equipment names to ensure accurate representation, even when equipment codes are not available.
2026-04-21 13:54:14 +09:00
kjs
e0b89036d0 feat: Enhance copy functionality for item inspection information
- Introduced state management for copy form and inspection rows to facilitate editing and copying of inspection data.
- Implemented logic to duplicate selected inspection data into a copy modal, allowing users to edit and manage copied information.
- Enhanced the copy process to include validation and user feedback, ensuring a smooth experience when copying inspection details to multiple target items.
- Updated the modal handling to support dynamic row management for copied inspection items, improving usability and flexibility.
2026-04-21 10:31:40 +09:00
f30ef643f9 Merge pull request 'jskim-node' (#31) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 51s
Reviewed-on: jskim/vexplor_dev#31
2026-04-20 09:09:36 +00:00
kjs
51c4fddde0 feat: Add report cell value management functionality
- Introduced a new controller for managing custom input values in report cells, allowing users to retrieve and upsert values associated with specific reports and targets.
- Implemented API routes for fetching and saving report cell values, ensuring proper authentication and data handling.
- Enhanced the frontend components to support the new report cell input functionality, including the ability to edit and save input values in a modal.
- Updated inventory and equipment management pages to include new features for handling missing items and managing warehouse locations effectively.
2026-04-20 17:59:28 +09:00
kjs
725aa976bf Merge branch 'main' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-20 14:52:03 +09:00
kjs
68bc857eae feat: Implement pagination and enhanced keyword search in work instruction retrieval
- Added pagination support to the `getList` function in the work instruction controller, allowing for efficient data retrieval with `page` and `pageSize` parameters.
- Enhanced the keyword search functionality to include checks for item numbers in the work instruction details, improving search accuracy.
- Updated the frontend components to utilize the new `SmartSelect` component for supplier and partner selection, enhancing user experience.
- Adjusted the `EDataTable` component to support server-side pagination, ensuring better performance with large datasets.
2026-04-20 14:51:32 +09:00
kjs
377e3e51e8 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-20 14:14:26 +09:00
kjs
9737805bf9 feat: Enhance outbound and receiving update functionalities with inventory adjustments
- Updated the `update` function in the outbound controller to include detailed inventory adjustments when modifying outbound records, ensuring accurate stock management.
- Implemented rollback mechanisms for both outbound and receiving updates to maintain data integrity in case of errors.
- Enhanced the `deleteOutbound` function to include inventory recovery and historical logging for deleted outbound records.
- Introduced a new utility function `adjustInventory` to handle inventory changes consistently across different controllers.
- Improved error handling and logging for better traceability during outbound and receiving operations.
2026-04-20 14:14:24 +09:00
dd01ebb484 Merge pull request 'jskim-node' (#30) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 48s
Reviewed-on: jskim/vexplor_dev#30
2026-04-20 00:31:28 +00:00
a7b977c5f6 Merge branch 'main' into jskim-node 2026-04-20 00:31:21 +00:00
kjs
48b9ba3d2a feat: Enhance routing details and subcontractor mapping functionality
- Updated the `getRoutingDetails` function to enrich routing details with subcontractor codes, improving data retrieval for routing information.
- Implemented a mapping mechanism to associate subcontractor codes with routing details, ensuring accurate representation of outsourcing suppliers.
- Enhanced the `saveRoutingDetails` function to handle subcontractor mappings during the save operation, ensuring data integrity and consistency.
- Updated the BOM service to improve unit handling and added inventory unit information for better clarity in item representation.
- Refactored production plan management to streamline modal handling and improve error messaging for better user feedback.
2026-04-17 18:25:35 +09:00
kjs
78e102fd45 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-17 13:11:02 +09:00
kjs
173b85b476 feat: Implement copy functionality for item inspection information
- Added a modal for copying inspection information from a selected item to multiple target items.
- Implemented search and selection logic for target items to facilitate the copying process.
- Included validation to ensure a source item is selected and that target items are valid before proceeding with the copy operation.
- Enhanced user feedback with toast notifications for successful and error states during the copy process.
- Updated BOM management to include unit label handling for better clarity in item representation.
2026-04-17 13:11:01 +09:00
kjs
b158b0aa77 feat: Enhance mold serial summary retrieval and improve category handling
- Updated the `getMoldSerialSummary` function to dynamically retrieve category values for mold statuses and operations, allowing for more flexible data aggregation.
- Implemented a mapping mechanism to categorize status codes based on their labels, improving the clarity of the summary results.
- Adjusted SQL queries to utilize the new category mappings for more accurate counts of mold statuses.
- Refactored the packaging and loading unit deletion logic to handle company code checks more efficiently, ensuring proper data access control.
2026-04-16 18:23:20 +09:00
01c77c553b Merge pull request 'jskim-node' (#29) from jskim-node into main
Some checks failed
Build and Push Images / build-and-push (push) Failing after 51s
Reviewed-on: jskim/vexplor_dev#29
2026-04-16 04:56:00 +00:00
17a5869bc0 Merge branch 'main' into jskim-node 2026-04-16 04:55:53 +00:00
kjs
c503e2c59c Merge branch 'gbpark-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-16 13:41:41 +09:00
kjs
dc7dd2776b feat: Enhance receiving update functionality and clean up imports
- Updated the receiving controller to allow for the update of inbound records, including both header and item fields (inbound_qty, unit_price, total_amount).
- Cleaned up the import statements in the receiving page by removing a duplicate toast import, improving code clarity and maintainability.
2026-04-16 13:41:35 +09:00
DDD1542
e6496c56f9 123123 2026-04-16 13:41:02 +09:00
kjs
4a0d4ab5c7 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into jskim-node 2026-04-16 13:22:56 +09:00
kjs
359fd2823f feat: Update pagination size for API requests across multiple pages
- Changed the pagination size from 500 to 0 for various API requests in the equipment, logistics, master data, quality, and sales pages.
- This adjustment aims to optimize data retrieval by potentially reducing the amount of data fetched in initial requests, improving performance and responsiveness.
- Ensured that the changes are consistent across all relevant components to maintain uniformity in data handling.
2026-04-16 13:22:54 +09:00
DDD1542
36d584ffa3 fix: remove duplicate toast import in COMPANY_30 receiving page
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-16 12:13:53 +09:00
DDD1542
cb9b5b2ec7 Merge remote-tracking branch 'origin/jskim-node' into jskim-node
; Conflicts:
;	frontend/app/(main)/COMPANY_30/sales/order/page.tsx
2026-04-16 12:10:32 +09:00
DDD1542
623cbc0b61 feat: add report preset management API
- Implemented CRUD operations for report presets in reportPresetController.
- Added routes for listing, creating, updating, and deleting report presets.
- Ensured authentication is required for all preset operations.
- Enhanced MaterialData interface to include optional width, height, and thickness properties.
2026-04-16 12:08:28 +09:00
kjs
a20fd267fc feat: Add table aggregation endpoint for data summarization
- Implemented a new endpoint to retrieve aggregated data (SUM/COUNT) for specified columns in a given table.
- Added validation to ensure the presence of table name and valid aggregation columns in the request.
- Integrated company code filtering to restrict data access based on user permissions.
- Updated the table management routes to include the new aggregation functionality.
- Enhanced the frontend order page to utilize the new aggregation endpoint for improved statistical reporting.
2026-04-16 12:03:51 +09:00
kjs
0e09b9e686 feat: Implement duplicate inbound registration check and enhance receiving page
- Added a check in the receiving controller to prevent duplicate inbound registrations based on the inbound number, ensuring idempotency.
- Updated the receiving page to maintain selected items across different inbound types, improving user experience.
- Enhanced the item mapping logic to utilize inventory unit codes, ensuring accurate data representation.
- Adjusted the layout to include a new column for inbound type in the receiving table, providing better visibility of item classifications.
2026-04-16 11:31:41 +09:00
kjs
d3491a79bb feat: Implement approval request validation and enhance UI components
- Added validation to prevent duplicate approval requests for the same target, ensuring that only one active or completed approval exists at a time.
- Implemented a check to disallow self-approval in the approval line unless the approval type is 'self'.
- Integrated the ApprovalDetailModal component into the main layout for improved user experience.
- Updated the SalesOrderPage to include approval status in the data structure, enhancing visibility of approval states.
- Enhanced BOM management modals across multiple company implementations to accommodate new UI requirements.
2026-04-16 10:26:38 +09:00