kmh 9da6b22a18 Merge branch 'jskim-node' of https://g.wace.me/jskim/vexplor_dev into mhkim-node ...

Resolved 11 conflicts by taking the jskim side. mhkim-side changes lost
in conflict zones (to be re-applied separately):

backend-node/
  - outboundController.ts: source_table/sales_order_id/shipment_plan_id/item_info_id columns in outbound_mng INSERT
  - popProductionController.ts: ensureLoadingInstance/insertPackagingRows imports and material auto-input + inventory_stock deduction block
  - workInstructionController.ts: getProcessResults function for production-result right panel
  - routes/workInstructionRoutes.ts: GET /:wiId/process-results route

frontend/
  - COMPANY_7/production/work-instruction/page.tsx: Lock icon, detailId/locked fields on WorkRow, locked column and lock icon in items table
  - COMPANY_8/10/16/28/29/production/work-instruction/page.tsx: expandedItems._qty payload (batch-split) replaced by jskim confirmItems.qty + infos
  - COMPANY_8/logistics/inbound-outbound/page.tsx: autoFilter true replaced by autoFilter:{enabled:false}

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

2026-05-21 18:25:27 +09:00

..

__tests__

feat(backend/work-instruction): re-project master checklist snapshot on wi edit

2026-04-24 15:00:38 +09:00

adminController.ts

Add Customer Contact Routes and Enhance User Management

2026-05-18 16:13:29 +09:00

analyticsReportController.ts

Refactor analytics report and production plan services for improved data handling

2026-04-29 21:05:38 +09:00

approvalController.ts

feat: Implement approval request validation and enhance UI components

2026-04-16 10:26:38 +09:00

approvalProxyController.ts

[agent-pipeline] pipe-20260305133525-uca5 round-2

2026-03-05 22:43:26 +09:00

auditLogController.ts

feat: enhance audit log functionality and file upload components

2026-03-17 11:31:54 +09:00

authController.ts

Migrate POP inventory adjust to v2 and remove legacy POP modules

2026-05-08 16:07:41 +09:00

barcodeLabelController.ts

바코드 기능 커밋밋

2026-03-04 20:51:00 +09:00

batchController.ts

타입스크립트 에러 수정

2025-12-01 15:30:25 +09:00

batchExecutionLogController.ts

REST API→DB 토큰 배치 및 auth_tokens 저장 구현

2025-11-27 11:32:19 +09:00

batchManagementController.ts

feat: Optimize batch management and improve performance

2026-04-23 18:24:32 +09:00

bomController.ts

Add All BOM Substitutes API and Update BOM Management

2026-05-11 15:06:13 +09:00

bookingController.ts

투두리스트, 예약요청, 정비,문서

2025-10-14 17:21:28 +09:00

buttonActionStandardController.ts

fix: buttonActionStandardController pool 사용을 transaction 함수로 변경

2025-10-01 14:38:14 +09:00

buttonDataflowController.ts

테이블 간 조인 관계 조회 기능 추가

2026-01-22 11:16:23 +09:00

cascadingAutoFillController.ts

배포 오류 해결

2025-12-11 14:34:42 +09:00

cascadingConditionController.ts

배포 오류 해결

2025-12-11 14:34:42 +09:00

cascadingHierarchyController.ts

배포 오류 해결

2025-12-11 14:34:42 +09:00

cascadingMutualExclusionController.ts

배포 오류 해결

2025-12-11 14:34:42 +09:00

cascadingRelationController.ts

카테고리 설정 구현

2025-12-18 14:12:48 +09:00

categoryTreeController.ts

feat: enhance audit logging and add company name to audit entries

2026-03-12 05:14:27 +09:00

categoryValueCascadingController.ts

refactor: Update references from table_column_category_values to category_values

2026-03-09 13:46:38 +09:00

codeMergeController.ts

코드병합기능 개선

2026-01-08 14:24:07 +09:00

collectionController.ts

외부커넥션관리

2025-09-24 10:04:25 +09:00

commonCodeController.ts

feat: enhance audit logging and add company name to audit entries

2026-03-12 05:14:27 +09:00

componentStandardController.ts

console.log 삭제

2025-09-16 16:16:41 +09:00

conditionalConnectionController.ts

실행 조건 구현

2025-09-12 11:33:54 +09:00

crawlController.ts

feat: add web crawling management functionality

2026-03-26 16:30:53 +09:00

customerContactController.ts

Add Customer Contact Routes and Enhance User Management

2026-05-18 16:13:29 +09:00

cuttingPlanController.ts

feat: Add cutting plan management for COMPANY_30

2026-04-23 14:03:45 +09:00

DashboardController.ts

리스트 위젯 REST API 기능 개선

2025-12-11 10:48:48 +09:00

dataflowController.ts

백엔드 구현

2025-09-12 10:05:25 +09:00

dataflowDiagramController.ts

각 회사별 데이터 분리

2025-10-27 16:40:59 +09:00

dataflowExecutionController.ts

refactor: Enhance unique constraint validation across data operations

2026-03-10 16:15:20 +09:00

dbTypeCategoryController.ts

데이터베이스 틀린 비밀번호 입력시 연결거부처리

2025-09-24 10:30:36 +09:00

ddlController.ts

feat: enhance audit logging and add company name to audit entries

2026-03-12 05:14:27 +09:00

deliveryController.ts

배송/화물현황과 리스크/알림(api 활용, 공공데이터 복구시 대체될 가능성 있음)

2025-10-14 16:36:00 +09:00

deliveryNoteController.ts

대진 오류사항 일부 수정

2026-05-19 11:57:05 +09:00

departmentController.ts

Enhance backend controllers, frontend pages, and V2 components

2026-03-30 11:52:03 +09:00

designController.ts

feat: add shipping order and design management features

2026-03-19 15:08:31 +09:00

digitalTwinDataController.ts

외부 DB 연결 끊김 오류 해결

2025-12-11 15:25:48 +09:00

digitalTwinLayoutController.ts

디지털 트윈 레이아웃 조회 시 최고 관리자 권한 처리 추가

2025-12-01 10:44:56 +09:00

digitalTwinTemplateController.ts

에디터 속성 편집 성능 최적화 (디바운스 적용)

2025-11-26 16:05:33 +09:00

driverController.ts

타입에러 수정

2025-12-03 18:56:14 +09:00

dynamicFormController.ts

refactor: Enhance unique constraint validation across data operations

2026-03-10 16:15:20 +09:00

entityJoinController.ts

feat: enhance v2 components and entity join functionality

2026-03-25 09:54:18 +09:00

entityReferenceController.ts

feat: 멀티테넌시 지원을 위한 레이어 관리 기능 추가

2026-02-09 13:21:56 +09:00

entitySearchController.ts

docs: update user menu development rules

2026-03-11 16:05:25 +09:00

excelMappingController.ts

엑셀 업로드 템플릿 기능 구현

2026-01-08 11:45:39 +09:00

fileController.ts

fix: Enhance file handling and inspection method mapping

2026-04-10 15:59:38 +09:00

flowController.ts

feat: Enhance audit logging with client IP tracking

2026-03-04 15:02:27 +09:00

flowExternalDbConnectionController.ts

플로우 외부db연결

2025-10-20 17:50:27 +09:00

inventoryTransferController.ts

Add inventory transfer API and enhance POP backend controllers

2026-05-21 18:02:39 +09:00

itemInspectionController.ts

Add Customer Contact Routes and Enhance User Management

2026-05-18 16:13:29 +09:00

kpiController.ts

Implement KPI daily production feature

2026-04-28 16:14:27 +09:00

layoutController.ts

레이아웃 추가기능

2025-09-10 18:36:28 +09:00

mailAccountFileController.ts

메일관리 기능 구현

2025-10-02 15:46:23 +09:00

mailReceiveBasicController.ts

메일관리

2025-10-22 17:07:38 +09:00

mailSendSimpleController.ts

메일관리

2025-10-22 17:07:38 +09:00

mailSentHistoryController.ts

ui 고치기 전 세이브

2025-10-22 16:06:04 +09:00

mailTemplateFileController.ts

메일관리 시스템 구현 완료

2025-10-01 17:01:31 +09:00

mapDataController.ts

차량위치 위젯 기존꺼 분할 완료

2025-10-15 10:29:15 +09:00

materialStatusController.ts

feat: Implement cutting plan management and work instruction modal

2026-04-24 11:12:32 +09:00

messengerController.ts

[RAPID] 메신저 기능 구현 및 UI/UX 개선

2026-04-01 12:20:43 +09:00

moldController.ts

feat: Add sales order bulk upload functionality

2026-04-24 17:58:11 +09:00

multilangController.ts

Merge branch 'mhkim-node' of http://39.117.244.52:3000/kjs/ERP-node into jskim-node

2026-03-26 09:30:17 +09:00

numberingRuleController.ts

fix: Improve numbering rule handling and item routing functionality

2026-04-09 12:18:26 +09:00

openApiProxyController.ts

날씨 진행 중 세이브

2025-10-23 12:31:14 +09:00

outboundController.ts

Refactor Outbound and Work Instruction Controllers for Source Table Updates

2026-05-21 15:03:09 +09:00

outsourcePurchaseController.ts

Implement Order Status Integration for Outsourcing Purchase Management

2026-05-07 18:33:38 +09:00

outsourcingOutboundController.ts

Refactor Outbound and Work Instruction Controllers for Source Table Updates

2026-05-21 15:03:09 +09:00

packagingController.ts

Add inventory transfer API and enhance POP backend controllers

2026-05-21 18:02:39 +09:00

popInOutDetailController.ts

Bundle pending POP work: production / inventory inout / inbound

2026-04-29 18:54:54 +09:00

popInOutHistoryController.ts

Add POP Inventory Move Feature and Update Shared POP Components

2026-05-11 12:03:02 +09:00

popInventoryAdjustController.ts

Add inventory transfer API and enhance POP backend controllers

2026-05-21 18:02:39 +09:00

popInventoryMoveController.ts

Add inventory transfer API and enhance POP backend controllers

2026-05-21 18:02:39 +09:00

popProductionController.ts

Refactor Outbound and Work Instruction Controllers for Source Table Updates

2026-05-21 15:03:09 +09:00

processInfoController.ts

Add Batch Process Equipment Registration Functionality

2026-05-19 18:09:57 +09:00

processWorkStandardController.ts

Implement Work Standard Copy Functionality for Items

2026-05-11 18:02:39 +09:00

productionController.ts

Implement server-side pagination for order summaries, plans, and shipping orders

2026-04-28 13:59:34 +09:00

qualityMonitoringController.ts

Update date handling in inventory and sales order pages

2026-04-29 18:20:01 +09:00

quoteController.ts

Add quote management functionality with API and UI integration

2026-04-02 15:30:44 +09:00

receivingController.ts

Add inventory transfer API and enhance POP backend controllers

2026-05-21 18:02:39 +09:00

reportCellValueController.ts

feat: Add report cell value management functionality

2026-04-20 17:59:28 +09:00

reportController.ts

feat: 리포트 타입 에러 수정

2026-03-12 18:47:42 +09:00

reportPresetController.ts

feat: add report preset management API

2026-04-16 12:08:28 +09:00

riskAlertController.ts

배송/화물현황과 리스크/알림(api 활용, 공공데이터 복구시 대체될 가능성 있음)

2025-10-14 16:36:00 +09:00

roleController.ts

Enhance user management and token invalidation features

2026-03-25 18:47:50 +09:00

salesOrderAuditController.ts

Refactor production plan service to handle empty due dates

2026-04-29 13:59:52 +09:00

salesOrderBulkController.ts

feat: Add sales order bulk upload functionality

2026-04-24 17:58:11 +09:00

salesOrderPackagingController.ts

Refactor production plan service to handle empty due dates

2026-04-29 13:59:52 +09:00

salesReportController.ts

feat: add report preset management API

2026-04-16 12:08:28 +09:00

sampleController.ts

[agent-pipeline] pipe-20260403004704-gib0 round-1

2026-04-03 09:48:39 +09:00

scheduleController.ts

feat: 스케줄 자동 생성 기능 및 이벤트 발송 설정 추가

2026-02-03 09:34:25 +09:00

screenEmbeddingController.ts

타입스크립트 에러 수정

2025-12-01 15:30:25 +09:00

screenFileController.ts

docs: Phase 4 남은 Prisma 호출 전환 계획서 작성

2025-10-01 14:33:08 +09:00

screenGroupController.ts

Migrate POP inventory adjust to v2 and remove legacy POP modules

2026-05-08 16:07:41 +09:00

screenManagementController.ts

Migrate POP inventory adjust to v2 and remove legacy POP modules

2026-05-08 16:07:41 +09:00

shippingOrderController.ts

Enhance Shipping Order and Plan Functionality

2026-05-14 15:46:35 +09:00

shippingPlanController.ts

Add Customer Contact Routes and Enhance User Management

2026-05-18 16:13:29 +09:00

smartFactoryLogController.ts

feat: Update smart factory log scheduling and enhance item info page

2026-04-08 10:41:32 +09:00

subcontractorStockController.ts

Implement Subcontractor Stock Management Features

2026-05-08 16:17:06 +09:00

systemNoticeController.ts

[agent-pipeline] pipe-20260305094105-763v round-2

2026-03-05 18:45:41 +09:00

tableCategoryValueController.ts

Add Customer Contact Routes and Enhance User Management

2026-05-18 16:13:29 +09:00

tableHistoryController.ts

세금계산서 하기 전에 저장

2025-12-08 14:34:18 +09:00

tableManagementController.ts

Enhance Shipping Order and Plan Functionality

2026-05-14 15:46:35 +09:00

taxInvoiceController.ts

세금계산서 업그레이드

2025-12-08 16:18:44 +09:00

templateStandardController.ts

컴포넌트 화면편집기에 배치

2025-09-10 14:09:32 +09:00

todoController.ts

투두리스트, 예약요청, 정비,문서

2025-10-14 17:21:28 +09:00

userMailController.ts

feat: 사용자 메일 관리 IMAP 구현

2026-03-30 17:17:20 +09:00

vehicleReportController.ts

공차관련수정사항들

2025-12-02 09:53:08 +09:00

vehicleTripController.ts

공차관련수정사항들

2025-12-02 09:53:08 +09:00

webTypeStandardController.ts

feat: webTypeStandardController & fileController Prisma 전환 완료

2025-10-01 14:36:36 +09:00

workHistoryController.ts

작업 이력 통계 위젯 추가

2025-10-20 14:07:08 +09:00

workInstructionController.ts

Refactor Outbound and Work Instruction Controllers for Source Table Updates

2026-05-21 15:03:09 +09:00

YardLayoutController.ts

요소 추가 버튼 시 api 호출 삭제

2025-10-20 10:06:17 +09:00