From 58981cbf4e2e91ec45697ab50e07b19ee9eacdfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 16 Mar 2026 17:22:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(rfid):=20=E6=B7=BB=E5=8A=A0RFID=E6=97=A5?=
 =?UTF-8?q?=E5=B8=B8=E7=9B=98=E7=82=B9=E7=BB=93=E6=9E=9C=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增generateCountResultFromSnapshot API接口用于从RFID快照生成盘点结果
- 在rfidDailyCountResult页面添加生成盘点结果按钮和相关功能
- 实现生成盘点结果的确认对话框和加载状态处理
- 添加生成过程中的错误处理和成功提示
- 在搜索物理盘点页面添加日常盘点类型的筛选选项
---
 src/api/check/rfidCount.js                    |  3 ++
 .../modules/check/rfidDailyCountResult.vue    | 52 ++++++++++++++++++-
 .../modules/check/searchPhysicalInventory.vue |  1 +
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/api/check/rfidCount.js b/src/api/check/rfidCount.js
index 7c173df..3b94851 100644
--- a/src/api/check/rfidCount.js
+++ b/src/api/check/rfidCount.js
@@ -12,3 +12,6 @@ export const searchRfidCountDetailList = data => createAPI(`/check/rfidCount/sea
 
 // 查询RFID日常入库盘点结果列表 - rqrq
 export const searchRfidCountSnapshotList = data => createAPI(`/check/rfidCount/searchRfidCountSnapshotList`, 'post', data)
+
+// 从RFID快照生成盘点结果 - rqrq
+export const generateCountResultFromSnapshot = data => createAPI(`/check/rfidCount/generateCountResultFromSnapshot`, 'post', data)
diff --git a/src/views/modules/check/rfidDailyCountResult.vue b/src/views/modules/check/rfidDailyCountResult.vue
index d0e4954..816aa81 100644
--- a/src/views/modules/check/rfidDailyCountResult.vue
+++ b/src/views/modules/check/rfidDailyCountResult.vue
@@ -43,6 +43,15 @@
         <el-form-item :label="' '">
           <el-button type="primary" @click="searchTable()">查询</el-button>
         </el-form-item>
+        <el-form-item :label="' '">
+          <el-button 
+            type="primary" 
+            class="yzzButtonAn" 
+            @click="generateCountResult()"
+            :disabled="generateLoading">
+            {{ generateLoading ? '生成中...' : '生成盘点结果' }}
+          </el-button>
+        </el-form-item>
       </el-form>
     </el-form>
 
@@ -181,7 +190,8 @@
 
 <script>
   import {
-    searchRfidCountSnapshotList
+    searchRfidCountSnapshotList,
+    generateCountResultFromSnapshot
   } from "@/api/check/rfidCount.js"
 
   export default {
@@ -192,6 +202,7 @@
 
         // 加载状态 - rqrq
         dataListLoading: false,
+        generateLoading: false,
 
         // 数据列表 - rqrq
         dataList: [],
@@ -262,6 +273,45 @@
         this.getDataList()
       },
 
+      /**
+       * @Description 生成盘点结果 - rqrq
+       * @Title generateCountResult
+       * @author rqrq
+       */
+      generateCountResult() {
+        // 二次确认 - rqrq
+        this.$confirm('确认将RFID盘点快照生成为正式盘点单吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.generateLoading = true
+          
+          let params = {
+            site: this.$store.state.user.site,
+            username: this.$store.state.user.name
+          }
+          
+          generateCountResultFromSnapshot(params).then(({data}) => {
+            this.generateLoading = false
+            if (data && data.code === 0) {
+              this.$message.success(data.msg || '生成成功')
+              // 刷新列表 - rqrq
+              this.getDataList()
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          }).catch(() => {
+            this.generateLoading = false
+            this.$message.error('生成失败')
+          })
+        }).catch(() => {
+          // 取消操作 - rqrq
+        })
+      },
+
       /**
        * @Description 每页数变化 - rqrq
        * @Title sizeChangeHandle
diff --git a/src/views/modules/check/searchPhysicalInventory.vue b/src/views/modules/check/searchPhysicalInventory.vue
index b25e565..af0c13a 100644
--- a/src/views/modules/check/searchPhysicalInventory.vue
+++ b/src/views/modules/check/searchPhysicalInventory.vue
@@ -31,6 +31,7 @@
           <el-select v-model="queryForm.searchCountType" placeholder="请选择" clearable style="width: 120px;">
             <el-option label="循环盘点" value="CYCLE"></el-option>
             <el-option label="手工盘点" value="MANUAL"></el-option>
+            <el-option label="日常盘点" value="DAILY"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="状态" style="margin-right: 10px;">