|
@ -227,7 +227,9 @@ |
|
|
that.fromLocationCode = that.subList[0].fromLocationCode |
|
|
that.fromLocationCode = that.subList[0].fromLocationCode |
|
|
|
|
|
|
|
|
that.detailSource.forEach(r => { |
|
|
that.detailSource.forEach(r => { |
|
|
r.isRecommTaskItem = true//为推荐任务 |
|
|
r.subList.forEach(s => { |
|
|
|
|
|
s.isRecommTaskItem = true//为推荐任务 |
|
|
|
|
|
}) |
|
|
}) |
|
|
}) |
|
|
//任务中已经扫描,模拟扫描赋值 |
|
|
//任务中已经扫描,模拟扫描赋值 |
|
|
if (this.scanMessage) { |
|
|
if (this.scanMessage) { |
|
@ -359,6 +361,7 @@ |
|
|
packQty:result.package.packQty, |
|
|
packQty:result.package.packQty, |
|
|
packUnit:result.package.packUnit, |
|
|
packUnit:result.package.packUnit, |
|
|
uom:result.balance.uom, |
|
|
uom:result.balance.uom, |
|
|
|
|
|
isRecommTaskItem:false,//不是推荐任务中的任务 |
|
|
// packList:[{ |
|
|
// packList:[{ |
|
|
// scaned : true, |
|
|
// scaned : true, |
|
|
// handleQty : Number(result.label.qty), |
|
|
// handleQty : Number(result.label.qty), |
|
@ -436,6 +439,7 @@ |
|
|
itemDetail.packUnit=result.package.packUnit |
|
|
itemDetail.packUnit=result.package.packUnit |
|
|
itemDetail.fromlocationCode=this.fromLocationCode |
|
|
itemDetail.fromlocationCode=this.fromLocationCode |
|
|
itemDetail.toLocationCode=this.toLocationCode |
|
|
itemDetail.toLocationCode=this.toLocationCode |
|
|
|
|
|
itemDetail.isRecommTaskItem = true//是推荐任务中的数量 |
|
|
// itemDetail.toInventoryStatus = "OK" |
|
|
// itemDetail.toInventoryStatus = "OK" |
|
|
// itemDetail.packList.forEach(pac => { |
|
|
// itemDetail.packList.forEach(pac => { |
|
|
// pac.scaned = true |
|
|
// pac.scaned = true |
|
@ -637,24 +641,24 @@ |
|
|
str1 += `物料号【${detail.itemCode}】提交数量【${detail.handleQty}】不允许大于任务数量【${detail.qty}】` |
|
|
str1 += `物料号【${detail.itemCode}】提交数量【${detail.handleQty}】不允许大于任务数量【${detail.qty}】` |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if(detail.isRecommTaskItem){//扫描推荐任务中的任务时候才有这个提示 |
|
|
|
|
|
detail.handleQty = detail.handleQty || 0 |
|
|
|
|
|
if(detail.handleQty == 0 && isTrue){ |
|
|
|
|
|
isTrue = false |
|
|
|
|
|
str3 = '推荐的箱码没扫,' |
|
|
|
|
|
} |
|
|
|
|
|
if(parseFloat(detail.handleQty)!=parseFloat(detail.qty)){ |
|
|
|
|
|
str3 += `物料号【${detail.itemCode}】扫描数量【${parseFloat(detail.handleQty)}】和任务数量【${detail.qty}】不一致` |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
detail.subList.forEach(item => { |
|
|
detail.subList.forEach(item => { |
|
|
if(item.scaned){ |
|
|
if(item.scaned){ |
|
|
if(parseFloat(item.handleQty)>parseFloat(item.balance.qty)){ |
|
|
if(parseFloat(item.handleQty)>parseFloat(item.balance.qty)){ |
|
|
str2 += `物料号【${detail.itemCode}】批次【${item.batch}】提交数量【${parseFloat(item.handleQty)}】不可以大于库存数量【${item.balance.qty}】` |
|
|
str2 += `物料号【${detail.itemCode}】批次【${item.batch}】提交数量【${parseFloat(item.handleQty)}】不可以大于库存数量【${item.balance.qty}】` |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
if(item.isRecommTaskItem){//扫描推荐任务中的任务时候才有这个提示 |
|
|
|
|
|
item.handleQty = item.handleQty || 0 |
|
|
|
|
|
if(item.handleQty == 0 && isTrue){ |
|
|
|
|
|
isTrue = false |
|
|
|
|
|
str3 = '推荐的箱码没扫,' |
|
|
|
|
|
} |
|
|
|
|
|
if(parseFloat(item.handleQty)!=parseFloat(item.qty)){ |
|
|
|
|
|
str3 += `物料号【${detail.itemCode}】批次【${item.batch}】扫描数量【${parseFloat(item.handleQty)}】和任务数量【${item.qty}】不一致` |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
if (this.jobContent.allowSmallerQty == "FALSE") { |
|
|
if (this.jobContent.allowSmallerQty == "FALSE") { |
|
|