From 8b8ad96dce90b8c8e55e2f19120b70416191c065 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Thu, 13 Jun 2024 15:53:28 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E5=93=81?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/productPutawayDetail.vue | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 0ae80cc1..646b5250 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -298,41 +298,26 @@ .fromLocationCode + "】已经扫描") } else { - this.addDetail(itemDetail, result); - return; + // this.addDetail(itemDetail, result); + // return; + //暂时先不判断状态 let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { - if (this.jobContent.allowModifyInventoryStatus == "TRUE") { + // if (this.jobContent.allowModifyInventoryStatus == "TRUE") { this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + ']不一致,是否继续上架?', res => { if (res) { this.addDetail(itemDetail, result); - // itemDetail.scaned = true; - // itemDetail.handleQty = Number(result.balance.qty) - // itemDetail.toInventoryStatus = result.balance.inventoryStatus; - // itemDetail.balance = result.balance; - // itemDetail.balance.balanceQty = Number(result.balance.qty) - // itemDetail.balance.packQty = Number(result.package.packQty) - // itemDetail.balance.packUnit = result.package.packUnit - // this.calcHandleQty(); } else { this.scanPopupGetFocus(); } }); } - } else { - this.addDetail(itemDetail, result); - // itemDetail.scaned = true; - // itemDetail.handleQty = Number(result.balance.qty) - // itemDetail.balance = result.balance; - // itemDetail.toInventoryStatus = result.balance.inventoryStatus; - // itemDetail.balance.balanceQty = Number(result.balance.qty) - // itemDetail.balance.packQty = Number(result.package.packQty) - // itemDetail.balance.packUnit = result.package.packUnit - // this.calcHandleQty(); - } + // } else { + // this.addDetail(itemDetail, result); + // } } } } @@ -346,6 +331,7 @@ itemDetail.handleQty = Number(result.balance.qty) itemDetail.balance = result.balance; itemDetail.toInventoryStatus = result.balance.inventoryStatus; + itemDetail.fromInventoryStatus = result.balance.inventoryStatus; itemDetail.balance.balanceQty = Number(result.balance.qty) itemDetail.balance.packQty = Number(result.package.packQty) itemDetail.balance.packUnit = result.package.packUnit From 442eec9995dfa91a16ac62b7ea3622e48528d224 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 26 Jun 2024 15:15:35 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/deliver/coms/comScanDeliverPack.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue index a7b4a29d..b8c4a16f 100644 --- a/src/pages/deliver/coms/comScanDeliverPack.vue +++ b/src/pages/deliver/coms/comScanDeliverPack.vue @@ -388,6 +388,11 @@ packingNumber:data.packingNumber, qty: 0, uom:data.uom, + itemName:packageInfo.itemName, + itemDesc1:packageInfo.itemDesc1, + itemDesc2:packageInfo.itemDesc2, + singlePrice:balance.singlePrice, + amount:balance.amount } } let record = this.creatRecord(data, balance, packageInfo); From f2e9b156e0c6536336a081b4a46e9aa010932c39 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 26 Jun 2024 16:15:32 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/deliver/coms/comScanDeliverPack.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue index b8c4a16f..2b30bafa 100644 --- a/src/pages/deliver/coms/comScanDeliverPack.vue +++ b/src/pages/deliver/coms/comScanDeliverPack.vue @@ -415,7 +415,9 @@ toLocationCode: this.toLocationCode, supplierCode: label.supplierCode, packUnit: packageInfo.packUnit, - packQty: packageInfo.packQty + packQty: packageInfo.packQty, + singlePrice:balance.singlePrice, + amount:balance.amount } return record; }, From 60818e9066553fc342d3aa2705b54974c6df1a62 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Wed, 26 Jun 2024 17:31:11 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=AE=8C=E5=96=84Mes=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winComScanFg.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue index 3fd8393b..b69462e3 100644 --- a/src/mycomponents/scan/winComScanFg.vue +++ b/src/mycomponents/scan/winComScanFg.vue @@ -188,27 +188,27 @@ getMesPackInfo(this.itemCode).then(res => { try { if (res.data.list.length == 0) { - throw new Error("没有查找到物料号【"+this.itemCode+"】对应的mes物料号") + throw new Error("没有查找到物料号【"+this.itemCode+"】对应的生产条码配置") } - var result = res.data.list[0] - var partNumber = result.partNumber; + var result = res.data.list[0] //Mes条码标签解析规格 + var partNumber = result.partNumber; //客户物料号 var lengthMat = result.lengthMat; var lengthBc = result.lengthBc; - let itemCode = content.substr(0, lengthMat); + let scanPartNumber = content.substr(0, lengthMat); //扫描的客户物料号 let productDate = content.substr(lengthMat, 8); let batch = content.substr(lengthMat + 8, 3); let order = content.substr(-8); - if (itemCode != partNumber) { + if (scanPartNumber != partNumber) { that.clear(); - throw new Error("解析错误:扫描物料号【" + itemCode + "】与查询物料号【" + partNumber + + throw new Error("解析错误:扫描的客户物料号【" + scanPartNumber + "】与生成条码配置表中的客户物料号【" + partNumber + "】不一致") } let scanResult = { - itemCode: itemCode, + itemCode: scanPartNumber, productDate: productDate, batch: batch, order: order, From c2eddadbdf6a588f67a2568418e3fd86b32edb29 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Wed, 26 Jun 2024 18:08:05 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=8F=96=E6=B6=88Mes=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F=E5=92=8C?= =?UTF-8?q?=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/scan/winComScanFg.vue | 65 ++++++++++++------- src/pages/productReceipt/coms/comFgCard.vue | 4 +- .../job/fgProductReceiptDetail.vue | 4 +- 3 files changed, 44 insertions(+), 29 deletions(-) diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue index b69462e3..c00a5016 100644 --- a/src/mycomponents/scan/winComScanFg.vue +++ b/src/mycomponents/scan/winComScanFg.vue @@ -139,7 +139,7 @@ }, 1000); // #endif }, - setItemCodeSimulate(itemCode,scanMsg) { + setItemCodeSimulate(itemCode, scanMsg) { this.itemCode = itemCode; this.scanMsg = scanMsg; }, @@ -188,38 +188,53 @@ getMesPackInfo(this.itemCode).then(res => { try { if (res.data.list.length == 0) { - throw new Error("没有查找到物料号【"+this.itemCode+"】对应的生产条码配置") + throw new Error("没有查找到物料号【" + this.itemCode + "】对应的生产条码配置") } - var result = res.data.list[0] //Mes条码标签解析规格 + var result = res.data.list[0] //Mes条码标签解析规格 var partNumber = result.partNumber; //客户物料号 var lengthMat = result.lengthMat; var lengthBc = result.lengthBc; + + //因为Q5的客户物料进行了加密,没有解析规格,在生产条码配置中的Type配置成Q5 + if (result.Type == 'P') { + let scanPartNumber = content.substr(0, lengthMat); //扫描的客户物料号 + // let productDate = content.substr(lengthMat, 8); + // let batch = content.substr(lengthMat + 8, 3); + let order = content.substr(-8); + if (scanPartNumber != partNumber) { + that.clear(); + throw new Error("解析错误:扫描的客户物料号【" + scanPartNumber + + "】与生成条码配置表中的客户物料号【" + partNumber + + "】不一致") + } - - let scanPartNumber = content.substr(0, lengthMat); //扫描的客户物料号 - let productDate = content.substr(lengthMat, 8); - let batch = content.substr(lengthMat + 8, 3); - let order = content.substr(-8); - if (scanPartNumber != partNumber) { + let scanResult = { + itemCode: scanPartNumber, + // productDate: productDate, + // batch: batch, + order: order, + qty: 1, + content: content, + success: true, + }; that.clear(); - throw new Error("解析错误:扫描的客户物料号【" + scanPartNumber + "】与生成条码配置表中的客户物料号【" + partNumber + - "】不一致") - + that.$emit("getResult", scanResult); + } else { + //不进行解析,直接按照扫描的标签进行赋值 + let scanResult = { + itemCode: this.itemCode, + // productDate: new Date(), + // batch: new Date(), + order: 0, + qty: 1, + content: content, + success: true, + }; + that.clear(); + that.$emit("getResult", scanResult); } - - let scanResult = { - itemCode: scanPartNumber, - productDate: productDate, - batch: batch, - order: order, - qty: 1, - content: content, - success: true, - }; - that.clear(); - that.$emit("getResult", scanResult); } catch (error) { - this.$refs.comMessage.showErrorMessage( error.message, res => { + this.$refs.comMessage.showErrorMessage(error.message, res => { if (res) { that.getfocus(); } diff --git a/src/pages/productReceipt/coms/comFgCard.vue b/src/pages/productReceipt/coms/comFgCard.vue index 0250637d..3dccba14 100644 --- a/src/pages/productReceipt/coms/comFgCard.vue +++ b/src/pages/productReceipt/coms/comFgCard.vue @@ -7,10 +7,10 @@ 零件号 {{detail.itemCode}} - + + + From 1d598e816c1df17930b90f9259cf4ba0551cb289 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 08:50:22 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=8A=A0=E7=B2=97?= =?UTF-8?q?=EF=BC=8C=E6=94=BE=E5=A4=A7=E4=B8=A4=E4=B8=AA=E5=AD=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hybrid/html/point.html | 4 ++++ src/pages/point/index.vue | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/hybrid/html/point.html b/src/hybrid/html/point.html index 82a76ddb..566ccd06 100644 --- a/src/hybrid/html/point.html +++ b/src/hybrid/html/point.html @@ -30,6 +30,10 @@ .left-item { display: flex; } + .bold-font{ + font-weight: bold; + font-size: 28rpx; + } .label { border-bottom: 1px solid #b1b1b1; diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue index 33d42430..e3ec36b4 100644 --- a/src/pages/point/index.vue +++ b/src/pages/point/index.vue @@ -5,7 +5,7 @@ 物品代码 - {{item.itemCode}} + {{item.itemCode}} 物品名称 @@ -29,7 +29,7 @@ 数量 - {{item.qty}} + {{item.qty}} @@ -119,7 +119,7 @@
物品代码
-
${item.itemCode}
+
${item.itemCode}
物品名称
@@ -143,7 +143,7 @@
数量
-
${item.qty}
+
${item.qty}
@@ -254,6 +254,10 @@ height: 100rpx; line-height: 100rpx; } + .bold-font{ + font-weight: bold; + font-size: 28rpx; + } .value { border-bottom: 1px solid #b1b1b1; From 64a920de568e40628c94dfd93f49997f8e82fae4 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 09:01:04 +0800 Subject: [PATCH 10/11] VITE_TENANT --- .env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.development b/.env.development index 67ef76c8..2d78cf62 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api #VITE_BASE_URL=http://172.21.32.13:81/api/admin-api #VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api - # 租户配置 ITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' + # 租户配置 VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' # 是否是测试环境 VITE_isDevelopment=true From 6323e895c339c99417e8248f177b6e8e69587ad7 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 17:03:11 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/job/jobComMainDetailCard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue index 64c3df42..14d5717c 100644 --- a/src/mycomponents/job/jobComMainDetailCard.vue +++ b/src/mycomponents/job/jobComMainDetailCard.vue @@ -13,7 +13,7 @@ - +