三码校验调整
This commit is contained in:
@@ -219,10 +219,7 @@ const handleScan = async () => {
|
||||
ElMessage.error('扫描的码值与期望不匹配,请核对!')
|
||||
}
|
||||
|
||||
// 检查是否全部通过(含skip场景)
|
||||
if (allSuccess.value) {
|
||||
await saveVerifyRecord()
|
||||
}
|
||||
await saveVerifyRecord()
|
||||
}
|
||||
focusScan()
|
||||
}
|
||||
@@ -250,6 +247,7 @@ const fetchProductInfo = async (packCode) => {
|
||||
}
|
||||
// 获取客户标签码
|
||||
await fetchClientTag(packCode, productInfo.engineTypeID)
|
||||
await saveVerifyRecord(false)
|
||||
} catch (e) {
|
||||
console.error('查询产品信息失败:', e)
|
||||
ElMessage.error('查询产品信息失败')
|
||||
@@ -282,26 +280,36 @@ const fetchClientTag = async (engineID, engineTypeID) => {
|
||||
}
|
||||
}
|
||||
|
||||
// === 校验成功写库 ===
|
||||
const saveVerifyRecord = async () => {
|
||||
// === 校验过程写库 ===
|
||||
const getVerifyResult = (status) => {
|
||||
if (status === 'success' || status === 'skip') return 1
|
||||
if (status === 'error') return 2
|
||||
return 0
|
||||
}
|
||||
const saveVerifyRecord = async (showSuccessMessage = true) => {
|
||||
try {
|
||||
if (!productInfo.productNo) return
|
||||
const verifyPassed = allSuccess.value
|
||||
const verifyStatus = verifyPassed ? 1 : hasError.value ? 2 : 0
|
||||
const param = [
|
||||
['产品编号', productInfo.productNo],
|
||||
['产品型号', productInfo.productType],
|
||||
['机型代码', productInfo.engineTypeID],
|
||||
['期望箱体码', expectedBoxCode.value],
|
||||
['期望客户标签码', expectedClientTag.value],
|
||||
['扫描箱体码', scannedBoxCode.value],
|
||||
['扫描客户标签码', scannedClientTag.value],
|
||||
['箱体码校验结果', 1],
|
||||
['客户标签码校验结果', 1],
|
||||
['校验状态', 1],
|
||||
['扫描箱体码', boxStatus.value === 'success' ? scannedBoxCode.value : ''],
|
||||
['扫描客户标签码', tagStatus.value === 'success' ? scannedClientTag.value : ''],
|
||||
['箱体码校验结果', getVerifyResult(boxStatus.value)],
|
||||
['客户标签码校验结果', getVerifyResult(tagStatus.value)],
|
||||
['校验状态', verifyStatus],
|
||||
['操作人', loginUserName.value]
|
||||
]
|
||||
const data = CreateData('11', 'PACK下线三码校验_记录_增加', param)
|
||||
await ExecDatabase(data)
|
||||
ElMessage.success('三码校验通过,已记录!')
|
||||
addHistory('--- 三码校验完成 ---', 'success', '全部通过 ✓✓✓')
|
||||
if (verifyPassed && showSuccessMessage) {
|
||||
ElMessage.success('三码校验通过,已记录!')
|
||||
addHistory('--- 三码校验完成 ---', 'success', '全部通过 ✓✓✓')
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('保存校验记录失败:', e)
|
||||
ElMessage.error('校验记录保存失败,请联系管理员')
|
||||
|
||||
Reference in New Issue
Block a user