From bac84ceb8365d3ef93ddcf32fadf6b0ac7bad041 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 18 Nov 2024 10:15:21 +0800 Subject: [PATCH] =?UTF-8?q?wmswms=E7=89=B9=E6=AE=8A=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/outorderfc.js | 15 ++ src/api/wms/sellout.js | 8 +- src/views/wms/bpprocure/index.vue | 88 +++++--- src/views/wms/outorderTS/index.vue | 41 ++-- src/views/wms/selloutTS/index.vue | 313 +++++++++++++++++++---------- 5 files changed, 313 insertions(+), 152 deletions(-) diff --git a/src/api/wms/outorderfc.js b/src/api/wms/outorderfc.js index 284a511..9e29db4 100644 --- a/src/api/wms/outorderfc.js +++ b/src/api/wms/outorderfc.js @@ -182,6 +182,14 @@ export function listProduct(query) { params: query }); } +// 查询物料信息列表 +export function listProductFp(query) { + return request({ + url: '/wms/matenews/listwmsFpStorageNews', + method: 'get', + params: query + }); +} // 查询报工详细列表 export function getCKList(data) { return request({ @@ -197,3 +205,10 @@ export function addOdsProcureOutOrderTS(data) { data: data }); } +export function addwmsFpStorageNewsTS(data) { + return request({ + url: '/wms/outorder/addwmsFpStorageNewsTS', + method: 'post', + data: data + }); +} diff --git a/src/api/wms/sellout.js b/src/api/wms/sellout.js index 6126e6d..d5862ef 100644 --- a/src/api/wms/sellout.js +++ b/src/api/wms/sellout.js @@ -16,7 +16,13 @@ export function listSelloutlistRE(query) { params: query }); } - +export function listSelloutlistRETS(query) { + return request({ + url: '/wms/sellout/listRETS', + method: 'get', + params: query + }); +} // 查询成品销售出库详细 export function getSellout(id) { return request({ diff --git a/src/views/wms/bpprocure/index.vue b/src/views/wms/bpprocure/index.vue index 16a5906..df1739b 100644 --- a/src/views/wms/bpprocure/index.vue +++ b/src/views/wms/bpprocure/index.vue @@ -82,7 +82,7 @@ - + @@ -340,8 +340,13 @@ export default { }); }, - handlePrint() { + async handlePrint() { // 获取选中数据 + let factoryCode = localStorage + .getItem("parkName") + .substring(3); + console.log(localStorage) + console.log(factoryCode) const selectedData = this.bpprocureList.filter(item => this.ids.includes(item.id)); if (selectedData.length === 0) { this.$message.warning("请先选择要打印的记录"); @@ -362,28 +367,25 @@ export default { })) }; - // 生成条形码 - const barcodeCanvas = document.createElement('canvas'); - console.log(" this.printData.workTable[0].procureCode: " + this.printData.workTable[0].procureCode); + if (this.printData.workTable.length === 0 || !this.printData.workTable[0].procureCode) { + this.$message.warning("没有可打印的数据或数据不完整"); + return; + } - JsBarcode(barcodeCanvas, this.printData.workTable[0].procureCode, { - format: "CODE128", - height: 35, - width: 1.5, - displayValue: true, - // background: "#FFFFFF", // 背景颜色 - // lineColor: "#000000" // 条形码颜色 - }); + try { + // 确保JsBarcode库加载完成 + if (typeof JsBarcode !== 'function') { + throw new Error("JsBarcode库没有正确加载"); + } - // 将条形码转换为 Data URL - const barcodeDataUrl = barcodeCanvas.toDataURL(); - console.log(barcodeDataUrl); // 检查生成的 Data URL + console.log("开始生成条形码..."); + const barcodeDataUrl = await this.generateBarcode(this.printData.workTable[0].procureCode); + console.log("条形码生成成功:", barcodeDataUrl); - // 打印内容 - let printContent = ` + // 创建打印内容 + let printContent = ` -