0号台账/计量期，部位台账，不记录计量单元编号

app/controller/ledger_controller.js

@@ -626,14 +626,14 @@ module.exports = app => {
                     ? await ctx.service.pos.getPosData({ tid: ctx.tender.id }) : [];
                 const convert = new billsPosConvert(ctx);
                 convert.loadData(ledgerData, posData, []);
-                //const result = await convert.convert();
-                const wbsCodeHis = await ctx.service.externalData.getExValue(ctx.tender.id, -1,
-                    externalDataConst.FuLong.exType, externalDataConst.FuLong.exFields.wbsCode) || [];
-                const [result, needUpdate] = convert.convertByWbsCode(wbsCodeHis);
-                if (needUpdate) {
-                    await ctx.service.externalData.saveExValue(ctx.tender.id, -1,
-                        externalDataConst.FuLong.exType, externalDataConst.FuLong.exFields.wbsCode, wbsCodeHis);
-                }
+                const result = await convert.convert();
+                // const wbsCodeHis = await ctx.service.externalData.getExValue(ctx.tender.id, -1,
+                //     externalDataConst.FuLong.exType, externalDataConst.FuLong.exFields.wbsCode) || [];
+                // const [result, needUpdate] = convert.convertByWbsCode(wbsCodeHis);
+                // if (needUpdate) {
+                //     await ctx.service.externalData.saveExValue(ctx.tender.id, -1,
+                //         externalDataConst.FuLong.exType, externalDataConst.FuLong.exFields.wbsCode, wbsCodeHis);
+                // }
                 ctx.body = {err: 0, msg: '', data: result};
             } catch(err) {
                 this.log(err);

app/controller/stage_controller.js

@@ -1161,14 +1161,14 @@ module.exports = app => {
                 const changeData = await this._getStageChangeData(ctx);
                 const convert = new billsPosConvert(ctx);
                 convert.loadData(ledgerData, posData, changeData);
-                // const result = convert.convert();
-                const wbsCodeHis = await ctx.service.externalData.getExValue(ctx.tender.id, -1,
-                    externalDataConst.FuLong.exType, externalDataConst.FuLong.exFields.wbsCode) || [];
-                const [result, needUpdate] = convert.convertByWbsCode(wbsCodeHis);
-                if (needUpdate) {
-                    await ctx.service.externalData.saveExValue(ctx.tender.id, -1,
-                        externalDataConst.FuLong.exType, externalDataConst.FuLong.exFields.wbsCode, wbsCodeHis);
-                }
+                const result = convert.convert();
+                // const wbsCodeHis = await ctx.service.externalData.getExValue(ctx.tender.id, -1,
+                //     externalDataConst.FuLong.exType, externalDataConst.FuLong.exFields.wbsCode) || [];
+                // const [result, needUpdate] = convert.convertByWbsCode(wbsCodeHis);
+                // if (needUpdate) {
+                //     await ctx.service.externalData.saveExValue(ctx.tender.id, -1,
+                //         externalDataConst.FuLong.exType, externalDataConst.FuLong.exFields.wbsCode, wbsCodeHis);
+                // }
                 ctx.body = {err: 0, msg: '', data: result};
             } catch(err) {
                 this.log(err);

app/lib/bills_pos_convert.js

@@ -302,6 +302,7 @@ class BillsPosConvert {
     convert() {
         this._recursiveConvertNode(this.bpcTree.children);
         this._calculateAndSortResult();
+        this._generateCodeByWbsCode([]);
         return this._getResultData();
     }
 

app/service/external_data.js

@@ -35,7 +35,7 @@ module.exports = app => {
             };
             const count = await this.count(filter);
             if (count >= 0) {
-                await this.db.update(this.tableName, { ex_value: JSON.stringify(ex_value) }, filter);
+                await this.db.update(this.tableName, { ex_value: JSON.stringify(ex_value) }, {where: filter});
             } else {
                 filter.ex_value = JSON.stringify(ex_value);
                 await this.db.insert(this.tableName, filter);