Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cosmoim-852 fix 俄罗斯拣配代码逻辑修改以及添加注释

Browse Source
master
guoshuang 3 years ago
parent e5d7f6b191
commit af89e8740c
2 changed files with 644 additions and 640 deletions
Show Stats Download Patch File Download Diff File

110
src/pages/raw/handover/RUS-picking/ByOrder.vue
Unescape Escape View File

@ -181,6 +181,7 @@ export default class RawReceiptDetail extends BasePage {
this.LocationList = [];
this.qty = '';
this.Barcode = '';
//不在推荐库位，所以注掉
//根据选择一行数据查询库位
// await this.model.queryItemLoc({
// workArea: session.workareaCode,
@ -207,8 +208,8 @@ export default class RawReceiptDetail extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
if (!this.some) {
this.customToast(this.$t('message.AppendMateriel6') as string);
if (JSON.stringify(this.some) == '{}') {
this.customToast(this.$t('message.Commission_tips6') as any);
return;
}
@ -256,19 +257,49 @@ export default class RawReceiptDetail extends BasePage {
this.customToast(this.$t('message.Commission_tips7') as any);
return (isTrue = false);
}
//本次输入容器码与下面容器码相同的所有qty的和，用于最大可添加数量校验
if (this.Barcode == item.barcode) {
allqty += parseFloat(item.qty);
}
});
//下面表格有数据情况下，添加一个时，最大可添加数量校验
if (allqty + parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
this.customToast(this.$t('message.Pi_tip20') as any);
return (isTrue = false);
}
} else {
//下面表格没数据时，添加一个时，最大可添加数量校验
if (parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
this.customToast(this.$t('message.Pi_tip20') as any);
return (isTrue = false);
}
}
if (isTrue == true) {
// let arr = {
// wlCode: this.wlCode.label,
// qty: this.qty,
// Code: this.wlCode.sendSpot,
// barcode: this.Barcode,
// };
// this.LocationList.push(arr);
// let objString = JSON.stringify(this.some);
// let TEM = JSON.parse(objString);
// TEM.wlList = null;
// TEM.wlCode = this.wlCode.label;
// TEM.qty = this.qty;
// TEM.barcode = this.Barcode;
// this.model.aggregateList[this.someIndex].wlList.push(TEM);
// this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
// this.qty = '';
if (parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) > parseFloat(this.some.amount)) {
uni.showModal({
title: 'Tip',
content: this.$t('message.Pi_tip11') as string,
confirmText: this.$t('message.workArea_Confirm') as string,
cancelText: this.$t('message.Cancel') as string,
showCancel: true,
success: (res) => {
if (res.confirm) {
let arr = {
wlCode: this.wlCode.label,
qty: this.qty,
@ -282,58 +313,31 @@ export default class RawReceiptDetail extends BasePage {
TEM.wlCode = this.wlCode.label;
TEM.qty = this.qty;
TEM.barcode = this.Barcode;
this.model.aggregateList[this.someIndex].wlList.push(TEM);
this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
//add之后有什么操作
this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
this.qty = '';
// if (parseFloat(this.qty) + parseFloat(this.some.totalMoAmount) > parseFloat(this.some.amount)) {
// uni.showModal({
// title: 'Tip',
// content: this.$t('message.Pi_tip11') as string,
// confirmText: this.$t('message.workArea_Confirm') as string,
// cancelText: this.$t('message.Cancel') as string,
// showCancel: true,
// success: (res) => {
// if (res.confirm) {
// let arr = {
// wlCode: this.wlCode.label,
// qty: this.qty,
// Code: this.wlCode.sendSpot,
// xxxx: this.form.xxxx,
// };
// this.LocationList.push(arr);
// let objString = JSON.stringify(this.some);
// let TEM = JSON.parse(objString);
// TEM.wlList = null;
// TEM.wlCode = this.wlCode.label;
// TEM.qty = this.qty;
// TEM.xxxx = this.form.xxxx;
// //add之后有什么操作
// this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
// this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
// this.qty = '';
// this.form.xxxx = '';
// }
// },
// });
// } else {
// let arr = {
// wlCode: this.wlCode.label,
// qty: this.qty,
// Code: this.wlCode.sendSpot,
// xxxx: this.form.xxxx,
// };
// this.LocationList.push(arr);
// let objString = JSON.stringify(this.some);
// let TEM = JSON.parse(objString);
// TEM.wlList = null;
// TEM.wlCode = this.wlCode.label;
// TEM.qty = this.qty;
// TEM.xxxx = this.form.xxxx;
// this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
// this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
// this.qty = '';
// this.form.xxxx = '';
// }
}
},
});
} else {
let arr = {
wlCode: this.wlCode.label,
qty: this.qty,
Code: this.wlCode.sendSpot,
barcode: this.Barcode,
};
this.LocationList.push(arr);
let objString = JSON.stringify(this.some);
let TEM = JSON.parse(objString);
TEM.wlList = null;
TEM.wlCode = this.wlCode.label;
TEM.qty = this.qty;
TEM.barcode = this.Barcode;
this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
this.qty = '';
}
}
}
deleteItem(index: any) {

12
src/pages/raw/handover/RUS-picking/BySummary.vue
Unescape Escape View File

@ -199,8 +199,8 @@ export default class RawReceiptDetail extends BasePage {
this.customToast(this.$t('message.barcode') as string);
return;
}
if (!this.some) {
this.customToast(this.$t('message.AppendMateriel6') as string);
if (JSON.stringify(this.some) == '{}') {
this.customToast(this.$t('message.Commission_tips6') as any);
return;
}
//确定物料编码是哪个字段
@ -249,7 +249,9 @@ export default class RawReceiptDetail extends BasePage {
this.customToast(this.$t('message.Commission_tips7') as any);
return (isTrue = false);
}
if (this.Barcode == item.barcode) {
allqty += parseFloat(item.qty);
}
});
if (allqty + parseFloat(this.qty) > parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4)) {
this.customToast(this.$t('message.Pi_tip20') as any);
@ -301,11 +303,10 @@ export default class RawReceiptDetail extends BasePage {
TEM.wlCode = this.wlCode.label;
TEM.qty = this.qty;
//
TEM.xxxx = this.form.xxxx;
TEM.barcode = this.Barcode;
this.model.aggregateList[this.someIndex].wlList.push(TEM);
this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
this.qty = '';
this.form.xxxx = '';
}
},
});
@ -323,11 +324,10 @@ export default class RawReceiptDetail extends BasePage {
TEM.wlCode = this.wlCode.label;
TEM.qty = this.qty;
///
TEM.xxxx = this.form.xxxx;
TEM.barcode = this.Barcode;
this.model.aggregateList[this.someIndex].wlList.push(TEM);
this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
this.qty = '';
this.form.xxxx = '';
}
}
}

Write Preview
Loading…
Cancel
Save