|
|
@@ -1766,6 +1766,7 @@
|
|
|
productItem.categoryModel = productItem.modelType; // 物品型号
|
|
|
productItem.specification = productItem.specification; // 规格
|
|
|
productItem.engrave = productItem.engrave; // 刻码
|
|
|
+ materielDesignation = productItem.materielDesignation; //物料代号
|
|
|
productItem.clientCode = productItem.clientCode; // 客户代号
|
|
|
productItem.batchNo = productItem.batchNo || batchNo; // 批次号
|
|
|
productItem.warehouseIds = [productItem.warehouseId]; // 仓库Id
|
|
|
@@ -3143,7 +3144,9 @@
|
|
|
netWeight: row.netWeight, // 净重
|
|
|
barcodes: '', // 发货条码
|
|
|
clientCode: row.extInfo ? row.extInfo.clientCode : '', // 客户代号
|
|
|
- materielDesignation: row.extInfo ? row.extInfo.materielCode : '', // 物料代号
|
|
|
+ materielDesignation:
|
|
|
+ row.materielDesignation ||
|
|
|
+ (row.extInfo ? row.extInfo.materielCode : ''), // 物料代号
|
|
|
supplierName: row.supplierName, // 供应商名称
|
|
|
supplierCode: row.supplierCode, // 供应商代号
|
|
|
engrave: '', // 刻码
|
|
|
@@ -3244,7 +3247,10 @@
|
|
|
} else {
|
|
|
measureQuantity = row.packingSpecificationOption[1].packageCell;
|
|
|
}
|
|
|
- console.log('meadasdassureQuantity', row.weight / row.packingQuantity);
|
|
|
+ console.log(
|
|
|
+ 'meadasdassureQuantity',
|
|
|
+ row.weight / row.packingQuantity
|
|
|
+ );
|
|
|
let item = {
|
|
|
index: row.index + '-' + index, // 包装索引
|
|
|
warehouseId: row.warehouseId, // 仓库id
|
|
|
@@ -3277,7 +3283,9 @@
|
|
|
barcodes: '', // 发货条码
|
|
|
clientCode:
|
|
|
row.clientCode || (row.extInfo ? row.extInfo.clientCode : ''), // 客户代号
|
|
|
- materielDesignation: row.extInfo ? row.extInfo.materielCode : '', // 物料代号
|
|
|
+ materielDesignation:
|
|
|
+ row.materielDesignation ||
|
|
|
+ (row.extInfo ? row.extInfo.materielCode : ''), // 物料代号
|
|
|
supplierName: row.supplierName, // 供应商名称
|
|
|
supplierCode: row.supplierCode, // 供应商代号
|
|
|
engrave: row.engrave, // 刻码
|
|
|
@@ -3369,7 +3377,7 @@
|
|
|
item.weight =
|
|
|
Number(item.measureQuantity) * Number(row.singleWeight);
|
|
|
} else {
|
|
|
- item.weight =item.weight|| 0;
|
|
|
+ item.weight = item.weight || 0;
|
|
|
}
|
|
|
}
|
|
|
}
|