中间计量调整

app/lib/stage_im.js

@@ -237,7 +237,7 @@ class StageIm {
             let parent = node, result = parent.name;
             while (parent.level > 3 && parent) {
                 parent = this._getNodeByLevel(node, parent.level - 1);
-                result = parent.name + '-' + result;
+                result = parent.name + mergeChar + result;
             }
             return result;
         }
@@ -484,13 +484,13 @@ class StageIm {
             const pPos = this.pos.getLedgerPos(p.id);
             if (pPos && pPos.length > 0) {
                 for (const pp of pPos) {
-                    if (!pp.gather_qty || !pp.contract_qty || !pp.qc_qty) continue;
+                    if (!pp.gather_qty && !pp.contract_qty && !pp.qc_qty) continue;
 
                     const im = this._getBwBillsPosIm(nodeImData, node, peg, nodeIndex, bw, pp.name);
 
                     for (const c of changes) {
                         if (c.lid === p.id && c.pid == pp.id && c.qty && c.qty !== 0) {
-                            imDefault.changes.push(c);
+                            im.changes.push(c);
                         }
                     }
 
@@ -528,8 +528,8 @@ class StageIm {
             ImData.push(imDefault);
         }
         for (const im of nodeImData) {
-            im.drawing_code = im.drawing_code.join('');
-            im.position = im.position.join('');
+            im.drawing_code = im.drawing_code.join(mergeChar);
+            im.position = im.position.join(mergeChar);
             ImData.push(im);
         }
     }

app/public/js/stage.js

@@ -1776,6 +1776,7 @@ $(document).ready(() => {
                                 updateData.name = data.name;
                                 updateData.unit = data.unit;
                                 updateData.unit_price = data.unit_price;
+                                updateData.pos_name = data.pos_name;
                             }
                             updateData.doc_code = info.editingText === null ? '' : info.editingText;
                             postData(window.location.pathname + '/detail/save', updateData, function (result) {
@@ -1815,6 +1816,7 @@ $(document).ready(() => {
                                     updateData.name = data.name;
                                     updateData.unit = data.unit;
                                     updateData.unit_price = data.unit_price;
+                                    updateData.pos_name = data.pos_name;
                                 }
                                 updateData.doc_code = info.sheet.getText(curRow, info.cellRange.col).replace('\n', '');
                                 datas.push(updateData);
@@ -1880,6 +1882,7 @@ $(document).ready(() => {
                                 updateData.name = data.name;
                                 updateData.unit = data.unit;
                                 updateData.unit_price = data.unit_price;
+                                updateData.pos_name = data.pos_name;
                             }
                             if (regRst) {
                                 updateData.doc_code = text.substr(0, regRst.index) + (parseInt(regRst[0]) + iRow + 1);
@@ -2221,6 +2224,7 @@ $(document).ready(() => {
                     updateData.name = data.name;
                     updateData.unit = data.unit;
                     updateData.unit_price = data.unit_price;
+                    updateData.pos_name = data.pos_name;
                 }
                 updateData.bw = $('#bw-name').val();
                 updateData.peg = $('#peg').val();
@@ -2372,6 +2376,7 @@ $(document).ready(() => {
                         updateData.name = data.name;
                         updateData.unit = data.unit;
                         updateData.unit_price = data.unit_price;
+                        updateData.pos_name = data.pos_name;
                     }
                     updateData.img = canvas.toDataURL('image/png');
                     updateData.imgInfo = itemInfo;

app/public/js/stage_im.js

@@ -224,7 +224,7 @@ const stageIm = (function () {
             const subPeg1 = getNodeByLevel(node, peg.level + 1);
             let result = peg.name;
             if (subPeg1 && subPeg1.id !== peg.id) {
-                result = result + '-' + subPeg1.name;
+                result = result + mergeChar + subPeg1.name;
             }
             return result;
         } else {
@@ -234,7 +234,7 @@ const stageIm = (function () {
                 let parent = node, result = parent.name;
                 while (parent.level > 3 && parent) {
                     parent = getNodeByLevel(node, parent.level - 1);
-                    result = parent.name + '-' + result;
+                    result = parent.name + mergeChar + result;
                 }
                 return result;
             }
@@ -248,7 +248,7 @@ const stageIm = (function () {
             let parent = node, result = parent.name;
             while (parent.level > 3 && parent) {
                 parent = getNodeByLevel(node, parent.level - 1);
-                result = parent.name + '-' + result;
+                result = parent.name + mergeChar + result;
             }
             return result;
         }
@@ -468,7 +468,7 @@ const stageIm = (function () {
                 const pPos = gsPos.getLedgerPos(p.id);
                 if (pPos && pPos.length > 0) {
                     for (const pp of pPos) {
-                        if (!pp.gather_qty || !pp.contract_qty || !pp.qc_qty) continue;
+                        if (!pp.gather_qty && !pp.contract_qty && !pp.qc_qty) continue;
                         let im = nodeImData.find(function (d) {
                             return d.lid === node.id && d.pos_name === pp.name;
                         });
@@ -488,7 +488,7 @@ const stageIm = (function () {
 
                         for (const c of changes) {
                             if (c.lid === p.id && c.pid == pp.id && c.qty && c.qty !== 0) {
-                                imDefault.changes.push(c);
+                                im.changes.push(c);
                             }
                         }
 
@@ -526,8 +526,8 @@ const stageIm = (function () {
                 ImData.push(imDefault);
             }
             for (const im of nodeImData) {
-                im.drawing_code = im.drawing_code.join('');
-                im.position = im.position.join('');
+                im.drawing_code = im.drawing_code.join(mergeChar);
+                im.position = im.position.join(mergeChar);
                 ImData.push(im);
             }
         }