Pārlūkot izejas kodu

中间计量,计算式说明调整

MaiXinRong 1 gadu atpakaļ
vecāks
revīzija
fe8238db26
2 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 2 2
      app/lib/stage_im.js
  2. 2 2
      app/public/js/stage_im.js

+ 2 - 2
app/lib/stage_im.js

@@ -785,9 +785,9 @@ class StageIm {
         if (!posRange) { return; }
         for (const p of posRange) {
             if (!p.contract_qty && !p.qc_qty && !p.qc_minus_qty) { continue; }
-            let lp = this._.find(lx.pos, { name: p.name });
+            let lp = this._.find(lx.pos, { name: p.name, position: p.position || '' });
             if (!lp) {
-                lp = { name: p.name };
+                lp = { name: p.name, position: p.position || '' };
                 lx.pos.push(lp);
             }
             lp.jl = this.ctx.helper.add(lp.jl, p.gather_qty);

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

@@ -755,9 +755,9 @@ const stageIm = (function () {
         if (!posRange) { return }
         for (const p of posRange) {
             if (checkZero(p.contract_qty) && checkZero(p.qc_qty) && checkZero(p.qc_minus_qty)) { continue; }
-            let lp = _.find(lx.pos, {name: p.name});
+            let lp = _.find(lx.pos, {name: p.name, position: p.position || ''});
             if (!lp) {
-                lp = {name: p.name};
+                lp = {name: p.name, position: p.position || ''};
                 lx.pos.push(lp);
             }
             lp.jl = ZhCalc.add(lp.jl, p.gather_qty);