1
0

2 Ревизии af35c38e8c ... b08977c8c9

Автор SHA1 Съобщение Дата
  MaiXinRong b08977c8c9 Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev преди 3 седмици
  MaiXinRong 3f71a81099 汇总对比,计量单元排序调整 преди 3 седмици
променени са 2 файла, в които са добавени 5 реда и са изтрити 5 реда
  1. 3 3
      app/controller/spss_controller.js
  2. 2 2
      app/public/js/stage.js

+ 3 - 3
app/controller/spss_controller.js

@@ -165,7 +165,7 @@ module.exports = app => {
                 where: { tender_id: tender.id },
             });
             const pos = await this.ctx.service.pos.getAllDataByCondition({
-                columns: ['id', 'lid', 'name', 'quantity'],
+                columns: ['id', 'lid', 'name', 'quantity', 'porder'],
                 where: { tid: tender.id },
             });
             return [bills, pos];
@@ -265,7 +265,7 @@ module.exports = app => {
                 where: { tender_id: tender.id },
             });
             const pos = await this.ctx.service.pos.getAllDataByCondition({
-                columns: ['id', 'lid', 'name', 'quantity'],
+                columns: ['id', 'lid', 'name', 'quantity', 'porder'],
                 where: { tid: tender.id },
             });
             if (!stage) return [bills, pos];
@@ -316,7 +316,7 @@ module.exports = app => {
                 where: { tender_id: tender.id },
             });
             const pos = await this.ctx.service.pos.getAllDataByCondition({
-                columns: ['id', 'lid', 'name', 'quantity'],
+                columns: ['id', 'lid', 'name', 'quantity', 'porder'],
                 where: { tid: tender.id },
             });
 

+ 2 - 2
app/public/js/stage.js

@@ -1564,8 +1564,8 @@ $(document).ready(() => {
                     const posData = pos.getLedgerPos(node.id);
                     if (posData && posData.length > 0) {
                         for (const p of changeBills.pos) {
-                            const changePos = changeBills.bwmx ? posData.find(x => { return x.name === changeBills.bwmx; }) : posData[0];
-                            changePos.tz_qc_qty = ZhCalc.add(pos.tz_qc_qty, p.checked_amount);
+                            const changePos = p.bwmx ? posData.find(x => { return x.name === p.bwmx; }) : posData[0];
+                            changePos.tz_qc_qty = ZhCalc.add(changePos.tz_qc_qty, p.checked_amount);
                         }
                     }
                 }