|
|
@@ -507,6 +507,24 @@
|
|
|
? '不定向订单'
|
|
|
: '库存式订单';
|
|
|
},
|
|
|
+ fillProductOrderLockMode(productList, saleOrders) {
|
|
|
+ const orderMap = (saleOrders || []).reduce((result, order) => {
|
|
|
+ result[order.orderNo] = order;
|
|
|
+ return result;
|
|
|
+ }, {});
|
|
|
+ const fallbackOrder = saleOrders?.length === 1 ? saleOrders[0] : null;
|
|
|
+ return (productList || []).map((product) => {
|
|
|
+ const order = orderMap[product.orderNo] || fallbackOrder || {};
|
|
|
+ return {
|
|
|
+ ...product,
|
|
|
+ orderNo: product.orderNo || order.orderNo,
|
|
|
+ needProduce: order.needProduce ?? product.needProduce,
|
|
|
+ hasSendRejectedOrWithdrawn:
|
|
|
+ order.hasSendRejectedOrWithdrawn ??
|
|
|
+ product.hasSendRejectedOrWithdrawn
|
|
|
+ };
|
|
|
+ });
|
|
|
+ },
|
|
|
//销售发货数量是否限制不能大于采购总数//0否 1是
|
|
|
parameterGetByCode() {
|
|
|
parameterGetByCode({
|
|
|
@@ -543,7 +561,10 @@
|
|
|
isSuspend: res[0]?.isSuspend || 0,
|
|
|
orderIds: res.map((item) => item.id).toString(),
|
|
|
orderNo: res.map((item) => item.orderNo).toString(),
|
|
|
- productList: res.map((item) => item.productList).flat(),
|
|
|
+ productList: this.fillProductOrderLockMode(
|
|
|
+ res.map((item) => item.productList).flat(),
|
|
|
+ res
|
|
|
+ ),
|
|
|
typedetailIds: res.map((item) => item.typedetailIds).flat(),
|
|
|
// needProduce: res.map((item) => item.needProduce),
|
|
|
totalAmount: res.reduce(
|
|
|
@@ -712,6 +733,15 @@
|
|
|
} else if (data.saleOrder) {
|
|
|
this.setData([data.saleOrder], 'sendInit');
|
|
|
}
|
|
|
+ const saleOrders = data.saleOrderList?.length
|
|
|
+ ? data.saleOrderList
|
|
|
+ : data.saleOrder
|
|
|
+ ? [data.saleOrder]
|
|
|
+ : [];
|
|
|
+ data.productList = this.fillProductOrderLockMode(
|
|
|
+ data.productList,
|
|
|
+ saleOrders
|
|
|
+ );
|
|
|
console.log('data~~~~', data);
|
|
|
this.loading = false;
|
|
|
if (data) {
|