导入计量台账Excel调整

app/lib/analysis_excel.js

@@ -77,7 +77,7 @@ const aeUtils = {
     isMatch18(tempData) {
         const checkCode = this.check18MainCode;
         return _.every(tempData, x => {
-            return !x.code ||  checkCode(x.code);
+            return !x.code || checkCode(x.code);
             // return !x.code || !!x.code.match(mainReg);
         });
     }
@@ -397,7 +397,6 @@ class ImportStd18Tree extends ImportBaseTree {
         if (!parent.code) return false;
         const numberPart = parent.code.replace(gdXmjPartReg, '');
         if (!numberPart || !codeNumberPart || numberPart.length >= codeNumberPart.length) return false;
-        if (parent === '1060501' && code == '1060501-102') console.log(numberPart);
         return code.indexOf(numberPart) === 0 ||
             code.indexOf('G' + numberPart) === 0 ||
             code.indexOf('GD' + numberPart) === 0;

app/service/stage_stash.js

@@ -55,6 +55,7 @@ class loadStageExcelTree {
                     const relaPos = self.pos.getLedgerPos(x.id);
                     x.has_pos = !!(relaPos && relaPos.length > 0);
                 }
+                if (!x.unit_price) x.unit_price = 0;
                 return node.b_code === _.trimEnd(x.b_code) && node.name === _.trimEnd(x.name) && node.unit === _.trimEnd(x.unit)
                     && node.unit_price === x.unit_price && node.has_pos === x.has_pos;
             } else {