feat(wms/report): 添加差值计算和异常信息展示功能

refactor(wms/report): 替换合计信息为差值显示 feat(wms/coil): 增加创建时间和创建人字段 feat(crm/contract): 添加合同导出按钮
2026-03-31 18:37:17 +08:00
parent abcc644f74
commit 0223102269
10 changed files with 161 additions and 42 deletions
--- a/klp-ui/src/views/crm/contract/index.vue
+++ b/klp-ui/src/views/crm/contract/index.vue
@@ -89,6 +89,7 @@
      <el-table-column label="备注" align="center" prop="remark" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-download" @click.stop="handleExportContract(scope.row)">导出</el-button>
          <el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(scope.row)">修改</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click.stop="handleDelete(scope.row)">删除</el-button>
        </template>
@@ -541,6 +542,10 @@ export default {
      this.download('crm/contract/export', {
        ...this.queryParams
      }, `contract_${new Date().getTime()}.xlsx`)
+    },
+    handleExportContract(row) {
+      // 合同导出
+      
    }
  }
 };
--- a/klp-ui/src/views/wms/coil/do/correntAll.vue
+++ b/klp-ui/src/views/wms/coil/do/correntAll.vue
@@ -426,6 +426,16 @@
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" placeholder="请输入备注" />
        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime" v-if="form.coilId">
+          <el-date-picker v-model="form.createTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择创建时间" style="width: 100%;" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="createBy" v-if="form.coilId">
+          <el-select v-model="form.createBy" placeholder="请选择创建人" style="width: 100%;" clearable filterable>
+            <el-option v-for="item in userList" :key="item.userName" :label="item.nickName" :value="item.userName" />
+          </el-select>
+          <!-- <el-input v-model="form.createBy" placeholder="请输入创建人" /> -->
+        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
--- a/klp-ui/src/views/wms/report/components/coilTable/index.vue
+++ b/klp-ui/src/views/wms/report/components/coilTable/index.vue
@@ -48,6 +48,12 @@
          <template v-else-if="column.prop === 'productionDuration'">
            {{ formatProductionDuration(scope.row.productionDuration) }}
          </template>
+          <!-- 质量状态，点击后会出现弹窗显示详细信息 -->
+          <template v-else-if="column.prop === 'qualityStatus'">
+            <div @click="handleQualityStatusClick(scope.row)" style="cursor: pointer; background-color: #f5f7fa;">
+              <dict-tag :options="dict.type.coil_quality_status" :value="scope.row.qualityStatus"></dict-tag>
+            </div>
+          </template>
          <!-- 默认渲染 -->
          <template v-else>
            {{ scope.row[column.prop] }}
@@ -55,6 +61,27 @@
        </template>
      </el-table-column>
    </el-table>
+
+    <el-dialog title="钢卷异常信息" :visible.sync="abmornal.visible" width="50%">
+      <el-table :data="abmornal.data" style="width: 100%" v-loading="abmornal.loading">
+        <el-table-column label="开始位置" prop="startPosition"></el-table-column>
+        <el-table-column label="结束位置" prop="endPosition"></el-table-column>
+        <el-table-column label="长度" prop="length"></el-table-column>
+        <el-table-column label="缺陷位置" prop="position"></el-table-column>
+        <el-table-column label="缺陷代码" prop="defectCode">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.coil_abnormal_code" :value="scope.row.defectCode" />
+          </template>
+        </el-table-column>
+        <el-table-column label="程度" prop="degree">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.coil_abnormal_degree" :value="scope.row.degree" />
+          </template>
+        </el-table-column>
+        <el-table-column label="产线" prop="productionLine"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+      </el-table>
+    </el-dialog>
  </div>
 </template>

@@ -63,6 +90,8 @@ import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";

+import { listCoilAbnormal } from '@/api/wms/coilAbnormal'
+
 export default {
  name: 'CoilTable',
  components: {
@@ -80,6 +109,7 @@ export default {
      default: () => [],
    },
  },
+  dicts: ['coil_quality_status', 'coil_abnormal_code', 'coil_abnormal_degree'],
  data() {
    return {
      pageNum: 1,
@@ -90,6 +120,11 @@ export default {
      // 筛选相关
      filterKeyword: '',
      filterColumn: [],
+      abmornal: {
+        visible: false,
+        data: {},
+        loading: false,
+      }
    }
  },
  mounted() {
@@ -201,6 +236,20 @@ export default {
    // 处理排序规则变化
    handleSortChange() {
      this.pageNum = 1
+    },
+    handleQualityStatusClick(row) {
+      this.abmornal.visible = true
+      this.abmornal.loading = true
+      listCoilAbnormal({
+        coilId: row.coilId
+      }).then(response => {
+        this.abmornal.data = response.rows || []
+      }).catch(error => {
+        console.error('查询异常记录失败:', error)
+        this.$message.error('查询异常记录失败: ' + (error.message || error))
+      }).finally(() => {
+        this.abmornal.loading = false
+      })
    }
  }
 }
--- a/klp-ui/src/views/wms/report/js/calc.js
+++ b/klp-ui/src/views/wms/report/js/calc.js
@@ -13,6 +13,11 @@ const calcSummary = (list, lossList) => {
  const totalWeight = parseFloat((outTotalWeight + lossTotalWeight).toFixed(2))
  const totalAvgWeight = totalCount > 0 ? (totalWeight / totalCount)?.toFixed(2) : 0

+  // 计算数量、总重、均重的插值
+  const countDiff = Math.abs(outCount - lossCount)
+  const weightDiff = Math.abs(parseFloat((outTotalWeight - lossTotalWeight).toFixed(2)))
+  const avgWeightDiff = Math.abs(parseFloat((outAvgWeight - lossAvgWeight).toFixed(2)))
+
  // 成品比率
  const passRate = outCount > 0 && lossTotalWeight > 0 ? (outTotalWeight / lossTotalWeight) : 0
  // 损失比率
@@ -38,6 +43,9 @@ const calcSummary = (list, lossList) => {
    totalCount,
    totalWeight: totalWeight.toFixed(2),
    totalAvgWeight,
+    countDiff,
+    weightDiff,
+    avgWeightDiff,
    passRate: (passRate * 100)?.toFixed(2) + '%',
    lossRate: (lossRate * 100)?.toFixed(2) + '%',
    abRate: (abRate * 100)?.toFixed(2) || 0,
@@ -163,6 +171,13 @@ const calcMSummary = (list, lossList) => {
  const totalWeight = parseFloat((outTotalWeight + lossTotalWeight).toFixed(2))
  const totalAvgWeight = totalCount > 0 ? (totalWeight / totalCount)?.toFixed(2) : 0

+  // 数量差值
+  const countDiff = Math.abs(outCount - lossCount)
+  // 总重差值
+  const weightDiff = Math.abs(parseFloat((outTotalWeight - lossTotalWeight).toFixed(2)))
+  // 均重差值
+  const avgWeightDiff = Math.abs(parseFloat((outAvgWeight - lossAvgWeight).toFixed(2)))
+
  // 成品比率
  const passRate = outCount > 0 && lossTotalWeight > 0 ? (outTotalWeight / lossTotalWeight) : 0
  // 损失比率
@@ -189,6 +204,9 @@ const calcMSummary = (list, lossList) => {
    totalCount,
    totalWeight: totalWeight.toFixed(2),
    totalAvgWeight,
+    countDiff,
+    weightDiff: weightDiff.toFixed(2),
+    avgWeightDiff,
    passRate: (passRate * 100)?.toFixed(2) + '%',
    lossRate: (lossRate * 100)?.toFixed(2) + '%',
    abRate: (abRate * 100)?.toFixed(2) || 0,
--- a/klp-ui/src/views/wms/report/template/comprehensive.vue
+++ b/klp-ui/src/views/wms/report/template/comprehensive.vue
@@ -57,9 +57,10 @@
      <el-descriptions-item label="消耗总重">{{ summary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ summary.lossAvgWeight }}t</el-descriptions-item>

-      <el-descriptions-item label="合计数量">{{ summary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ summary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="数量差值">{{ summary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ summary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ summary.avgWeightDiff }}t</el-descriptions-item>
+      <!-- <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item> -->

      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ summary.passRate }}</el-descriptions-item>
@@ -80,10 +81,9 @@
      <el-descriptions-item label="消耗总重">{{ mSummary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ mSummary.lossAvgWeight }}t</el-descriptions-item>

-      <el-descriptions-item label="合计数量">{{ mSummary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ mSummary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ mSummary.totalAvgWeight }}t</el-descriptions-item>
-
+      <el-descriptions-item label="数量差值">{{ mSummary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ mSummary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ mSummary.avgWeightDiff }}t</el-descriptions-item>
      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ mSummary.passRate }}</el-descriptions-item>
      <el-descriptions-item label="损耗率">{{ mSummary.lossRate }}</el-descriptions-item>
--- a/klp-ui/src/views/wms/report/template/day.vue
+++ b/klp-ui/src/views/wms/report/template/day.vue
@@ -53,9 +53,10 @@
      <el-descriptions-item label="消耗总重">{{ summary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ summary.lossAvgWeight }}t</el-descriptions-item>

-      <el-descriptions-item label="合计数量">{{ summary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ summary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="数量差值">{{ summary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ summary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ summary.avgWeightDiff }}t</el-descriptions-item>
+      <!-- <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item> -->

      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ summary.passRate }}</el-descriptions-item>
@@ -76,10 +77,9 @@
      <el-descriptions-item label="消耗总重">{{ mSummary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ mSummary.lossAvgWeight }}t</el-descriptions-item>

-      <el-descriptions-item label="合计数量">{{ mSummary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ mSummary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ mSummary.totalAvgWeight }}t</el-descriptions-item>
-
+      <el-descriptions-item label="数量差值">{{ mSummary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ mSummary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ mSummary.avgWeightDiff }}t</el-descriptions-item>
      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ mSummary.passRate }}</el-descriptions-item>
      <el-descriptions-item label="损耗率">{{ mSummary.lossRate }}</el-descriptions-item>
--- a/klp-ui/src/views/wms/report/template/merge.vue
+++ b/klp-ui/src/views/wms/report/template/merge.vue
@@ -52,15 +52,40 @@
      <el-descriptions-item label="消耗总重">{{ summary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ summary.lossAvgWeight }}t</el-descriptions-item>

-      <el-descriptions-item label="合计数量">{{ summary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ summary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="数量差值">{{ summary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ summary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ summary.avgWeightDiff }}t</el-descriptions-item>
+      <!-- <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item> -->

      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ summary.passRate }}</el-descriptions-item>
      <el-descriptions-item label="损耗率">{{ summary.lossRate }}</el-descriptions-item>
      <!-- 异常率 -->
      <el-descriptions-item label="异常率">{{ summary.abRate }}</el-descriptions-item>
+      <!-- 正品率 -->
+      <el-descriptions-item label="正品率">{{ summary.passRate2 }}</el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 已处理M统计信息 -->
+    <el-descriptions title="已处理M统计信息" :column="3" border>
+      <el-descriptions-item label="产出数量">{{ mSummary.outCount }}</el-descriptions-item>
+      <el-descriptions-item label="产出总重">{{ mSummary.outTotalWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="产出均重">{{ mSummary.outAvgWeight }}t</el-descriptions-item>
+
+      <el-descriptions-item label="消耗数量">{{ mSummary.lossCount }}</el-descriptions-item>
+      <el-descriptions-item label="消耗总重">{{ mSummary.lossTotalWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="消耗均重">{{ mSummary.lossAvgWeight }}t</el-descriptions-item>
+
+      <el-descriptions-item label="数量差值">{{ mSummary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ mSummary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ mSummary.avgWeightDiff }}t</el-descriptions-item>
+      <!-- 成品率 -->
+      <el-descriptions-item label="成品率">{{ mSummary.passRate }}</el-descriptions-item>
+      <el-descriptions-item label="损耗率">{{ mSummary.lossRate }}</el-descriptions-item>
+      <!-- 异常率 -->
+      <el-descriptions-item label="异常率">{{ mSummary.abRate }}</el-descriptions-item>
+      <!-- 正品率 -->
+      <el-descriptions-item label="正品率">{{ mSummary.passRate2 }}</el-descriptions-item>
    </el-descriptions>

    <el-descriptions title="明细信息" :column="3" border>
@@ -94,7 +119,7 @@ import MutiSelect from "@/components/MutiSelect";
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
-import { calcSummary } from "@/views/wms/report/js/calc";
+import { calcSummary, calcMSummary } from "@/views/wms/report/js/calc";
 import CoilTable from "@/views/wms/report/components/coilTable";
 import ColumnsSetting from "@/views/wms/report/components/setting/columns";

@@ -191,6 +216,9 @@ export default {
    summary() {
      return calcSummary(this.outList, this.lossList)
    },
+    mSummary() {
+      return calcMSummary(this.outList, this.lossList)
+    }
  },
  created() {
    this.handleQuery()
--- a/klp-ui/src/views/wms/report/template/month.vue
+++ b/klp-ui/src/views/wms/report/template/month.vue
@@ -44,7 +44,7 @@
      </el-form>
    </el-row>

-    <el-descriptions title="统计信息" :column="3" border>
+     <el-descriptions title="统计信息" :column="3" border>
      <el-descriptions-item label="产出数量">{{ summary.outCount }}</el-descriptions-item>
      <el-descriptions-item label="产出总重">{{ summary.outTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="产出均重">{{ summary.outAvgWeight }}t</el-descriptions-item>
@@ -53,9 +53,10 @@
      <el-descriptions-item label="消耗总重">{{ summary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ summary.lossAvgWeight }}t</el-descriptions-item>

-      <el-descriptions-item label="合计数量">{{ summary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ summary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="数量差值">{{ summary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ summary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ summary.avgWeightDiff }}t</el-descriptions-item>
+      <!-- <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item> -->

      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ summary.passRate }}</el-descriptions-item>
@@ -76,10 +77,9 @@
      <el-descriptions-item label="消耗总重">{{ mSummary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ mSummary.lossAvgWeight }}t</el-descriptions-item>

-      <el-descriptions-item label="合计数量">{{ mSummary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ mSummary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ mSummary.totalAvgWeight }}t</el-descriptions-item>
-
+      <el-descriptions-item label="数量差值">{{ mSummary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ mSummary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ mSummary.avgWeightDiff }}t</el-descriptions-item>
      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ mSummary.passRate }}</el-descriptions-item>
      <el-descriptions-item label="损耗率">{{ mSummary.lossRate }}</el-descriptions-item>
--- a/klp-ui/src/views/wms/report/template/team.vue
+++ b/klp-ui/src/views/wms/report/template/team.vue
@@ -54,36 +54,46 @@
      </el-form>
    </el-row>

-    <el-descriptions title="统计信息" :column="3" border>
+     <el-descriptions title="统计信息" :column="3" border>
      <el-descriptions-item label="产出数量">{{ summary.outCount }}</el-descriptions-item>
      <el-descriptions-item label="产出总重">{{ summary.outTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="产出均重">{{ summary.outAvgWeight }}t</el-descriptions-item>
+
      <el-descriptions-item label="消耗数量">{{ summary.lossCount }}</el-descriptions-item>
      <el-descriptions-item label="消耗总重">{{ summary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ summary.lossAvgWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计数量">{{ summary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ summary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item>
+
+      <el-descriptions-item label="数量差值">{{ summary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ summary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ summary.avgWeightDiff }}t</el-descriptions-item>
+      <!-- <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item> -->
+
+      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ summary.passRate }}</el-descriptions-item>
      <el-descriptions-item label="损耗率">{{ summary.lossRate }}</el-descriptions-item>
+      <!-- 异常率 -->
      <el-descriptions-item label="异常率">{{ summary.abRate }}</el-descriptions-item>
      <!-- 正品率 -->
      <el-descriptions-item label="正品率">{{ summary.passRate2 }}</el-descriptions-item>
    </el-descriptions>

-    <!-- 已处理M统计信息 -->
+   <!-- 已处理M统计信息 -->
    <el-descriptions title="已处理M统计信息" :column="3" border>
      <el-descriptions-item label="产出数量">{{ mSummary.outCount }}</el-descriptions-item>
      <el-descriptions-item label="产出总重">{{ mSummary.outTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="产出均重">{{ mSummary.outAvgWeight }}t</el-descriptions-item>
+
      <el-descriptions-item label="消耗数量">{{ mSummary.lossCount }}</el-descriptions-item>
      <el-descriptions-item label="消耗总重">{{ mSummary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ mSummary.lossAvgWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计数量">{{ mSummary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ mSummary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ mSummary.totalAvgWeight }}t</el-descriptions-item>
+
+      <el-descriptions-item label="数量差值">{{ mSummary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ mSummary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ mSummary.avgWeightDiff }}t</el-descriptions-item>
+      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ mSummary.passRate }}</el-descriptions-item>
      <el-descriptions-item label="损耗率">{{ mSummary.lossRate }}</el-descriptions-item>
+      <!-- 异常率 -->
      <el-descriptions-item label="异常率">{{ mSummary.abRate }}</el-descriptions-item>
      <!-- 正品率 -->
      <el-descriptions-item label="正品率">{{ mSummary.passRate2 }}</el-descriptions-item>
--- a/klp-ui/src/views/wms/report/template/year.vue
+++ b/klp-ui/src/views/wms/report/template/year.vue
@@ -44,7 +44,7 @@
      </el-form>
    </el-row>

-    <el-descriptions title="统计信息" :column="3" border>
+     <el-descriptions title="统计信息" :column="3" border>
      <el-descriptions-item label="产出数量">{{ summary.outCount }}</el-descriptions-item>
      <el-descriptions-item label="产出总重">{{ summary.outTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="产出均重">{{ summary.outAvgWeight }}t</el-descriptions-item>
@@ -53,9 +53,9 @@
      <el-descriptions-item label="消耗总重">{{ summary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ summary.lossAvgWeight }}t</el-descriptions-item>

-      <el-descriptions-item label="合计数量">{{ summary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ summary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ summary.totalAvgWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="数量差值">{{ summary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ summary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ summary.avgWeightDiff }}t</el-descriptions-item>

      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ summary.passRate }}</el-descriptions-item>
@@ -76,10 +76,9 @@
      <el-descriptions-item label="消耗总重">{{ mSummary.lossTotalWeight }}t</el-descriptions-item>
      <el-descriptions-item label="消耗均重">{{ mSummary.lossAvgWeight }}t</el-descriptions-item>

-      <el-descriptions-item label="合计数量">{{ mSummary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="合计总重">{{ mSummary.totalWeight }}t</el-descriptions-item>
-      <el-descriptions-item label="合计均重">{{ mSummary.totalAvgWeight }}t</el-descriptions-item>
-
+      <el-descriptions-item label="数量差值">{{ mSummary.countDiff }}</el-descriptions-item>
+      <el-descriptions-item label="总重差值">{{ mSummary.weightDiff }}</el-descriptions-item>
+      <el-descriptions-item label="均重差值">{{ mSummary.avgWeightDiff }}t</el-descriptions-item>
      <!-- 成品率 -->
      <el-descriptions-item label="成品率">{{ mSummary.passRate }}</el-descriptions-item>
      <el-descriptions-item label="损耗率">{{ mSummary.lossRate }}</el-descriptions-item>