From d94a2ae5d9ee5399939f52b7568b111ddd1c5678 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Mon, 12 Aug 2024 16:32:05 +0800
Subject: [PATCH] no message

---
 src/views/app-update/index.vue                |  2 +-
 src/views/base-data/stock/index.vue           |  5 +++-
 .../business-data/businessTask/agvTask.vue    |  8 +++--
 src/views/business-data/inventory/index.vue   | 29 +++++++++++++++++++
 src/views/business-data/pick/index.vue        |  1 +
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/views/app-update/index.vue b/src/views/app-update/index.vue
index 98cb43a..006357a 100644
--- a/src/views/app-update/index.vue
+++ b/src/views/app-update/index.vue
@@ -22,7 +22,7 @@
         <el-form ref="form" :model="form" size="small" label-width="80px">
 
           <el-form-item label="项目名称">
-            <el-input v-model="form.appName" style="width: 370px;"/>
+            <el-input v-model="form.appName" style="width: 370px;" />
           </el-form-item>
 
           <el-form-item label="版本代码">
diff --git a/src/views/base-data/stock/index.vue b/src/views/base-data/stock/index.vue
index 39d781a..04ec21b 100644
--- a/src/views/base-data/stock/index.vue
+++ b/src/views/base-data/stock/index.vue
@@ -124,7 +124,10 @@
                 v-for="point in pointList"
                 :key="point.id"
                 :label="point.code"
-                :value="point"></el-option>
+                :value="point">
+                <span style="float: left">{{ point.area.name }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ point.code}}</span>
+              </el-option>
             </el-select>
           </el-form-item>
 
diff --git a/src/views/business-data/businessTask/agvTask.vue b/src/views/business-data/businessTask/agvTask.vue
index b3e0d0a..0950ba0 100644
--- a/src/views/business-data/businessTask/agvTask.vue
+++ b/src/views/business-data/businessTask/agvTask.vue
@@ -298,12 +298,16 @@ export default {
       return row.endSlotCode;
     },
     toAgvTaskFinish(data) {
-      if(data.status!='UP_CONTAINER'){
+      if (data.status != 'UP_CONTAINER') {
         return this.crud.notify("容器未顶升，需顶升之后在做操作!", CRUD.NOTIFICATION_TYPE.ERROR);
       }
       this.MissionStateCallback.missionCode = data.id
       this.MissionStateCallback.containerCode = data.stockCode
-      this.MissionStateCallback.missionStatus = 'COMPLETED'
+      if (data.type == 'ASN' || data.type == 'FB_RETURN') {
+        this.MissionStateCallback.missionStatus = 'FORK_DOWN'
+      } else {
+        this.MissionStateCallback.missionStatus = 'COMPLETED'
+      }
       crudAgvTask.missionStateCallback(this.MissionStateCallback).then(res => {
         if (res.status == 200) {
           this.crud.notify("任务完成!", CRUD.NOTIFICATION_TYPE.SUCCESS);
diff --git a/src/views/business-data/inventory/index.vue b/src/views/business-data/inventory/index.vue
index 9d509a2..46dd5ac 100644
--- a/src/views/business-data/inventory/index.vue
+++ b/src/views/business-data/inventory/index.vue
@@ -86,6 +86,7 @@
       <el-table
         ref="table"
         show-summary
+        :summary-method="getSummaries"
         v-loading="crud.loading"
         :data="crud.data"
         size="small"
@@ -240,8 +241,36 @@ export default {
     },
     resetQuery() {
       this.crud.resetQuery()
+    },
+    getSummaries(param) {
+      const {columns, data} = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+        if (column.property == 'quantity' || column.property == 'queuedQty') {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index];
+          }
+        }
+
+      });
+
+      return sums;
     }
   }
+
 }
 </script>
 
diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index cb6c0b2..d1b9ffb 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -128,6 +128,7 @@
         <el-table-column prop="point.code" label="翻包点位"/>
         <el-table-column prop="stock.code" label="翻包容器"/>
         <el-table-column prop="callPoint.code" label="叫料点位"/>
+        <el-table-column prop="orderType" label="单据类型"/>
         <el-table-column prop="createTime" label="创建时间"/>
         <el-table-column v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" align="center">
           <template slot-scope="scope">