diff --git a/klp-ui/src/api/system/ocr.js b/klp-ui/src/api/system/ocr.js index 586c2196..c50f687a 100644 --- a/klp-ui/src/api/system/ocr.js +++ b/klp-ui/src/api/system/ocr.js @@ -1,9 +1,30 @@ import request from '@/utils/request' +/** + * 调用ocr, 直接识别图像中的文字 + * + * @param {string} imgUrl 图片url + * @returns {Promise} 识别结果 + */ export function recognizeText({ imgUrl }) { return request({ url: '/wms/purchasePlan/recognizeText', method: 'post', data: { imgUrl } }) +} + +/** + * 调用通义千问模型, 识别图片中的文字 + * + * @param {string} imageUrl 图片url + * @returns {Promise} 识别结果 + */ +export function recognizeBomByModel({ imageUrl }) { + return request({ + url: '/wms/imageRecognition/recognize', + method: 'post', + data: { imageUrl }, + timeout: 100000 + }) } \ No newline at end of file diff --git a/klp-ui/src/assets/images/model.png b/klp-ui/src/assets/images/model.png new file mode 100644 index 00000000..b2906681 Binary files /dev/null and b/klp-ui/src/assets/images/model.png differ diff --git a/klp-ui/src/assets/images/ocr.png b/klp-ui/src/assets/images/ocr.png new file mode 100644 index 00000000..5950dc97 Binary files /dev/null and b/klp-ui/src/assets/images/ocr.png differ diff --git a/klp-ui/src/views/wms/purchasePlan/panels/detail.vue b/klp-ui/src/views/wms/purchasePlan/panels/detail.vue index 9276629b..0d89d7ac 100644 --- a/klp-ui/src/views/wms/purchasePlan/panels/detail.vue +++ b/klp-ui/src/views/wms/purchasePlan/panels/detail.vue @@ -422,6 +422,7 @@ export default { // }); }, handleUploadQualityCertificateConfirm() { + this.uploadQualityCertificateOpen = false; this.handleStatusChange(this.uploadQualityCertificateInfo, EPurchaseDetailStatus.FINISH, '采购完成'); }, /** 创建入库单按钮操作 */ diff --git a/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue b/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue index f41c9172..947f1833 100644 --- a/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue +++ b/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue @@ -5,7 +5,9 @@ - +
+ +
@@ -18,12 +20,14 @@
OCR识别 + ocr
大模型识别 + model
@@ -31,13 +35,22 @@
- + + + + - 历史质保单 + + + + - 新质保单 + + + + @@ -52,14 +65,17 @@ 确认
+ + + 质保单内容
- -
+ +
确认 @@ -72,14 +88,16 @@ import FileUpload from '@/components/FileUpload' import { listByIds } from '@/api/system/oss' import { updatePurchasePlanDetail } from '@/api/wms/purchasePlanDetail' -import { recognizeText } from '@/api/system/ocr' -import { listBomItem } from '@/api/wms/bomItem' +import { recognizeText, recognizeBomByModel } from '@/api/system/ocr' +import { listBomItem, addBomItem } from '@/api/wms/bomItem' +import { addBom } from '@/api/wms/bom' +import { updateRawMaterial, addRawMaterial, getRawMaterial } from '@/api/wms/rawMaterial' const so = { annex: { loading: '正在保存质保单', - handler: (vm, newVal) => { - return updatePurchasePlanDetail({ + handler: async (vm, newVal) => { + return await updatePurchasePlanDetail({ ...vm.info, annex: newVal }) @@ -87,36 +105,43 @@ const so = { }, ocr: { loading: '等待ocr识别结果', - handler: (vm) => { - console.log(vm.file, 'vm.file'); - return recognizeText({ imgUrl: vm.file.url }).then(res => { - console.log(res, 'res'); - return res; - }) + handler: async (vm) => { + const text = await recognizeText({ imgUrl: vm.file.url }) + return text; } }, model: { loading: '等待大模型识别结果', + handler: async (vm) => { + const res = await recognizeBomByModel({ imageUrl: vm.file.url }) + vm.newResult = res.data.structuredResult.attributes; + vm.$modal.msgSuccess(res.data.structuredResult.summary); + return res; + } }, bom: { loading: '正在处理BOM' }, oss: { loading: '正在获取质保单', - handler: (vm, newVal) => { - return listByIds(newVal).then(res => { - vm.file = res.data[0]; - vm.active = 1; - return res.data[0]; - }) + handler: async (vm, newVal) => { + const res = await listByIds(newVal) + vm.file = res.data[0]; + vm.active = 1; + return res.data[0]; } }, old: { loading: '正在获取历史质保单', - handler: (vm, newVal) => { - return listBomItem({ - itemId: vm.info.rawMaterialId, + handler: async (vm, newVal) => { + // 查询对应的bomId + const res = await getRawMaterial(vm.info.rawMaterialId) + const bomId = res.data.bomId; + const bomItemRes = await listBomItem({ + bomId, }) + vm.oldResult = bomItemRes.rows; + return bomItemRes.rows; } } } @@ -165,17 +190,29 @@ export default { file: undefined, loading: false, loadingText: '加载中...', - resultDiff: true + resultDiff: true, + oldResult: [], + newResult: [], } }, methods: { handleOcr() { this.loadingMethod('ocr', (res) => { - console.log(res, 'res'); + this.loadingMethod('old').then(() => { + this.handleCompareResult() + this.active = 2; + }) }) }, handleModel() { - this.active = 2; + + this.loadingMethod('model', async (res) => { + await this.loadingMethod('old') + console.log(this); + this.handleCompareResult() + this.active = 2; + }) + }, async handleConfirm() { // 确认内容，如果质保单内容与历史质保单内容不一致，则提示用户选择处理方式 @@ -185,29 +222,95 @@ export default { this.$modal.msgError('请选择处理方式'); return; } + this.loading = true; + this.loadingText = '正在处理产品BOM'; if (this.uploadQualityCertificateForm.qualityCertificateType === 1) { + // 什么都不需要做,直接完成就可以 console.log('使用旧的质保单'); } else if (this.uploadQualityCertificateForm.qualityCertificateType === 2) { + // 创建一个新的BOM + const bom = await addBom({ + bomName: 'N' + new Date().getTime(), + bomCode: 'N' + new Date().getTime(), + }) + // 将BOMID赋值给对应的materialId + await updateRawMaterial({ + rawMaterialId: this.info.rawMaterialId, + bomId: bom.data.bomId, + }) + // 逐项创建BOMItem + for (let i = 0; i < this.newResult.length; i++) { + await addBomItem({ + bomId: bom.data.bomId, + attrKey: this.newResult[i].attrKey, + attrValue: this.newResult[i].attrValue, + }) + } console.log('使用新的质保单'); } else if (this.uploadQualityCertificateForm.qualityCertificateType === 3) { console.log('创建新物料'); + // 创建一个新的BOM + const bom = await addBom({ + bomName: 'N' + new Date().getTime(), + bomCode: 'N' + new Date().getTime(), + }) + // 逐项创建BOMItem + for (let i = 0; i < this.newResult.length; i++) { + await addBomItem({ + bomId: bom.data.bomId, + attrKey: this.newResult[i].attrKey, + attrValue: this.newResult[i].attrValue, + }) + } + // 创建一个新的物料,使用原有物料的信息, code使用时间戳 + const { rawMaterialId, rawMaterialCode, ...rawMaterial } = (await getRawMaterial(this.info.rawMaterialId)).data + const newMaterial = await addRawMaterial({ + ...rawMaterial, + bomId: bom.data.bomId, + rawMaterialCode: 'N' + new Date().getTime(), + }) + // 修改采购单据赋值为新的物料 + await updatePurchasePlanDetail({ + detailId: this.info.detailId, + rawMaterialId: newMaterial.data.rawMaterialId, + }) } } + this.loading = false; + // 变更状态 this.active = 3; this.$emit('confirm') }, - loadingMethod(key, fn) { + async loadingMethod(key, fn) { this.loading = true; this.loadingText = so[key].loading; - so[key].handler(this, this.uploadQualityCertificateForm.qualityCertificate).then((res) => { - fn && fn(res) - this.loading = false; - }).catch(() => { - this.loading = false; + try { + const res = await so[key].handler(this, this.uploadQualityCertificateForm.qualityCertificate) + fn && await fn(res) + return res; + } catch { this.$modal.msgError('操作失败'); - }); + } finally { + this.loading = false; + } + }, + // 比较新旧result是否一致 + handleCompareResult() { + // 先检查新旧result是否一致 + if (this.oldResult.length !== this.newResult.length) { + this.resultDiff = true; + return; + } + // 比较新旧result是否一致 + for (let i = 0; i < this.oldResult.length; i++) { + if (this.oldResult[i].attrKey !== this.newResult[i].attrKey || this.oldResult[i].attrValue !== this.newResult[i].attrValue) { + this.resultDiff = true; + return; + } + } + this.resultDiff = false; } } }