Browse Source

fix: 导入原始数据表问题,excel空单元格,可能实际上是有类型的

vian 3 years atrás
parent
commit
b5ffa290b8
1 changed files with 2 additions and 2 deletions
  1. 2 2
      modules/ration_repository/models/ration_item.js

+ 2 - 2
modules/ration_repository/models/ration_item.js

@@ -1111,9 +1111,9 @@ rationItemDAO.prototype.batchAddFromExcel = async function(rationRepId, data) {
             continue;
         }
         // 如果第一个字段为null则是工料机数据,放入上一个数据的工料机字段
-        if (tmp[0] === undefined && Object.keys(lastData).length > 0) {
+        if (!tmp[0] && Object.keys(lastData).length > 0) {
             // 如果不存在对应的工料机库数据则跳过
-            if (stdGLJList[tmp[1]] === undefined) {
+            if (!stdGLJList[tmp[1]]) {
                 if (lastFailCount === 0) {
                     failGLJList.push('定额' + lastData.code + '下的');
                     lastFailCount++;