MaiXinRong 1 year ago
parent
commit
71a00407af
2 changed files with 4 additions and 4 deletions
  1. 2 2
      app/lib/stage_im.js
  2. 2 2
      app/public/js/stage_im.js

+ 2 - 2
app/lib/stage_im.js

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

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

@@ -463,9 +463,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(gclBills.pos, {name: p.name});
+            let lp = _.find(gclBills.pos, {name: p.name, position: p.position || ''});
             if (!lp) {
-                lp = {name: p.name};
+                lp = {name: p.name, position: p.position || ''};
                 gclBills.pos.push(lp);
             }
             lp.jl = ZhCalc.add(lp.jl, p.gather_qty);