报表，中间计量表数据相关

app/lib/ledger.js

@@ -755,7 +755,7 @@ class checkData {
         const check = [];
         if (tender.s2b_gxby_limit) check.push('gxby');
         if (tender.s2b_dagl_limit) check.push('dagl');
-        if (check.length === 0) return result;
+        if (check.length === 0) return;
 
         for (const b of this.checkBills.children) {
             this._recursiveCheckBills3fLimit(check, b, {});
@@ -845,7 +845,7 @@ class checkData {
         if (isTz && posRange.length > 0) {
             if (posRange.length > 0) {
                 for (const p of posRange) {
-                    const end_contract_qty = this.add(p.pre_contract_qty, p.contract_qty);
+                    const end_contract_qty = this.ctx.helper.add(p.pre_contract_qty, p.contract_qty);
                     if (!p.quantity) return !!end_contract_qty;
                     return p.quantity > 0
                         ? end_contract_qty > p.quantity
@@ -854,8 +854,8 @@ class checkData {
                 return false;
             }
         } else {
-            const end_contract_qty = this.add(bills.contract_qty, bills.pre_contract_qty);
-            const end_contract_tp = this.add(bills.contract_tp, bills.pre_contract_tp);
+            const end_contract_qty = this.ctx.helper.add(bills.contract_qty, bills.pre_contract_qty);
+            const end_contract_tp = this.ctx.helper.add(bills.contract_tp, bills.pre_contract_tp);
             if (bills.is_tp) {
                 const compare_tp = isTz ? bills.total_price : bills.deal_tp;
                 if (!compare_tp) return !!end_contract_tp;

app/lib/stage_im.js

@@ -319,11 +319,11 @@ class StageIm {
                 (!im.pid || im.pid === d.pid) &&
                 (!im.pos_name || im.pos_name === d.pos_name);
         });
-        if (im.code === '101-1-b') console.log(im, cd);
         if (cd) {
-            im.custom_define = cd.custom_define ? cd.custom_define.split(',') : this.imFields;
+            im.custom_define = im.custom_define !== null
+                ? (cd.custom_define ? cd.custom_define.split(',') : [])
+                : this.imFields;
             this._.assignInWith(im, cd, function(oV, sV, key) {
-                if (key === 'calc_memo') console.log(im.code, sV);
                 return im.custom_define.indexOf(key) > -1 ? sV : oV;
             });
             if (im.code === '101-1-b') console.log(im.calc_memo);