diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 8fb3b6c7..1fa86ce7 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -388,7 +388,7 @@ console.log("包装规格获取失败", res) }) - var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated"; + var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated"; getSwitchByCode(switchCode).then(res=>{ uni.setStorageSync("switch", res.data) diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 7a898713..1c6c3cb3 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -85,7 +85,8 @@ import { goHome, navigateBack, - getPackingNumberAndBatch, + getPackingNumberAndBatch, + getSwitchInfoByCode } from '@/common/basic.js'; import { @@ -334,18 +335,21 @@ }); }, - commit() { + commit() { this.scanCount = getScanCount(this.subList); if (this.scanCount == 0) { this.showErrorMessage("扫描数为0,请先扫描") return; + } + var valiDate = getSwitchInfoByCode("semiProductReceipCommitValidate") + //校验库位、 + if(valiDate){ + if (!this.checkLocation()) { + return + } + }else{ + this.toLocationCode = this.jobToLocationCode } - //校验库位、 - if (!this.checkLocation()) { - return - } - - //扫描数量和任务数量相等,直接提交 if (this.scanCount == this.subList.length) { if (this.checkCount()) {