Selaa lähdekoodia

清单汇总,变更令,截止数据问题

MaiXinRong 1 vuosi sitten
vanhempi
commit
4f932a8647
1 muutettua tiedostoa jossa 4 lisäystä ja 3 poistoa
  1. 4 3
      app/public/js/gcl_gather.js

+ 4 - 3
app/public/js/gcl_gather.js

@@ -416,6 +416,7 @@ const gclGatherModel = (function () {
                 gcb.c_qty = ZhCalc.add(gcb.c_qty, cb.checked_amount);
                 gcb.c_tp = ZhCalc.add(gcb.c_tp, cb.checked_price);
 
+                console.log(cb.code, cb.pre_qty, cb.pre_qty_minus);
                 gcb.cur_qty = ZhCalc.add(gcb.cur_qty, cb.cur_qty);
                 gcb.cur_qty_minus = ZhCalc.add(gcb.cur_qty_minus, cb.cur_qty_minus);
                 gcb.pre_qty = ZhCalc.add(gcb.pre_qty, cb.pre_qty);
@@ -480,9 +481,9 @@ const gclGatherModel = (function () {
             for (const c of gcl.change) {
                 c.cur_tp = ZhCalc.mul(c.cur_qty, gcl.unit_price, tpDecimal);
                 c.pre_tp = ZhCalc.mul(c.pre_qty, gcl.unit_price, tpDecimal);
-                c.end_qty = ZhCalc.add(c.cur_qty, c.end_qty);
-                c.end_tp = ZhCalc.add(c.cur_tp, c.end_tp);
-                c.end_qty_minus = ZhCalc.add(c.cur_qty_minus, c.end_qty_minus);
+                c.end_qty = ZhCalc.add(c.cur_qty, c.pre_qty);
+                c.end_tp = ZhCalc.add(c.cur_tp, c.pre_tp);
+                c.end_qty_minus = ZhCalc.add(c.cur_qty_minus, c.pre_qty_minus);
             }
             gcl.settle_status = settle_status.length === 1 ? settle_status[0] : 1;
         }