diff --git a/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx b/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx
index f225179..bb44739 100644
--- a/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx
+++ b/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx
@@ -71,15 +71,10 @@ const PickOrderSearch: React.FC<Props> = ({ pickOrders, printerCombo }) => {
  // const [summary4F, setSummary4F] = useState<StoreLaneSummary | null>(null);
   const [isLoadingSummary, setIsLoadingSummary] = useState(false);
 
-  const [selectedPrinterForAllDraft, setSelectedPrinterForAllDraft] = useState<PrinterCombo | null>(
-    printerCombo && printerCombo.length > 0 ? printerCombo[0] : null
-  );
-  const [selectedPrinterForDraft, setSelectedPrinterForDraft] = useState<PrinterCombo | null>(
-    printerCombo && printerCombo.length > 0 ? printerCombo[0] : null
-  );
-  const [selectedPrinterForRecord, setSelectedPrinterForRecord] = useState<PrinterCombo | null>(
-    printerCombo && printerCombo.length > 0 ? printerCombo[0] : null
-  );
+  const [selectedPrinterForAllDraft, setSelectedPrinterForAllDraft] = useState<PrinterCombo | null>(null);
+const [selectedPrinterForDraft, setSelectedPrinterForDraft] = useState<PrinterCombo | null>(null);
+  const [selectedPrinterForRecord, setSelectedPrinterForRecord] = useState<PrinterCombo | null>(null);
+
 
 
   const [hideCompletedUntilNext, setHideCompletedUntilNext] = useState<boolean>(
diff --git a/src/components/ProductionProcess/ProductionProcessDetail.tsx b/src/components/ProductionProcess/ProductionProcessDetail.tsx
index e434ae6..00d8935 100644
--- a/src/components/ProductionProcess/ProductionProcessDetail.tsx
+++ b/src/components/ProductionProcess/ProductionProcessDetail.tsx
@@ -282,6 +282,14 @@ const processQrCode = useCallback((qrValue: string, lineId: number) => {
   // 其他格式处理（JSON、普通文本等）
   try {
     const qrData = JSON.parse(qrValue);
+    if (qrData.staffNo) {
+      setScannedStaffNo(String(qrData.staffNo));
+    }
+    if (qrData.equipmentTypeSubTypeEquipmentNo || qrData.equipmentCode) {
+      setScannedEquipmentTypeSubTypeEquipmentNo(
+        String(qrData.equipmentTypeSubTypeEquipmentNo ?? qrData.equipmentCode)
+      );
+    }
     // TODO: 处理 JSON 格式的 QR 码
   } catch {
     // 普通文本格式 - 尝试判断是 staffNo 还是 equipmentCode