导出工料处理

app/public/js/material_checklist.js

@@ -1499,10 +1499,6 @@ $(document).ready(() => {
         };
         if (!materialChecklistData || materialChecklistData.length === 0) return;
         for (const ml of materialChecklistData) {
-            data.push({
-                b_code: ml.b_code, name: ml.name, unit: ml.unit,
-                unit_price: ml.unit_price,
-            });
             const index = _.findIndex(gclGatherData, { b_code: ml.b_code, name: ml.name, unit: ml.unit, unit_price: ml.unit_price });
             if (index === -1) continue;
             const gcl = gclGatherData[index];
@@ -1520,6 +1516,10 @@ $(document).ready(() => {
                     }
                 }
                 if (newMaterialList.length > 0) {
+                    data.push({
+                        b_code: ml.b_code, name: ml.name, unit: ml.unit,
+                        unit_price: ml.unit_price,
+                    });
                     for (const nm of newMaterialList) {
                         data.push({
                             gljcode: nm.code, name: nm.name, unit: nm.unit,