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 01/10] =?UTF-8?q?wmswms=E7=89=B9=E6=AE=8A=E5=87=BA?= =?UTF-8?q?=E5=BA=93=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 = ` - From cdc0140dacb52ca00609f333af32145bfbffd2da Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 25 Nov 2024 09:31:00 +0800 Subject: [PATCH 08/10] =?UTF-8?q?wms=E7=99=BD=E8=83=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/bpprocure/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/bpprocure/index.vue b/src/views/wms/bpprocure/index.vue index dee49b0..098e733 100644 --- a/src/views/wms/bpprocure/index.vue +++ b/src/views/wms/bpprocure/index.vue @@ -372,7 +372,7 @@ export default { // 获取选中数据 let factoryCode = localStorage .getItem("parkName") - .substring(3); + // .substring(3); console.log(localStorage) console.log(factoryCode) const selectedData = this.bpprocureList.filter(item => this.ids.includes(item.id)); From 09b3c15c826adb986193a721b982304e7ec7af91 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 25 Nov 2024 10:56:05 +0800 Subject: [PATCH 09/10] =?UTF-8?q?wms=E7=99=BD=E8=83=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B92=E6=B7=BB=E5=8A=A0=E6=B3=A8=E6=84=8F?= =?UTF-8?q?=E4=BA=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/bpprocure/index.vue | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/src/views/wms/bpprocure/index.vue b/src/views/wms/bpprocure/index.vue index 098e733..71e5380 100644 --- a/src/views/wms/bpprocure/index.vue +++ b/src/views/wms/bpprocure/index.vue @@ -248,6 +248,7 @@ export default { total: 0, // 白坯原材料采购单表格数据 bpprocureList: [], + factoryName: "", // 弹出层标题 title: "", // 是否显示弹出层 @@ -370,11 +371,24 @@ export default { async handlePrint() { // 获取选中数据 - let factoryCode = localStorage - .getItem("parkName") + let factoryCode = localStorage.getItem("USER_POOL_NAME_CURRENT"); // .substring(3); console.log(localStorage) + + // 定义 factoryCode 和 factoryName 的映射关系 + const factoryMapping = { + "ds_1000": "中山小榄工厂", + "ds_1010": "阜沙工厂", + "ds_1020": "重庆工厂", + "ds_1030": "江西工厂", + "ds_1040": "安徽工厂", + "ds_999": "中山恒阳" + }; + // 根据 factoryCode 查找对应的 factoryName console.log(factoryCode) + this.factoryName = factoryMapping[factoryCode] || "未知工厂"; // 如果没有匹配，赋值为“未知工厂” + // if (){} + console.log(this.factoryName ) const selectedData = this.bpprocureList.filter(item => this.ids.includes(item.id)); if (selectedData.length === 0) { this.$message.warning("请先选择要打印的记录"); @@ -422,7 +436,7 @@ export default {
-

中山恒阳采购单

+

${this.factoryName}采购单

条形码
@@ -460,6 +474,15 @@ export default { printContent += ` +
+

注意事项：

+
    +
  1. 本采购订单请贵单位在 48 小时内确认回传，逾期将视为放弃本订单。
    2. +
  2. 供应商请严格遵守交货日期，若突发意外情况需要延期供货请以书面、电话等方式向我方联络，否则延期后的一切损失由供应商承担。
    3. +
  3. 供应商所交付的货物与采购订单的要求不符。
    4. +
  4. 供应商在供货时，需注明货物的采购单号以方便此后与我方对账结算。
    5. +
+
`; From 1c0ceef7bda61df124cb440e1e8f29c4eb704d11 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Mon, 25 Nov 2024 11:07:38 +0800 Subject: [PATCH 10/10] =?UTF-8?q?wms=E7=99=BD=E8=83=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B93=E6=B3=A8=E6=84=8F=E4=BA=8B=E9=A1=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/bpprocure/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/bpprocure/index.vue b/src/views/wms/bpprocure/index.vue index 71e5380..9ddcdd2 100644 --- a/src/views/wms/bpprocure/index.vue +++ b/src/views/wms/bpprocure/index.vue @@ -479,7 +479,7 @@ export default {
  1. 本采购订单请贵单位在 48 小时内确认回传，逾期将视为放弃本订单。
  2. 供应商请严格遵守交货日期，若突发意外情况需要延期供货请以书面、电话等方式向我方联络，否则延期后的一切损失由供应商承担。
    3. -
  3. 供应商所交付的货物与采购订单的要求不符。
    4. +
  4. 供应商所交付的货物与采购订单的要求不符，我方有权拒收货物。
  5. 供应商在供货时，需注明货物的采购单号以方便此后与我方对账结算。