修复新增期数据bug

app/public/js/material.js

@@ -338,11 +338,11 @@ $(document).ready(() => {
                 newMaterialBillsData = _.filter(materialBillsData, function (item) {
                     return item.quantity !== null && item.quantity !== 0;
                 });
-                if (redo) {
-                    materialSpread.getActiveSheet().reset();
-                    SpreadJsObj.initSpreadSettingEvents(materialSpreadSetting, materialCol);
-                    SpreadJsObj.initSheet(materialSpread.getActiveSheet(), materialSpreadSetting);
-                }
+            }
+            if (redo) {
+                materialSpread.getActiveSheet().reset();
+                SpreadJsObj.initSpreadSettingEvents(materialSpreadSetting, materialCol);
+                SpreadJsObj.initSheet(materialSpread.getActiveSheet(), materialSpreadSetting);
             }
             console.log(newMaterialBillsData);
             SpreadJsObj.loadSheetData(materialSpread.getActiveSheet(), SpreadJsObj.DataType.Data, newMaterialBillsData);

app/service/material_stage_bills.js

@@ -223,7 +223,7 @@ module.exports = app => {
         async calcQuantityByMB(transaction, mid, mb, msb, materialCalculator, decimal, pre_is_stage_self, qty_source) {
             const [newmsg_spread, newm_spread] = await this.getSpread(mb, null, decimal.up);
             if (mb.t_type === materialConst.t_type[0].value) {
-                const newQuantity = await this.ctx.service.materialList.getMbQuantity(transaction, mid, qty_source, decimal.qty, mb.id, null, 0);
+                const newQuantity = await this.ctx.service.materialList.getMbQuantity(transaction, mid, qty_source, decimal.qty, mb.id, msb.ms_id, 0);
                 const newTp = this.ctx.helper.round(this.ctx.helper.mul(this.ctx.helper.round(newQuantity, decimal.qty), newm_spread), decimal.tp);
                 msb.quantity = newQuantity;
                 msb.msg_spread = newmsg_spread;