打印日志

杨鑫
1 parent 599d2940
Showing 32 changed files with 2477 additions and 609 deletions
标签模块接口对接说明(8).md → 标签模块接口对接说明.md
美国版/Food Labeling Management App UniApp/src/pages/labels/preview.vue
美国版/Food Labeling Management App UniApp/src/pages/more/print-log.vue
美国版/Food Labeling Management App UniApp/src/services/usAppLabeling.ts
美国版/Food Labeling Management App UniApp/src/types/usAppLabeling.ts
美国版/Food Labeling Management App UniApp/src/utils/labelPreview/buildLabelPrintPayload.ts
美国版/Food Labeling Management App UniApp/src/utils/labelPreview/printInputOptions.ts
美国版/Food Labeling Management App UniApp/src/utils/labelPreview/renderLabelPreviewCanvas.ts
美国版/Food Labeling Management App UniApp/src/utils/print/bleWriteModeRules.ts
美国版/Food Labeling Management App UniApp/src/utils/print/manager/printerManager.ts
美国版/Food Labeling Management App UniApp/src/utils/print/printerConnection.ts
美国版/Food Labeling Management App UniApp/src/utils/print/systemTemplateAdapter.ts
美国版/Food Labeling Management App UniApp/src/utils/print/tscLabelBuilder.ts
美国版/Food Labeling Management App UniApp/src/utils/printFromPrintDataList.ts
美国版/Food Labeling Management App UniApp/src/utils/printSnapshotStorage.ts
美国版/Food Labeling Management App UniApp/src/utils/reprintFromMergedTemplate.ts
美国版/Food Labeling Management App UniApp/src/utils/resolveMediaUrl.ts
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/UsAppLabeling/PrintLogDataItemDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/UsAppLabeling/PrintLogGetListInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/UsAppLabeling/PrintLogItemDto.cs
@@ -835,6 +835,11 @@ curl -X GET &quot;http://localhost:19001/api/app/us-app-labeling/labeling-tree?locati
 - `template`：`LabelTemplatePreviewDto`
   - `width` / `height` / `unit`：模板物理尺寸
   - `elements[]`：元素数组（对齐前端 editor JSON：`id/elementName/type/x/y/width/height/rotation/border/zIndex/orderNum/config`）
+- `templateProductDefaultValues`：`object | null`
+  - 来源：`fl_label_template_product_default.DefaultValuesJson`
+  - 命中条件：当前预览上下文的 `templateId + productId + labelTypeId`
+  - 建议结构：`{ "elementId": "默认值" }`
+  - 未命中时返回 `null`（向后兼容）
  
 `elements[].config` 内常用字段（示例）：
  
@@ -902,6 +907,7 @@ curl -X POST &quot;http://localhost:19001/api/app/us-app-labeling/preview&quot; \
 | `labelCode` | string | 是 | 标签编码（`fl_label.LabelCode`） |
 | `productId` | string | 否 | 打印用产品Id；不传则默认取该标签绑定的第一个产品（用于模板解析） |
 | `printQuantity` | number | 否 | 打印份数；`<=0` 按 1 处理 |
+| `clientRequestId` | string | 否 | 客户端幂等请求Id；同一个值重复调用会直接返回首次创建的 `batchId/taskIds`，避免重复写库 用法:前端/客户端每次点击 Print 生成一个稳定的 clientRequestId（比如 uuid） |
 | `baseTime` | string | 否 | 业务基准时间（用于 DATE/TIME 元素计算） |
 | `printInputJson` | object | 否 | 打印输入（用于模板 PRINT_INPUT 元素），key 建议与模板元素 `inputKey` 对齐 |
 | `printerId` | string | 否 | 打印机Id（可选，用于追踪） |
@@ -911,11 +917,11 @@ curl -X POST &quot;http://localhost:19001/api/app/us-app-labeling/preview&quot; \
 #### 数据落库说明
  
 - **任务表**：`fl_label_print_task`
-  - 插入 1 条任务记录（`locationId / labelCode / productId / labelTypeId / templateCode / printQuantity / baseTime / printer...` 等）。
+  - **一份打印 = 一条任务**：当 `printQuantity = N` 时，后端会插入 **N 条任务记录**（同一次点击 Print 共享一个 `BatchId`，并记录 `CopyIndex=1..N`）。
+  - 任务表会保存：本次打印的输入、命中的模板默认值、以及整份 resolved 后的模板快照 JSON，便于追溯/重打。
 - **明细表**：`fl_label_print_data`
-  - 按 `printQuantity` 插入 N 条明细记录（`copyIndex = 1..N`）。
-  - `printInputJson`：保存本次打印的原始输入（JSON 字符串）。
-  - `renderDataJson`：保存本次解析后的模板预览结构（`LabelTemplatePreviewDto`，包含 resolved 后的 `elements[].config`），供追溯/重打使用。
+  - **按组件写快照**：每个任务会按模板 `elements[]` 逐个插入明细记录（`ElementId/ElementName/RenderValue/RenderConfigJson`）。
+  - 适用于按组件维度审计/统计/追溯。
  
 > 模板解析的数据源来自 `fl_label_template` + `fl_label_template_element`，与预览接口一致。
  
@@ -923,8 +929,11 @@ curl -X POST &quot;http://localhost:19001/api/app/us-app-labeling/preview&quot; \
  
 | 字段 | 类型 | 说明 |
 |---|---|---|
-| `taskId` | string | 打印任务Id（用于后续查询/重打/统计） |
+| `taskId` | string | 第 1 份打印任务Id（兼容旧逻辑） |
 | `printQuantity` | number | 实际写入的份数 |
+| `batchId` | string | 本次点击 Print 的批次Id |
+| `taskIds` | string[] | 本次生成的所有任务Id（长度=printQuantity） |
+
  
 #### 错误与边界
  
@@ -959,3 +968,122 @@ curl -X POST &quot;http://localhost:19001/api/app/us-app-labeling/print&quot; \
   -d '{"locationId":"11111111-1111-1111-1111-111111111111","labelCode":"LBL_CHICKEN_DEFROST","productId":"22222222-2222-2222-2222-222222222222","printQuantity":2,"baseTime":"2026-03-26T10:30:00","printInputJson":{"price":"12.99"}}'
 ```
  
+---
+
+## 接口 10：App 打印日志（当前登录账号 + 当前门店）
+
+**场景**：移动端“打印记录/历史”页面。只展示**当前登录账号**在**当前门店**打印的记录，便于追溯/重打。
+
+### 10.1 分页获取打印日志
+
+#### HTTP
+
+- **方法**：`POST`（与本模块其它复杂入参接口一致；若与 Swagger 不一致，**以 Swagger 为准**）
+- **路径**：`/api/app/us-app-labeling/get-print-log-list`
+- **鉴权**：需要登录（`Authorization: Bearer ...`）
+
+#### 入参（Body：`PrintLogGetListInputVo`）
+
+> 本项目分页约定：`skipCount` 表示 **页码（从 1 开始）**，不是 0 基 offset。
+
+| 参数名（JSON） | 类型 | 必填 | 说明 |
+|---|---|---|---|
+| `locationId` | string | 是 | 当前门店Id（仅返回该门店记录） |
+| `skipCount` | number | 否 | 页码，从 1 开始；默认 1 |
+| `maxResultCount` | number | 否 | 每页条数；默认按后端/ABP 默认 |
+
+#### 过滤条件（后端固定逻辑）
+
+- `fl_label_print_task.CreatedBy == CurrentUser.Id`
+- `fl_label_print_task.LocationId == locationId`
+- 按时间倒序：`PrintedAt ?? CreationTime`（越新的越靠前）
+
+#### 出参（`PagedResultWithPageDto<PrintLogItemDto>`）
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `pageIndex` | number | 当前页码（从 1 开始） |
+| `pageSize` | number | 每页条数 |
+| `totalCount` | number | 总条数 |
+| `totalPages` | number | 总页数 |
+| `items` | PrintLogItemDto[] | 列表 |
+
+`PrintLogItemDto`：
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `taskId` | string | 任务Id（fl_label_print_task.Id） |
+| `batchId` | string | 批次Id（同一次点击 Print 共享） |
+| `copyIndex` | number | 第几份（从 1 开始） |
+| `labelId` | string | 标签Id |
+| `labelCode` | string | 标签编码（来自 fl_label.LabelCode） |
+| `productId` | string | 产品Id |
+| `productName` | string | 产品名（来自 fl_product.ProductName；无则 “无”） |
+| `typeName` | string | 标签类型名称（来自 fl_label_type.TypeName） |
+| `labelSizeText` | string | 模板尺寸（宽高+单位，如 `2.00x2.00inch` / `6.00x4.00cm`） |
+| `printDataList` | PrintLogDataItemDto[] | 本次打印内容快照（来自 fl_label_print_data，按 taskId 关联） |
+| `printedAt` | string | 打印时间（PrintedAt ?? CreationTime） |
+| `operatorName` | string | 操作人姓名（当前登录账号 Name） |
+| `locationName` | string | 门店名称 |
+
+`PrintLogDataItemDto`：
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `elementId` | string | 模板组件Id（fl_label_print_data.ElementId） |
+| `renderValue` | string | 最终渲染值（fl_label_print_data.RenderValue） |
+| `renderConfigJson` | object | 最终渲染配置（fl_label_print_data.RenderConfigJson 反序列化） |
+
+#### curl
+
+```bash
+curl -X POST "http://localhost:19001/api/app/us-app-labeling/get-print-log-list" \
+  -H "Authorization: <data.token>" \
+  -H "Content-Type: application/json" \
+  -d '{"locationId":"11111111-1111-1111-1111-111111111111","skipCount":1,"maxResultCount":20}'
+```
+
+---
+
+## 接口 11：App 重新打印（根据任务Id重打）
+
+**场景**：移动端“打印记录/历史”页面点击 **Reprint**。后端根据历史任务 `taskId` 创建一批新的打印任务与明细。
+
+### 11.1 重打
+
+#### HTTP
+
+- **方法**：`POST`
+- **路径**：`/api/app/us-app-labeling/reprint`（若与 Swagger 不一致，**以 Swagger 为准**）
+- **鉴权**：需要登录（`Authorization: Bearer ...`）
+
+#### 入参（Body：`UsAppLabelReprintInputVo`）
+
+| 参数名（JSON） | 类型 | 必填 | 说明 |
+|---|---|---|---|
+| `locationId` | string | 是 | 当前门店Id（后端校验历史任务必须属于该门店） |
+| `taskId` | string | 是 | 历史打印任务Id（`fl_label_print_task.Id`） |
+| `printQuantity` | number | 否 | 重新打印份数；`<=0` 按 1 处理；默认 1 |
+| `clientRequestId` | string | 否 | 客户端幂等请求Id；同一个值重复调用会直接返回首次创建的 `batchId/taskIds`，避免重复写库 |
+| `printerId` | string | 否 | 可选，覆盖历史任务的打印机Id |
+| `printerMac` | string | 否 | 可选，覆盖历史任务的打印机MAC |
+| `printerAddress` | string | 否 | 可选，覆盖历史任务的打印机地址 |
+
+#### 权限校验（后端固定逻辑）
+
+- 历史任务必须满足：`CreatedBy == CurrentUser.Id`
+- 且 `LocationId == locationId`
+
+#### 出参（`UsAppLabelPrintOutputDto`）
+
+字段与接口 9 一致：`taskId / printQuantity / batchId / taskIds`
+
+#### curl
+
+```bash
+curl -X POST "http://localhost:19001/api/app/us-app-labeling/reprint" \
+  -H "Authorization: <data.token>" \
+  -H "Content-Type: application/json" \
+  -d '{"locationId":"11111111-1111-1111-1111-111111111111","taskId":"3a205389-78dd-4750-51ab-720344c9f607","printQuantity":1}'
+```
+
@@ -215,6 +215,7 @@ import {
   postUsAppLabelPrint,
   US_APP_LABEL_PRINT_PATH,
 } from '../../services/usAppLabeling'
+import { savePrintTemplateSnapshotForTask } from '../../utils/printSnapshotStorage'
 import {
   applyTemplateProductDefaultValuesToTemplate,
   extractTemplateProductDefaultValuesFromPreviewPayload,
@@ -547,6 +548,15 @@ const goBluetoothPage = () =&gt; {
   uni.navigateTo({ url: '/pages/labels/bluetooth' })
 }
  
+/** 接口 9 可选 clientRequestId（文档 10 幂等） */
+function createPrintClientRequestId (): string {
+  const c = typeof globalThis !== 'undefined' ? (globalThis as { crypto?: Crypto }).crypto : undefined
+  if (c && typeof c.randomUUID === 'function') {
+    return c.randomUUID()
+  }
+  return `print-${Date.now()}-${Math.random().toString(36).slice(2, 12)}`
+}
+
 const handlePrint = async () => {
   if (isPrinting.value || previewLoading.value || !systemTemplate.value) return
  
@@ -660,17 +670,39 @@ const handlePrint = async () =&gt; {
     let printLogRequestBody: ReturnType<typeof buildUsAppLabelPrintRequestBody> = null
     try {
       const bt = getBluetoothConnection()
+      /**
+       * 接口 9 落库必须与本次出纸使用的合并模板完全一致（与 labelPrintJobPayload.template 同源），
+       * 避免另起 buildPrintPersistTemplateSnapshot(base) 与 computeMergedPreviewTemplate() 细微偏差，
+       * 导致库内缺用户输入的价签/过敏原/数字/日期，重打与预览不一致。
+       */
+      const persistTemplateDoc = JSON.parse(
+        JSON.stringify(labelPrintJobPayload.template)
+      ) as Record<string, unknown>
+
       printLogRequestBody = buildUsAppLabelPrintRequestBody({
         locationId: getCurrentStoreId(),
         labelCode: labelCode.value,
         productId: productId.value || undefined,
         printQuantity: printQty.value,
-        printInputJson,
-        templateSnapshot: labelPrintJobPayload.template,
+        mergedTemplate: persistTemplateDoc,
+        clientRequestId: createPrintClientRequestId(),
         printerMac: bt?.deviceId || undefined,
       })
       if (printLogRequestBody) {
-        await postUsAppLabelPrint(printLogRequestBody)
+        const printRes = await postUsAppLabelPrint(printLogRequestBody)
+        /** 本机快照：列表接口 renderTemplateJson 常为设计器占位，重打需与当次出纸合并模板一致 */
+        try {
+          const tid = String(
+            (printRes as { taskId?: string })?.taskId
+            ?? (printRes as { TaskId?: string })?.TaskId
+            ?? '',
+          ).trim()
+          if (tid) {
+            savePrintTemplateSnapshotForTask(tid, JSON.stringify(persistTemplateDoc))
+          }
+        } catch {
+          /* 忽略快照写入失败 */
+        }
       }
     } catch (syncErr: unknown) {
       if (!isUsAppSessionExpiredError(syncErr)) {
@@ -34,21 +34,32 @@
       </view>
     </view>
  
-    <scroll-view class="content" scroll-y>
+    <scroll-view
+      class="content"
+      scroll-y
+      @scrolltolower="onScrollToLower"
+    >
+      <view v-if="loading && !items.length" class="state-block">
+        <text class="state-text">Loading…</text>
+      </view>
+      <view v-else-if="!loading && !items.length" class="state-block">
+        <text class="state-text">No print records</text>
+      </view>
+
       <!-- 卡片视图 -->
-      <view v-if="viewMode === 'card'" class="log-list">
+      <view v-else-if="viewMode === 'card'" class="log-list">
         <view
-          v-for="row in printLogData"
-          :key="row.labelId"
+          v-for="row in items"
+          :key="row.taskId + '-' + row.copyIndex"
           class="log-card"
         >
           <view class="card-header">
-            <text class="product-name">{{ row.productName }}</text>
-            <text class="label-id">{{ row.labelId }}</text>
+            <text class="product-name">{{ row.productName || '无' }}</text>
+            <text class="label-id">{{ shortRef(row) }}</text>
           </view>
           <view class="card-tags">
-            <text class="tag">{{ row.category }}</text>
-            <text class="tag">{{ row.template }}</text>
+            <text class="tag">{{ tagLabelSize(row) }}</text>
+            <text class="tag">{{ tagTypeName(row) }}</text>
           </view>
           <view class="card-details">
             <view class="detail-row">
@@ -57,15 +68,11 @@
             </view>
             <view class="detail-row">
               <AppIcon name="user" size="sm" color="gray" />
-              <text class="detail-text">{{ row.printedBy }}</text>
+              <text class="detail-text">{{ row.operatorName || '无' }}</text>
             </view>
             <view class="detail-row">
               <AppIcon name="mapPin" size="sm" color="gray" />
-              <text class="detail-text">{{ row.location }}</text>
-            </view>
-            <view class="detail-row">
-              <AppIcon name="calendar" size="sm" color="gray" />
-              <text class="detail-text">Expires {{ row.expiryDate }}</text>
+              <text class="detail-text">{{ row.locationName || '无' }}</text>
             </view>
           </view>
           <view class="card-footer">
@@ -75,6 +82,12 @@
             </view>
           </view>
         </view>
+        <view v-if="loadingMore" class="load-more">
+          <text class="load-more-text">Loading more…</text>
+        </view>
+        <view v-else-if="!hasMore && items.length" class="load-more end">
+          <text class="load-more-text">End of list</text>
+        </view>
       </view>
  
       <!-- 列表视图 -->
@@ -82,20 +95,22 @@
         <view class="log-table">
           <view class="log-table-header">
             <text class="th th-product">Product</text>
-            <text class="th th-id">Label ID</text>
+            <text class="th th-id">Ref</text>
+            <text class="th th-size">Label size</text>
+            <text class="th th-type">Type</text>
             <text class="th th-printed">Printed At</text>
-            <text class="th th-expires">Expires</text>
             <text class="th th-action">Action</text>
           </view>
           <view
-            v-for="row in printLogData"
-            :key="row.labelId"
+            v-for="row in items"
+            :key="row.taskId + '-' + row.copyIndex"
             class="log-table-row"
           >
-            <text class="td td-product">{{ row.productName }}</text>
-            <text class="td td-id">{{ row.labelId }}</text>
+            <text class="td td-product">{{ row.productName || '无' }}</text>
+            <text class="td td-id">{{ shortRef(row) }}</text>
+            <text class="td td-size">{{ tagLabelSize(row) }}</text>
+            <text class="td td-type">{{ tagTypeName(row) }}</text>
             <text class="td td-printed">{{ row.printedAt }}</text>
-            <text class="td td-expires">{{ row.expiryDate }}</text>
             <view class="td td-action">
               <view class="reprint-btn-sm" @click="handleReprint(row)">
                 <AppIcon name="printer" size="sm" color="white" />
@@ -103,6 +118,9 @@
             </view>
           </view>
         </view>
+        <view v-if="loadingMore" class="load-more">
+          <text class="load-more-text">Loading more…</text>
+        </view>
       </view>
     </scroll-view>
  
@@ -112,20 +130,169 @@
  
 <script setup lang="ts">
 import { ref } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
 import AppIcon from '../../components/AppIcon.vue'
 import SideMenu from '../../components/SideMenu.vue'
 import LocationPicker from '../../components/LocationPicker.vue'
 import { getStatusBarHeight } from '../../utils/statusBar'
-import { printLogList } from '../../utils/printLog'
+import { getCurrentStoreId } from '../../utils/stores'
+import {
+  fetchUsAppPrintLogList,
+  postUsAppLabelReprint,
+} from '../../services/usAppLabeling'
+import {
+  consumeReprintEmittedTemplateJsonForPersist,
+  printFromPrintLogRow,
+} from '../../utils/printFromPrintDataList'
+import { savePrintTemplateSnapshotForTask } from '../../utils/printSnapshotStorage'
+import { getBluetoothConnection, getPrinterType } from '../../utils/print/printerConnection'
+import { isUsAppSessionExpiredError } from '../../utils/usAppApiRequest'
+import type { PrintLogItemDto } from '../../types/usAppLabeling'
  
 const statusBarHeight = getStatusBarHeight()
 const isMenuOpen = ref(false)
 const viewMode = ref<'card' | 'list'>('card')
  
-const printLogData = ref(printLogList)
+const items = ref<PrintLogItemDto[]>([])
+const loading = ref(false)
+const loadingMore = ref(false)
+const pageIndex = ref(1)
+const hasMore = ref(true)
+const pageSize = 20
+
+function createClientRequestId (): string {
+  const c = typeof globalThis !== 'undefined' ? (globalThis as { crypto?: Crypto }).crypto : undefined
+  if (c && typeof c.randomUUID === 'function') {
+    return c.randomUUID()
+  }
+  return `reprint-${Date.now()}-${Math.random().toString(36).slice(2, 12)}`
+}
+
+function shortRef (row: PrintLogItemDto): string {
+  const b = String(row.batchId || row.taskId || '').trim()
+  if (b.length > 14) return `${b.slice(0, 8)}…`
+  return b || row.labelCode || '—'
+}
+
+/** 红框左：labelSizeText（兼容 PascalCase） */
+function tagLabelSize (row: PrintLogItemDto): string {
+  const raw = row.labelSizeText ?? (row as unknown as { LabelSizeText?: string }).LabelSizeText
+  const s = String(raw ?? '').trim()
+  return s || '无'
+}
+
+/** 红框右：typeName（兼容 PascalCase） */
+function tagTypeName (row: PrintLogItemDto): string {
+  const raw = row.typeName ?? (row as unknown as { TypeName?: string }).TypeName
+  const s = String(raw ?? '').trim()
+  return s || '无'
+}
+
+async function loadPage (reset: boolean) {
+  const locationId = getCurrentStoreId()
+  if (!locationId) {
+    items.value = []
+    return
+  }
+  if (reset) {
+    pageIndex.value = 1
+    hasMore.value = true
+    loading.value = true
+  } else {
+    if (!hasMore.value || loadingMore.value) return
+    loadingMore.value = true
+  }
+  try {
+    const p = reset ? 1 : pageIndex.value
+    const res = await fetchUsAppPrintLogList({
+      locationId,
+      skipCount: p,
+      maxResultCount: pageSize,
+    })
+    if (reset) {
+      items.value = res.items
+    } else {
+      items.value = [...items.value, ...res.items]
+    }
+    hasMore.value = items.value.length < res.totalCount
+    if (res.items.length > 0) {
+      pageIndex.value = p + 1
+    }
+  } catch (e) {
+    if (!isUsAppSessionExpiredError(e)) {
+      const msg = e instanceof Error ? e.message : 'Load failed'
+      uni.showToast({ title: msg, icon: 'none', duration: 2500 })
+    }
+    if (reset) items.value = []
+  } finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+function onScrollToLower () {
+  if (!loading.value && hasMore.value) {
+    loadPage(false)
+  }
+}
+
+onShow(() => {
+  loadPage(true)
+})
  
-const handleReprint = (row: any) => {
-  uni.navigateTo({ url: `/pages/more/print-detail?labelId=${encodeURIComponent(row.labelId)}` })
+const handleReprint = async (row: PrintLogItemDto) => {
+  const locationId = getCurrentStoreId()
+  if (!locationId) {
+    uni.showToast({ title: 'Please select a store', icon: 'none' })
+    return
+  }
+  if (!getPrinterType()) {
+    uni.showToast({ title: 'Please connect a printer first', icon: 'none' })
+    return
+  }
+  uni.showLoading({ title: 'Printing…', mask: true })
+  try {
+    /** 优先 `renderTemplateJson` 完整模板（与接口 9 一致）；无则回退 printDataList */
+    await printFromPrintLogRow(row, {
+      printQty: 1,
+      onProgress: (pct) => {
+        if (pct > 5 && pct < 100) {
+          uni.showLoading({ title: `Printing ${pct}%`, mask: true })
+        }
+      },
+    })
+    const bt = getBluetoothConnection()
+    uni.showLoading({ title: 'Saving…', mask: true })
+    /** 出纸成功后再调接口 11 记重打（与文档「重复打印」落库一致） */
+    const reprintRes = await postUsAppLabelReprint({
+      locationId,
+      taskId: row.taskId,
+      printQuantity: 1,
+      clientRequestId: createClientRequestId(),
+      printerMac: bt?.deviceId || undefined,
+    })
+    try {
+      const nextTid = String(
+        (reprintRes as { taskId?: string })?.taskId
+        ?? (reprintRes as { TaskId?: string })?.TaskId
+        ?? '',
+      ).trim()
+      const emitted = consumeReprintEmittedTemplateJsonForPersist()
+      if (nextTid && emitted) {
+        savePrintTemplateSnapshotForTask(nextTid, emitted)
+      }
+    } catch {
+      /* 忽略 */
+    }
+    uni.showToast({ title: 'Done', icon: 'success' })
+  } catch (e: unknown) {
+    if (!isUsAppSessionExpiredError(e)) {
+      const msg = e instanceof Error ? e.message : 'Reprint failed'
+      uni.showToast({ title: msg, icon: 'none', duration: 3000 })
+    }
+  } finally {
+    uni.hideLoading()
+  }
 }
  
 const goBack = () => {
@@ -182,10 +349,21 @@ const goBack = () =&gt; {
   color: #fff;
 }
  
+.state-block {
+  padding: 80rpx 32rpx;
+  text-align: center;
+}
+
+.state-text {
+  font-size: 28rpx;
+  color: #6b7280;
+}
+
 .content {
   flex: 1;
   padding: 24rpx 28rpx 40rpx;
   box-sizing: border-box;
+  height: 0;
 }
  
 .log-list {
@@ -339,7 +517,6 @@ const goBack = () =&gt; {
   border: 1rpx solid #e5e7eb;
 }
  
-/* 确保横向滚动条可见（H5/浏览器） */
 .log-table-wrap::-webkit-scrollbar {
   height: 6px;
 }
@@ -386,9 +563,10 @@ const goBack = () =&gt; {
 }
  
 .th-product, .td-product { flex: 0 0 auto; min-width: 140rpx; }
-.th-id, .td-id { flex: 0 0 auto; min-width: 140rpx; }
+.th-id, .td-id { flex: 0 0 auto; min-width: 160rpx; }
+.th-size, .td-size { flex: 0 0 auto; min-width: 220rpx; max-width: 360rpx; }
+.th-type, .td-type { flex: 0 0 auto; min-width: 120rpx; }
 .th-printed, .td-printed { flex: 0 0 auto; min-width: 200rpx; }
-.th-expires, .td-expires { flex: 0 0 auto; min-width: 200rpx; }
 .th-action, .td-action {
   flex: 0 0 80rpx;
   width: 80rpx;
@@ -400,7 +578,9 @@ const goBack = () =&gt; {
  
 .td-product { color: #111827; font-weight: 500; }
 .td-id { color: #6b7280; font-size: 24rpx; }
-.td-printed, .td-expires { color: #4b5563; }
+.td-size,
+.td-type { color: #4b5563; font-size: 24rpx; }
+.td-printed { color: #4b5563; }
  
 .reprint-btn-sm {
   display: inline-flex;
@@ -415,4 +595,16 @@ const goBack = () =&gt; {
 .reprint-btn-sm:active {
   opacity: 0.9;
 }
+
+.load-more {
+  padding: 24rpx;
+  text-align: center;
+}
+.load-more.end .load-more-text {
+  color: #9ca3af;
+}
+.load-more-text {
+  font-size: 24rpx;
+  color: #6b7280;
+}
 </style>
 import type {
+  PrintLogGetListInputVo,
+  PrintLogItemDto,
   UsAppLabelCategoryTreeNodeDto,
   UsAppLabelingProductNodeDto,
   UsAppLabelPreviewInputVo,
   UsAppLabelPrintInputVo,
   UsAppLabelPrintOutputDto,
+  UsAppLabelReprintInputVo,
   UsAppLabelTypeNodeDto,
   UsAppProductCategoryNodeDto,
 } from '../types/usAppLabeling'
+import { extractPagedItems } from '../utils/pagedList'
 import { usAppApiRequest } from '../utils/usAppApiRequest'
  
 /** 接口 9：与文档路径一致，供日志与请求共用 */
@@ -106,6 +110,13 @@ export async function postUsAppLabelPreview(body: UsAppLabelPreviewInputVo): Pro
  * 注意：仅供业务落库场景调用；打印机设置页「测试打印」、蓝牙页 Test Print 等 **不得** 使用（避免脏数据）。
  */
 export async function postUsAppLabelPrint(body: UsAppLabelPrintInputVo): Promise<UsAppLabelPrintOutputDto> {
+  console.log('[UsAppLabelPrint] 接口 9 请求前 — path:', US_APP_LABEL_PRINT_PATH)
+  console.log('[UsAppLabelPrint] 接口 9 请求体 body:', body)
+  try {
+    console.log('[UsAppLabelPrint] 接口 9 请求体 JSON:', JSON.stringify(body))
+  } catch {
+    console.log('[UsAppLabelPrint] 接口 9 请求体 JSON 序列化失败（含循环引用等）')
+  }
   return usAppApiRequest<UsAppLabelPrintOutputDto>({
     path: US_APP_LABEL_PRINT_PATH,
     method: 'POST',
@@ -119,9 +130,9 @@ export function buildUsAppLabelPrintRequestBody(input: {
   labelCode?: string | null
   productId?: string | null
   printQuantity: number
-  printInputJson: Record<string, unknown>
-  /** 与 buildLabelPrintJobPayload().template 同构，落库 RenderDataJson */
-  templateSnapshot?: Record<string, unknown> | null
+  /** 与 buildLabelPrintJobPayload().template 同构，写入接口 printInputJson 供重打 */
+  mergedTemplate: Record<string, unknown>
+  clientRequestId?: string | null
   printerMac?: string | null
   printerAddress?: string | null
 }): UsAppLabelPrintInputVo | null {
@@ -129,20 +140,22 @@ export function buildUsAppLabelPrintRequestBody(input: {
   const labelCode = String(input.labelCode || '').trim()
   if (!locationId || !labelCode) return null
  
+  let printInputJson: Record<string, unknown>
+  try {
+    printInputJson = JSON.parse(JSON.stringify(input.mergedTemplate)) as Record<string, unknown>
+  } catch {
+    return null
+  }
+
   const body: UsAppLabelPrintInputVo = {
     locationId,
     labelCode,
     printQuantity: Math.max(1, Math.round(Number(input.printQuantity) || 1)),
-    printInputJson: { ...input.printInputJson },
+    printInputJson,
     baseTime: new Date().toISOString(),
   }
-  if (input.templateSnapshot && typeof input.templateSnapshot === 'object') {
-    try {
-      body.templateSnapshot = JSON.parse(JSON.stringify(input.templateSnapshot)) as Record<string, unknown>
-    } catch {
-      /* 忽略快照克隆失败 */
-    }
-  }
+  const cid = String(input.clientRequestId || '').trim()
+  if (cid) body.clientRequestId = cid
   const pid = String(input.productId || '').trim()
   if (pid) body.productId = pid
   const mac = String(input.printerMac || '').trim()
@@ -154,7 +167,7 @@ export function buildUsAppLabelPrintRequestBody(input: {
  
 /**
  * 接口 9：仅在 **标签预览页**（`pages/labels/preview`）用户打印真实标签、出纸成功后落库。
- * `printInputJson` 与预览/原生 dataJson 同源；缺少 `locationId` 或 `labelCode` 时不发请求。
+ * `mergedTemplate` 写入请求体 `printInputJson`（与 label-template 同构）；缺少 `locationId` 或 `labelCode` 时不发请求。
  * 测试打印模板（printers / bluetooth Test Print）不走此函数。
  */
 export async function reportUsAppLabelPrintIfReady(input: {
@@ -162,8 +175,8 @@ export async function reportUsAppLabelPrintIfReady(input: {
   labelCode?: string | null
   productId?: string | null
   printQuantity: number
-  printInputJson: Record<string, unknown>
-  templateSnapshot?: Record<string, unknown> | null
+  mergedTemplate: Record<string, unknown>
+  clientRequestId?: string | null
   printerMac?: string | null
   printerAddress?: string | null
 }): Promise<UsAppLabelPrintOutputDto | null> {
@@ -171,3 +184,28 @@ export async function reportUsAppLabelPrintIfReady(input: {
   if (!body) return null
   return postUsAppLabelPrint(body)
 }
+
+/** 接口 10：分页打印日志 */
+export async function fetchUsAppPrintLogList (input: PrintLogGetListInputVo) {
+  const raw = await usAppApiRequest<unknown>({
+    path: '/api/app/us-app-labeling/get-print-log-list',
+    method: 'POST',
+    auth: true,
+    data: {
+      locationId: input.locationId,
+      skipCount: input.skipCount ?? 1,
+      maxResultCount: input.maxResultCount ?? 20,
+    },
+  })
+  return extractPagedItems<PrintLogItemDto>(raw)
+}
+
+/** 接口 11：重打并返回含 mergedTemplateJson 的出参 */
+export async function postUsAppLabelReprint (body: UsAppLabelReprintInputVo): Promise<UsAppLabelPrintOutputDto> {
+  return usAppApiRequest<UsAppLabelPrintOutputDto>({
+    path: '/api/app/us-app-labeling/reprint',
+    method: 'POST',
+    auth: true,
+    data: body,
+  })
+}
@@ -61,14 +61,14 @@ export interface UsAppLabelPrintInputVo {
   labelCode: string
   productId?: string
   printQuantity?: number
+  /** 客户端幂等 Id（接口 9 文档 optional） */
+  clientRequestId?: string
   baseTime?: string
-  /** 扁平 PRINT_INPUT 组装（审计/再合并用）；与 App 内 buildPrintInputJson 一致 */
-  printInputJson?: Record<string, unknown>
   /**
-   * 与平台导出 label-template-*.json 同构的合并后模板（含 elements[].config）；
-   * 服务端优先写入明细 RenderDataJson，便于打印历史按「整模板」重打，与出纸一致。
+   * 对齐《标签模块接口对接说明(10)》：存**可再次打印**的合并模板（与 label-template-*.json 同构，含 elements[].config）。
+   * 与 `buildLabelPrintJobPayload().template` 一致；服务端写入落库字段并用于重打。
    */
-  templateSnapshot?: Record<string, unknown>
+  printInputJson?: Record<string, unknown>
   printerId?: string
   printerMac?: string
   printerAddress?: string
@@ -77,4 +77,60 @@ export interface UsAppLabelPrintInputVo {
 export interface UsAppLabelPrintOutputDto {
   taskId: string
   printQuantity: number
+  batchId?: string
+  taskIds?: string[]
+  /** 接口 11：服务端返回的历史合并模板 JSON，供本地 BLE 打印 */
+  mergedTemplateJson?: string | null
+}
+
+/** 接口 10 分页入参 */
+export interface PrintLogGetListInputVo {
+  locationId: string
+  skipCount?: number
+  maxResultCount?: number
+}
+
+/** 接口 10 打印明细项（元素快照） */
+export interface PrintLogDataItemDto {
+  elementId?: string
+  renderValue?: string
+  /** 完整元素 JSON（与模板 elements[] 单项同构） */
+  renderConfigJson?: unknown
+}
+
+/** 接口 10 列表项 */
+export interface PrintLogItemDto {
+  taskId: string
+  batchId: string
+  copyIndex: number
+  labelId: string
+  labelCode: string
+  productId?: string | null
+  productName: string
+  printedAt: string
+  operatorName: string
+  locationName: string
+  labelCategoryName?: string | null
+  labelTemplateSummary?: string | null
+  /** 与接口/预览 labelSizeText 一致，如 2.00x2.00inch */
+  labelSizeText?: string | null
+  /** 标签种类名 fl_label_type.TypeName */
+  typeName?: string | null
+  /** 用于重打：元素列表（接口返回 printDataList） */
+  printDataList?: PrintLogDataItemDto[] | null
+  /**
+   * 列表接口若返回与接口 9 同构的完整模板 JSON 字符串（或含 `printInputJson` 的保存体），重打应优先用此字段以保留坐标与样式相关 config。
+   */
+  renderTemplateJson?: string | null
+}
+
+/** 接口 11 重打入参 */
+export interface UsAppLabelReprintInputVo {
+  locationId: string
+  taskId: string
+  printQuantity?: number
+  clientRequestId?: string
+  printerId?: string
+  printerMac?: string
+  printerAddress?: string
 }
@@ -40,6 +40,11 @@ function cloneJsonSafeConfig(cfg: Record&lt;string, unknown&gt;): Record&lt;string, unkno
   }
 }
  
+/** 落库 config：完整深拷贝，避免白名单遗漏字段导致重打缺价签/过敏原/数字等 */
+function mergePersistConfigSnapshot(src: Record<string, unknown>): Record<string, unknown> {
+  return cloneJsonSafeConfig(src)
+}
+
 /** 单元素序列化：与 JSON 模板 elements[] 项字段对齐，并保留 PRINT_INPUT 相关根字段 */
 export function serializeElementForLabelTemplateJson(el: SystemTemplateElementBase): Record<string, unknown> {
   const cfg = (el.config || {}) as Record<string, unknown>
@@ -52,11 +57,14 @@ export function serializeElementForLabelTemplateJson(el: SystemTemplateElementBa
     height: el.height,
     rotation: el.rotation ?? 'horizontal',
     border: el.border ?? 'none',
-    config: cloneJsonSafeConfig(cfg),
+    config: mergePersistConfigSnapshot(cfg),
   }
   if (el.valueSourceType) o.valueSourceType = el.valueSourceType
   if (el.inputKey != null && String(el.inputKey).trim()) o.inputKey = el.inputKey
   if (el.elementName != null && String(el.elementName).trim()) o.elementName = el.elementName
+  const zx = el as SystemTemplateElementBase & { zIndex?: number; orderNum?: number }
+  if (zx.zIndex !== undefined) o.zIndex = zx.zIndex
+  if (zx.orderNum !== undefined) o.orderNum = zx.orderNum
   return o
 }
  
@@ -195,6 +195,22 @@ export function buildPrintInputJson(
   }
 }
  
+/**
+ * 供接口 9 落库 `printInputJson`：在**纯 JSON 克隆**上再合并多选/自由输入，避免 Vue Proxy 嵌套 config
+ * 在部分环境下 `JSON.stringify` 丢字段，导致服务端存下的 RenderDataJson 仍是设计器默认值（无日期、无多选）。
+ */
+export function buildPrintPersistTemplateSnapshot(
+  base: SystemLabelTemplate,
+  optionSelections: Record<string, string[]>,
+  freeFieldValues: Record<string, string>,
+  dictNames: Record<string, string>
+): SystemLabelTemplate {
+  const cloned = JSON.parse(JSON.stringify(base)) as SystemLabelTemplate
+  let m = mergePrintOptionSelections(cloned, optionSelections, dictNames)
+  m = mergePrintInputFreeFields(m, freeFieldValues)
+  return m
+}
+
 /** 本地打印机 / dataJson：与 printInputJson 同键，供模板 {{key}} 或 native 层合并 */
 export function printInputJsonToLabelTemplateData(pj: Record<string, unknown>): LabelTemplateData {
   const out: LabelTemplateData = {}
 import type { SystemLabelTemplate, SystemTemplateElementBase } from '../print/types/printer'
-import { resolveMediaUrlForApp } from '../resolveMediaUrl'
+import { resolveMediaUrlForApp, storedValueLooksLikeImagePath } from '../resolveMediaUrl'
 import { sortElementsForPreview } from './normalizePreviewTemplate'
  
 /** 与 Web LabelCanvas.unitToPx 一致：cm 用 37.8px/inch，保证与后台模板坐标系一致 */
@@ -225,20 +225,49 @@ function runLabelPreviewCanvasDraw(
       }
  
       if (type === 'QRCODE' || type === 'BARCODE') {
-        ctx.setFillStyle('#f3f4f6')
-        ctx.fillRect(x, y, w || 60, h || 60)
-        ctx.setStrokeStyle('#9ca3af')
-        ctx.setLineWidth(1)
-        ctx.strokeRect(x, y, w || 60, h || 60)
         const d = previewTextForElement(el)
-        ctx.setFillStyle('#374151')
-        ctx.setFontSize(10)
-        const label = type === 'QRCODE' ? 'QR' : 'BC'
-        ctx.fillText(label, x + 4, y + 14)
-        if (d) {
-          const short = d.length > 12 ? `${d.slice(0, 10)}…` : d
-          ctx.fillText(short, x + 4, y + 28)
+        const drawQrBarcodePlaceholder = () => {
+          ctx.setFillStyle('#f3f4f6')
+          ctx.fillRect(x, y, w || 60, h || 60)
+          ctx.setStrokeStyle('#9ca3af')
+          ctx.setLineWidth(1)
+          ctx.strokeRect(x, y, w || 60, h || 60)
+          ctx.setFillStyle('#374151')
+          ctx.setFontSize(10)
+          const label = type === 'QRCODE' ? 'QR' : 'BC'
+          ctx.fillText(label, x + 4, y + 14)
+          if (d) {
+            const short = d.length > 12 ? `${d.slice(0, 10)}…` : d
+            ctx.fillText(short, x + 4, y + 28)
+          }
         }
+
+        // 管理端可把二维码默认值存为上传图片路径，须按位图绘制而非占位符文本
+        if (type === 'QRCODE' && d && storedValueLooksLikeImagePath(d)) {
+          const src = resolveMediaUrlForApp(d)
+          if (src) {
+            uni.getImageInfo({
+              src,
+              success: (info) => {
+                try {
+                  const dw = w || info.width
+                  const dh = h || info.height
+                  ctx.drawImage(info.path, x, y, dw, dh)
+                } catch (_) {
+                  drawQrBarcodePlaceholder()
+                }
+                next()
+              },
+              fail: () => {
+                drawQrBarcodePlaceholder()
+                next()
+              },
+            })
+            return
+          }
+        }
+
+        drawQrBarcodePlaceholder()
         next()
         return
       }
 /**
  * 部分标签机 BLE 串口：GATT 同时声明 write / writeNoResponse，但数据口实际只接受 Write Command（无响应）。
  * 用默认「带响应写」时常见首包过、第二包起 writeBLECharacteristicValue:fail property not support (10007)。
- * printerConnection 对白名单 UUID 会强制全程 writeNoResponse，且禁止在 10007 时翻成「带响应写」（否则长任务/多份打印必挂）。
+ * printerManager 在「同时声明两种属性」时对本白名单 UUID 优先选 writeNoResponse；若系统只暴露 write，则绝不强行 Command 写（否则 10007）。
+ * sendViaBle 在已选无响应写仍 10007 时，对白名单禁止翻到带响应写（避免佳博长任务第二包必挂）。
  */
  
 export function normalizeBleUuid (uuid: string): string {
@@ -25,3 +26,9 @@ export function blePairRequiresWriteNoResponse (
   const c = normalizeBleUuid(characteristicId)
   return FORCE_WRITE_NO_RESPONSE.some((p) => p.service === s && p.characteristic === c)
 }
+
+/** 是否为本仓库维护的 Nordic UART 风格串口服务（需写前开 notify、分包间留间隔等） */
+export function isNordicUartStyleBleService (serviceId: string): boolean {
+  const s = normalizeBleUuid(serviceId)
+  return FORCE_WRITE_NO_RESPONSE.some((p) => p.service === s)
+}
 import { blePairRequiresWriteNoResponse } from '../bleWriteModeRules'
 import {
   clearPrinter,
+  ensureBleUartNotifyIfNeeded,
   getBluetoothConnection,
   getCurrentPrinterDriverKey,
   getPrinterType,
@@ -112,8 +113,35 @@ function connectClassicBluetooth (device: PrinterCandidate, driver: PrinterDrive
  
 /**
  * 优先带响应 write（与 uni 默认写入方式一致）；仅当没有 write 再用 writeNoResponse（需在下发时传 writeType）。
- * 若反选 writeNoResponse 优先，易出现 writeBLECharacteristicValue:fail property not support。
+ * 若系统 GATT 只声明 write、未声明 writeNoResponse，却强行 writeNoResponse，会报 property not support (10007)。
  */
+function hasBleWriteProperty (item: any): boolean {
+  const w = item.properties?.write
+  return w === true || w === 'true'
+}
+
+function hasBleWriteNoResponseProperty (item: any): boolean {
+  const p = item.properties || {}
+  return (
+    p.writeNoResponse === true ||
+    p.writeNoResponse === 'true' ||
+    p.writeWithoutResponse === true ||
+    p.writeWithoutResponse === 'true'
+  )
+}
+
+/**
+ * 无 writeNoResponse 属性则绝不走 Command 写。
+ * Nordic 白名单在「同时声明 write + writeNoResponse」时优先无响应写（佳博等实测）；否则有 write 时优先带响应。
+ */
+function pickBleWriteUsesNoResponse (serviceId: string, item: any): boolean {
+  const hw = hasBleWriteProperty(item)
+  const hn = hasBleWriteNoResponseProperty(item)
+  if (!hn) return false
+  if (!hw) return true
+  return blePairRequiresWriteNoResponse(serviceId, String(item.uuid || ''))
+}
+
 function findBleWriteCharacteristic (deviceId: string): Promise<{
   serviceId: string
   characteristicId: string
@@ -135,41 +163,26 @@ function findBleWriteCharacteristic (deviceId: string): Promise&lt;{
             serviceId,
             success: (charRes) => {
               const chars = charRes.characteristics || []
-              const hasWrite = (item: any) => {
-                const w = item.properties?.write
-                return w === true || w === 'true'
-              }
-              const hasWriteNoResp = (item: any) => {
-                const p = item.properties || {}
-                return (
-                  p.writeNoResponse === true ||
-                  p.writeNoResponse === 'true' ||
-                  p.writeWithoutResponse === true ||
-                  p.writeWithoutResponse === 'true'
-                )
-              }
-              const writable = (item: any) => hasWrite(item) || hasWriteNoResp(item)
+              const writable = (item: any) => hasBleWriteProperty(item) || hasBleWriteNoResponseProperty(item)
               for (const item of chars) {
                 const cid = String(item.uuid || '')
                 if (blePairRequiresWriteNoResponse(serviceId, cid) && writable(item)) {
                   resolve({
                     serviceId,
                     characteristicId: cid,
-                    bleWriteUsesNoResponse: true,
+                    bleWriteUsesNoResponse: pickBleWriteUsesNoResponse(serviceId, item),
                   })
                   return
                 }
               }
-              const withResp = chars.find(hasWrite)
-              const noResp = chars.find(hasWriteNoResp)
+              const withResp = chars.find(hasBleWriteProperty)
+              const noResp = chars.find(hasBleWriteNoResponseProperty)
               const target = withResp || noResp
               if (target) {
-                const cid = String(target.uuid || '')
-                const forceNoResp = blePairRequiresWriteNoResponse(serviceId, cid)
                 resolve({
                   serviceId,
-                  characteristicId: cid,
-                  bleWriteUsesNoResponse: forceNoResp || (!withResp && !!noResp),
+                  characteristicId: String(target.uuid || ''),
+                  bleWriteUsesNoResponse: pickBleWriteUsesNoResponse(serviceId, target),
                 })
                 return
               }
@@ -215,6 +228,7 @@ function connectBlePrinter (device: PrinterCandidate, driver: PrinterDriver): Pr
     if (!write) {
       throw new Error('No writable characteristic found. This device may not support printing.')
     }
+    await ensureBleUartNotifyIfNeeded(device.deviceId, write.serviceId, write.characteristicId)
     const negotiatedMtu = await requestBleMtu(device.deviceId, driver.preferredBleMtu || 20)
     setBluetoothConnection({
       deviceId: device.deviceId,
@@ -4,7 +4,11 @@
 import type { ActiveBtDeviceType, PrinterType } from './types/printer'
 import classicBluetooth from './bluetoothTool.js'
 import { getDeviceFingerprint } from '../deviceInfo'
-import { blePairRequiresWriteNoResponse } from './bleWriteModeRules'
+import {
+  blePairRequiresWriteNoResponse,
+  isNordicUartStyleBleService,
+  normalizeBleUuid,
+} from './bleWriteModeRules'
 import { getPrinterDriverByKey } from './manager/driverRegistry'
  
 const STORAGE_PRINTER_TYPE = 'printerType'
@@ -282,6 +286,80 @@ function bleEnsureDeviceConnected (deviceId: string): Promise&lt;void&gt; {
 /**
  * 每次打印前会 createBLEConnection，链路 MTU 可能回到默认 23；若仍按 storage 里 512 分包，实机常丢数据但 write 仍 success。
  */
+let bleNordicUartValueListenerAttached = false
+
+function attachBleNordicUartValueListener (): void {
+  if (bleNordicUartValueListenerAttached) return
+  bleNordicUartValueListenerAttached = true
+  try {
+    if (typeof uni.onBLECharacteristicValueChange === 'function') {
+      uni.onBLECharacteristicValueChange(() => {})
+    }
+  } catch (_) {}
+}
+
+/**
+ * Nordic UART 类标签机：未对 TX 打开 notify 时，部分安卓栈第二包起对 RX 写会统一报 property not support (10007)。
+ * 连接后、大批量 write 前各调用一次（幂等）。
+ */
+export function ensureBleUartNotifyIfNeeded (
+  deviceId: string,
+  serviceId: string,
+  rxCharacteristicId?: string
+): Promise<void> {
+  // #ifndef APP-PLUS
+  return Promise.resolve()
+  // #endif
+  // #ifdef APP-PLUS
+  if (!isNordicUartStyleBleService(serviceId)) {
+    return Promise.resolve()
+  }
+  const rx = normalizeBleUuid(rxCharacteristicId || '')
+  return new Promise((resolve) => {
+    uni.getBLEDeviceCharacteristics({
+      deviceId,
+      serviceId,
+      success: (res) => {
+        const chars = ((res as any).characteristics || []) as Array<{ uuid?: string; properties?: Record<string, unknown> }>
+        const notifyChar = chars.find((c) => {
+          const p = c.properties || {}
+          const n =
+            p.notify === true ||
+            p.notify === 'true' ||
+            p.indicate === true ||
+            p.indicate === 'true'
+          if (!n) return false
+          const cid = normalizeBleUuid(String(c.uuid || ''))
+          if (rx && cid === rx) return false
+          return true
+        })
+        if (!notifyChar?.uuid) {
+          console.warn('[BLE] Nordic 串口：未找到可订阅的 notify/indicate 特征，跳过后续写入可能仍 10007')
+          resolve()
+          return
+        }
+        const cid = String(notifyChar.uuid)
+        uni.notifyBLECharacteristicValueChange({
+          deviceId,
+          serviceId,
+          characteristicId: cid,
+          state: true,
+          success: () => {
+            attachBleNordicUartValueListener()
+            console.log('[BLE] Nordic 串口已订阅 notify:', cid)
+            setTimeout(() => resolve(), 80)
+          },
+          fail: () => {
+            resolve()
+          },
+        })
+      },
+      fail: () => resolve(),
+    })
+  })
+  // #endif
+}
+
 function requestBleMtuNegotiation (deviceId: string, preferredMtu: number): Promise<number> {
   return new Promise((resolve) => {
     // #ifdef APP-PLUS
@@ -334,23 +412,25 @@ function sendViaBle (
     let sent = 0
     let completed = false
     let timeoutId: ReturnType<typeof setTimeout> | null = setTimeout(() => {}, 0)
+    /** Nordic 大包连续 0ms 间隔时，部分机型第二包起 10007；与 enable notify 配合 */
+    const nordicUart = isNordicUartStyleBleService(serviceId)
     const writeDelayMs =
-      payloadSize >= 180 ? 0 : payloadSize > 20 ? 2 : 10
-
-    /** 与 bleWriteModeRules 白名单一致：该 UUID 对只认 Write Command，不能切到「默认带响应写」 */
+      nordicUart && payloadSize >= 64
+        ? 18
+        : payloadSize >= 180
+          ? 0
+          : payloadSize > 20
+            ? 2
+            : 10
+
+    /** Nordic 白名单：仅用于失败时是否禁止翻到带响应写（佳博等）；写入方式以连接时写入 storage 的 bleWriteUsesNoResponse 为准 */
     const blePairForceNoResponse = blePairRequiresWriteNoResponse(serviceId, characteristicId)
  
     /** 本 job 内若因 property not support 翻过模式，后续包统一用 effectiveUseNoResp */
-    let effectiveUseNoResp = bleWriteUsesNoResponse || blePairForceNoResponse
+    let effectiveUseNoResp = bleWriteUsesNoResponse
     let hasFlippedWriteModeThisJob = false
     let pendingPersistUseNoResp: boolean | null = null
  
-    if (blePairForceNoResponse) {
-      try {
-        uni.setStorageSync(PrinterStorageKeys.bleWriteNoResponse, '1')
-      } catch (_) {}
-    }
-
     const resetTimeout = (reject: (reason?: any) => void) => {
       if (timeoutId) clearTimeout(timeoutId)
       timeoutId = setTimeout(() => {
@@ -517,6 +597,7 @@ function sendViaBle (
     return bleOpenAdapter()
       .then(() => bleEnsureDeviceConnected(deviceId))
       .then(() => new Promise<void>((r) => setTimeout(r, 100)))
+      .then(() => ensureBleUartNotifyIfNeeded(deviceId, serviceId, characteristicId))
       .then(() => requestBleMtuNegotiation(deviceId, preferred))
       .then((negotiated) => runWritesWithPayloadSize(mtuToPayloadSize(negotiated)))
   }
+import { storedValueLooksLikeImagePath } from '../resolveMediaUrl'
 import {
   createImageBitmapPatch,
   createTextBitmapPatch,
@@ -154,8 +155,9 @@ function resolvePlainTextLikeElement (
     if (v && u && !v.endsWith(u)) return `${v}${u}`
     return v || u
   }
+  /** 与预览一致：展示用文案在 config.text；无 text 时不应把 format 模板（如 YYYY-MM-DD）当内容打印 */
   if (type === 'DATE' || type === 'TIME' || type === 'DURATION') {
-    return getConfigString(config, ['format', 'Format'])
+    return ''
   }
   return ''
 }
@@ -167,12 +169,31 @@ function resolveElementText (
   const config = element.config || {}
   const type = String(element.type || '').toUpperCase()
   const hasText = config.text != null && config.text !== ''
+  const vst = String(element.valueSourceType || '').toUpperCase()
+
   if (type === 'TEXT_PRICE') {
     const bindingKey = resolveBindingKey(element)
     const boundValue = resolveTemplateFieldValue(data, bindingKey)
+    const rawCfg = getConfigString(config, ['text', 'Text'])
+    /** FIXED：重打快照里价格已在 config.text，勿用空 data 绑定出 0 */
+    if (vst === 'FIXED' && rawCfg.trim()) {
+      return formatPriceValue(rawCfg, config)
+    }
     const baseValue = boundValue || (hasText ? applyTemplateData(String(config.text), data) : '')
     return baseValue ? formatPriceValue(baseValue, config) : ''
   }
+
+  /** FIXED：TEXT_PRODUCT 等勿在 data 为空时仍走 productName 绑定（与快照 config.text 冲突） */
+  if (
+    vst === 'FIXED' &&
+    hasText &&
+    (type === 'TEXT_PRODUCT' ||
+      type === 'TEXT_CATEGORY' ||
+      type === 'TEXT_LABEL_ID')
+  ) {
+    return applyTemplateData(String(config.text), data)
+  }
+
   if (hasText && type === 'TEXT_STATIC') {
     return applyTemplateData(String(config.text), data)
   }
@@ -293,6 +314,14 @@ function resolveTextX (params: {
   return Math.max(0, left + Math.max(0, boxWidth - textWidth))
 }
  
+/** TSC 内置西文字体无法显示全角￥时易成「?」；位图失败走此回退时替换为可打字符（与预览位图路径一致时可显示原符号） */
+function sanitizeTextForTscBuiltinFont (text: string): string {
+  return String(text || '')
+    .replace(/\uFFE5/g, 'Y')
+    .replace(/\u00A5/g, 'Y')
+    .replace(/￥/g, 'Y')
+}
+
 function buildTscTemplate (
   template: SystemLabelTemplate,
   data: LabelTemplateData,
@@ -340,6 +369,8 @@ function buildTscTemplate (
         }
       }
  
+      const textForTsc = sanitizeTextForTscBuiltinFont(text)
+
       items.push({
         type: 'text',
         x: resolveTextX({
@@ -347,11 +378,11 @@ function buildTscTemplate (
           xPx: element.x,
           widthPx: element.width,
           dpi,
-          text,
+          text: textForTsc,
           scale,
         }),
         y: pxToDots(element.y, dpi),
-        text,
+        text: textForTsc,
         font: 'TSS24.BF2',
         rotation: resolveRotation(element.rotation),
         xScale: scale,
@@ -363,6 +394,17 @@ function buildTscTemplate (
     if (type === 'QRCODE') {
       const value = resolveElementDataValue(element, data)
       if (!value) return
+      if (storedValueLooksLikeImagePath(value)) {
+        const bitmapPatch = createImageBitmapPatch({
+          element: {
+            ...element,
+            config: { ...config, src: value, url: value, Src: value, Url: value },
+          },
+          dpi,
+        })
+        if (bitmapPatch) items.push(bitmapPatch)
+        return
+      }
       const level = normalizeQrLevel(getConfigString(config, ['errorLevel'], 'M'))
       items.push({
         type: 'qrcode',
@@ -454,7 +496,7 @@ function buildEscTemplate (
       const scale = fontSize >= 28 ? 2 : 1
       items.push({
         type: 'text',
-        text,
+        text: sanitizeTextForTscBuiltinFont(text),
         align,
         bold: String(config.fontWeight || '').toLowerCase() === 'bold',
         widthScale: scale,
@@ -8,6 +8,7 @@ import type { MonochromeImageData, PrintImageOptions, StructuredTscTemplate } fr
 function normalizePrinterText (str: string): string {
   return String(str || '')
     .normalize('NFKC')
+    .replace(/\uFFE5/g, '\u00A5')
     .replace(/[\u2018\u2019]/g, '\'')
     .replace(/[\u201C\u201D]/g, '"')
     .replace(/[\u2013\u2014]/g, '-')
+import { serializeElementForLabelTemplateJson } from './labelPreview/buildLabelPrintPayload'
+import {
+  normalizeLabelTemplateFromPreviewApi,
+  parseLabelSizeText,
+  sortElementsForPreview,
+} from './labelPreview/normalizePreviewTemplate'
+import { printSystemTemplateForCurrentPrinter } from './print/manager/printerManager'
+import type {
+  LabelTemplateData,
+  SystemLabelTemplate,
+  SystemTemplateElementBase,
+} from './print/types/printer'
+import { getPrintTemplateSnapshotForTask } from './printSnapshotStorage'
+import type { PrintLogDataItemDto, PrintLogItemDto } from '../types/usAppLabeling'
+
+/** 本次重打实际送机的模板（焙平后），供接口 11 返回新 taskId 时写入本机快照，支持连续重打 */
+let reprintEmittedTemplateJsonForPersist: string | null = null
+
+export function consumeReprintEmittedTemplateJsonForPersist (): string | null {
+  const s = reprintEmittedTemplateJsonForPersist
+  reprintEmittedTemplateJsonForPersist = null
+  return s
+}
+
+function rememberReprintEmittedTemplate (tmpl: SystemLabelTemplate) {
+  try {
+    reprintEmittedTemplateJsonForPersist = persistableTemplateJsonFromSystem(tmpl)
+  } catch {
+    reprintEmittedTemplateJsonForPersist = null
+  }
+}
+
+/** 与 preview 落库、接口 printInputJson 根结构一致，便于本机存储与解析 */
+function persistableTemplateJsonFromSystem (tmpl: SystemLabelTemplate): string {
+  const doc: Record<string, unknown> = {
+    id: String(tmpl.id ?? ''),
+    name: String(tmpl.name ?? 'Label'),
+    labelType: tmpl.labelType ?? '',
+    unit: String(tmpl.unit ?? 'inch'),
+    width: Number(tmpl.width) || 0,
+    height: Number(tmpl.height) || 0,
+    appliedLocation: tmpl.appliedLocation ?? 'ALL',
+    showRuler: tmpl.showRuler !== false,
+    showGrid: tmpl.showGrid !== false,
+    elements: (tmpl.elements || []).map((el) =>
+      serializeElementForLabelTemplateJson(el as SystemTemplateElementBase),
+    ),
+  }
+  return JSON.stringify(doc)
+}
+
+function nonEmptyDisplay (value: string | null | undefined): string {
+  if (value == null || value === '' || value === '无') return ''
+  return String(value).trim()
+}
+
+/**
+ * 接口 9/11 落库的快照里 elements[].config 已是最终展示值；重打时 data 不能再带 productName，
+ * 否则 TEXT_PRODUCT 会优先解析为 productName（与预览里用 config.text 的「freeze」等冲突，出现两行 sandwich）。
+ */
+function labelTemplateDataForSnapshotReprint (): LabelTemplateData {
+  return {}
+}
+
+function formatPriceLineForBake (config: Record<string, any>, rawText: string): string {
+  const prefix = String(config.prefix ?? config.Prefix ?? '')
+  const suffix = String(config.suffix ?? config.Suffix ?? '')
+  const decRaw = config.decimal ?? config.Decimal
+  const decimal = typeof decRaw === 'number' ? decRaw : Number(decRaw)
+  const numericValue = Number(rawText)
+  const value =
+    !Number.isNaN(numericValue) && Number.isFinite(numericValue) && Number(decimal) >= 0
+      ? numericValue.toFixed(Number(decimal))
+      : rawText
+  return `${prefix}${value}${suffix}`
+}
+
+/**
+ * 原生快打插件对 TEXT_PRODUCT / TEXT_PRICE / DATE 等仍会按类型做绑定；重打时 dataJson 为空，
+ * 必须把接口/落库快照里已填好的展示值焙成 TEXT_STATIC，否则会出现第二行商品名、价格 0、日期成 format 等问题。
+ */
+export function bakeReprintTemplateSnapshot (tmpl: SystemLabelTemplate): SystemLabelTemplate {
+  const elements = (tmpl.elements || []).map((el) => {
+    const vst = String(el.valueSourceType || '').toUpperCase()
+    const type = String(el.type || '').toUpperCase()
+    const cfg = { ...(el.config || {}) } as Record<string, any>
+
+    const toStatic = (line: string): SystemTemplateElementBase => ({
+      ...el,
+      type: 'TEXT_STATIC',
+      valueSourceType: 'FIXED',
+      config: { ...cfg, text: line, Text: line },
+    })
+
+    if (vst === 'FIXED') {
+      if (type === 'TEXT_PRODUCT' || type === 'TEXT_CATEGORY' || type === 'TEXT_LABEL_ID') {
+        const t = String(cfg.text ?? cfg.Text ?? '').trim()
+        if (t) return toStatic(t)
+      }
+      if (type === 'TEXT_PRICE') {
+        const raw = String(cfg.text ?? cfg.Text ?? '').trim()
+        if (raw) {
+          const line = formatPriceLineForBake(cfg, raw)
+          return {
+            ...el,
+            type: 'TEXT_STATIC',
+            valueSourceType: 'FIXED',
+            config: { ...cfg, text: line, Text: line, prefix: '', Prefix: '', suffix: '', Suffix: '' },
+          }
+        }
+      }
+    }
+
+    if (vst === 'PRINT_INPUT') {
+      if (type === 'DATE' || type === 'TIME' || type === 'DURATION') {
+        const textVal = String(cfg.text ?? cfg.Text ?? '').trim()
+        if (textVal) return toStatic(textVal)
+      }
+      if (type === 'WEIGHT') {
+        const textVal = String(cfg.text ?? cfg.Text ?? '').trim()
+        const v = String(cfg.value ?? cfg.Value ?? '').trim()
+        const u = String(cfg.unit ?? cfg.Unit ?? '').trim()
+        const line =
+          textVal || (v && u ? (v.endsWith(u) ? v : `${v}${u}`) : v || u)
+        if (line) return toStatic(line)
+      }
+      if (type === 'TEXT_STATIC') {
+        const inputType = String(cfg.inputType ?? cfg.InputType ?? '').toLowerCase()
+        if (inputType === 'number' || inputType === 'text') {
+          const t = String(cfg.text ?? cfg.Text ?? '').trim()
+          if (t) return toStatic(t)
+        }
+        if (
+          inputType === 'options' ||
+          cfg.multipleOptionId ||
+          cfg.MultipleOptionId
+        ) {
+          const rawText = String(cfg.text ?? cfg.Text ?? '').trim()
+          const sel = cfg.selectedOptionValues ?? cfg.SelectedOptionValues
+          const joined =
+            Array.isArray(sel) && sel.length ? sel.map((x: unknown) => String(x)).join(', ') : ''
+          let line = rawText
+          if (!line && joined) {
+            const dictLabel = String(
+              cfg.multipleOptionName ?? cfg.MultipleOptionName ?? 'Options',
+            ).trim()
+            const prefix = String(cfg.prefix ?? cfg.Prefix ?? '').trim()
+            line = prefix ? `${prefix}${joined}` : `${dictLabel}: ${joined}`
+          }
+          if (line) return toStatic(line)
+        }
+      }
+    }
+
+    return el
+  })
+  return { ...tmpl, elements }
+}
+
+/**
+ * 接口可能返回两类 renderConfigJson：
+ * 1）与设计器 elements[] 单项同构（含 type、x、y、config）
+ * 2）仅画布 config 快照（只有 text、fontSize 等），无 type、无坐标 —— 若直接当 element 传入，
+ *    normalizeLabelTemplateFromPreviewApi 只读 e.config，会得到空 config，打印全空。
+ */
+function inferElementTypeFromPrintSnapshotConfig (cfg: Record<string, unknown>): string {
+  const inputType = String(cfg.inputType ?? '').toLowerCase()
+  const hasUnit = cfg.unit != null || cfg.Unit != null
+  const hasValue = cfg.value != null || cfg.Value != null
+  if (hasUnit && hasValue) return 'WEIGHT'
+
+  if (
+    typeof cfg.decimal === 'number' &&
+    ('prefix' in cfg || 'suffix' in cfg)
+  ) {
+    return 'TEXT_PRICE'
+  }
+
+  if (cfg.format != null && inputType === 'datetime') return 'DATE'
+
+  return 'TEXT_STATIC'
+}
+
+function applyRenderValueToSnapshotConfig (
+  cfg: Record<string, unknown>,
+  elementType: string,
+  renderValue: string | null | undefined
+): void {
+  if (renderValue === undefined || renderValue === null) return
+  const t = elementType.toUpperCase()
+  const s = String(renderValue)
+  if (t === 'WEIGHT') {
+    cfg.value = s
+    cfg.Value = s
+    return
+  }
+  if (t === 'DATE' || t === 'TIME') {
+    cfg.text = s
+    cfg.Text = s
+    return
+  }
+  cfg.text = s
+  cfg.Text = s
+}
+
+function pageWidthPxFromPrintLogRow (row: PrintLogItemDto): number {
+  const size = parseLabelSizeText(row.labelSizeText ?? null)
+  const w = size?.width ?? 2
+  return Math.max(96, Math.round(w * 96))
+}
+
+/**
+ * 将 printDataList 单项转为 normalize 可用的 element；扁平 config 会包进 config 并补全坐标（纵向堆叠）。
+ */
+function elementFromPrintDataItem (
+  item: PrintLogDataItemDto,
+  index: number,
+  pageWidthPx: number
+): Record<string, unknown> {
+  const raw =
+    item.renderConfigJson ?? (item as unknown as { RenderConfigJson?: unknown }).RenderConfigJson
+  if (raw == null) {
+    throw new Error('Missing renderConfigJson')
+  }
+
+  let obj: Record<string, unknown>
+  if (typeof raw === 'string') {
+    try {
+      obj = JSON.parse(raw) as Record<string, unknown>
+    } catch {
+      throw new Error('Invalid element JSON')
+    }
+  } else if (typeof raw === 'object' && !Array.isArray(raw)) {
+    obj = { ...(raw as Record<string, unknown>) }
+  } else {
+    throw new Error('Invalid renderConfigJson')
+  }
+
+  const hasElementEnvelope =
+    typeof obj.type === 'string' ||
+    typeof obj.Type === 'string' ||
+    typeof obj.elementType === 'string' ||
+    'x' in obj ||
+    'posX' in obj ||
+    'config' in obj ||
+    'ConfigJson' in obj ||
+    'configJson' in obj
+
+  if (hasElementEnvelope) {
+    const base = { ...obj }
+    if (item.elementId) {
+      base.id = item.elementId
+      base.Id = item.elementId
+    }
+    return base
+  }
+
+  const cfg = { ...obj }
+  const inferredType = inferElementTypeFromPrintSnapshotConfig(cfg)
+  applyRenderValueToSnapshotConfig(cfg, inferredType, item.renderValue)
+
+  const lineHeight = 40
+  const pad = 8
+  return {
+    id: item.elementId ?? `el-${index}`,
+    type: inferredType,
+    x: pad,
+    y: pad + index * lineHeight,
+    width: Math.max(40, pageWidthPx - pad * 2),
+    height: lineHeight,
+    rotation: 'horizontal',
+    border: 'none',
+    config: cfg,
+    zIndex: index,
+    orderNum: index,
+  }
+}
+
+/**
+ * 重打快照：勿调用 overlayProductNameOnPreviewTemplate。
+ * 列表 printDataList 里 TEXT_PRODUCT 若丢字端，text 变空串会触发「占位」逻辑被整行替成 productName，出现两行 sandwich。
+ */
+function overlayReprintResolvedFields (
+  tmpl: SystemLabelTemplate,
+  row: PrintLogItemDto,
+  data: LabelTemplateData
+): SystemLabelTemplate {
+  const t = tmpl
+  const productName = nonEmptyDisplay(row.productName)
+  /** 勿含空串：接口拆包丢字端时 text 为空，若把 '' 当占位并整行换成 productName，会与第一行商品名重复成两个 sandwich */
+  const placeholders = new Set([
+    '文本',
+    'text',
+    'Text',
+    'TEXT',
+    '名称',
+    'name',
+    'Name',
+    'label',
+    'Label',
+  ])
+
+  const elements = (t.elements || []).map((el) => {
+    const type = String(el.type || '').toUpperCase()
+    const cfg = { ...(el.config || {}) } as Record<string, unknown>
+    const inputType = String(cfg.inputType ?? '').toLowerCase()
+
+    if (type === 'TEXT_STATIC' || type === 'TEXT_PRODUCT') {
+      if (cfg.multipleOptionId || inputType === 'options') {
+        const rawText = String(cfg.text ?? cfg.Text ?? '').trim()
+        const sel = cfg.selectedOptionValues
+        const joined =
+          Array.isArray(sel) && sel.length ? sel.map((x) => String(x)).join(', ') : ''
+        /** 快照已存整行「Allergens: x, y」时勿改成仅选项值，否则缺行且缺前缀 */
+        if (rawText && (rawText.includes(joined) || (joined && rawText.length > joined.length))) {
+          return el
+        }
+        if (!rawText && joined) {
+          const dictLabel = String(cfg.multipleOptionName ?? cfg.MultipleOptionName ?? 'Options').trim()
+          const prefix = String(cfg.prefix ?? cfg.Prefix ?? '').trim()
+          const line = prefix ? `${prefix}${joined}` : `${dictLabel}: ${joined}`
+          return { ...el, config: { ...cfg, text: line } }
+        }
+        return el
+      }
+    }
+
+    if ((type === 'TEXT_STATIC' || type === 'TEXT_PRODUCT') && productName) {
+      const raw = String(cfg.text ?? cfg.Text ?? '').trim()
+      const vstEl = String(el.valueSourceType || '').toUpperCase()
+      /** FIXED 的 TEXT_PRODUCT 多为标签类型/说明，占位「名称」等不应被商品名替换（避免出现两行 sandwich） */
+      if (type === 'TEXT_PRODUCT' && vstEl === 'FIXED') {
+        return el
+      }
+      if (placeholders.has(raw)) {
+        return {
+          ...el,
+          type: 'TEXT_PRODUCT',
+          config: { ...cfg, text: productName },
+        }
+      }
+    }
+
+    if (type === 'DATE' && !String(cfg.text ?? cfg.Text ?? '').trim() && data.date) {
+      return { ...el, config: { ...cfg, text: String(data.date) } }
+    }
+    if (type === 'TIME' && !String(cfg.text ?? cfg.Text ?? '').trim() && data.time) {
+      return { ...el, config: { ...cfg, text: String(data.time) } }
+    }
+
+    return el
+  })
+
+  return { ...t, elements }
+}
+
+/**
+ * 使用接口 10 返回的 `printDataList` 组装模板并走当前打印机（与预览同路径）。
+ */
+function logReprintJson (label: string, data: unknown): void {
+  try {
+    console.log(`[Reprint] ${label}`, typeof data === 'string' ? data : JSON.stringify(data, null, 2))
+  } catch {
+    console.log(`[Reprint] ${label}`, data)
+  }
+}
+
+export async function printFromPrintDataListRow (
+  row: PrintLogItemDto,
+  options: {
+    printQty?: number
+    onProgress?: (percent: number) => void
+  } = {}
+): Promise<void> {
+  const list =
+    row.printDataList ??
+    (row as unknown as { PrintDataList?: PrintLogDataItemDto[] }).PrintDataList ??
+    []
+  if (!Array.isArray(list) || list.length === 0) {
+    throw new Error('No printDataList in record')
+  }
+
+  const pageW = pageWidthPxFromPrintLogRow(row)
+  const elements = list.map((item, index) => elementFromPrintDataItem(item, index, pageW))
+  const size = parseLabelSizeText(row.labelSizeText ?? null)
+  const payload: Record<string, unknown> = {
+    id: row.labelId || row.labelCode || 'reprint',
+    name: 'Reprint',
+    unit: size?.unit ?? 'inch',
+    width: size?.width ?? 2,
+    height: size?.height ?? 2,
+    appliedLocation: 'ALL',
+    elements,
+  }
+
+  console.log('[Reprint] 路径: printDataList 组装')
+  logReprintJson('printDataList 原始', list)
+  logReprintJson('组装的 template payload（normalize 前）', payload)
+
+  let tmpl = normalizeLabelTemplateFromPreviewApi(payload)
+  if (!tmpl) {
+    throw new Error('Cannot build template from printDataList')
+  }
+
+  const templateData = labelTemplateDataForSnapshotReprint()
+  tmpl = overlayReprintResolvedFields(tmpl, row, templateData)
+  tmpl = bakeReprintTemplateSnapshot(tmpl)
+
+  tmpl = {
+    ...tmpl,
+    elements: sortElementsForPreview(tmpl.elements || []),
+  } as SystemLabelTemplate
+
+  logReprintJson('bake + sort 后送打印机模板 tmpl', tmpl)
+
+  rememberReprintEmittedTemplate(tmpl)
+  await printSystemTemplateForCurrentPrinter(
+    tmpl,
+    templateData,
+    { printQty: options.printQty ?? 1 },
+    options.onProgress
+  )
+}
+
+/**
+ * 从列表接口 `renderTemplateJson` 或本地保存的整段请求体中取出与 `printInputJson` 同构的对象 JSON 字符串。
+ * 支持：`{ "printInputJson": { "elements": [...] } }` 或直接 `{ "elements": [...] }`。
+ */
+export function extractPrintTemplateJsonForReprint (raw: string): string | null {
+  const s = raw.trim()
+  if (!s) return null
+  try {
+    const doc = JSON.parse(s) as Record<string, unknown>
+    const pi = doc.printInputJson ?? doc.PrintInputJson
+    if (pi != null && typeof pi === 'object' && !Array.isArray(pi)) {
+      return JSON.stringify(pi)
+    }
+    if (Array.isArray(doc.elements) || Array.isArray(doc.Elements)) {
+      return JSON.stringify(doc)
+    }
+  } catch {
+    return null
+  }
+  return null
+}
+
+/**
+ * 打印日志重打入口：
+ * 1）本机按 taskId 存的合并快照（预览出纸成功时写入）——与接口 10 的 renderTemplateJson 解耦；
+ * 2）否则 `renderTemplateJson`（常为设计器占位，易错）；
+ * 3）再否则 `printDataList`。
+ */
+export async function printFromPrintLogRow (
+  row: PrintLogItemDto,
+  options: {
+    printQty?: number
+    onProgress?: (percent: number) => void
+  } = {}
+): Promise<void> {
+  const r =
+    row.renderTemplateJson ??
+    (row as unknown as { RenderTemplateJson?: string | null }).RenderTemplateJson
+
+  console.log('[Reprint] ========== 重复打印 JSON 调试 ==========')
+  console.log('[Reprint] taskId', row.taskId, 'labelCode', row.labelCode, 'productName', row.productName)
+  logReprintJson('renderTemplateJson（列表字段，可为空）', r ?? '(无)')
+
+  const localSnap = getPrintTemplateSnapshotForTask(row.taskId)
+  if (localSnap) {
+    console.log('[Reprint] 优先使用本机存储的合并快照（与当次预览出纸一致），taskId=', row.taskId)
+    logReprintJson('本机快照 JSON', localSnap)
+    await printFromMergedTemplateJsonString(localSnap, row, options)
+    return
+  }
+
+  if (typeof r === 'string' && r.trim()) {
+    const extracted = extractPrintTemplateJsonForReprint(r)
+    if (extracted) {
+      logReprintJson('extract 后用于打印的模板 JSON 字符串', extracted)
+      await printFromMergedTemplateJsonString(extracted, row, options)
+      return
+    }
+    console.warn('[Reprint] renderTemplateJson 存在但 extractPrintTemplateJsonForReprint 失败，回退 printDataList')
+  } else {
+    console.log('[Reprint] 无 renderTemplateJson，使用 printDataList')
+  }
+
+  await printFromPrintDataListRow(row, options)
+}
+
+/**
+ * 接口 11 返回的 `mergedTemplateJson`（与落库 PrintInputJson/RenderDataJson 同源），用于重打编排。
+ * 勿使用列表接口里的 `renderTemplateJson`/仅拆出来的 printDataList 代替完整模板，否则易缺坐标或缺用户输入快照。
+ */
+export async function printFromMergedTemplateJsonString (
+  mergedTemplateJson: string,
+  row: PrintLogItemDto,
+  options: {
+    printQty?: number
+    onProgress?: (percent: number) => void
+  } = {}
+): Promise<void> {
+  console.log('[Reprint] 路径: renderTemplateJson / merged 完整模板')
+  logReprintJson('mergedTemplateJson 原始字符串', mergedTemplateJson)
+
+  let payload: unknown
+  try {
+    payload = JSON.parse(mergedTemplateJson) as unknown
+  } catch {
+    throw new Error('Invalid merged template JSON')
+  }
+  logReprintJson('JSON.parse 后的 payload', payload)
+
+  let tmpl = normalizeLabelTemplateFromPreviewApi(payload)
+  if (!tmpl) {
+    throw new Error('Cannot parse merged template')
+  }
+  const templateData = labelTemplateDataForSnapshotReprint()
+  tmpl = overlayReprintResolvedFields(tmpl, row, templateData)
+  tmpl = bakeReprintTemplateSnapshot(tmpl)
+  tmpl = {
+    ...tmpl,
+    elements: sortElementsForPreview(tmpl.elements || []),
+  } as SystemLabelTemplate
+
+  logReprintJson('bake + sort 后送打印机模板 tmpl', tmpl)
+  logReprintJson('templateData（快照重打为空对象）', templateData)
+
+  rememberReprintEmittedTemplate(tmpl)
+  await printSystemTemplateForCurrentPrinter(
+    tmpl,
+    templateData,
+    { printQty: options.printQty ?? 1 },
+    options.onProgress
+  )
+}
+/**
+ * 接口 10 返回的 renderTemplateJson 常为设计器占位（文本/名称/0.00），与当次出纸合并模板不一致。
+ * 本机按 taskId 存「与出纸同源」的合并模板 JSON，重打优先读取（仅前端，不改后端）。
+ */
+const STORAGE_KEY = 'us_app_print_template_snapshot_v1'
+const MAX_ENTRIES = 400
+
+type SnapshotStore = {
+  order: string[]
+  map: Record<string, string>
+}
+
+function readStore (): SnapshotStore {
+  try {
+    const raw = uni.getStorageSync(STORAGE_KEY)
+    if (raw == null || raw === '') return { order: [], map: {} }
+    const p = typeof raw === 'string' ? JSON.parse(raw) : raw
+    if (!p || typeof p !== 'object') return { order: [], map: {} }
+    const order = Array.isArray(p.order) ? p.order.map((x: unknown) => String(x)) : []
+    const map = typeof p.map === 'object' && p.map && !Array.isArray(p.map) ? (p.map as Record<string, string>) : {}
+    return { order, map }
+  } catch {
+    return { order: [], map: {} }
+  }
+}
+
+function writeStore (s: SnapshotStore) {
+  try {
+    uni.setStorageSync(STORAGE_KEY, JSON.stringify(s))
+  } catch {
+    /* 存储满或不可用则跳过 */
+  }
+}
+
+function trimStore (s: SnapshotStore): SnapshotStore {
+  let { order, map } = s
+  while (order.length > MAX_ENTRIES) {
+    const k = order.shift()
+    if (k && map[k] != null) delete map[k]
+  }
+  return { order, map }
+}
+
+/** 保存与本次出纸一致的合并模板 JSON（与 preview 落库 printInputJson 同构根对象） */
+export function savePrintTemplateSnapshotForTask (taskId: string, mergedTemplateJson: string): void {
+  const id = String(taskId || '').trim()
+  if (!id || !mergedTemplateJson.trim()) return
+  const s = readStore()
+  const nextMap = { ...s.map, [id]: mergedTemplateJson }
+  let order = s.order.filter((k) => k !== id)
+  order.push(id)
+  writeStore(trimStore({ order, map: nextMap }))
+}
+
+export function getPrintTemplateSnapshotForTask (taskId: string): string | null {
+  const id = String(taskId || '').trim()
+  if (!id) return null
+  const s = readStore()
+  const v = s.map[id]
+  return typeof v === 'string' && v.trim() ? v : null
+}
+import {
+  normalizeLabelTemplateFromPreviewApi,
+  sortElementsForPreview,
+} from './labelPreview/normalizePreviewTemplate'
+import { printSystemTemplateForCurrentPrinter } from './print/manager/printerManager'
+import type { SystemLabelTemplate } from './print/types/printer'
+
+/**
+ * 将接口 11 返回的 `mergedTemplateJson`（或历史落库的合并模板 JSON 字符串）交给当前打印机打印。
+ */
+export async function printMergedTemplateJsonString (
+  mergedJson: string,
+  options: {
+    printQty?: number
+    onProgress?: (percent: number) => void
+  } = {}
+): Promise<void> {
+  let raw: unknown
+  try {
+    raw = JSON.parse(mergedJson) as unknown
+  } catch {
+    throw new Error('Invalid print snapshot JSON')
+  }
+  let tmpl = normalizeLabelTemplateFromPreviewApi(raw)
+  if (!tmpl) {
+    throw new Error('Cannot parse label template from snapshot')
+  }
+  const sorted: SystemLabelTemplate = {
+    ...tmpl,
+    elements: sortElementsForPreview(tmpl.elements || []),
+  }
+  await printSystemTemplateForCurrentPrinter(
+    sorted,
+    {},
+    { printQty: options.printQty ?? 1 },
+    options.onProgress
+  )
+}
@@ -11,3 +11,22 @@ export function resolveMediaUrlForApp(stored: string | null | undefined): string
   if (mediaOrigin) return `${mediaOrigin.replace(/\/$/, '')}${path}`
   return buildApiUrl(path)
 }
+
+/**
+ * 判断模板里存的字符串是否应按「图片」加载（含平台上传后的 /picture/ 路径）。
+ * 用于 QRCODE 等元素：data 可能是「要编码的 URL 文本」，也可能是「已上传的二维码图」路径。
+ */
+export function storedValueLooksLikeImagePath(stored: string | null | undefined): boolean {
+  const s = (stored ?? '').trim()
+  if (!s) return false
+  const lower = s.toLowerCase()
+  if (lower.startsWith('data:image/')) return true
+  if (lower.startsWith('/picture/') || lower.startsWith('/static/')) return true
+  if (/\.(png|jpe?g|gif|webp|bmp)(\?|#|$)/i.test(s)) return true
+  if (/^https?:\/\//i.test(s)) {
+    if (/\/picture\//i.test(s)) return true
+    if (/\.(png|jpe?g|gif|webp|bmp)(\?|#|$)/i.test(s)) return true
+    return false
+  }
+  return false
+}
+using System.Text.Json;
+
+namespace FoodLabeling.Application.Contracts.Dtos.UsAppLabeling;
+
+/// <summary>
+/// 打印明细快照（接口 10，对应 fl_label_print_data 解析后的元素级信息）
+/// </summary>
+public class PrintLogDataItemDto
+{
+    public string ElementId { get; set; } = string.Empty;
+
+    public string RenderValue { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 元素完整 JSON（与 LabelTemplateElementDto / 编辑器 elements[] 项同构），供 App 重打组装模板。
+    /// </summary>
+    public JsonElement? RenderConfigJson { get; set; }
+}
+namespace FoodLabeling.Application.Contracts.Dtos.UsAppLabeling;
+
+/// <summary>
+/// App 打印日志分页（接口 10）
+/// </summary>
+public class PrintLogGetListInputVo
+{
+    /// <summary>当前门店 Id</summary>
+    public string LocationId { get; set; } = string.Empty;
+
+    /// <summary>页码，从 1 开始</summary>
+    public int SkipCount { get; set; } = 1;
+
+    /// <summary>每页条数</summary>
+    public int MaxResultCount { get; set; } = 20;
+}
+using System.Collections.Generic;
+
+namespace FoodLabeling.Application.Contracts.Dtos.UsAppLabeling;
+
+/// <summary>
+/// 单条打印日志（接口 10）
+/// </summary>
+public class PrintLogItemDto
+{
+    public string TaskId { get; set; } = string.Empty;
+
+    public string BatchId { get; set; } = string.Empty;
+
+    public int CopyIndex { get; set; }
+
+    public string LabelId { get; set; } = string.Empty;
+
+    public string LabelCode { get; set; } = string.Empty;
+
+    public string? ProductId { get; set; }
+
+    public string ProductName { get; set; } = "无";
+
+    public string PrintedAt { get; set; } = string.Empty;
+
+    public string OperatorName { get; set; } = string.Empty;
+
+    public string LocationName { get; set; } = string.Empty;
+
+    /// <summary>标签分类名（展示用，可为空）</summary>
+    public string? LabelCategoryName { get; set; }
+
+    /// <summary>标签幅面/模板摘要（如 2"x2" Basic）</summary>
+    public string? LabelTemplateSummary { get; set; }
+
+    /// <summary>标签幅面文案（与列表/预览 labelSizeText 一致，如 2.00x2.00inch）</summary>
+    public string? LabelSizeText { get; set; }
+
+    /// <summary>标签种类名称（fl_label_type.TypeName）</summary>
+    public string? TypeName { get; set; }
+
+    /// <summary>本次份打印内容元素快照（由 RenderDataJson 解析）</summary>
+    public List<PrintLogDataItemDto> PrintDataList { get; set; } = new();
+}
@@ -36,15 +36,16 @@ public class UsAppLabelPrintInputVo
     public DateTime? BaseTime { get; set; }
  
     /// <summary>
-    /// 打印输入（用于 PRINT_INPUT 元素）
+    /// 打印数据（对齐《标签模块接口对接说明(10)》）：
+    /// - App 推荐传：与平台导出 label-template-*.json 同构的<strong>合并后模板</strong>（含 elements[].config），便于落库后直接重打；
+    /// - 兼容旧客户端：扁平字典（key 对齐元素 inputKey），由服务端 PreviewAsync 解析生成 RenderDataJson。
     /// </summary>
-    public Dictionary<string, object?>? PrintInputJson { get; set; }
+    public JsonElement? PrintInputJson { get; set; }
  
     /// <summary>
-    /// 可选：App 端合并后的完整模板快照（与平台导出 label-template JSON 同构，含 elements[].config）。
-    /// 传入时明细表 RenderDataJson 优先存此快照，便于打印历史与出纸结果一致；未传时仍由服务端 PreviewAsync 生成。
+    /// 客户端幂等请求 Id（可选）；重复相同值时由服务端决定是否直接返回首次结果（见接口文档）。
     /// </summary>
-    public JsonElement? TemplateSnapshot { get; set; }
+    public string? ClientRequestId { get; set; }
  
     /// <summary>
     /// 打印机Id（可选，若业务需要追踪）
 namespace FoodLabeling.Application.Contracts.Dtos.UsAppLabeling;
  
 /// <summary>
-/// App 打印出参
+/// App 打印出参（接口 9 / 11）
 /// </summary>
 public class UsAppLabelPrintOutputDto
 {
     public string TaskId { get; set; } = string.Empty;
  
     public int PrintQuantity { get; set; }
+
+    public string? BatchId { get; set; }
+
+    public List<string> TaskIds { get; set; } = new();
+
+    /// <summary>
+    /// 供 App 本地 BLE 重打：合并模板 JSON 字符串（与接口 9 落库的 printInputJson 同构，含 elements[]）。
+    /// </summary>
+    public string? MergedTemplateJson { get; set; }
 }
  
+namespace FoodLabeling.Application.Contracts.Dtos.UsAppLabeling;
+
+/// <summary>
+/// App 重新打印入参（接口 11）
+/// </summary>
+public class UsAppLabelReprintInputVo
+{
+    public string LocationId { get; set; } = string.Empty;
+
+    public string TaskId { get; set; } = string.Empty;
+
+    public int PrintQuantity { get; set; } = 1;
+
+    public string? ClientRequestId { get; set; }
+
+    public string? PrinterId { get; set; }
+
+    public string? PrinterMac { get; set; }
+
+    public string? PrinterAddress { get; set; }
+}
+using FoodLabeling.Application.Contracts.Dtos.Common;
 using FoodLabeling.Application.Contracts.Dtos.UsAppLabeling;
 using Volo.Abp.Application.Services;
  
@@ -22,4 +23,14 @@ public interface IUsAppLabelingAppService : IApplicationService
     /// App 打印：创建打印任务并落库打印明细（fl_label_print_task / fl_label_print_data）
     /// </summary>
     Task<UsAppLabelPrintOutputDto> PrintAsync(UsAppLabelPrintInputVo input);
+
+    /// <summary>
+    /// 接口 10：当前账号在当前门店的打印日志分页
+    /// </summary>
+    Task<PagedResultWithPageDto<PrintLogItemDto>> GetPrintLogListAsync(PrintLogGetListInputVo input);
+
+    /// <summary>
+    /// 接口 11：按历史任务重打并落库，返回新任务信息及可本地打印的模板 JSON
+    /// </summary>
+    Task<UsAppLabelPrintOutputDto> ReprintAsync(UsAppLabelReprintInputVo input);
 }
@@ -4,11 +4,16 @@ using System.Globalization;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
+using FoodLabeling.Application.Contracts.Dtos.Common;
 using FoodLabeling.Application.Contracts.Dtos.Label;
+using FoodLabeling.Application.Contracts.Dtos.LabelTemplate;
 using FoodLabeling.Application.Contracts.Dtos.UsAppLabeling;
 using FoodLabeling.Application.Contracts.IServices;
+using FoodLabeling.Application.Helpers;
 using FoodLabeling.Application.Services.DbModels;
+using FoodLabeling.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using Volo.Abp;
 using Volo.Abp.Application.Services;
@@ -388,35 +393,54 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ
             throw new UserFriendlyException("该标签不属于当前门店");
         }
  
-        var printInputJsonStr = input.PrintInputJson is null
-            ? null
-            : JsonSerializer.Serialize(input.PrintInputJson);
-
+        string? printInputJsonStr = null;
         string renderDataJsonStr;
-        var snapshotOk = false;
-        if (input.TemplateSnapshot.HasValue)
+        var templateSnapshotOk = false;
+
+        if (input.PrintInputJson.HasValue)
         {
-            var snapEl = input.TemplateSnapshot.Value;
-            if (snapEl.ValueKind == JsonValueKind.Object
-                && snapEl.TryGetProperty("elements", out var elArr)
+            var piRoot = input.PrintInputJson.Value;
+            if (piRoot.ValueKind == JsonValueKind.Object
+                && piRoot.TryGetProperty("elements", out var elArr)
                 && elArr.ValueKind == JsonValueKind.Array)
             {
-                // App 与出纸一致的合并模板（label-template 同构），供打印历史/重打直接使用
-                renderDataJsonStr = snapEl.GetRawText();
-                snapshotOk = true;
+                // App 传入整份合并模板（与 label-template JSON 同构）：落库 printInputJson / renderDataJson 均存同一份，供重打
+                printInputJsonStr = piRoot.GetRawText();
+                renderDataJsonStr = printInputJsonStr;
+                templateSnapshotOk = true;
+            }
+        }
+
+        Dictionary<string, object?>? flatPrintInput = null;
+        if (!templateSnapshotOk && input.PrintInputJson.HasValue)
+        {
+            var piFlat = input.PrintInputJson.Value;
+            if (piFlat.ValueKind == JsonValueKind.Object)
+            {
+                try
+                {
+                    flatPrintInput = JsonSerializer.Deserialize<Dictionary<string, object?>>(piFlat.GetRawText());
+                }
+                catch
+                {
+                    flatPrintInput = null;
+                }
             }
         }
  
-        if (!snapshotOk)
+        if (!templateSnapshotOk)
         {
             var resolvedTemplate = await _labelAppService.PreviewAsync(new LabelPreviewResolveInputVo
             {
                 LabelCode = labelCode,
                 ProductId = input.ProductId?.Trim(),
                 BaseTime = input.BaseTime,
-                PrintInputJson = input.PrintInputJson
+                PrintInputJson = flatPrintInput
             });
             renderDataJsonStr = JsonSerializer.Serialize(resolvedTemplate);
+            printInputJsonStr = input.PrintInputJson.HasValue
+                ? input.PrintInputJson.Value.GetRawText()
+                : null;
         }
  
         var now = DateTime.Now;
@@ -462,7 +486,421 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ
         return new UsAppLabelPrintOutputDto
         {
             TaskId = taskId,
-            PrintQuantity = quantity
+            PrintQuantity = quantity,
+            BatchId = taskId,
+            TaskIds = new List<string> { taskId },
+            MergedTemplateJson = null
+        };
+    }
+
+    /// <summary>
+    /// 接口 10：分页打印日志（当前用户 + 当前门店）
+    /// </summary>
+    [Authorize]
+    [HttpPost]
+    public virtual async Task<PagedResultWithPageDto<PrintLogItemDto>> GetPrintLogListAsync(PrintLogGetListInputVo input)
+    {
+        if (input == null)
+        {
+            throw new UserFriendlyException("入参不能为空");
+        }
+
+        var locationId = input.LocationId?.Trim();
+        if (string.IsNullOrWhiteSpace(locationId))
+        {
+            throw new UserFriendlyException("门店Id不能为空");
+        }
+
+        var userId = CurrentUser.Id?.ToString();
+        if (string.IsNullOrWhiteSpace(userId))
+        {
+            throw new UserFriendlyException("未登录");
+        }
+
+        var pageIndex = input.SkipCount <= 0 ? 1 : input.SkipCount;
+        var pageSize = input.MaxResultCount <= 0 ? 20 : Math.Min(input.MaxResultCount, 200);
+
+        RefAsync<int> total = 0;
+        var dataRows = await _dbContext.SqlSugarClient
+            .Queryable<FlLabelPrintDataDbEntity, FlLabelPrintTaskDbEntity>((d, t) => d.TaskId == t.Id)
+            .Where((d, t) => !d.IsDeleted && !t.IsDeleted)
+            .Where((d, t) => t.CreatorId == userId && t.LocationId == locationId)
+            .OrderBy((d, t) => d.CreationTime, OrderByType.Desc)
+            .Select((d, t) => d)
+            .ToPageListAsync(pageIndex, pageSize, total);
+
+        string? locationDisplayName = null;
+        if (Guid.TryParse(locationId, out var locGuid))
+        {
+            var locRows = await _dbContext.SqlSugarClient.Queryable<LocationAggregateRoot>()
+                .Where(x => x.Id == locGuid && !x.IsDeleted)
+                .Select(x => x.LocationName)
+                .Take(1)
+                .ToListAsync();
+            locationDisplayName = locRows.FirstOrDefault();
+        }
+
+        var operatorName = CurrentUser.Name?.Trim();
+        if (string.IsNullOrWhiteSpace(operatorName))
+        {
+            operatorName = CurrentUser.UserName?.Trim();
+        }
+        if (string.IsNullOrWhiteSpace(operatorName))
+        {
+            operatorName = "无";
+        }
+
+        var taskIds = dataRows.Select(x => x.TaskId).Distinct().ToList();
+        var tasks = taskIds.Count == 0
+            ? new List<FlLabelPrintTaskDbEntity>()
+            : await _dbContext.SqlSugarClient.Queryable<FlLabelPrintTaskDbEntity>()
+                .Where(t => taskIds.Contains(t.Id))
+                .ToListAsync();
+        var taskMap = tasks.ToDictionary(x => x.Id, x => x);
+
+        var labelCodes = tasks.Select(t => t.LabelCode).Where(x => !string.IsNullOrWhiteSpace(x)).Distinct().ToList();
+        var labels = labelCodes.Count == 0
+            ? new List<FlLabelDbEntity>()
+            : await _dbContext.SqlSugarClient.Queryable<FlLabelDbEntity>()
+                .Where(l => !l.IsDeleted && labelCodes.Contains(l.LabelCode))
+                .ToListAsync();
+        var labelByCode = labels.GroupBy(x => x.LabelCode).ToDictionary(g => g.Key, g => g.First());
+
+        var categoryIds = labels
+            .Select(x => x.LabelCategoryId)
+            .Where(x => !string.IsNullOrWhiteSpace(x))
+            .Select(x => x!.Trim())
+            .Distinct()
+            .ToList();
+        var categories = categoryIds.Count == 0
+            ? new List<FlLabelCategoryDbEntity>()
+            : await _dbContext.SqlSugarClient.Queryable<FlLabelCategoryDbEntity>()
+                .Where(c => !c.IsDeleted && categoryIds.Contains(c.Id))
+                .ToListAsync();
+        var catMap = categories.ToDictionary(x => x.Id, x => x);
+
+        var templateIds = labels
+            .Select(x => x.TemplateId)
+            .Where(x => !string.IsNullOrWhiteSpace(x))
+            .Select(x => x!.Trim())
+            .Distinct()
+            .ToList();
+        var templates = templateIds.Count == 0
+            ? new List<FlLabelTemplateDbEntity>()
+            : await _dbContext.SqlSugarClient.Queryable<FlLabelTemplateDbEntity>()
+                .Where(tpl => !tpl.IsDeleted && templateIds.Contains(tpl.Id))
+                .ToListAsync();
+        var tplMap = templates.ToDictionary(x => x.Id, x => x);
+
+        var labelTypeIds = labels
+            .Select(x => x.LabelTypeId)
+            .Where(x => !string.IsNullOrWhiteSpace(x))
+            .Select(x => x!.Trim())
+            .Distinct()
+            .ToList();
+        var labelTypes = labelTypeIds.Count == 0
+            ? new List<FlLabelTypeDbEntity>()
+            : await _dbContext.SqlSugarClient.Queryable<FlLabelTypeDbEntity>()
+                .Where(lt => !lt.IsDeleted && labelTypeIds.Contains(lt.Id))
+                .ToListAsync();
+        var typeMap = labelTypes.ToDictionary(x => x.Id, x => x);
+
+        var productIds = tasks
+            .Select(t => t.ProductId)
+            .Where(x => !string.IsNullOrWhiteSpace(x))
+            .Select(x => x!.Trim())
+            .Distinct()
+            .ToList();
+        var products = productIds.Count == 0
+            ? new List<FlProductDbEntity>()
+            : await _dbContext.SqlSugarClient.Queryable<FlProductDbEntity>()
+                .Where(p => !p.IsDeleted && productIds.Contains(p.Id))
+                .ToListAsync();
+        var prodMap = products.ToDictionary(x => x.Id, x => x);
+
+        var items = dataRows.Select(d =>
+        {
+            taskMap.TryGetValue(d.TaskId, out var t);
+            var lblId = "";
+            string? catName = null;
+            string? tplSummary = null;
+            string? labelSizeText = null;
+            string? typeName = null;
+            if (t != null && !string.IsNullOrWhiteSpace(t.LabelCode) && labelByCode.TryGetValue(t.LabelCode.Trim(), out var lbl))
+            {
+                lblId = lbl.Id;
+                if (!string.IsNullOrWhiteSpace(lbl.LabelCategoryId) && catMap.TryGetValue(lbl.LabelCategoryId.Trim(), out var c))
+                {
+                    catName = string.IsNullOrWhiteSpace(c.CategoryName) ? "无" : c.CategoryName.Trim();
+                }
+                if (!string.IsNullOrWhiteSpace(lbl.LabelTypeId) && typeMap.TryGetValue(lbl.LabelTypeId.Trim(), out var lt))
+                {
+                    typeName = string.IsNullOrWhiteSpace(lt.TypeName) ? null : lt.TypeName.Trim();
+                }
+                if (!string.IsNullOrWhiteSpace(lbl.TemplateId) && tplMap.TryGetValue(lbl.TemplateId.Trim(), out var tpl))
+                {
+                    tplSummary = $"{tpl.Width}x{tpl.Height}{tpl.Unit} {tpl.TemplateName}".Trim();
+                    labelSizeText = string.Format(
+                        CultureInfo.InvariantCulture,
+                        "{0:0.00}x{1:0.00}{2}",
+                        tpl.Width,
+                        tpl.Height,
+                        tpl.Unit);
+                }
+            }
+
+            var productName = "无";
+            if (t != null && !string.IsNullOrWhiteSpace(t.ProductId) && prodMap.TryGetValue(t.ProductId.Trim(), out var p))
+            {
+                productName = string.IsNullOrWhiteSpace(p.ProductName) ? "无" : p.ProductName.Trim();
+            }
+
+            return new PrintLogItemDto
+            {
+                TaskId = d.TaskId,
+                BatchId = d.TaskId,
+                CopyIndex = d.CopyIndex ?? 1,
+                LabelId = string.IsNullOrWhiteSpace(lblId) ? (t?.LabelCode ?? "") : lblId,
+                LabelCode = t?.LabelCode ?? "",
+                ProductId = t?.ProductId,
+                ProductName = productName,
+                PrintedAt = d.CreationTime.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture),
+                OperatorName = operatorName,
+                LocationName = string.IsNullOrWhiteSpace(locationDisplayName) ? "无" : locationDisplayName!,
+                LabelCategoryName = catName,
+                LabelTemplateSummary = tplSummary,
+                LabelSizeText = labelSizeText,
+                TypeName = typeName,
+                PrintDataList = BuildPrintDataListFromRenderJson(d.RenderDataJson)
+            };
+        }).ToList();
+
+        var totalCount = total.Value;
+        var totalPages = pageSize <= 0 ? 0 : (int)Math.Ceiling(totalCount / (double)pageSize);
+
+        return new PagedResultWithPageDto<PrintLogItemDto>
+        {
+            PageIndex = pageIndex,
+            PageSize = pageSize,
+            TotalCount = totalCount,
+            TotalPages = totalPages,
+            Items = items
+        };
+    }
+
+    private static List<PrintLogDataItemDto> BuildPrintDataListFromRenderJson(string? renderDataJson)
+    {
+        var list = new List<PrintLogDataItemDto>();
+        if (string.IsNullOrWhiteSpace(renderDataJson))
+        {
+            return list;
+        }
+
+        try
+        {
+            using var doc = JsonDocument.Parse(renderDataJson);
+            var root = doc.RootElement;
+            if (root.ValueKind == JsonValueKind.Object
+                && root.TryGetProperty("elements", out var elArr)
+                && elArr.ValueKind == JsonValueKind.Array)
+            {
+                foreach (var el in elArr.EnumerateArray())
+                {
+                    if (el.ValueKind != JsonValueKind.Object)
+                    {
+                        continue;
+                    }
+
+                    var id = el.TryGetProperty("id", out var idEl) ? idEl.GetString() ?? string.Empty : string.Empty;
+                    list.Add(new PrintLogDataItemDto
+                    {
+                        ElementId = id,
+                        RenderValue = string.Empty,
+                        RenderConfigJson = el.Clone()
+                    });
+                }
+
+                if (list.Count > 0)
+                {
+                    return list;
+                }
+            }
+        }
+        catch
+        {
+            // 继续尝试强类型解析
+        }
+
+        try
+        {
+            var preview = JsonSerializer.Deserialize<LabelTemplatePreviewDto>(renderDataJson);
+            if (preview?.Elements == null || preview.Elements.Count == 0)
+            {
+                return list;
+            }
+
+            foreach (var el in preview.Elements)
+            {
+                var elJson = JsonSerializer.SerializeToElement(el);
+                list.Add(new PrintLogDataItemDto
+                {
+                    ElementId = el.Id ?? string.Empty,
+                    RenderValue = GetElementRenderValue(el),
+                    RenderConfigJson = elJson
+                });
+            }
+        }
+        catch
+        {
+            // 历史数据或非预览结构时忽略
+        }
+
+        return list;
+    }
+
+    private static string GetElementRenderValue(LabelTemplateElementDto el)
+    {
+        try
+        {
+            if (el.ConfigJson is JsonElement je)
+            {
+                if (je.ValueKind == JsonValueKind.Object)
+                {
+                    if (je.TryGetProperty("text", out var t))
+                    {
+                        return t.GetString() ?? string.Empty;
+                    }
+                    if (je.TryGetProperty("Text", out var t2))
+                    {
+                        return t2.GetString() ?? string.Empty;
+                    }
+                }
+            }
+        }
+        catch
+        {
+            // ignore
+        }
+
+        return string.Empty;
+    }
+
+    /// <summary>
+    /// 接口 11：按历史任务重打并落库，返回可本地打印的合并模板 JSON
+    /// </summary>
+    [Authorize]
+    [UnitOfWork]
+    [HttpPost]
+    public virtual async Task<UsAppLabelPrintOutputDto> ReprintAsync(UsAppLabelReprintInputVo input)
+    {
+        if (input == null)
+        {
+            throw new UserFriendlyException("入参不能为空");
+        }
+
+        var locationId = input.LocationId?.Trim();
+        if (string.IsNullOrWhiteSpace(locationId))
+        {
+            throw new UserFriendlyException("门店Id不能为空");
+        }
+
+        var histTaskId = input.TaskId?.Trim();
+        if (string.IsNullOrWhiteSpace(histTaskId))
+        {
+            throw new UserFriendlyException("taskId不能为空");
+        }
+
+        var userId = CurrentUser.Id?.ToString();
+        if (string.IsNullOrWhiteSpace(userId))
+        {
+            throw new UserFriendlyException("未登录");
+        }
+
+        var taskRows = await _dbContext.SqlSugarClient.Queryable<FlLabelPrintTaskDbEntity>()
+            .Where(t => t.Id == histTaskId && !t.IsDeleted)
+            .Take(1)
+            .ToListAsync();
+        var task = taskRows.FirstOrDefault();
+        if (task == null)
+        {
+            throw new UserFriendlyException("打印任务不存在");
+        }
+
+        if (!string.Equals(task.CreatorId?.Trim(), userId, StringComparison.Ordinal))
+        {
+            throw new UserFriendlyException("无权操作该打印任务");
+        }
+
+        if (!string.Equals(task.LocationId?.Trim(), locationId, StringComparison.OrdinalIgnoreCase))
+        {
+            throw new UserFriendlyException("该任务不属于当前门店");
+        }
+
+        var histDataRows = await _dbContext.SqlSugarClient.Queryable<FlLabelPrintDataDbEntity>()
+            .Where(d => d.TaskId == histTaskId && !d.IsDeleted)
+            .OrderBy(d => d.CopyIndex)
+            .Take(1)
+            .ToListAsync();
+        var histData = histDataRows.FirstOrDefault();
+        if (histData == null)
+        {
+            throw new UserFriendlyException("打印明细不存在");
+        }
+
+        var mergedJson = !string.IsNullOrWhiteSpace(histData.PrintInputJson)
+            ? histData.PrintInputJson!
+            : histData.RenderDataJson;
+        if (string.IsNullOrWhiteSpace(mergedJson))
+        {
+            throw new UserFriendlyException("无法重打：历史打印数据为空");
+        }
+
+        var qty = input.PrintQuantity <= 0 ? 1 : input.PrintQuantity;
+
+        var now = DateTime.Now;
+        var newTaskId = _guidGenerator.Create().ToString();
+        var newTask = new FlLabelPrintTaskDbEntity
+        {
+            Id = newTaskId,
+            IsDeleted = false,
+            CreationTime = now,
+            CreatorId = userId,
+            ConcurrencyStamp = _guidGenerator.Create().ToString("N"),
+            LocationId = locationId,
+            LabelCode = task.LabelCode,
+            ProductId = task.ProductId,
+            LabelTypeId = task.LabelTypeId,
+            TemplateCode = task.TemplateCode,
+            PrintQuantity = qty,
+            BaseTime = task.BaseTime,
+            PrinterId = !string.IsNullOrWhiteSpace(input.PrinterId) ? input.PrinterId.Trim() : task.PrinterId,
+            PrinterMac = !string.IsNullOrWhiteSpace(input.PrinterMac) ? input.PrinterMac.Trim() : task.PrinterMac,
+            PrinterAddress = !string.IsNullOrWhiteSpace(input.PrinterAddress) ? input.PrinterAddress.Trim() : task.PrinterAddress
+        };
+        await _dbContext.SqlSugarClient.Insertable(newTask).ExecuteCommandAsync();
+
+        var dataRows = Enumerable.Range(1, qty).Select(i => new FlLabelPrintDataDbEntity
+        {
+            Id = _guidGenerator.Create().ToString(),
+            IsDeleted = false,
+            CreationTime = now,
+            CreatorId = userId,
+            ConcurrencyStamp = _guidGenerator.Create().ToString("N"),
+            TaskId = newTaskId,
+            CopyIndex = i,
+            PrintInputJson = histData.PrintInputJson,
+            RenderDataJson = histData.RenderDataJson
+        }).ToList();
+
+        await _dbContext.SqlSugarClient.Insertable(dataRows).ExecuteCommandAsync();
+
+        return new UsAppLabelPrintOutputDto
+        {
+            TaskId = newTaskId,
+            PrintQuantity = qty,
+            BatchId = newTaskId,
+            TaskIds = new List<string> { newTaskId },
+            MergedTemplateJson = mergedJson
         };
     }
  
@@ -5,7 +5,7 @@
       <meta charset="UTF-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <title>Food Labeling Management Platform</title>
-      <script type="module" crossorigin src="/assets/index-BaZIqfDW.js"></script>
+      <script type="module" crossorigin src="/assets/index-rOdDFGrB.js"></script>
       <link rel="stylesheet" crossorigin href="/assets/index-Dc47WtG1.css">
     </head>
  
@@ -17,7 +17,7 @@ import { getLabelTemplate, updateLabelTemplate } from &#39;../../services/labelTempl
 import { getProducts } from '../../services/productService';
 import { getLabelTypes } from '../../services/labelTypeService';
 import { skipCountForPage } from '../../lib/paginationQuery';
-import type { ElementType, LabelElement, LabelTemplateDto, LabelType, Unit } from '../../types/labelTemplate';
+import type { LabelElement, LabelTemplateDto, LabelType, Unit } from '../../types/labelTemplate';
 import {
   appliedLocationToEditor,
   dataEntryColumnLabel,
@@ -44,23 +44,33 @@ function newRowId(): string {
   }
 }
  
+/** 模板录入表：图片与二维码（及名称含 qrcode 的控件）用上传组件，预览区固定 100×100 */
+const DATA_ENTRY_IMAGE_BOX =
+  'h-[100px] w-[100px] min-h-[100px] min-w-[100px] max-h-[100px] max-w-[100px] shrink-0 aspect-auto';
+
+function dataEntryUsesImageUpload(element: LabelElement): boolean {
+  if (element.type === 'IMAGE' || element.type === 'QRCODE') return true;
+  const n = (element.elementName ?? '').trim().toLowerCase();
+  return n.includes('qrcode');
+}
+
 function DataEntryValueCell({
-  elementType,
+  element,
   value,
   onValueChange,
 }: {
-  elementType: ElementType;
+  element: LabelElement;
   value: string;
   onValueChange: (next: string) => void;
 }) {
-  if (elementType === 'IMAGE') {
+  if (dataEntryUsesImageUpload(element)) {
     return (
       <ImageUrlUpload
         value={value}
         onChange={onValueChange}
         uploadSubDir="label-template-data"
         oneImageOnly
-        boxClassName="max-w-[160px]"
+        boxClassName={DATA_ENTRY_IMAGE_BOX}
         hint="Upload stores full URL/path for save."
       />
     );
@@ -381,7 +391,7 @@ export function LabelTemplateDataEntryView({
                   {printFields.map((f) => (
                     <TableCell key={f.id} className="align-top py-2">
                       <DataEntryValueCell
-                        elementType={f.type}
+                        element={f}
                         value={row.fieldValues[f.id] ?? ''}
                         onValueChange={(v) => setFieldValue(row.id, f.id, v)}
                       />
@@ -238,7 +238,7 @@ export function ProductsView() {
             list = list.filter((p) => allowed.has(p.id));
           }
           if (categoryFilter !== "all") {
-            list = list.filter((p) => (p.categoryName ?? "").trim() === categoryFilter);
+            list = list.filter((p) => (p.categoryId ?? "").trim() === categoryFilter);
           }
           const t = list.length;
           setTotal(t);
@@ -350,11 +350,11 @@ export function ProductsView() {
     [locations],
   );
  
-  const categoryNameOptions = useMemo(
+  const categorySelectOptions = useMemo(
     () =>
       productCategoriesCatalog
         .map((c) => ({
-          value: (c.categoryName ?? c.categoryCode ?? c.id ?? "").trim(),
+          value: (c.id ?? "").trim(),
           label: toDisplay(c.categoryName ?? c.categoryCode ?? c.id),
         }))
         .filter((o) => o.value),
@@ -434,7 +434,7 @@ export function ProductsView() {
             </SelectTrigger>
             <SelectContent>
               <SelectItem value="all">All Categories</SelectItem>
-              {categoryNameOptions.map((o) => (
+              {categorySelectOptions.map((o) => (
                 <SelectItem key={o.value} value={o.value}>
                   {o.label}
                 </SelectItem>
@@ -861,7 +861,7 @@ export function ProductsView() {
         }}
         editing={editingProduct}
         locationOptions={locationOptions}
-        categoryOptions={categoryNameOptions}
+        categoryOptions={categorySelectOptions}
         locationMap={locationMap}
         onSaved={() => {
           refresh();
@@ -925,7 +925,7 @@ function ProductFormDialog({
   const [submitting, setSubmitting] = useState(false);
   const [productCode, setProductCode] = useState("");
   const [productName, setProductName] = useState("");
-  const [categoryName, setCategoryName] = useState("");
+  const [categoryId, setCategoryId] = useState("");
   const [productImageUrl, setProductImageUrl] = useState("");
   const [state, setState] = useState(true);
   const [locationId, setLocationId] = useState("");
@@ -935,7 +935,7 @@ function ProductFormDialog({
     if (editing) {
       setProductCode(editing.productCode ?? "");
       setProductName(editing.productName ?? "");
-      setCategoryName((editing.categoryName ?? "").trim());
+      setCategoryId((editing.categoryId ?? "").trim());
       setProductImageUrl(editing.productImageUrl ?? "");
       setState(editing.state !== false);
       const lids = locationMap.get(editing.id) ?? [];
@@ -943,7 +943,7 @@ function ProductFormDialog({
     } else {
       setProductCode("");
       setProductName("");
-      setCategoryName("");
+      setCategoryId("");
       setProductImageUrl("");
       setState(true);
       setLocationId("");
@@ -963,7 +963,7 @@ function ProductFormDialog({
     const body: ProductCreateInput = {
       productCode: productCode.trim(),
       productName: productName.trim(),
-      categoryName: categoryName.trim() || null,
+      categoryId: categoryId.trim() || null,
       productImageUrl: productImageUrl.trim() || null,
       state,
     };
@@ -1021,10 +1021,10 @@ function ProductFormDialog({
             </div>
           </div>
           <div className="space-y-2">
-            <Label>Category name</Label>
+            <Label>Category</Label>
             <SearchableSelect
-              value={categoryName}
-              onValueChange={setCategoryName}
+              value={categoryId}
+              onValueChange={setCategoryId}
               options={categoryOptions}
               placeholder="Select category (optional)"
               searchPlaceholder="Search category…"
@@ -27,6 +27,7 @@ function normalizeProductDto(raw: unknown): ProductDto {
     id,
     productCode: (r?.productCode ?? r?.ProductCode) as string | null | undefined,
     productName: (r?.productName ?? r?.ProductName) as string | null | undefined,
+    categoryId: (r?.categoryId ?? r?.CategoryId) as string | null | undefined,
     categoryName: (r?.categoryName ?? r?.CategoryName) as string | null | undefined,
     productImageUrl: (r?.productImageUrl ?? r?.ProductImageUrl) as string | null | undefined,
     state:
@@ -73,7 +74,7 @@ export async function createProduct(input: ProductCreateInput): Promise&lt;ProductD
     body: {
       productCode: input.productCode,
       productName: input.productName,
-      categoryName: input.categoryName ?? null,
+      categoryId: input.categoryId?.trim() ? input.categoryId.trim() : null,
       productImageUrl: input.productImageUrl ?? null,
       state: input.state ?? true,
     },
@@ -88,7 +89,7 @@ export async function updateProduct(id: string, input: ProductUpdateInput): Prom
     body: {
       productCode: input.productCode,
       productName: input.productName,
-      categoryName: input.categoryName ?? null,
+      categoryId: input.categoryId?.trim() ? input.categoryId.trim() : null,
       productImageUrl: input.productImageUrl ?? null,
       state: input.state ?? true,
     },
@@ -2,6 +2,7 @@ export type ProductDto = {
   id: string;
   productCode?: string | null;
   productName?: string | null;
+  categoryId?: string | null;
   categoryName?: string | null;
   productImageUrl?: string | null;
   state?: boolean | null;
@@ -24,7 +25,7 @@ export type ProductGetListInput = {
 export type ProductCreateInput = {
   productCode: string;
   productName: string;
-  categoryName?: string | null;
+  categoryId?: string | null;
   productImageUrl?: string | null;
   state?: boolean;
 };