Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test

src/modules/overseas-warehouse/api/mojiaSkuSync.ts

@@ -1,10 +1,14 @@
 import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 
 export type MojiaSkuSyncStatus = 'PENDING' | 'SUCCESS' | 'FAILED'
+export type MojiaMeasurementKind = 'BOX_LABEL' | 'SKU'
 
 export interface MojiaSkuSyncRecord {
   id: string
-  skuCode: string
+  measurementKind: MojiaMeasurementKind
+  boxCode: string
+  inboundCode?: string | null
+  skuCode?: string | null
   lengthCm: number
   widthCm: number
   heightCm: number
@@ -13,7 +17,7 @@ export interface MojiaSkuSyncRecord {
   imageUrl?: string | null
   measuredAt?: string | null
   receivedAt?: string | null
-  syncStatus: MojiaSkuSyncStatus
+  syncStatus?: MojiaSkuSyncStatus | null
   syncFailureCode?: string | null
   syncFailureReason?: string | null
   lingxingSkuId?: string | null
@@ -32,7 +36,8 @@ export interface MojiaSkuSyncPage {
 export interface MojiaSkuSyncQuery {
   page: number
   size: number
-  skuCode?: string
+  code?: string
+  measurementKind?: MojiaMeasurementKind
   syncStatus?: MojiaSkuSyncStatus
 }
 

src/modules/overseas-warehouse/lastMilePresentation.test.ts

@@ -117,7 +117,7 @@ describe('last-mile order presentation adapter', () => {
     ['PENDING_REVIEW', '待审核'],
     ['WAIT_PDA_RECEIVING', '入库测量中'],
     ['WAIT_CUSTOMER_CONFIRMATION', '待客户确认实测'],
-    ['INBOUND_COMPLETED', '入库完成'],
+    ['INBOUND_COMPLETED', '全部入库'],
   ])('maps warehouse transfer status %s to %s', (status, expected) => {
     expect(lastMileStatusLabel(status)).toBe(expected)
   })

src/modules/overseas-warehouse/pages/InboundOrderDetailView.vue

@@ -88,7 +88,7 @@ onMounted(load)
   <section class="detail-section pallet-section" aria-labelledby="inbound-pallet-heading"><div class="section-heading"><div><h2 id="inbound-pallet-heading">入库单托盘明细</h2><p class="pallet-note">PDA 合托后，参与合托的入库单会分别展示同一托盘及本单对应箱数；A0 为系统共享溢出位。</p></div><span class="section-count">{{ palletRows.length }} 条</span></div><div class="detail-table-wrap"><DataTable :data="palletRows" :columns="palletColumns" column-settings-mode="hide" row-key="id" empty-text="暂无托盘明细"><template #actions="{ row }"><el-button class="density-action" size="small" :disabled="!(row as typeof palletRows[number]).palletNo || !(row as typeof palletRows[number]).palletVersion" @click="openMove(row as typeof palletRows[number])">移库</el-button></template></DataTable></div></section>
   <section class="detail-section appointment-section" aria-labelledby="inbound-appointment-heading"><div class="compact-section-heading"><h2 id="inbound-appointment-heading">预约与排车</h2></div><dl class="detail-fields appointment-fields density-fields"><div v-for="label in appointmentFields" :key="label" :class="{ 'is-wide': label === '备注' }"><dt>{{ label }}</dt><dd>{{ fieldValues[label] }}</dd></div></dl></section>
   <section class="detail-section fee-section" aria-labelledby="inbound-fees-heading"><div class="compact-section-heading"><h2 id="inbound-fees-heading">应收费用明细</h2><span>费用结果以服务端为准</span></div><div class="detail-table-wrap"><DataTable :data="[]" :columns="feeColumns" column-settings-mode="hide" empty-text="当前入库计划详情接口未提供应收费用" /></div><footer class="fee-total"><span>应收费用合计（USD）</span><strong>—</strong></footer></section></template>
-</OverseasDetailShell><AppDialog v-model="moveOpen" class="admin-density-dialog" title="托盘移库" width="min(560px, calc(100vw - 28px))" confirm-text="提交移库" :confirm-loading="moveSaving" :confirm-disabled="!targetLocationCode" @confirm="submitMove"><el-form class="density-form" label-position="top"><el-form-item label="托盘号"><el-input :model-value="moveRow?.palletNo" readonly /></el-form-item><el-form-item label="目标库位" required><el-select v-model="targetLocationCode" filterable placeholder="请选择普通库位或 A0"><el-option v-for="item in availableLocations" :key="item.id" :value="item.locationCode" :label="`${item.locationCode}${item.sharedOverflow || item.locationType === 'SHARED_OVERFLOW' ? ' · A0共享溢出位' : ''}`" /></el-select></el-form-item><el-form-item label="操作原因" required><el-input v-model="moveReason" maxlength="200" /></el-form-item></el-form></AppDialog></template>
+</OverseasDetailShell><AppDialog v-model="moveOpen" class="admin-density-dialog" title="托盘移库" width="min(560px, calc(100vw - 28px))" confirm-text="提交移库" :confirm-loading="moveSaving" :confirm-disabled="!targetLocationCode" @confirm="submitMove"><el-form class="density-form" label-position="top"><el-form-item label="托盘号"><el-input :model-value="moveRow?.palletNo" readonly /></el-form-item><el-form-item label="目标库位" required><el-select v-model="targetLocationCode" filterable placeholder="请选择普通库位或 A0"><el-option v-for="item in availableLocations" :key="item.id" :value="item.locationCode" :label="`${item.locationCode}${item.sharedOverflow || item.locationType === 'SHARED_OVERFLOW' ? ' · A0共享溢出位' : ''}`" /></el-select></el-form-item><el-form-item label="操作原因" required><el-input v-model="moveReason" maxlength="200" placeholder="请输入移库原因" /></el-form-item></el-form></AppDialog></template>
 
 <style scoped>
 .detail-section { min-width: 0; padding: 0; border: 0; background: #fff; }

src/modules/overseas-warehouse/pages/LastMileOrdersView.vue

@@ -798,14 +798,14 @@ async function reviewReturn(source: object) {
   const returnNo = row.sourceOrderNo
   if (!returnNo || !row.customerId) return
   try {
-    await ElMessageBox.confirm('审核通过后，仓库才可以签收这张退货预报。', '退货预报审核', { confirmButtonText: '审核通过', cancelButtonText: '驳回', distinguishCancelAndClose: true })
+    await ElMessageBox.confirm('审核通过后，仓库才可以签收这张退货预报。', '退货预报审核', { customClass: 'admin-density-confirm', confirmButtonText: '审核通过', cancelButtonText: '驳回', distinguishCancelAndClose: true })
     await reviewReturnOrder(returnNo, row.customerId, 'APPROVE')
     ElMessage.success('退货预报已审核通过')
     await load()
   } catch (error) {
     if (error === 'cancel') {
       try {
-        const { value } = await ElMessageBox.prompt('请填写驳回原因', '驳回退货预报', { inputType: 'textarea', inputValidator: (input) => Boolean(input?.trim()) || '请填写驳回原因', confirmButtonText: '确认驳回', cancelButtonText: '取消' })
+        const { value } = await ElMessageBox.prompt('请填写驳回原因', '驳回退货预报', { customClass: 'admin-density-confirm', inputType: 'textarea', inputValidator: (input) => Boolean(input?.trim()) || '请填写驳回原因', confirmButtonText: '确认驳回', cancelButtonText: '取消' })
         await reviewReturnOrder(returnNo, row.customerId, 'REJECT', value)
         ElMessage.success('退货预报已驳回')
         await load()
@@ -817,14 +817,14 @@ async function reviewDirectRelabel(source: object) {
   const row = source as LastMileOrderListItem
   if (!row.id || !row.customerId) return
   try {
-    await ElMessageBox.confirm('审核通过后，贴标单将进入海外仓换标作业。', '贴标单审核', { confirmButtonText: '审核通过', cancelButtonText: '驳回', distinguishCancelAndClose: true })
+    await ElMessageBox.confirm('审核通过后，贴标单将进入海外仓换标作业。', '贴标单审核', { customClass: 'admin-density-confirm', confirmButtonText: '审核通过', cancelButtonText: '驳回', distinguishCancelAndClose: true })
     await reviewDirectRelabelOrder(row.id, row.customerId, 'APPROVE')
     ElMessage.success('贴标单已审核通过')
     await load()
   } catch (error) {
     if (error === 'cancel') {
       try {
-        const { value } = await ElMessageBox.prompt('请填写驳回原因，客户可在贴标单详情查看并修改后重新提交。', '驳回贴标单', { inputType: 'textarea', inputValidator: (input) => Boolean(input?.trim()) || '请填写驳回原因', confirmButtonText: '确认驳回', cancelButtonText: '取消' })
+        const { value } = await ElMessageBox.prompt('请填写驳回原因，客户可在贴标单详情查看并修改后重新提交。', '驳回贴标单', { customClass: 'admin-density-confirm', inputType: 'textarea', inputValidator: (input) => Boolean(input?.trim()) || '请填写驳回原因', confirmButtonText: '确认驳回', cancelButtonText: '取消' })
         await reviewDirectRelabelOrder(row.id, row.customerId, 'REJECT', value)
         ElMessage.success('贴标单已驳回')
         await load()
@@ -903,7 +903,7 @@ async function confirmRelabel(row: { relabelOrderNo?: string }) {
   const relabelNo = row.relabelOrderNo
   if (!relabelNo) return
   try {
-    await ElMessageBox.confirm('确认仓库上传的换标结果无误并继续后续流程吗？', '换标完成确认', { confirmButtonText: '确认并继续', cancelButtonText: '取消' })
+    await ElMessageBox.confirm('确认仓库上传的换标结果无误并继续后续流程吗？', '换标完成确认', { customClass: 'admin-density-confirm', confirmButtonText: '确认并继续', cancelButtonText: '取消' })
     await confirmRelabelCompletion(relabelNo)
     ElMessage.success('已确认换标完成')
     await load()
@@ -914,7 +914,7 @@ async function reworkRelabel(row: { relabelOrderNo?: string }) {
   if (!relabelNo) return
   try {
     const task = await getRelabelReviewTask(relabelNo)
-    const { value } = await ElMessageBox.prompt('填写退回原因，仓库将重新执行换标并上传照片。', '重新换标', { inputType: 'textarea', inputValidator: (value) => Boolean(value?.trim()) && value.trim().length <= 1000 || '请填写 1 至 1000 字原因', confirmButtonText: '确认重新换标', cancelButtonText: '取消' })
+    const { value } = await ElMessageBox.prompt('填写退回原因，仓库将重新执行换标并上传照片。', '重新换标', { customClass: 'admin-density-confirm', inputType: 'textarea', inputValidator: (value) => Boolean(value?.trim()) && value.trim().length <= 1000 || '请填写 1 至 1000 字原因', confirmButtonText: '确认重新换标', cancelButtonText: '取消' })
     await returnRelabelForRework(relabelNo, task.version, value.trim(), crypto.randomUUID())
     ElMessage.success('已退回重新换标')
     await load()

src/modules/overseas-warehouse/pages/MojiaSkuSyncView.vue

@@ -11,7 +11,7 @@ import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { getApiErrorMessage } from '@/shared/api/http'
 import {
   getMojiaSkuSyncConfig, listMojiaSkuSync, retryMojiaSkuSync, submitLingxingVerificationCode, testLingxingConnection, updateMojiaSkuSync,
-  type LingxingConnectionTestResult, type MojiaSkuSyncRecord, type MojiaSkuSyncStatus,
+  type LingxingConnectionTestResult, type MojiaSkuSyncRecord, type MojiaSkuSyncStatus, type MojiaMeasurementKind,
 } from '../api/mojiaSkuSync'
 
 const permission = {
@@ -37,14 +37,16 @@ const submittingVerification = ref(false)
 const pendingVerificationAction = ref<{ type: 'test' } | { type: 'retry', id: string, revision: number } | null>(null)
 const page = ref(1)
 const size = ref(20)
-const form = reactive({ skuCode: '', syncStatus: '' as '' | MojiaSkuSyncStatus })
+const form = reactive({ code: '', measurementKind: '' as '' | MojiaMeasurementKind, syncStatus: '' as '' | MojiaSkuSyncStatus })
 const editOpen = ref(false)
 const editing = ref<MojiaSkuSyncRecord | null>(null)
 const editForm = reactive({ skuCode: '', lengthCm: 0, widthCm: 0, heightCm: 0, weightKg: 0, revision: 0 })
 
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 190, fixed: 'left', slotName: 'actions' },
-  { key: 'skuCode', prop: 'skuCode', label: 'SKU', minWidth: 180, showOverflowTooltip: true },
+  { key: 'sourceCode', label: '上传标识', minWidth: 180, showOverflowTooltip: true, slotName: 'sourceCode' },
+  { key: 'kind', label: '类型', width: 110, slotName: 'kind' },
+  { key: 'inboundCode', prop: 'inboundCode', label: '命中入仓码', minWidth: 150, showOverflowTooltip: true },
   { key: 'image', label: '测量图片', width: 110, slotName: 'image' },
   { key: 'dimensions', label: '长 × 宽 × 高（cm）', width: 170, slotName: 'dimensions' },
   { key: 'weightKg', prop: 'weightKg', label: '重量（kg）', width: 110 },
@@ -65,11 +67,11 @@ async function load() {
   loading.value = true
   error.value = ''
   try {
-    const result = await listMojiaSkuSync({ page: page.value, size: size.value, skuCode: form.skuCode || undefined, syncStatus: form.syncStatus || undefined })
+    const result = await listMojiaSkuSync({ page: page.value, size: size.value, code: form.code || undefined, measurementKind: form.measurementKind || undefined, syncStatus: form.syncStatus || undefined })
     rows.value = result.records
     total.value = result.total
   } catch (cause) {
-    error.value = getApiErrorMessage(cause, 'SKU同步记录加载失败')
+    error.value = getApiErrorMessage(cause, '称重机器上传记录加载失败')
   } finally { loading.value = false }
 }
 
@@ -82,14 +84,22 @@ async function loadConfig() {
 }
 
 function search() { page.value = 1; void load() }
-function reset() { form.skuCode = ''; form.syncStatus = ''; search() }
+function reset() { form.code = ''; form.measurementKind = ''; form.syncStatus = ''; search() }
 function formatTime(value?: string | null) { return value ? value.replace('T', ' ').slice(0, 19) : '—' }
 function asRecord(row: unknown) { return row as MojiaSkuSyncRecord }
-function syncLabel(row: unknown) { return statusLabel[asRecord(row).syncStatus] }
-function syncTagType(row: unknown) { return statusType[asRecord(row).syncStatus] }
+function syncLabel(row: unknown) {
+  const value = asRecord(row)
+  if (value.measurementKind === 'BOX_LABEL') return value.inboundCode ? '已命中入仓码' : '未命中'
+  return value.syncStatus ? statusLabel[value.syncStatus] : '—'
+}
+function syncTagType(row: unknown) {
+  const value = asRecord(row)
+  if (value.measurementKind === 'BOX_LABEL') return value.inboundCode ? 'success' : 'warning'
+  return value.syncStatus ? statusType[value.syncStatus] : 'info'
+}
 
 async function testConnection() {
-  const skuCode = form.skuCode.trim()
+  const skuCode = form.code.trim()
   if (!skuCode) { ElMessage.warning('请先输入要查询的 SKU'); return }
   testingConnection.value = true
   try {
@@ -129,7 +139,7 @@ async function submitVerification() {
 
 function openEdit(row: MojiaSkuSyncRecord) {
   editing.value = row
-  Object.assign(editForm, { skuCode: row.skuCode, lengthCm: row.lengthCm, widthCm: row.widthCm, heightCm: row.heightCm, weightKg: row.weightKg, revision: row.revision })
+  Object.assign(editForm, { skuCode: row.skuCode || '', lengthCm: row.lengthCm, widthCm: row.widthCm, heightCm: row.heightCm, weightKg: row.weightKg, revision: row.revision })
   editOpen.value = true
 }
 
@@ -177,7 +187,7 @@ onMounted(() => { void Promise.all([loadConfig(), load()]) })
 
 <template>
   <AdminPage class="admin-density mojia-sku-sync-page">
-    <ListPageLayout aria-label="SKU同步">
+    <ListPageLayout aria-label="称重机器">
       <section class="surface-panel table-panel" :aria-busy="loading">
         <el-alert v-if="error" type="error" :title="error" show-icon :closable="false" />
         <el-alert
@@ -187,10 +197,11 @@ onMounted(() => { void Promise.all([loadConfig(), load()]) })
           show-icon
           :closable="false"
         />
-        <DataTable :data="rows" :columns="columns" :loading="loading" row-key="id" border stripe empty-text="暂无墨家 SKU 测量记录">
+        <DataTable :data="rows" :columns="columns" :loading="loading" row-key="id" border stripe empty-text="暂无墨家机器上传记录">
           <template #toolbar-start>
             <div class="sync-filters">
-              <el-input v-model.trim="form.skuCode" clearable placeholder="搜索 SKU" @keyup.enter="search" />
+              <el-input v-model.trim="form.code" clearable placeholder="搜索箱码或 SKU" @keyup.enter="search" />
+              <el-select v-model="form.measurementKind" clearable placeholder="上传类型" style="width: 130px"><el-option label="箱码" value="BOX_LABEL" /><el-option label="SKU" value="SKU" /></el-select>
               <el-select v-model="form.syncStatus" clearable placeholder="同步状态" style="width: 140px">
                 <el-option v-for="(label, value) in statusLabel" :key="value" :label="label" :value="value" />
               </el-select>
@@ -203,9 +214,11 @@ onMounted(() => { void Promise.all([loadConfig(), load()]) })
           <template #actions="{ row }">
             <div class="density-actions">
               <el-button v-if="canEdit" class="density-action" @click="openEdit(asRecord(row))"><Edit3 :size="15" />编辑</el-button>
-              <el-button v-if="canRetry && row.syncStatus !== 'SUCCESS'" class="density-action" data-tone="primary" :loading="actionId === row.id" @click="retry(asRecord(row))"><RotateCw :size="15" />人工推送</el-button>
+              <el-button v-if="canRetry && row.measurementKind === 'SKU' && row.syncStatus !== 'SUCCESS'" class="density-action" data-tone="primary" :loading="actionId === row.id" @click="retry(asRecord(row))"><RotateCw :size="15" />人工推送</el-button>
             </div>
           </template>
+          <template #sourceCode="{ row }">{{ row.measurementKind === 'SKU' ? row.skuCode : row.boxCode }}</template>
+          <template #kind="{ row }">{{ row.measurementKind === 'SKU' ? 'SKU测量' : '箱码测量' }}</template>
           <template #image="{ row }"><el-image v-if="row.imageUrl" :src="row.imageUrl" fit="cover" class="sync-image" preview-teleported /><span v-else>—</span></template>
           <template #dimensions="{ row }">{{ row.lengthCm }} × {{ row.widthCm }} × {{ row.heightCm }}</template>
           <template #syncStatus="{ row }"><el-tag size="small" :type="syncTagType(row)">{{ syncLabel(row) }}</el-tag></template>
@@ -218,12 +231,12 @@ onMounted(() => { void Promise.all([loadConfig(), load()]) })
     </ListPageLayout>
     <AppDialog v-model="editOpen" class="admin-density-dialog" title="编辑 SKU 测量修正版" width="min(620px, calc(100vw - 28px))" confirm-text="保存并重新同步" :confirm-loading="Boolean(actionId)" @confirm="saveEdit">
       <el-form label-position="top" class="sync-edit-form">
-        <el-form-item label="SKU"><el-input v-model.trim="editForm.skuCode" /></el-form-item>
+        <el-form-item label="SKU"><el-input v-model.trim="editForm.skuCode" placeholder="请输入 SKU" /></el-form-item>
         <div class="sync-edit-grid">
-          <el-form-item label="长（cm）"><el-input-number v-model="editForm.lengthCm" :min="0.001" :controls="false" /></el-form-item>
-          <el-form-item label="宽（cm）"><el-input-number v-model="editForm.widthCm" :min="0.001" :controls="false" /></el-form-item>
-          <el-form-item label="高（cm）"><el-input-number v-model="editForm.heightCm" :min="0.001" :controls="false" /></el-form-item>
-          <el-form-item label="重量（kg）"><el-input-number v-model="editForm.weightKg" :min="0.001" :controls="false" /></el-form-item>
+          <el-form-item label="长（cm）"><el-input-number v-model="editForm.lengthCm" :min="0.001" :controls="false" placeholder="请输入长度" /></el-form-item>
+          <el-form-item label="宽（cm）"><el-input-number v-model="editForm.widthCm" :min="0.001" :controls="false" placeholder="请输入宽度" /></el-form-item>
+          <el-form-item label="高（cm）"><el-input-number v-model="editForm.heightCm" :min="0.001" :controls="false" placeholder="请输入高度" /></el-form-item>
+          <el-form-item label="重量（kg）"><el-input-number v-model="editForm.weightKg" :min="0.001" :controls="false" placeholder="请输入重量" /></el-form-item>
         </div>
         <el-alert type="info" :closable="false" title="原始墨家测量记录不可变，本次保存会生成新的人工修正版并进入同步队列。" />
       </el-form>
@@ -241,7 +254,7 @@ onMounted(() => { void Promise.all([loadConfig(), load()]) })
     </AppDialog>
     <AppDialog v-model="verificationOpen" class="admin-density-dialog" title="领星二次验证" width="min(460px, calc(100vw - 28px))" confirm-text="提交验证码" :confirm-loading="submittingVerification" @confirm="submitVerification">
       <el-alert type="warning" :closable="false" title="领星要求二次验证，请在验证码发送到手机、邮箱或验证器后输入。" />
-      <el-form label-position="top" class="verification-form"><el-form-item label="验证码"><el-input v-model.trim="verificationCode" maxlength="16" autocomplete="one-time-code" @keyup.enter="submitVerification" /></el-form-item></el-form>
+      <el-form label-position="top" class="verification-form"><el-form-item label="验证码"><el-input v-model.trim="verificationCode" maxlength="16" autocomplete="one-time-code" placeholder="请输入验证码" @keyup.enter="submitVerification" /></el-form-item></el-form>
     </AppDialog>
   </AdminPage>
 </template>

src/modules/overseas-warehouse/pages/RelabelOrdersView.test.ts

@@ -104,7 +104,7 @@ describe('RelabelOrdersView', () => {
     expect(firstKey).toBeTruthy()
     expect(retryKey).toBe(firstKey)
     expect(createRelabelOrder).toHaveBeenLastCalledWith('10001', expect.objectContaining({
-      customerOrderNo: 'CO-1', overseasWarehouseId: 'WH-1', idempotencyKey: firstKey,
+      customerOrderNo: 'CO-1', operationWarehouseId: 'WH-1', chargeAmount: 20, contactName: '张三', contactPhone: '13800000000', labelDeadline: '2026-08-30T10:00:00', remark: undefined, idempotencyKey: firstKey,
       items: [expect.objectContaining({ skuCode: 'SKU-1', newSkuCode: 'SKU-2', labelRequirement: '换SKU标' })],
     }))
   })

src/modules/overseas-warehouse/routes.test.ts

@@ -26,6 +26,8 @@ describe('overseas warehouse routes', () => {
       ['overseas-warehouse/relabel-orders/:orderId', permission.relabelOrderList],
       ['overseas-warehouse/pallets', permission.palletList],
       ['overseas-warehouse/pallets/:palletId', permission.palletList],
+      ['overseas-warehouse/locations', permission.locationList],
+      ['general/mojia-sku-sync', permission.mojiaSkuSyncList],
     ])
   })
 

src/modules/overseas-warehouse/routes.ts

@@ -140,6 +140,6 @@ export const overseasWarehouseRoutes = [
     path: 'general/mojia-sku-sync',
     name: 'mojia-sku-sync',
     component: () => import('./pages/MojiaSkuSyncView.vue'),
-    meta: { title: 'SKU同步', description: '查看墨家测量数据并同步领星 SKU 尺寸重量', permission: permission.mojiaSkuSyncList },
+    meta: { title: '称重机器', description: '查看墨家机器上传的箱码和 SKU 测量记录', permission: permission.mojiaSkuSyncList },
   },
 ] satisfies RouteRecordRaw[]