html/admin-web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/test' into dev

Browse Source 
# Conflicts:
#	AGENTS.md
#	src/modules/container-loading/pages/GlobalSmartLoadingView.vue
#	src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue
This commit is contained in:
ouyangxq
2026-09-04 16:21:32 +08:00
parent 7d29f3d7ea 6a88d21f10
commit 871d0a56b9
26 changed files with 278 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/inbounds/components/InboundTaskList.test.ts
+9
View File
@@ -165,6 +165,15 @@ describe('InboundTaskList measurement scope', () => {
expect(source).toContain("if (!value) return '—'")
})
it('shows the expected arrival as a date in both measurement and review lists', () => {
const source = readFileSync(resolve('src/modules/inbounds/components/InboundTaskList.vue'), 'utf8')
expect(source).toContain("date.toLocaleDateString('zh-CN')")
expect(source).toContain('{{ formatDateOnly((row as InboundOrderSummary).expectedArrivalAt) }}')
expect(source).toContain('{{ formatDate((row as InboundOrderSummary).measureCompletedAt) }}')
expect(source).not.toContain('{{ formatDate((row as InboundOrderSummary).expectedArrivalAt) }}')
})
it('renders first-leg business types with the shared Chinese labels', () => {
const source = readFileSync(resolve('src/modules/inbounds/components/InboundTaskList.vue'), 'utf8')
src/modules/inbounds/components/InboundTaskList.vue
+7 -1
View File
@@ -119,6 +119,12 @@ function formatDate(value: string | null | undefined) {
return Number.isNaN(date.getTime()) ? value : date.toLocaleString('zh-CN', { hour12: false })
}
function formatDateOnly(value: string | null | undefined) {
if (!value) return '—'
const date = new Date(value)
return Number.isNaN(date.getTime()) ? value : date.toLocaleDateString('zh-CN')
}
function dateParam(value: string | undefined, end = false) {
return value ? `${value}T${end ? '23:59:59' : '00:00:00'}` : undefined
}
@@ -381,7 +387,7 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
<template #inboundCode="{ row }"><div class="inbound-code-cell"><strong>{{ text((row as InboundOrderSummary).inboundCode) }}</strong></div></template>
<template #processStatus="{ row }"><el-tag effect="light">{{ inboundStatusLabel((row as InboundOrderSummary).processStatus, inboundProcessStatusLabels) }}</el-tag></template>
<template #measureReviewStatus="{ row }">{{ inboundStatusLabel((row as InboundOrderSummary).measureReviewStatus, inboundReviewStatusLabels) }}</template>
<template #expectedArrivalAt="{ row }">{{ formatDate((row as InboundOrderSummary).expectedArrivalAt) }}</template>
<template #expectedArrivalAt="{ row }">{{ formatDateOnly((row as InboundOrderSummary).expectedArrivalAt) }}</template>
<template #customerName="{ row }"><LineClampText :content="(row as InboundOrderSummary).customerName" /></template>
<template #warehouseName="{ row }">{{ text((row as InboundOrderSummary).warehouseName) }}</template>
<template #deliveryWarehouseName="{ row }">{{ text((row as InboundOrderSummary).deliveryWarehouseName) }}</template>
src/modules/inbounds/measurement/InboundMeasurementDialog.test.ts
+1
View File
@@ -14,6 +14,7 @@ describe('InboundMeasurementDialog', () => {
expect(source).toContain('class="inbound-measurement-workspace-dialog"')
expect(source).toContain('width="min(1240px, calc(100vw - 32px))"')
expect(source).toContain('height: 92vh')
expect(source).toContain('padding: 10px 20px')
expect(source).toContain('<WeightOcrPanel')
expect(source).toContain('<InboundMeasurementPanel')
expect(source).toContain('class="measurement-dialog-weight"')
src/modules/inbounds/measurement/InboundMeasurementDialog.vue
+1 -1
View File
@@ -130,7 +130,7 @@ function handleSubmitted() {
<style>
.inbound-measurement-workspace-dialog.el-dialog { display: flex; max-width: calc(100vw - 32px); height: 92vh; max-height: 92vh; margin-bottom: 0; flex-direction: column; overflow: hidden; }
.inbound-measurement-workspace-dialog .el-dialog__header { flex: 0 0 auto; margin: 0; padding: 18px 24px; border-bottom: 1px solid var(--cc-border); }
.inbound-measurement-workspace-dialog .el-dialog__header { flex: 0 0 auto; margin: 0; padding: 10px 20px; border-bottom: 1px solid var(--cc-border); }
.inbound-measurement-workspace-dialog .el-dialog__body { min-height: 0; flex: 1 1 auto; overflow-y: auto; padding: 20px 24px; }
.inbound-measurement-workspace-dialog .el-dialog__footer { flex: 0 0 auto; padding: 14px 24px; border-top: 1px solid var(--cc-border); }
.inbound-measurement-workspace-dialog .measurement-panel { border: 0; border-radius: 0; box-shadow: none; }
src/modules/inbounds/measurement/InboundMeasurementPanel.vue
+1 -1
View File
@@ -814,7 +814,7 @@ defineExpose({ saveDraft, submitForReview, updateActualWeights, mayMaintain, may
.measurement-alert ul { margin: 7px 0 0; padding-left: 18px; font-size: 12px; line-height: 1.65; }
.measurement-alert .el-button { margin-top: 9px; }
.measurement-form fieldset { min-width: 0; margin: 0; padding: 0; border: 0; }
.measurement-section { padding: 16px 20px; border-top: 1px solid var(--cc-border); }
.measurement-section { padding: 16px 0px; border-top: 1px solid var(--cc-border); }
.measurement-summary-section { display: grid; gap: 12px; border-top: 0; }
.measurement-summary-header { display: flex; align-items: flex-start; justify-content: space-between; gap: 20px; }
.measurement-summary-context { display: flex; min-width: 0; flex-wrap: wrap; align-items: center; gap: 8px 20px; }
src/modules/inbounds/measurement/api.test.ts
+1 -1
View File
@@ -45,7 +45,7 @@ describe('inbound measurement API', () => {
await expect(getInboundMeasurement('10001', '7001')).resolves.toEqual(detail)
expect(http.get).toHaveBeenCalledWith('/platform/v1/first-leg/inbounds/7001/measurement', {
params: { tenantId: '10001' },
params: { tenantId: '10001', requestAt: expect.any(Number) },
})
})
src/modules/inbounds/measurement/api.ts
+3 -1
View File
@@ -37,7 +37,9 @@ export async function getInboundMeasurement(customerId: string, inboundId: strin
// items[].boxCode, machineNo, deviceMeasuredAt. Keep the response aligned with the backend OpenAPI.
const response = await http.get<ApiEnvelope<InboundMeasurementDetail>, ApiEnvelope<InboundMeasurementDetail>>(
measurementPath(inboundId),
{ params: { tenantId: customerId } },
// Calculation-mode saves use a sibling PUT endpoint. A cache may otherwise keep
// returning the pre-save measurement and make a successful update look failed.
{ params: { tenantId: customerId, requestAt: Date.now() } },
)
return unwrapApiResponse(response)
}
src/modules/inbounds/weight/components/WeightOcrPanel.behavior.test.ts
+16 -25
View File
@@ -231,23 +231,18 @@ describe('WeightOcrPanel confirmation behavior', () => {
expect(wrapper.text()).not.toContain('raw-0')
})
it('renders server-bound pallet sequence, target location, and pending putaway status ahead of OCR facts', async () => {
it('renders the server-bound location and status once in the compact card facts', async () => {
const wrapper = mountPanel()
await flushPromises()
const card = wrapper.get('.weight-card')
expect(card.text()).toContain('第 1 托')
expect(card.text()).toContain('目标库位')
expect(card.text()).toContain('A01')
expect(card.text()).toContain('整票预留库位')
expect(card.text()).toContain('库位A01 · 待上架')
expect(card.text()).toContain('待上架')
const putawayGuide = card.get('.weight-card__putaway').element
expect(putawayGuide.compareDocumentPosition(
card.get('.weight-card__value').element,
) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
expect(card.find('.weight-card__putaway').exists()).toBe(false)
expect(card.get('.weight-card__facts').text()).toContain('库位A01 · 待上架')
})
it('renders the authoritative whole-inbound reservation summary and an empty reserved slot', async () => {
it('keeps whole-inbound reservation guidance out of the panel and shows location on each weight card', async () => {
vi.mocked(getWeightWorkspace).mockResolvedValue({
...workspace,
palletLocationGuide: {
@@ -265,21 +260,18 @@ describe('WeightOcrPanel confirmation behavior', () => {
const wrapper = mountPanel()
await flushPromises()
const guide = wrapper.get('.putaway-guide')
expect(guide.text()).toContain('整票预留库位')
expect(guide.text()).toContain('A01 / A02 / A03')
expect(guide.text()).toContain('预留槽位数3')
expect(guide.text()).toContain('实际托数2')
expect(guide.text()).toContain('预留空位数1')
expect(guide.text()).toContain('A03预留空位本票预留空位')
expect(wrapper.find('.putaway-guide').exists()).toBe(false)
expect(wrapper.text()).not.toContain('整票上架引导')
expect(wrapper.get('.weight-card__facts').text()).toContain('库位A01 · 待上架')
})
it('shows an explicit whole-inbound unassigned state when no guide exists', async () => {
it('does not render a full-width placeholder when no whole-inbound guide exists', async () => {
vi.mocked(getWeightWorkspace).mockResolvedValue({ ...workspace, palletLocationGuide: null })
const wrapper = mountPanel()
await flushPromises()
expect(wrapper.text()).toContain('尚未分配整票预留库位')
expect(wrapper.text()).not.toContain('尚未分配整票预留库位')
expect(wrapper.find('.putaway-guide-empty').exists()).toBe(false)
})
it('marks A0 as a temporary overflow location from the server flag', async () => {
@@ -299,8 +291,8 @@ describe('WeightOcrPanel confirmation behavior', () => {
await flushPromises()
expect(wrapper.text()).toContain('A0 临时溢出位')
expect(wrapper.get('.weight-card__putaway').classes()).toContain('is-overflow')
expect(wrapper.get('.putaway-guide__slots li').classes()).toContain('is-overflow')
expect(wrapper.get('.weight-card__facts').text()).toContain('库位A0 · 待上架 · A0 临时溢出位')
expect(wrapper.find('.putaway-guide').exists()).toBe(false)
})
it.each([
@@ -336,8 +328,8 @@ describe('WeightOcrPanel confirmation behavior', () => {
const wrapper = mountPanel()
await flushPromises()
expect(wrapper.text()).toContain('托盘未分配')
expect(wrapper.text()).toContain('目标库位未分配')
expect(wrapper.text()).not.toContain('托盘未分配')
expect(wrapper.get('.weight-card__facts').text()).toContain('库位未分配')
})
it('deletes a pending image with its optimistic-lock version', async () => {
@@ -376,8 +368,7 @@ describe('WeightOcrPanel confirmation behavior', () => {
)
expect(getWeightWorkspace).toHaveBeenCalledTimes(2)
expect(wrapper.findAll('.weight-card')).toHaveLength(0)
expect(wrapper.get('.putaway-guide').text()).toContain('预留空位数1')
expect(wrapper.get('.putaway-guide').text()).toContain('A01预留空位本票预留空位')
expect(wrapper.find('.putaway-guide').exists()).toBe(false)
})
it('keeps the image and server workspace visible when deletion fails', async () => {
src/modules/inbounds/weight/components/WeightOcrPanel.test.ts
+6 -5
View File
@@ -35,14 +35,15 @@ describe('WeightOcrPanel contract', () => {
expect(source).toContain('货物重量')
expect(source).toContain('palletTareWeightKg')
expect(source).toContain('netWeightKg')
expect(source).toContain('row.palletSequence')
expect(source).toContain('row.locationCode')
expect(source).toContain('row.sharedOverflow')
expect(source).toContain('putawayStatusLabel(row.slotStatus)')
expect(source).toContain('workspace.palletLocationGuide.reservedSlotCount')
expect(source).toContain('workspace.palletLocationGuide.actualPalletCount')
expect(source).toContain('workspace.palletLocationGuide.reservedEmptySlotCount')
expect(source).toContain('本票预留空位')
expect(source).not.toContain('class="putaway-guide"')
expect(source).not.toContain('整票上架引导')
expect(source).not.toContain('整票预留库位')
expect(source).not.toContain('尚未分配整票预留库位')
expect(source).not.toContain('class="weight-card__putaway"')
expect(source).toContain('<div><dt>库位</dt><dd')
expect(source).toContain('对应库位仍为本票保留，不会释放给其他订单')
expect(source).toContain("emit('summaryChanged', workspace.value?.actualGrossWeightKg ?? null, workspace.value?.actualNetWeightKg ?? null)")
})
src/modules/inbounds/weight/components/WeightOcrPanel.vue
+1 -95
View File
@@ -24,7 +24,6 @@ import {
} from '../api/weightOcr'
import type {
WeightPalletOption,
WeightPutawaySlotStatus,
WeightResultResource,
WeightWorkspaceResource,
} from '../types'
@@ -194,17 +193,6 @@ function putawayStatusLabel(status: WeightResultResource['slotStatus']) {
} as const)[status as Exclude<WeightResultResource['slotStatus'], null>] || '未分配'
}
function putawayStatusType(status: WeightResultResource['slotStatus']) {
if (status === 'TRANSFERRED') return 'success'
if (status === 'BOUND') return 'warning'
if (status === 'RELEASED') return 'info'
return 'info'
}
function guideSlotStatusType(status: WeightPutawaySlotStatus) {
return putawayStatusType(status)
}
function hasWeightDraftChanged(row: WeightResultResource) {
const draft = weightDrafts.value[row.id]
if (!draft) return false
@@ -557,41 +545,6 @@ defineExpose({ reload: loadWorkspace })
</LoadErrorState>
<template v-else>
<section v-if="workspace?.palletLocationGuide" class="putaway-guide" aria-labelledby="putaway-guide-title">
<div class="putaway-guide__heading">
<div>
<span class="putaway-guide__eyebrow">整票上架引导</span>
<h4 id="putaway-guide-title">整票预留库位</h4>
</div>
<div class="putaway-guide__metrics" aria-label="整票库位汇总">
<div><span>预留库位</span><strong>{{ workspace.palletLocationGuide.slots.map((slot) => slot.locationCode).join(' / ') }}</strong></div>
<div><span>预留槽位数</span><strong>{{ workspace.palletLocationGuide.reservedSlotCount }}</strong></div>
<div><span>实际托数</span><strong>{{ workspace.palletLocationGuide.actualPalletCount }}</strong></div>
<div><span>预留空位数</span><strong>{{ workspace.palletLocationGuide.reservedEmptySlotCount }}</strong></div>
</div>
</div>
<ol class="putaway-guide__slots" aria-label="整票预留槽位">
<li
v-for="slot in workspace.palletLocationGuide.slots"
:key="slot.reservationId"
:class="{ 'is-empty': slot.slotStatus === 'RESERVED_EMPTY', 'is-overflow': slot.sharedOverflow }"
>
<div class="putaway-guide__slot-title">
<strong>{{ slot.locationCode }}</strong>
<el-tag size="small" effect="light" :type="guideSlotStatusType(slot.slotStatus)">
{{ putawayStatusLabel(slot.slotStatus) }}
</el-tag>
</div>
<span v-if="slot.palletSequence != null">第 {{ slot.palletSequence }} 托 · {{ slot.palletCode || '托盘编码未记录' }}</span>
<span v-else>本票预留空位</span>
<small v-if="slot.sharedOverflow">A0 临时溢出位</small>
</li>
</ol>
</section>
<div v-else-if="workspace" class="putaway-guide-empty" role="status">
<strong>尚未分配整票预留库位</strong>
<span>称重图片绑定库位后，将按服务端上架引导显示目标库位。</span>
</div>
<LoadErrorState
v-if="palletError"
title="可选托盘加载失败"
@@ -639,20 +592,6 @@ defineExpose({ reload: loadWorkspace })
><Trash2 :size="16" /></el-button>
</el-tooltip>
<div class="weight-card__body">
<div class="weight-card__putaway" :class="{ 'is-overflow': row.sharedOverflow }">
<div class="weight-card__putaway-title">
<strong>{{ row.palletSequence == null ? '托盘未分配' : `第 ${row.palletSequence} 托` }}</strong>
<el-tag size="small" effect="light" :type="putawayStatusType(row.slotStatus)">
{{ putawayStatusLabel(row.slotStatus) }}
</el-tag>
</div>
<div class="weight-card__location">
<span>目标库位</span>
<strong>{{ row.locationCode || '未分配' }}</strong>
</div>
<span v-if="row.sharedOverflow" class="weight-card__overflow">A0 临时溢出位</span>
<span v-else-if="row.locationCode" class="weight-card__normal-location">整票预留库位</span>
</div>
<button
type="button"
class="weight-card__value"
@@ -662,6 +601,7 @@ defineExpose({ reload: loadWorkspace })
<dl class="weight-card__facts">
<div><dt>托盘编码</dt><dd :title="row.palletCode">{{ row.palletCode || '未记录编码' }}</dd></div>
<div><dt>托盘类型</dt><dd>{{ row.palletType || '未记录类型' }}</dd></div>
<div><dt>库位</dt><dd :title="row.locationCode || '未分配'">{{ row.locationCode || '未分配' }}<template v-if="row.locationCode"> · {{ putawayStatusLabel(row.slotStatus) }}</template><template v-if="row.sharedOverflow"> · A0 临时溢出位</template></dd></div>
<div><dt>服务端确认毛重</dt><dd>{{ formatWeight(row.grossWeightKg) }}</dd></div>
<div><dt>托盘皮重</dt><dd>{{ formatWeight(row.palletTareWeightKg) }}</dd></div>
<div><dt>货物重量</dt><dd>{{ formatWeight(row.netWeightKg) }}</dd></div>
@@ -750,43 +690,12 @@ defineExpose({ reload: loadWorkspace })
.weight-summary strong { color: #067647; font-size: 16px; }
.visually-hidden-input { position: absolute; width: 1px; height: 1px; overflow: hidden; clip: rect(0 0 0 0); clip-path: inset(50%); white-space: nowrap; }
.weight-action-error { margin-bottom: 14px; }
.putaway-guide { margin: 14px 0 18px; padding: 16px; border: 1px solid #84caff; border-radius: 8px; background: #f5fbff; }
.putaway-guide__heading { display: flex; align-items: flex-start; justify-content: space-between; gap: 24px; }
.putaway-guide__eyebrow { color: #175cd3; font-size: 11px; font-weight: 700; letter-spacing: .08em; }
.putaway-guide h4 { margin: 3px 0 0; color: #102a56; font-size: 18px; }
.putaway-guide__metrics { display: grid; grid-template-columns: minmax(180px, 1.8fr) repeat(3, minmax(90px, .6fr)); gap: 10px; flex: 1; max-width: 820px; }
.putaway-guide__metrics div { display: grid; min-width: 0; gap: 3px; padding: 9px 11px; border-radius: 6px; background: #fff; box-shadow: 0 1px 2px rgb(16 24 40 / 6%); }
.putaway-guide__metrics span { color: #667085; font-size: 11px; }
.putaway-guide__metrics strong { color: #101828; font-size: 15px; overflow-wrap: anywhere; }
.putaway-guide__slots { display: grid; grid-template-columns: repeat(auto-fit, minmax(170px, 1fr)); gap: 10px; margin: 14px 0 0; padding: 0; list-style: none; }
.putaway-guide__slots li { display: grid; gap: 5px; min-width: 0; padding: 11px; border: 1px solid #b2ddff; border-radius: 6px; background: #fff; }
.putaway-guide__slots li.is-empty { border-style: dashed; background: #f9fafb; }
.putaway-guide__slots li.is-overflow { border-color: #fec84b; background: #fffaeb; }
.putaway-guide__slot-title { display: flex; align-items: center; justify-content: space-between; gap: 8px; }
.putaway-guide__slot-title strong { color: #1849a9; font-size: 20px; }
.putaway-guide__slots li.is-overflow .putaway-guide__slot-title strong { color: #93370d; }
.putaway-guide__slots li > span { color: #475467; font-size: 12px; overflow-wrap: anywhere; }
.putaway-guide__slots small { width: fit-content; color: #93370d; font-weight: 600; }
.putaway-guide-empty { display: grid; gap: 3px; margin: 14px 0 18px; padding: 13px 15px; border: 1px dashed #98a2b3; border-radius: 8px; background: #f9fafb; }
.putaway-guide-empty strong { color: #344054; font-size: 14px; }
.putaway-guide-empty span { color: #667085; font-size: 12px; }
.weight-list { min-height: 0; margin-top: 14px; }
.weight-empty { display: flex; min-height: 0; align-items: center; gap: 10px; padding: 4px 0 0; color: var(--cc-muted); }
.weight-empty strong { color: #344054; font-size: 14px; }
.weight-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(190px, 1fr)); gap: 14px; }
.weight-card { position: relative; min-width: 0; overflow: hidden; border: 1px solid var(--cc-border); border-radius: 6px; background: #fff; }
.weight-card__body { padding: 12px; text-align: center; }
.weight-card__putaway { display: grid; gap: 8px; margin: -12px -12px 12px; padding: 12px; border-bottom: 1px solid #b2ddff; background: #eff8ff; text-align: left; }
.weight-card__putaway.is-overflow { border-color: #fec84b; background: #fffaeb; }
.weight-card__putaway-title { display: flex; align-items: center; justify-content: space-between; gap: 8px; }
.weight-card__putaway-title strong { color: #1849a9; font-size: 15px; }
.weight-card__putaway.is-overflow .weight-card__putaway-title strong { color: #93370d; }
.weight-card__location { display: flex; align-items: baseline; justify-content: space-between; gap: 8px; }
.weight-card__location span { color: #475467; font-size: 12px; }
.weight-card__location strong { color: #101828; font-size: 22px; line-height: 1; overflow-wrap: anywhere; }
.weight-card__overflow, .weight-card__normal-location { width: fit-content; padding: 2px 7px; border-radius: 999px; font-size: 11px; font-weight: 600; }
.weight-card__overflow { background: #fef0c7; color: #93370d; }
.weight-card__normal-location { background: #d1e9ff; color: #175cd3; }
.weight-delete { position: absolute; z-index: 2; top: 8px; right: 8px; width: 30px; height: 30px; padding: 0; border: 1px solid rgb(255 255 255 / 82%); background: rgb(255 255 255 / 92%); box-shadow: 0 1px 3px rgb(16 24 40 / 16%); }
.weight-card__value { width: 100%; padding: 0; border: 0; background: transparent; color: inherit; cursor: pointer; text-align: center; }
.weight-card__value strong { color: #101828; font-size: 17px; }
@@ -813,9 +722,6 @@ defineExpose({ reload: loadWorkspace })
.pallet-picker :deep(.el-select) { width: 100%; }
.weight-heading__actions :deep(.el-button) { width: 100%; min-height: 44px; }
.weight-summary-group { width: 100%; justify-content: space-between; }
.putaway-guide__heading { flex-direction: column; }
.putaway-guide__metrics { width: 100%; grid-template-columns: repeat(2, minmax(0, 1fr)); }
.putaway-guide__metrics div:first-child { grid-column: 1 / -1; }
.weight-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); }
}