Просмотр исходного кода

解决入库计量数量和保存舍入误差数据问题

huang_an 2 лет назад
Родитель
Сommit
ce87934315
1 измененных файлов с 30 добавлено и 10 удалено
  1. 30 10
      src/views/warehouseManagement/stockManagement/add.vue

+ 30 - 10
src/views/warehouseManagement/stockManagement/add.vue

@@ -531,7 +531,7 @@
               </el-table-column>
               </el-table-column>
               <el-table-column label="计量数量" prop="counts">
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
                 <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount * row.outInNum }}
+                  {{ $math.format(row.minPackingCount * row.outInNum, 14) }}
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column
               <el-table-column
@@ -1751,7 +1751,12 @@
           outInNum: Number(outInNum > 0 ? outInNum : 0),
           outInNum: Number(outInNum > 0 ? outInNum : 0),
           univalence: Number(univalence > 0 ? univalence : 0)
           univalence: Number(univalence > 0 ? univalence : 0)
         };
         };
-        return total.PackingCount * total.outInNum * total.univalence;
+        return Number(
+          this.$math.format(
+            total.PackingCount * total.outInNum * total.univalence,
+            14
+          )
+        );
       },
       },
       handleRowUnit(row) {
       handleRowUnit(row) {
         return row.measuringUnit;
         return row.measuringUnit;
@@ -2289,8 +2294,8 @@
 
 
             let arr = this.warehousingMaterialList.map((item) => {
             let arr = this.warehousingMaterialList.map((item) => {
               return {
               return {
-                netWeight: item.netWeight,
-                num: item.num,
+                netWeight: item.netWeight > 0 ? item.netWeight : 0,
+                num: item.num > 0 ? item.num : 0,
                 manualBatchNo: item.manualBatchNo,
                 manualBatchNo: item.manualBatchNo,
                 batchNo: item.batchNo,
                 batchNo: item.batchNo,
                 categoryId:
                 categoryId:
@@ -2299,21 +2304,36 @@
                       ? item.categoryId
                       ? item.categoryId
                       : item.id
                       : item.id
                     : item.id,
                     : item.id,
-                count: parseInt(item.outInNum) * parseInt(item.minPackingCount),
-                minPackingCount: item.minPackingCount,
-                packingCount: item.outInNum,
-                price: item.univalence,
+                count:
+                  item.outInNum > 0 && item.minPackingCount > 0
+                    ? this.$math.format(
+                        parseInt(item.outInNum) *
+                          parseInt(item.minPackingCount),
+                        14
+                      )
+                    : 0,
+                minPackingCount:
+                  item.minPackingCount > 0 ? item.minPackingCount : 0,
+                packingCount: item.outInNum > 0 ? item.outInNum : 0,
+                price: item.univalence > 0 ? item.univalence : 0,
                 outInDetailRecordAddPOList: item.warehouseLedgerDetails,
                 outInDetailRecordAddPOList: item.warehouseLedgerDetails,
                 position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
                 position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
                 remark: '',
                 remark: '',
                 pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
                 pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
                 pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
                 pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
                 totalMoney:
                 totalMoney:
-                  item.outInNum * item.minPackingCount * item.univalence,
+                  item.outInNum > 0 &&
+                  item.minPackingCount > 0 &&
+                  item.univalence > 0
+                    ? this.$math.format(
+                        item.outInNum * item.minPackingCount * item.univalence,
+                        14
+                      )
+                    : 0,
                 weightUnit: item.weightUnit,
                 weightUnit: item.weightUnit,
                 customCode: item.customCode,
                 customCode: item.customCode,
                 supplierCode: item.supplierCode,
                 supplierCode: item.supplierCode,
-                weight: item.weight
+                weight: item.weight > 0 ? item.weight : 0
               };
               };
             });
             });