|
@@ -346,19 +346,19 @@ $(document).ready(() => {
|
|
|
let materialList = [];
|
|
|
function loadMaterialData(iGclRow, iLXmjRow) {
|
|
|
const gcl = gclGatherData[iGclRow];
|
|
|
- // const leafXmjs = gcl.leafXmjs.filter(item => {
|
|
|
- // return item.qc_qty || item.contract_qty
|
|
|
- // });
|
|
|
+ const leafXmjs = gcl && gcl.leafXmjs ? gcl.leafXmjs.filter(item => {
|
|
|
+ return item.qc_qty || item.contract_qty
|
|
|
+ }) : null;
|
|
|
// console.log(iLXmjRow, leafXmjs, materialListData);
|
|
|
- if (gcl && gcl.leafXmjs[iLXmjRow]) {
|
|
|
- const xmj = gcl.leafXmjs[iLXmjRow];
|
|
|
+ if (leafXmjs) {
|
|
|
+ const xmj = leafXmjs[iLXmjRow];
|
|
|
materialList = [];
|
|
|
for (const m of materialListData) {
|
|
|
if (m.gcl_id === xmj.gcl_id && m.xmj_id === xmj.id && ((xmj.mx_id !==undefined && m.mx_id === xmj.mx_id) || xmj.mx_id === undefined)) {
|
|
|
materialList.push(m);
|
|
|
}
|
|
|
}
|
|
|
- console.log(materialList);
|
|
|
+ console.log(xmj, materialList);
|
|
|
SpreadJsObj.loadSheetData(materialSpread.getActiveSheet(), SpreadJsObj.DataType.Data, materialList);
|
|
|
} else {
|
|
|
SpreadJsObj.loadSheetData(materialSpread.getActiveSheet(), SpreadJsObj.DataType.Data, []);
|