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

优化

Browse Source
This commit is contained in:
liuyihe
2026-10-12 14:33:17 +08:00
parent 6d0eb2a5f3
commit 6cb9b91435
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/overseas-warehouse/views/WarehouseServiceView.vue
+2 -2
View File
@@ -1402,7 +1402,7 @@ function selectRelabelInventory(inboundOrderId: string) {
labelingMode.value = 'sku' labelingMode.value = 'sku'
for (const candidate of selectedCandidates) rows.push({ for (const candidate of selectedCandidates) rows.push({
id: ++cargoSequence, sku: candidate.skuItems?.[0]?.skuCode || candidate.skuCode || '', id: ++cargoSequence, sku: candidate.skuItems?.[0]?.skuCode || candidate.skuCode || '',
name: candidate.productNameZh || '退货库存', included: false, quantity: 1, availableQuantity: 1, name: candidate.productNameZh || '', included: false, quantity: 1, availableQuantity: 1,
returnCartonId: String(candidate.returnCartonId), sourceInboundOrderNo: candidate.inboundOrderNo, returnCartonId: String(candidate.returnCartonId), sourceInboundOrderNo: candidate.inboundOrderNo,
fnsku: '', shipmentNo: candidate.inboundOrderNo || '', newSkuCode: '', shippingMark: '', customerCartonMarks: '', fnsku: '', shipmentNo: candidate.inboundOrderNo || '', newSkuCode: '', shippingMark: '', customerCartonMarks: '',
cartonMark: candidate.cartonMark || '', fbaCartonMark: '', destinationWarehouseId: '', remark: '', cartonMark: candidate.cartonMark || '', fbaCartonMark: '', destinationWarehouseId: '', remark: '',
@@ -1442,7 +1442,7 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
return return
} }
if (cartonDetailRows.value.some(item => item.cartonMark === source.cartonMark)) return if (cartonDetailRows.value.some(item => item.cartonMark === source.cartonMark)) return
cargoRows.value.push({ id: ++cargoSequence, included: true, sku: source.skuItems?.map(item => item.skuCode).join(',') || '', name: source.productNameZh || '退货箱', shipmentNo: selectedReturnOrderNo.value, cartonMark: source.cartonMark || '', fbaCartonMark: '', remark: '', sourceInventoryBalanceId: undefined, sourceInventoryPositionId: undefined, sourceInboundOrderId: undefined, returnCartonId: String(source.returnCartonId), quantity: 1, fnsku: '', newSkuCode: '', shippingMark: '', customerCartonMarks: '', destinationWarehouseId: '' }) cargoRows.value.push({ id: ++cargoSequence, included: true, sku: source.skuItems?.map(item => item.skuCode).join(',') || '', name: source.productNameZh || '', shipmentNo: '', cartonMark: source.cartonMark || '', fbaCartonMark: '', remark: '', sourceInventoryBalanceId: undefined, sourceInventoryPositionId: undefined, sourceInboundOrderId: undefined, returnCartonId: String(source.returnCartonId), quantity: 1, fnsku: '', newSkuCode: '', shippingMark: '', customerCartonMarks: '', destinationWarehouseId: '' })
} }
</script> </script>
src/modules/overseas-warehouse/views/returnRelabelSources.test.mjs
+3 -1
View File
@@ -52,12 +52,14 @@ test('包裹箱唛添加保持一个实物并去重，三种类型不再禁用',
const compiledBinding = ts.transpileModule(binding, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText const compiledBinding = ts.transpileModule(binding, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
const cargoRows = { value: [] } const cargoRows = { value: [] }
const bind = new Function('labelingMode', 'cartonDetailRows', 'cargoRows', 'selectedReturnOrderNo', 'addReturnSkuBinding', 'let cargoSequence = 0; ' + compiledBinding + '; return addReturnBoxBinding')({ value: 'carton' }, { value: cargoRows.value }, cargoRows, { value: 'RETURN-1' }, () => assert.fail('箱唛模式不添加SKU行')) const bind = new Function('labelingMode', 'cartonDetailRows', 'cargoRows', 'selectedReturnOrderNo', 'addReturnSkuBinding', 'let cargoSequence = 0; ' + compiledBinding + '; return addReturnBoxBinding')({ value: 'carton' }, { value: cargoRows.value }, cargoRows, { value: 'RETURN-1' }, () => assert.fail('箱唛模式不添加SKU行'))
const parcel = { returnCartonId: 'PARCEL-ID', sourceType: 'RETURN_PARCEL', cartonMark: 'RP-1', skuItems: [{ skuCode: 'SKU-A', quantity: 80 }] } const parcel = { returnCartonId: 'PARCEL-ID', sourceType: 'RETURN_PARCEL', cartonMark: 'RP-1', productNameZh: '测试商品中文名', skuItems: [{ skuCode: 'SKU-A', quantity: 80 }] }
bind(parcel) bind(parcel)
bind(parcel) bind(parcel)
assert.equal(cargoRows.value.length, 1) assert.equal(cargoRows.value.length, 1)
assert.equal(cargoRows.value[0].returnCartonId, 'PARCEL-ID') assert.equal(cargoRows.value[0].returnCartonId, 'PARCEL-ID')
assert.equal(cargoRows.value[0].quantity, 1) assert.equal(cargoRows.value[0].quantity, 1)
assert.equal(cargoRows.value[0].shipmentNo, '')
assert.equal(cargoRows.value[0].name, '测试商品中文名')
assert.doesNotMatch(view, /returnSkuOnly|散件库存只能贴 SKU/) assert.doesNotMatch(view, /returnSkuOnly|散件库存只能贴 SKU/)
assert.match(view, /labelingMode === 'sku' \? addReturnSkuBinding\(source, sku.skuCode\) : addReturnBoxBinding\(source\)/) assert.match(view, /labelingMode === 'sku' \? addReturnSkuBinding\(source, sku.skuCode\) : addReturnBoxBinding\(source\)/)
}) })