|
@ -401,7 +401,9 @@ |
|
|
mask: true |
|
|
mask: true |
|
|
}); |
|
|
}); |
|
|
var params = this.setParams() |
|
|
var params = this.setParams() |
|
|
console.log(params); |
|
|
|
|
|
|
|
|
console.log("提交参数"+JSON.stringify(params)); |
|
|
|
|
|
return |
|
|
overPageSubmit(params).then(res => { |
|
|
overPageSubmit(params).then(res => { |
|
|
uni.hideLoading() |
|
|
uni.hideLoading() |
|
|
// if (res.data == '打印任务已发送,等待打印机处理!') { |
|
|
// if (res.data == '打印任务已发送,等待打印机处理!') { |
|
@ -492,28 +494,15 @@ |
|
|
|
|
|
|
|
|
record.toBatch = r.batch; |
|
|
record.toBatch = r.batch; |
|
|
record.toPackingNumber = "" |
|
|
record.toPackingNumber = "" |
|
|
|
|
|
|
|
|
//使用在途库不改变管理模式 |
|
|
|
|
|
// if (this.jobContent |
|
|
|
|
|
// .useOnTheWayLocation == |
|
|
|
|
|
// 'TRUE') { |
|
|
|
|
|
// record.toPackingNumber = r |
|
|
|
|
|
// .packingNumber; |
|
|
|
|
|
// record.toBatch = r.batch; |
|
|
|
|
|
// } else { |
|
|
|
|
|
// var info = |
|
|
|
|
|
// getPackingNumberAndBatch( |
|
|
|
|
|
// this.managementList, r |
|
|
|
|
|
// .itemCode, |
|
|
|
|
|
// r.packingNumber, r |
|
|
|
|
|
// .batch); |
|
|
|
|
|
// record.toPackingNumber = info |
|
|
|
|
|
// .packingNumber; |
|
|
|
|
|
// record.toBatch = info.batch; |
|
|
|
|
|
// } |
|
|
|
|
|
subItem.recordList.push(record); |
|
|
subItem.recordList.push(record); |
|
|
}) |
|
|
}) |
|
|
subList.push(deepCopyData(subItem)); |
|
|
|
|
|
|
|
|
var itemInfo = subList.find(r => r.itemCode == subItem.itemCode&& r.fromLocationCode == subItem.fromLocationCode); |
|
|
|
|
|
if(itemInfo){ |
|
|
|
|
|
itemInfo.recordList.push(...subItem.recordList) |
|
|
|
|
|
}else { |
|
|
|
|
|
subList.push(deepCopyData(subItem)); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|