diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 561b667..d10052a 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.159'; //正式版本号 + version = '0.0.160'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/Raw/SpecialDelivery/index.vue b/src/pages/wms/Raw/SpecialDelivery/index.vue index 80bd24e..7f72bbf 100644 --- a/src/pages/wms/Raw/SpecialDelivery/index.vue +++ b/src/pages/wms/Raw/SpecialDelivery/index.vue @@ -250,10 +250,10 @@ export default class SpecialDelivery extends BasePage { let alreadyList = model.byidcardobj; alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/)); alreadyList.produceCode = this.orderNo; - let tianjiaflage = this.materilist.some((item) => item.materialCode == alreadyList.materialCode); + let tianjiaflage = this.materilist.some((item) => item.handlematerialCode == alreadyList.handlematerialCode); if (tianjiaflage) { this.materilist.forEach((item) => { - if (item.materialCode == alreadyList.materialCode) { + if (item.handlematerialCode == alreadyList.handlematerialCode) { if (item.userDefined9) { uni.showModal({ content: '否要进行加料?', @@ -307,12 +307,12 @@ export default class SpecialDelivery extends BasePage { confirmNumber(changeobj) { let addnumber = 0; this.list.forEach((item) => { - if (item.materialCode == changeobj.materialCode) { + if (item.handlematerialCode == changeobj.handlematerialCode) { addnumber += parseFloat(item.amount ? item.amount : '0'); } }); this.materilist.forEach((item) => { - if (item.materialCode == changeobj.materialCode) { + if (item.handlematerialCode == changeobj.handlematerialCode) { item.outNumber = item.returnoutNumber + addnumber; } }); @@ -373,7 +373,7 @@ export default class SpecialDelivery extends BasePage { delet(deletobj, index) { this.list.splice(index, 1); this.materilist.forEach((item) => { - if (item.materialCode == deletobj.materialCode) { + if (item.handlematerialCode == deletobj.handlematerialCode) { item.outNumber -= deletobj.amount; } });