From d3d6259971b1b00586577557cee201037dc8f6bf Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 30 Jul 2024 14:58:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=90=8E=E5=B0=86=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=BF=A1=E6=81=AF=E7=BD=AE=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 12 +-- src/common/detail.js | 54 ++++++------- src/manifest.json | 4 +- .../purchaseReceipt/job/receiptDetail.vue | 77 ++++++++----------- 4 files changed, 67 insertions(+), 80 deletions(-) diff --git a/.env.development b/.env.development index a4608106..a216fad1 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,11 @@ -#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.14:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api - # 租户配置 VITE_TENANT='[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' +VITE_BASE_URL=http://172.21.32.14:81/api/admin-api +VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api + +# 租户配置 +VITE_TENANT='[{"text":"长春1379","value":1}]' # 是否是测试环境 VITE_isDevelopment=true # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' +VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' diff --git a/src/common/detail.js b/src/common/detail.js index f9d6fe8a..b6ed44a3 100644 --- a/src/common/detail.js +++ b/src/common/detail.js @@ -34,8 +34,9 @@ export function getTreeDataSource(dataList) { items.forEach(r => r.subList.forEach(s => { s.packList = childList.filter(c => c.parentPackingNumber == s.packingNumber) - s.packList.forEach(pac=>{ - pac.scaned=false; + s.packList.forEach(pac => { + pac.scaned = false; + pac.scanDate = new Date(); }) }) ) @@ -45,23 +46,23 @@ export function getTreeDataSource(dataList) { } export function getDataSource(subList) { - let items = []; - subList.forEach(detail => { - var item = items.find(r => - r.itemCode == detail.itemCode) - if (item == undefined) { - item = createItemInfo(detail); - let newDetail = createDetailInfo(detail); // - item.subList.push(newDetail); - items.push(item) - } else { - item.qty = calc.add(item.qty, detail.qty) - let newDetail = createDetailInfo(detail); // - item.subList.push(newDetail); - } - }) - return items; - } + let items = []; + subList.forEach(detail => { + var item = items.find(r => + r.itemCode == detail.itemCode) + if (item == undefined) { + item = createItemInfo(detail); + let newDetail = createDetailInfo(detail); // + item.subList.push(newDetail); + items.push(item) + } else { + item.qty = calc.add(item.qty, detail.qty) + let newDetail = createDetailInfo(detail); // + item.subList.push(newDetail); + } + }) + return items; +} export function createItemInfo(detail) { let item = { @@ -79,6 +80,7 @@ export function createItemInfo(detail) { export function createDetailInfo(data) { data.scaned = false; + data.scanDate = new Date(); let detail = data; detail.packList = []; return detail; @@ -104,8 +106,8 @@ export function calcHandleQty(detailSource) { item.handleQty = new Decimal(0).toNumber(); item.qty = new Decimal(0).toNumber(); for (let detail of item.subList) { - if (detail != undefined ) { - if(detail.scaned){ + if (detail != undefined) { + if (detail.scaned) { item.handleQty = calc.add(item.handleQty, detail.handleQty); } item.qty = calc.add(item.qty, detail.qty); @@ -117,14 +119,14 @@ export function calcHandleQty(detailSource) { export function calcTreeHandleQty(detailSource) { for (let item of detailSource) { item.handleQty = new Decimal(0).toNumber(); - + for (let detail of item.subList) { if (detail != undefined && detail.scaned) { - if(detail.packList.length>0){ + if (detail.packList.length > 0) { detail.handleQty = new Decimal(0).toNumber(); - for (let pack of detail.packList){ - if(pack!=undefined&&pack.scaned){ - detail.handleQty = calc.add(detail.handleQty, pack.handleQty); + for (let pack of detail.packList) { + if (pack != undefined && pack.scaned) { + detail.handleQty = calc.add(detail.handleQty, pack.handleQty); } } } diff --git a/src/manifest.json b/src/manifest.json index 56fe8079..eb25cc47 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,8 +2,8 @@ "name" : "wms", "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.28", - "versionCode" : 28, + "versionName" : "1.0.37", + "versionCode" : 37, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 8972ea93..b662dc70 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -78,7 +78,7 @@ goHome, getCurrDateTime, getPackingNumberAndBatch, - compareAsc, + compareDesc, navigateBack, getSwitchInfoByCode } from '@/common/basic.js'; @@ -282,18 +282,19 @@ } else { itemDetail.forEach(item => { item.scaned = true; - itemDetail.scaneDate = new Date(); + itemDetail.scanDate = new Date(); item.handleQty = item.qty; item.toLocationCode = this.toLocationCode; }) - this.detailSource[0].subList.sort(compareAsc('scaneDate')); //按扫描信息排序 calcHandleQty(this.detailSource); + this.detailSource[0].subList.sort(compareDesc('scanDate')); //按扫描信息排序 this.continueScan() this.$forceUpdate() } } } else if (result.label.labelType == "PurchaseLabel") { - var packingNumber = result.label.packingNumber; + var packingNumber = result.package.number; + var parentpackingNumber = result.package.parentNumber; var batch = result.label.batch; var qty = result.label.qty; var detail = this.detailSource.find(r => r.itemCode == itemCode); @@ -304,51 +305,35 @@ var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch); if (itemDetail == undefined) { - var isExit; - let subItem; - let index = -1; - for (subItem of detail.subList) { - var item; - for (var i = 0; i < subItem.packList.length; i++) { - let pack = subItem.packList[i]; - index = i; - if (pack.packingNumber == packingNumber && - pack.batch == batch) { - item = pack; - isExit = pack; - break; - } - } - // for (let pack of subItem.packList) { - // if (pack.packingNumber == packingNumber && - // pack.batch == batch) { - // item = pack; - // isExit = pack; - // break; - // } - // } - // if (item != undefined) { - // subItem.scaned = true - // subItem.handleQty = 0; - // item = undefined - // } - } + itemDetail = detail.subList.find(r => r.packingNumber == parentpackingNumber && r.batch == + batch); - if (isExit == undefined) { + if (itemDetail == undefined) { this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中") } else { - if (isExit.scaned) { - this.showMessage("箱码【" + packingNumber + "】已经扫描"); + var pack = itemDetail.packList.find(p => p.packingNumber == packingNumber && + p.batch == batch) + if (pack == undefined) { + this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中") } else { - isExit.scaned = true - isExit.handleQty = Number(result.label.qty); - isExit.toLocationCode = this.toLocationCode; - isExit.labelQty = Number(result.label.qty); + if (pack.scaned) { + pack.scanDate = new Date(); + this.showMessage("箱码【" + packingNumber + "】已经扫描"); + } else { + pack.scaned = true + pack.scanDate = new Date(); + pack.handleQty = Number(result.label.qty); + pack.toLocationCode = this.toLocationCode; + pack.labelQty = Number(result.label.qty); + } } + calcTreeHandleQty(this.detailSource); + itemDetail.packList.sort(compareDesc('scanDate')); //按扫描信息排序 + this.$forceUpdate() } - calcTreeHandleQty(this.detailSource); - this.$forceUpdate() + } else { + //扫描的是外包装,将包装集合全部扫描 var scanedLength = 0; itemDetail.packList.forEach(res => { if (res.scaned) { @@ -357,23 +342,23 @@ }) if (itemDetail.scaned && scanedLength == itemDetail .packList.length) { + isExit.scanDate = new Date(); this.showMessage("箱码【" + packingNumber + "】已经扫描") } else { itemDetail.scaned = true; - itemDetail.scaneDate = new Date(); - this.detailSource[0].subList.sort(compareAsc('scaneDate')); //按扫描信息排序 + itemDetail.scanDate = new Date(); itemDetail.handleQty = Number(result.label.qty); itemDetail.toLocationCode = this.toLocationCode; itemDetail.labelQty = Number(result.label.qty); itemDetail.packList.forEach(pac => { pac.scaned = true - itemDetail.scaneDate = new Date(); + pac.scanDate = new Date(); pac.handleQty = Number(pac.qty); pac.toLocationCode = this.toLocationCode; }) calcTreeHandleQty(this.detailSource); - var test = this.detailSource + this.detailSource[0].subList.sort(compareDesc('scanDate')); //按扫描信息排序 this.continueScan() this.$forceUpdate() }