diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index b28251a..43fe486 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.119'; //正式版本号 + version = '0.0.120'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/product/SaleOutWH/index.vue b/src/pages/wms/product/SaleOutWH/index.vue index 96cc626..9f1a445 100644 --- a/src/pages/wms/product/SaleOutWH/index.vue +++ b/src/pages/wms/product/SaleOutWH/index.vue @@ -356,22 +356,32 @@ export default class SaleOutWH extends BasePage { item.siteCode = session.FactoryCode; await this.model.ScanCodeWholePallet(item); if (this.model.scanCode == '200') { - (this.$refs.uToast as any).show({ - title: '成功', - type: 'success', - }); - model.scandatalist.map((item) => { - item.productCode = item.productCode.slice(item.productCode.search(/[1-9]/)); - if (item.productCode == this.orderNoItemList.productCode) { - this.list.push(item); - this.orderNoItemList.outQuantity += item.amount; - } else { - (this.$refs.uToast as any).show({ - title: '扫描的物料必须与选择的物料相同', - type: 'error', - }); - } - }); + let chongfuscan = this.list.some((item) => item.storageId === model.scandatalist[0].storageId); + if (chongfuscan) { + (this.$refs.uToast as any).show({ + title: '请勿重复扫描标志卡', + // url: '/pages/user/index' + }); + return; + } else { + (this.$refs.uToast as any).show({ + title: '成功', + type: 'success', + }); + model.scandatalist.map((item) => { + item.productCode = item.productCode.slice(item.productCode.search(/[1-9]/)); + if (item.productCode == this.orderNoItemList.productCode) { + this.list.push(item); + this.orderNoItemList.outQuantity += item.amount; + } else { + (this.$refs.uToast as any).show({ + title: '扫描的物料必须与选择的物料相同', + type: 'error', + }); + } + }); + } + // this.list.push() this.boxnumber = '';