diff --git a/src/components/production/WorkerScreen/WorkCard.tsx b/src/components/production/WorkerScreen/WorkCard.tsx
index cdd4cbd0..cd9478ee 100644
--- a/src/components/production/WorkerScreen/WorkCard.tsx
+++ b/src/components/production/WorkerScreen/WorkCard.tsx
@@ -58,7 +58,7 @@ export function WorkCard({
{/* 헤더 박스: 품목명 + 수량 */}
- {order.productName}
+ {order.productCode !== '-' ? order.productCode : order.productName}
{order.quantity}
diff --git a/src/components/production/WorkerScreen/WorkOrderListPanel.tsx b/src/components/production/WorkerScreen/WorkOrderListPanel.tsx
index df90be9f..af8583f8 100644
--- a/src/components/production/WorkerScreen/WorkOrderListPanel.tsx
+++ b/src/components/production/WorkerScreen/WorkOrderListPanel.tsx
@@ -74,8 +74,10 @@ export function WorkOrderListPanel({
- {/* 제품코드 - 제품명 */}
- {order.productCode} - {order.productName}
+ {/* 제품코드 (제품명) */}
+
+ {order.productCode !== '-' ? order.productCode : order.productName}
+
{/* 현장명 + 수량 */}
diff --git a/src/components/production/WorkerScreen/index.tsx b/src/components/production/WorkerScreen/index.tsx
index 848966f3..af641783 100644
--- a/src/components/production/WorkerScreen/index.tsx
+++ b/src/components/production/WorkerScreen/index.tsx
@@ -714,7 +714,7 @@ export default function WorkerScreen() {
workOrderId: selectedOrder.id,
itemNo: index + 1,
itemCode: selectedOrder.orderNo || '-',
- itemName: `${selectedOrder.productCode !== '-' ? selectedOrder.productCode + ' - ' : ''}${itemSummary}`,
+ itemName: selectedOrder.productCode !== '-' ? selectedOrder.productCode : itemSummary,
floor: (opts.floor as string) || '-',
code: (opts.code as string) || '-',
width: (opts.width as number) || 0,
@@ -740,7 +740,7 @@ export default function WorkerScreen() {
detail_parts: { part_name: string; material: string; barcy_info: string }[];
};
workItem.bendingInfo = {
- common: { kind: bi.common.kind, type: bi.common.type, lengthQuantities: bi.common.length_quantities || [] },
+ common: { kind: bi.common?.kind || '', type: bi.common?.type || '', lengthQuantities: bi.common?.length_quantities || [] },
detailParts: (bi.detail_parts || []).map(dp => ({ partName: dp.part_name, material: dp.material, barcyInfo: dp.barcy_info })),
};
}
@@ -774,7 +774,7 @@ export default function WorkerScreen() {
workOrderId: selectedOrder.id,
itemNo: 1,
itemCode: selectedOrder.orderNo || '-',
- itemName: `${selectedOrder.productCode !== '-' ? selectedOrder.productCode + ' - ' : ''}${selectedOrder.productName || '-'}`,
+ itemName: selectedOrder.productCode !== '-' ? selectedOrder.productCode : (selectedOrder.productName || '-'),
floor: '-',
code: '-',
width: 0,
@@ -1763,7 +1763,7 @@ export default function WorkerScreen() {
open={isInspectionInputModalOpen}
onOpenChange={setIsInspectionInputModalOpen}
processType={getInspectionProcessType()}
- productName={selectedOrder?.productName || workItems[0]?.itemName || ''}
+ productName={selectedOrder?.productCode && selectedOrder.productCode !== '-' ? selectedOrder.productCode : (selectedOrder?.productName || workItems[0]?.itemName || '')}
specification={workItems[0]?.slatJointBarInfo?.specification || workItems[0]?.wipInfo?.specification || ''}
initialData={selectedOrder ? inspectionDataMap.get(selectedOrder.id) : undefined}
onComplete={handleInspectionComplete}