Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/public/js/material_list.js

@@ -545,9 +545,12 @@ $(document).ready(() => {
                 }
             }
             for (const gcl of gclGatherData) {
-                const gcl_id = gcl.leafXmjs[0].gcl_id;
-                if (hadGclIdList.indexOf(gcl_id) !== -1) {
-                    hadMaterialGclGatherData.push(gcl);
+                for (const index in gcl.leafXmjs) {
+                    const gcl_id = gcl.leafXmjs[index].gcl_id;
+                    if (hadGclIdList.indexOf(gcl_id) !== -1) {
+                        hadMaterialGclGatherData.push(gcl);
+                        break;
+                    }
                 }
             }
             gclGatherData = hadMaterialGclGatherData;