|
|
@@ -105,6 +105,16 @@
|
|
|
? row.detailJnVOList
|
|
|
: [];
|
|
|
details.forEach((detail) => {
|
|
|
+ const fields = [
|
|
|
+ detail.purpose,
|
|
|
+ detail.categoryCode,
|
|
|
+ detail.categoryName,
|
|
|
+ detail.batchNo,
|
|
|
+ detail.originalBatchNo,
|
|
|
+ detail.certificateNumber,
|
|
|
+ detail.originalCertificateNumber,
|
|
|
+ detail.measureQuantity
|
|
|
+ ].map((v) => (v === undefined || v === null ? '' : v));
|
|
|
list.push({
|
|
|
productCode: detail.purpose || '',
|
|
|
materialCode: detail.categoryCode || '',
|
|
|
@@ -114,18 +124,7 @@
|
|
|
originalBatchNo: detail.originalBatchNo || '',
|
|
|
certificateNumber: detail.certificateNumber || '',
|
|
|
originalCertificateNumber: detail.originalCertificateNumber || '',
|
|
|
- codeStr: [
|
|
|
- detail.purpose,
|
|
|
- detail.categoryCode,
|
|
|
- detail.categoryName,
|
|
|
- detail.batchNo,
|
|
|
- detail.measureQuantity,
|
|
|
- detail.originalBatchNo,
|
|
|
- detail.certificateNumber,
|
|
|
- detail.originalCertificateNumber
|
|
|
- ]
|
|
|
- .filter(Boolean)
|
|
|
- .join(';'),
|
|
|
+ codeStr: fields.join(';'),
|
|
|
qrCodeUrl: ''
|
|
|
});
|
|
|
});
|