From c5f600bdb698aea29c458472257ad35540bcd5f2 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Wed, 7 Aug 2024 23:23:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E5=92=8C?= =?UTF-8?q?=E8=A1=A5=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/label.js | 43 +++++----- .../inventoryMove/coms/comMoveRecord.vue | 8 +- src/pages/issue/coms/comScanIssuePack.vue | 86 +------------------ src/pages/issue/job/issueDetail.vue | 10 ++- .../repleinsh/coms/comScanReplishPack.vue | 1 + src/pages/repleinsh/job/repleinshDetail.vue | 1 - 6 files changed, 38 insertions(+), 111 deletions(-) diff --git a/src/common/label.js b/src/common/label.js index 83308d4c..355b68c6 100644 --- a/src/common/label.js +++ b/src/common/label.js @@ -12,45 +12,45 @@ import { -export function getLabelInfo(scanMsg,headerType, callBack) { - console.log('扫描信息:', scanMsg); +export function getLabelInfo(scanMsg, headerType, callBack) { + console.log('扫描信息:', scanMsg); if (scanMsg.length == 0) { return null } let items = scanMsg.split(';'); let header = items[0]; let version = items[1]; - if ((header != undefined) && (version!=undefined)) { - var hearList =getDirectoryItemArray(headerType) - if(!checkDirectoryItemExist(hearList,header)){ + if ((header != undefined) && (version != undefined)) { + var hearList = getDirectoryItemArray(headerType) + if (!checkDirectoryItemExist(hearList, header)) { let labelResult = { label: { labelType: "", barType: '', - code:"" + code: "" }, package: null, success: false, - message: '请输入'+headerType+"开始的标签", + message: '请输入' + headerType + "开始的标签", } callBack(labelResult); return; } - + //解析扫描的是一维码还是二维码 let type = header.substring(header.length - 1, header.length); if (type == 'Q') //qrcode { getQRCodeInfo(header, version, scanMsg, callBack); - } + } // else if (type == 'B') //barcode // { // getBarCodeInfo(header, version, items[2], callBack); // } - else { //直接输入文本 + else { //直接输入文本 getBarCodeInfo('text', 'V1.0', scanMsg, callBack); } - }else { + } else { getBarCodeInfo('text', 'V1.0', scanMsg, callBack); // let labelResult = { // label: { @@ -79,7 +79,7 @@ export function getQRCodeInfo(header, version, scanMsg, callBack) { message: '' } getLabelByHeader(header, version).then(res => { - if (res.data==null) { + if (res.data == null) { labelResult.success = false; labelResult.message = '未查找到标签头为[' + header + ']的标签类型'; callBack(labelResult); @@ -89,7 +89,7 @@ export function getQRCodeInfo(header, version, scanMsg, callBack) { version: version, label: res.data, }; - + labelDic.push(newItem); getLabelItems(newItem, scanMsg, callBack); } @@ -108,13 +108,13 @@ export function getLabelItems(labelItem, scanMsg, callBack) { if (labelResult.label.labelType == 'PurchaseLabel' || labelResult.label.labelType == 'MakeLabel') { //查询包装信息 let packingNumber = labelResult.label.packingNumber - if (packingNumber != undefined) { + if (packingNumber != undefined && packingNumber != '') { getPackageListByNumber(packingNumber).then(pack => { if (pack.data.reqPackage) { labelResult.package = pack.data.reqPackage; labelResult.package.subList = pack.data.subList; console.log('包装信息', JSON.stringify(labelResult.package)) - + } else { labelResult.success = false; labelResult.message = '包装号[' + packingNumber + ']没有包装信息'; @@ -126,9 +126,12 @@ export function getLabelItems(labelItem, scanMsg, callBack) { callBack(labelResult); }) } else { - labelResult.success = false; - labelResult.message = '在条码中未解析到箱码'; + //线边的物料可能没有箱码 + labelResult.package = labelResult.label; callBack(labelResult); + // labelResult.success = false; + // labelResult.message = '在条码中未解析到箱码'; + // callBack(labelResult); } } else { callBack(labelResult); @@ -145,7 +148,7 @@ export function analysisQRCodeLabel(labelItem, scanMsg) { success: true, message: '' } - + let separators = labelItem.label.separators; if (separators == undefined || separators == null) { labelResult.message = "未读取到分隔符"; @@ -189,11 +192,11 @@ export function getBarCodeInfo(header, version, value, callBack) { label: { labelType: header, barType: 'BarCode', - code:value + code: value }, package: null, success: true, message: '', } callBack(labelResult); -} +} \ No newline at end of file diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index c6df8890..48bcc383 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -191,7 +191,7 @@ getBasicLocationByCode(this.toLocationCode).then(res => { if (res.data.total > 0) { let result = res.data.list[0]; - if(result.code!=this.toLocationCode){ + if (result.code != this.toLocationCode) { this.showErrorMessage('未查询到库位[' + this.toLocationCode + ']') return; } @@ -245,7 +245,11 @@ if (item == undefined) { var itemp = createItemInfo(balance, pack); let newDetail = createDetailInfo(balance, pack); - // + + if (newDetail.packingNumber == '') { + newDetail.packingNumber = pack.number; + } + if (this.businessTypeCode == "Move") { newDetail.toInventoryStatus = balance.inventoryStatus; } else { diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 0a28f250..c7bcd734 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -331,91 +331,6 @@ uni.hideLoading() this.showErrorMessage(error) }) - - // this.getBalance(result.label, packageInfo, balances => { - // this.packageInfo = packageInfo; - // //扫描的是外包装 - // let s = ''; - // if (!result.package.parentNumber) { - // if (balances.list.length == 0) { - // this.showErrorMessage('未查找到该包装的库存信息,请重新扫描') - // } else { - // let newBalances = balances.list.filter(b => b.locationCode == that - // .fromLocationCode); - // if (newBalances.length == 0) { - // this.showErrorMessage('未查找到该包装的库存信息,请重新扫描') - // } else if (newBalances.length == 1) { - // let balance = newBalances[0]; - // this.afterGetBalance(result.label, balance, packageInfo); - // } else { - // this.showBalanceSelect(newBalances); - // } - // } - // } else { - // //扫描的是小包装 - // if (balances.list.length == 0) { - // this.showErrorMessage('未查找到该包装的库存信息,请重新扫描') - // } else { - // //小包装库存 - // let subPackitems = balances.list.filter(r => r.packingNumber == packageInfo - // .number) - // //外包装库存 - // let subParentPackitems = balances.list.filter(r => r.packingNumber == - // packageInfo - // .parentNumber && r.locationCode == this.fromLocationCode) - - - // //小包装没有库存， - // if (subPackitems.length == 0) { - // //外包装有库存，出库后剩余库存未转换为出库包装规格 - - // if (subParentPackitems.length > 0) { - // if (subParentPackitems.length == 1) { - // let balance = subParentPackitems[0]; - // balance.qty = packageInfo.qty; - // this.afterGetBalance(result.label, balance, packageInfo); - // } else { - // this.showBalanceSelect(subParentPackitems); - // } - - // } else { - // this.showErrorMessage('按外包装【' + packageInfo.parentNumber + '】和子包装【' + - // packageInfo.number + '】都未查找到库存余额') - // } - // } else { - // var locationCode = this.fromLocationCode - // if (balances.list == 1) { - // locationCode = balances.list[0].locationCode - // } else { - // var manyBlances = balances.list.filter(r => r.locationCode != this - // .fromLocationCode) - // if (manyBlances.length > 0) { - // locationCode = manyBlances[0].locationCode; - // } - - // } - // this.showErrorMessage('该包装【' + packageInfo.number + '】在库位【' + - // locationCode + - // '】已经有库存余额,请重新扫描') - - // // var locationCode = this.fromLocationCode - // // if(balances.list==1){ - // // locationCode=balances.list[0].locationCode - // // }else { - // // var manyBlances = balances.list.filter(r=>r.locationCode!=this.fromLocationCode) - // // if(manyBlances.length>0){ - // // locationCode = manyBlances[0].locationCode; - // // } - - // // } - // // this.showErrorMessage('该包装【' + packageInfo.number + '】在库位【' + - // // locationCode + - // // '】已经有库存余额,请重新扫描') - // } - // } - // } - // uni.hideLoading(); - // }); } } catch (e) { this.showErrorMessage(e.stack) @@ -598,6 +513,7 @@ } let batch = this.createBatchInfo(label, balance, packageInfo); batch.detail = balance; + batch.detail.fromLocationCode=balance.locationCode; location.Batchs.push(batch); return location; }, diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index bf7b346c..13b15b2f 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -272,7 +272,7 @@ // }) // }, - submit() { + submit() { uni.showLoading({ title: "提交中....", mask: true @@ -346,8 +346,12 @@ .ContainerNumber; record.toInventoryStatus = r .inventoryStatus; - record.toLocationCode = subItem - .toLocationCode; + // record.toLocationCode = subItem + // .toLocationCode; + + record.toLocationCode = this.jobContent + .detailToLocationCode; + record.supplierCode = r.supplierCode; let single_price = r.balance diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index b5506380..c4fc1f3d 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -425,6 +425,7 @@ } let batch = this.createBatchInfo(label, balance, packageInfo); batch.detail = balance; + batch.detail.fromLocationCode = balance.locationCode; location.Batchs.push(batch); return location; }, diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index a0a0c25d..fabc2fed 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -278,7 +278,6 @@ }); var params = this.setParams() console.log("提交参数", JSON.stringify(params)); - return; repleinshJobSubmit(params).then(res => { uni.hideLoading() if (res.data) {