Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuOperation

modules/std_glj_lib/models/gljModel.js

@@ -72,11 +72,10 @@ class GljDao extends OprDao {
                 ID: IDMapping[c.ID],
                 consumeAmt: c.consumeAmt
             }));
-            // 设备改材料
-            const gljType = glj.gljType === 5 ? 201 : glj.gljType;
+            /* // 设备改材料
+            const gljType = glj.gljType === 5 ? 201 : glj.gljType; */
             return {
                 ...glj,
-                gljType,
                 repositoryId: targetLibID,
                 ID: IDMapping[glj.ID],
                 component: newComponent

web/maintain/bills_lib/scripts/db_controller.js

@@ -1018,7 +1018,7 @@ var tools = {
     for (let i = orgRow; i <= maxRow; i++) {
       let validData = {};
       for (let j = orgCol; j <= maxCol; j++) {
-        let value = sheet.getValue(i, j);
+        let value = sheet.getValue(i, j) || "";
         if (value) {
           if (setting.cols[j].data.field === "engineering") {
             if (!isNaN(value) && value % 1 === 0) {
@@ -1043,6 +1043,8 @@ var tools = {
           } else {
             validData[setting.cols[j].data.field] = value;
           }
+        } else {
+          validData[setting.cols[j].data.field] = value;
         }
       }
       if (!tools.isEmptyObj(validData)) {