浏览代码

update

master
CANCERYS\kw093 1周前
父节点
当前提交
923e29ea39
共有 2 个文件被更改,包括 12 次插入9 次删除
  1. +4
    -9
      src/components/FinishedGoodSearch/FinishedGoodSearch.tsx
  2. +8
    -0
      src/components/ProductionProcess/ProductionProcessDetail.tsx

+ 4
- 9
src/components/FinishedGoodSearch/FinishedGoodSearch.tsx 查看文件

@@ -71,15 +71,10 @@ const PickOrderSearch: React.FC<Props> = ({ pickOrders, printerCombo }) => {
// const [summary4F, setSummary4F] = useState<StoreLaneSummary | null>(null); // const [summary4F, setSummary4F] = useState<StoreLaneSummary | null>(null);
const [isLoadingSummary, setIsLoadingSummary] = useState(false); 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>( const [hideCompletedUntilNext, setHideCompletedUntilNext] = useState<boolean>(


+ 8
- 0
src/components/ProductionProcess/ProductionProcessDetail.tsx 查看文件

@@ -282,6 +282,14 @@ const processQrCode = useCallback((qrValue: string, lineId: number) => {
// 其他格式处理(JSON、普通文本等) // 其他格式处理(JSON、普通文本等)
try { try {
const qrData = JSON.parse(qrValue); 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 码 // TODO: 处理 JSON 格式的 QR 码
} catch { } catch {
// 普通文本格式 - 尝试判断是 staffNo 还是 equipmentCode // 普通文本格式 - 尝试判断是 staffNo 还是 equipmentCode


正在加载...
取消
保存