提交

src/views/Inventory/task/autoInventory.vue

@@ -0,0 +1,487 @@
+<template>
+  <div class="app-container">
+    <el-header style="display: flex;align-items: center;justify-content: space-between;background-color: #9ebee5;">
+      <div>{{ dataList[0] ||  '等待连接' }}</div>
+    </el-header>
+    <div style="display: flex;">
+      <div style="width: 300px;display: flex;flex-direction: column;align-items: center;padding: 20px 0;">
+        <el-avatar :size="100" :src="avatar" />
+        <el-button type="primary" style="margin-top: 20px;" @click="startScan" v-show="matchStatus == 0">开始盘点</el-button>
+        <el-button type="success" style="margin-top: 20px;" @click="startMatch" v-show="matchStatus == 1">开始匹配</el-button>
+        <el-button type="primary" style="margin-top: 20px;" @click="stopTask" v-show="matchStatus == 1">停止盘点</el-button>
+        <el-button type="info" style="margin-top: 20px;" @click="resetMatch" v-show="matchStatus == 2">重新盘点</el-button>
+      </div>
+      <div style="width: 300px;font-size: 18px;padding: 30px 0;">
+        <div>
+          设备IP：{{ deviceObj.ipAddress || "暂无" }}
+        </div>
+        <div style="margin-top: 20px;">
+          设备端口：{{ deviceObj.port || "暂无" }}
+        </div>
+        <div style="margin-top: 20px;">
+          总条目：{{ scanTotal || '暂无' }}
+        </div>
+      </div>
+      <div style="width: 300px;font-size: 18px;padding: 30px 0;">
+        <div>
+          所属仓库：{{ deviceObj.warehouseName || "暂无" }}
+        </div>
+        <div style="margin-top: 20px;">
+          所属场景：{{ deviceObj.sceneName || "暂无" }}
+        </div>
+      </div>
+      <div style="flex: 1;">
+        <div id="chartsMain" style="height: 300px;padding: 20px 0;"></div>
+      </div>
+    </div>
+    <el-divider style="margin-top: 0;" />
+
+    <el-tabs type="border-card" v-model="activeTabName" @tab-click="changeTab">
+      <el-tab-pane label="扫码列表" name="扫码">
+        <div>共扫描到：{{ dataList.length > 0 ? dataList.length - 1 : 0 }}条</div>
+        <div v-for="(item, index) in dataList" :key="index" style="text-align: center;">
+          <div v-show="index != 0">
+            {{ item }}
+          </div>
+        </div>
+        <div v-show="dataList.length == 1">
+          <el-empty description="暂无数据" />
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="匹配列表" name="匹配" :disabled="matchStatus < 2">
+        <el-select
+          v-model="status"
+          class="m-2"
+          placeholder="Select"
+          size="large"
+          style="width: 200px"
+          @change="changeStatus"
+        >
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <div style="margin: 20px 0">
+          <el-text v-show="status == 0">当前为正常数据</el-text>
+          <el-text v-show="status == 1">当前为未扫描到，但数据库里有的数据</el-text>
+          <el-text v-show="status == 2">当前为已扫描到，但数据库里没有的数据</el-text>
+        </div>
+        <el-table :data="matchData" border empty-text="暂无数据" v-if="status == 0 || status == 1">
+          <el-table-column prop="rkPcode" label="存放位置" />
+          <el-table-column prop="realQty" label="数量" />
+          <el-table-column prop="count" label="操作" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-table :data="matchData" border empty-text="暂无数据" v-if="status == 2">
+          <el-table-column prop="rkPcode" label="存放位置" />
+        </el-table>
+        <div style="margin-top: 20px;width: 100%;display: flex;align-items: center;justify-content: flex-end;">
+          <div style="margin-right: 20px;color: #606266;">共 {{ matchTotal }}条</div>
+          <el-pagination background layout="prev, pager, next" :total="matchTotal" @change="chagePage" />
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-dialog v-model="taskView" title="详情" width="85%" draggable>
+      <el-table :data="viewData" border empty-text="暂无数据">
+        <el-table-column prop="sapNo" label="订单" />
+        <el-table-column prop="wlNo" label="物料号" />
+        <el-table-column prop="wlMs" label="物料描述" />
+        <el-table-column prop="realQty" label="数量">
+          <template #default="scope">{{ scope.row.realQty }}({{ scope.row.dw }})</template>
+        </el-table-column>
+        <el-table-column prop="xmMs" label="项目名称" />
+        <el-table-column prop="gysMc" label="供应商" />
+        <el-table-column prop="cangkuName" label="所属仓库" />
+        <el-table-column prop="rkTime" label="入库时间">
+          <template #default="scope">{{ parseTime(scope.row.rkTime, '{y}-{m}-{d}') }}</template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="taskView=false">关闭</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="AutoInventory">
+import { ElLoading } from 'element-plus';
+import { getTaskCount, getScan, getMatch, getChart, stopScan, getScanResult, getStockList } from "@/api/Inventory/autoInventory"
+import { ref, reactive, onMounted, onBeforeUnmount, markRaw } from "vue";
+import avatar from "@/assets/images/avatar.jpg"
+import { useRoute } from 'vue-router';
+import * as echarts from 'echarts';
+
+const taskId = ref(null)
+const taskView = ref(false)
+const viewData = ref([])
+
+const handleView = (row) => {
+  // let obj = {
+  //   pageNum: 1,
+  //   pageSize: 100,
+  //   pcode: row.rkPcode
+  // }
+  console.log(row.rkPcode)
+  getStockList(row.rkPcode).then(res => {
+    console.log(res)
+    viewData.value = res.data
+    taskView.value = true
+  })
+}
+
+// 获取总条数
+const scanTotal = ref("")
+const getTotal = () => {
+  let obj = {
+    taskId: taskId.value
+  }
+  getTaskCount(obj).then(res => {
+    scanTotal.value = res.data
+  })
+}
+// 开始盘点
+const startScan = async (formEl) => {
+  let obj = {
+    deviceId: deviceObj.value.deviceId
+  }
+  getScan(obj).then(res => {
+    console.log('开始盘点')
+    localStorage.setItem("scanTotal", scanTotal.value)
+  })
+}
+
+let chartInt = ref("")
+const status = ref(0)  // 盘点状态
+const statusList = ref(
+  [
+    {
+      label: '正常',
+      value: 0
+    },
+    {
+      label: '未扫到',
+      value: 1
+    },
+    {
+      label: '无数据',
+      value: 2
+    }
+  ]
+)  // 盘点状态
+const isSend = ref(false) // 是否正在发送
+const activeTabName = ref("扫码") // tab高亮
+const matchStatus = ref(0) //是否可以点击匹配列表
+const matchData = ref([])     // 匹配列表
+const isConnect = ref(true)   // 是否自动重新重连websocket
+const deviceObj = ref({
+  deviceId: 0,
+  ipAddress: 0,
+  port: 0,
+  warehouseId: 0,
+});
+const matchTotal = ref(0);
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+});
+let loadingInstance = null;  //
+
+
+const warehouseList = ref([
+  {value: 1, label: '1号仓库'},
+  {value: 2, label: '2号仓库'},
+  {value: 3, label: '3号仓库'},
+  {value: 4, label: '4号仓库'},
+  {value: 5, label: '5号仓库'}
+]);
+
+
+// 开始匹配
+const startMatch = () => {
+  queryParams.value.pageNum = 1
+  status.value = 0
+  activeTabName.value = "匹配"
+  getMatchData()
+}
+// 重新盘点
+const resetMatch = () => {
+  activeTabName.value = "扫码"
+  matchStatus.value = 0
+  scanTotal.value = ""
+  let text = dataList.value[0]
+  dataList.value = [text]
+}
+// 开始匹配/结束盘点/获取盘点列表
+const getMatchData = () => {
+  let list = JSON.parse(JSON.stringify(dataList.value))
+  let arr = list.splice(1)
+  let obj = {
+    ids: arr,
+    deviceId: deviceObj.value.deviceId,
+    taskId: taskId.value
+  }
+  getMatch(obj).then(res => {
+    let text = dataList.value[0]
+    dataList.value = [text]
+    localStorage.removeItem("scanTotal")
+    localStorage.setItem("dataList", JSON.stringify(dataList.value))
+    matchStatus.value = 2
+    getResultList()
+    // 渲染图表
+    let chartObj = {
+      ids: arr,
+    }
+    getChart(chartObj).then(res => {
+      console.log(res.data)
+      chartInt.value.setOption({
+        title: {
+          text: '本次共计盘点到' + res.data.total + "个库位(库位货品数如下表)",
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: res.data.xdata,
+          axisTick: {
+            alignWithLabel: true
+          }
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data: res.data.ydata,
+            type: 'bar',
+            showBackground: true,
+            backgroundStyle: {
+              color: 'rgba(180, 180, 180, 0.2)'
+            }
+          }
+        ]
+      })
+    })
+  })
+  
+}
+// 匹配结果
+const getResultList = () => {
+  let obj = {
+    pageNum: queryParams.value.pageNum,
+    pageSize: queryParams.value.pageSize,
+    status: status.value,
+    taskId: taskId.value
+  }
+  getScanResult(obj).then(res => {
+    matchData.value = res.rows
+    matchTotal.value = res.total
+  })
+}
+
+
+// 切换tab
+const changeTab = (tab) => {
+  if (tab.props.label == '匹配列表') {
+    queryParams.value.pageNum = 1
+    status.value = 0
+    getResultList()
+  }
+}
+// 点击翻页
+const chagePage = (e) => {
+  queryParams.value.pageNum = e
+  getResultList()
+}
+// 切换盘点状态
+const changeStatus = function (e) {
+  queryParams.value.pageNum = 1
+  status.value = e
+  getResultList()
+}
+
+
+// websocket连接
+let webSocketPort = import.meta.env.VITE_APP_BASE_API + '/ws/socket'
+const dataList = ref([]); // 用于展示从 WebSocket 获取的消息
+let ws = null; // WebSocket 实例
+let reconnectTimeout = null; // 重连超时控制
+// 建立 WebSocket 连接
+const connectWebSocket = () => {
+  ws = new WebSocket(webSocketPort); // 替换为实际的 WebSocket 服务 URL
+
+  ws.onopen = () => {
+    console.log("WebSocket 连接已建立");
+    send()
+  };
+
+  ws.onmessage = (event) => {
+    console.log(event.data); // 接收到服务器推送的消息
+    if (localStorage.getItem("scanTotal")) {
+      scanTotal.value = localStorage.getItem("scanTotal")
+      dataList.value = JSON.parse(localStorage.getItem("dataList"))
+      console.log("获取", dataList.value)
+    }
+    if (!(dataList.value.some(e => e == event.data))) {
+      if (dataList.value.findIndex(item => item.includes("连接")) >= 0 && event.data.includes("连接")) {
+        let signIndex = dataList.value.findIndex(item => item.includes("连接"))
+        dataList.value[signIndex] = event.data
+      } else {
+        dataList.value.push(event.data)
+      }
+      localStorage.setItem("dataList", JSON.stringify(dataList.value))
+      console.log("存储", dataList.value)
+    }
+    if (dataList.value.length > 1) {
+      matchStatus.value = 1
+    }
+  };
+
+  ws.onerror = (error) => {
+    console.error("WebSocket 发生错误", error);
+  };
+
+  ws.onclose = (event) => {
+    console.log("WebSocket 连接已关闭", event.code);
+    if (isConnect.value) {
+      handleReconnect(); // WebSocket 连接关闭时尝试重连
+    }
+  };
+};
+// 处理 WebSocket 连接断开后的重连
+const handleReconnect = () => {
+  // 如果已经在重连，避免重复重连
+  if (reconnectTimeout) {
+    return;
+  }
+  reconnectTimeout = setTimeout(() => {
+    console.log("正在尝试重新连接 WebSocket...");
+    connectWebSocket();
+    reconnectTimeout = null; // 重连后清除重连超时
+  }, 5000); // 5 秒后重连
+};
+
+// 获取缓存数据
+const deviceInfo = localStorage.getItem("deviceInfo")
+if (deviceInfo) {
+  deviceObj.value = JSON.parse(deviceInfo)
+  loadingInstance = ElLoading.service({
+    background: 'rgba(0, 0, 0, 0.7)',
+    text: '正在连接设备...',
+  });
+  connectWebSocket(); // 组件加载时连接 WebSocket
+}
+
+// 使用 Websocket 发送消息
+const send = () => {
+  let obj = {
+    deviceId: deviceObj.value.deviceId,
+    ip: deviceObj.value.ipAddress,
+    port: deviceObj.value.port  
+  }
+  loadingInstance.close();
+  isSend.value = true
+  ws.send(JSON.stringify(obj))
+}
+
+// 停止盘点
+const stopTask = () => {
+  let obj = {
+    deviceId: deviceObj.value.deviceId
+  }
+  stopScan(obj).then(res => {
+    console.log("停止盘点")
+    matchStatus.value = 0
+    let text = dataList.value[0]
+    dataList.value = [text]
+    localStorage.removeItem("scanTotal")
+    localStorage.setItem("dataList", JSON.stringify(dataList.value))
+  })
+}
+const route = useRoute()
+
+onMounted(() => {
+  chartInt.value = markRaw(echarts.init(document.getElementById('chartsMain')))
+  taskId.value = route.query.taskId
+  getTotal()
+  // chartInt.value.setOption({
+  //     title: {
+  //       text: '本次共计盘点到' + "10个库位(库位货品数如下表)",
+  //     },
+  //     tooltip: {
+  //       trigger: 'axis',
+  //       axisPointer: {
+  //         type: 'shadow'
+  //       }
+  //     },
+  //     grid: {
+  //       left: '3%',
+  //       right: '4%',
+  //       bottom: '3%',
+  //       containLabel: true
+  //     },
+  //     xAxis: {
+  //       type: 'category',
+  //       // data: res.data.xdata,
+  //       data: ['G02-0102', 'G02-0101', 'G02-0103', 'G02-0104', 'G02-0105', 'G02-0106', 'G02-0107'],
+  //       axisTick: {
+  //         alignWithLabel: true
+  //       }
+  //     },
+  //     yAxis: {
+  //       type: 'value'
+  //     },
+  //     series: [
+  //       {
+  //         // data: res.data.ydata,
+  //         data: [120, 200, 150, 80, 70, 110, 130],
+  //       type: 'bar',
+  //         showBackground: true,
+  //         backgroundStyle: {
+  //           color: 'rgba(180, 180, 180, 0.2)'
+  //         }
+  //       }
+  //     ]
+  //   })
+});
+
+onBeforeUnmount(() => {
+  isConnect.value = false
+  if (ws) {
+    ws.close(); // 组件销毁时关闭 WebSocket 连接
+    ws = null
+  }
+});
+</script>
+
+<style scoped>
+.text{
+  font-size: 18px;
+  padding: 30px 0;
+}
+.demo-tabs > .el-tabs__content {
+  padding: 32px;
+  color: #6b778c;
+  font-size: 32px;
+  font-weight: 600;
+}
+</style>

src/views/Inventory/task/index.vue

@@ -0,0 +1,424 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef"  v-show="showSearch" >
+      <el-row :gutter="40">
+        <el-col :span="4">
+          <el-form-item label="任务名称" prop="taskName">
+            <el-input
+              v-model="queryParams.taskName"
+              placeholder="请输入任务名称"
+              clearable
+              @keyup.enter="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="任务状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable >
+              <el-option v-for="dict in taskStatusDict" :key="dict.id" :label="dict.label" :value="dict.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="仓库" prop="warehouseCode">
+            <el-select v-model="queryParams.warehouseCode" placeholder="请选择仓库" clearable >
+              <el-option v-for="dict in warehouseData" :key="dict.id" :label="dict.warehouseName" :value="dict.warehouseCode" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="执行人" prop="userId">
+            <el-select v-model="queryParams.userId" placeholder="请选择执行人" clearable >
+              <el-option v-for="dict in personData" :key="dict.userId" :label="dict.userName" :value="dict.userId" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="盘点类型" prop="taskType">
+            <el-select v-model="queryParams.taskType" placeholder="请选择盘点类型" clearable >
+              <el-option v-for="dict in taskTypeList" :key="dict.id" :label="dict.label" :value="dict.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['Inventory:task:add']"
+        >新增</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['Inventory:task:edit']"
+        >修改</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['Inventory:task:remove']"
+        >删除</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['Inventory:task:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+     
+      <el-table-column label="任务名称" align="center" prop="taskName" />
+      <el-table-column label="仓库" align="center" prop="warehouseName" />
+      <el-table-column label="场景" align="center" prop="sceneName" />
+      <el-table-column label="执行人" align="center" prop="userName" />
+      <el-table-column label="要求完成时间" align="center" prop="requireTime" />
+      <el-table-column label="任务状态" align="center" >
+        <template #default="scope">
+          <span>{{ scope.row.status==0?"待执行":(scope.row.status==1?"已完成":"已超时") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="盘点类型" align="center" prop="taskType" >
+        <template #default="scope">
+          <span>{{ scope.row.taskType==0?"手持盘点":"自动盘点"}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务备注" align="center" prop="remark" width="300"/>
+      <!-- <el-table-column label="删除状态" align="center" prop="isDelete" >
+        <template #default="scope">
+          <span>{{ scope.row.isDelete==0?"正常":"已删除"}}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="400">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['Inventory:task:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['Inventory:task:remove']">删除</el-button>
+          <el-button link type="primary" :disabled="scope.row.taskType == 0 || (scope.row.taskType == 1 && scope.row.status != 0)" icon="TakeawayBox" @click="handleInventory(scope.row)" v-hasPermi="['Inventory:task:autoInventory']">盘点</el-button>
+          <el-button link type="primary" :disabled="scope.row.status != 1" icon="view" @click="handleHistory(scope.row)" v-hasPermi="['Inventory:task:history']">查看结果</el-button>
+          <el-button link type="primary" :disabled="scope.row.status != 1" icon="Download" @click="handleExport(scope.row)" v-hasPermi="['Inventory:task:resultExport']">导出</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改盘点任务对话框 -->
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+      <el-form ref="taskRef" :model="form" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="任务名称" prop="taskName">
+              <el-input v-model="form.taskName" placeholder="请输入任务名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="仓库" prop="warehouseCode">
+              <!-- <el-select v-model="form.warehouseId" placeholder="请选择仓库" clearable style="width: 100%">
+                <el-option v-for="dict in warehouseData" :key="dict.id" :label="dict.warehouseName" :value="dict.warehouseCode" />
+              </el-select> -->
+              <el-select v-model="form.warehouseCode" placeholder="请选择仓库" clearable style="width: 100%">
+                <el-option v-for="dict in warehouseData" :key="dict.id" :label="dict.warehouseName" :value="dict.warehouseCode" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="场景" prop="sceneId">
+              <el-select v-model="form.sceneId" placeholder="请选择场景" clearable style="width: 100%">
+                <el-option v-for="dict in sceneData" :key="dict.id" :label="dict.sceneName" :value="dict.sceneCode" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="执行人" prop="userId">
+              <el-select v-model="form.userId" placeholder="请选择执行人" clearable style="width: 100%">
+                <el-option v-for="dict in personData" :key="dict.userId" :label="dict.userName" :value="dict.userId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="盘点类型" prop="taskType">
+              <el-select v-model="form.taskType" placeholder="请选择任务类型" clearable style="width: 100%">
+                <el-option v-for="dict in taskTypeList" :key="dict.id" :label="dict.label" :value="dict.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="要求完成时间" prop="requireTime">
+              <el-date-picker clearable
+                style="width:100%"
+                v-model="form.requireTime"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择入库时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="任务备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Task">
+import { listTask, getTask, delTask, addTask, updateTask } from "@/api/Inventory/task";
+import {warehouseDict} from "@/api/information/warehouseinfo";
+import {listScene} from "@/api/information/scene";
+import {personListDict} from "@/api/system/user";    //任务执行人
+import { useRouter } from 'vue-router';
+
+const router = useRouter()
+
+const { proxy } = getCurrentInstance();
+
+const taskList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const warehouseData = ref([])   //仓库下拉列表
+const sceneData = ref([])   //场景下拉列表
+const personData = ref([])    //任务执行人下拉列表
+//搜索条件
+const taskStatusDict = ref([
+  {id:0,label:"待执行"},
+  {id:1,label:"已完成"},
+  {id:2,label:"已超时"}
+])
+//搜索条件
+const delStatusDict = ref([
+  {id:0,label:"正常"},
+  {id:1,label:"已删除"}
+])
+//盘点类型
+const taskTypeList = ref([
+  {id:"0",label:"手持盘点"},
+  {id:"1",label:"自动盘点"}
+])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    taskName: null,
+    warehouseCode:null,
+    status: null,
+    userId:null,
+    taskType: null
+  },
+  rules: {
+    taskName: [
+      { required: true, message: "任务名称不能为空", trigger: "blur" }
+    ],
+    warehouseCode: [
+      { required: true, message: "仓库不能为空", trigger: "blur" }
+    ],
+    sceneId: [
+      { required: true, message: "场景不能为空", trigger: "blur" }
+    ],
+    userId: [
+      { required: true, message: "执行人不能为空", trigger: "blur" }
+    ],
+    requireTime: [
+      { required: true, message: "要求完成时间不能为空", trigger: "blur" }
+    ],
+    taskType: [
+      { required: true, message: "任务类型不能为空", trigger: "change" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询盘点任务列表 */
+function getList() {
+  loading.value = true;
+  listTask(queryParams.value).then(response => {
+    taskList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    taskName: null,
+    warehouseCode: null,
+    sceneId: null,
+    userId: null,
+    requireTime: null,
+    status: null,
+    taskType: null,
+    remark: null,
+    createdBy: null,
+    createdAt: null,
+    updatedBy: null,
+    updatedAt: null,
+    isDelete: null
+  };
+  proxy.resetForm("taskRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加盘点任务";
+  
+}
+//获取仓库下拉列表
+function warehouseList(){
+  warehouseDict().then(response=>{
+    warehouseData.value = response.data
+  })
+}
+//场景下拉列表
+function sceneList(){
+  let params = {pageNum:1,pageSize:50}
+  listScene(params).then(response=>{
+    sceneData.value = response.rows
+  })
+}
+//任务执行人下拉列表
+function personList(){
+  personListDict().then(response=>{
+    personData.value = response.data
+  })
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _id = row.id || ids.value
+  getTask(_id).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改盘点任务";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["taskRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateTask(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addTask(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value;
+  proxy.$modal.confirm('是否确认删除？').then(function() {
+    return delTask(_ids);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 盘点操作 */
+function handleInventory(row) {
+  router.push({ path: "/Inventory/task/autoInventory" , query: {"taskId": row.id} })
+}
+
+/** 查看结果操作 */
+function handleHistory(row) {
+  router.push({ path: "/Inventory/task/inventoryResult" , query: {"taskId": row.id} })
+}
+
+/** 导出按钮操作 */
+function handleExport(row) {
+  let taskId = row.id
+  proxy.download('/MatchScan/export', {taskId}, `${row.taskName}_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+warehouseList();  //库房
+  sceneList();    //场景
+  personList()  //任务执行人
+</script>

src/views/Inventory/task/inventoryResult.vue

@@ -0,0 +1,146 @@
+<template>
+  <div class="app-container">
+    <div style="margin-bottom: 20px;display: flex;align-items: center;justify-content: space-between;">
+      <div>
+        {{ '盘点结果' }}
+        <el-text v-show="dialogParams.status == 0">(当前为正常数据)</el-text>
+        <el-text v-show="dialogParams.status == 1">(当前为未扫描到，但数据库里有的数据)</el-text>
+        <el-text v-show="dialogParams.status == 2">(当前为已扫描到，但数据库里没有的数据)</el-text>
+      </div>
+      <el-button
+        type="warning"
+        plain
+        icon="Download"
+        @click="handleExport"
+      >导出</el-button>
+    </div>
+
+
+    <el-tabs v-model="activeTabs" type="border-card" @tab-change="handleQueryInfo">
+      <el-tab-pane v-for="item in statusList" :label="item.label" :name="item.value">
+        <el-table :data="dialogData" border empty-text="暂无数据" v-if="dialogParams.status == 0 || dialogParams.status == 1">
+          <el-table-column prop="rkPcode" label="存放位置" />
+          <el-table-column prop="realQty" label="数量" />
+          <el-table-column prop="count" label="操作" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        
+        <el-table :data="dialogData" border empty-text="暂无数据" v-if="dialogParams.status == 2">
+          <el-table-column prop="rkPcode" label="存放位置" />
+        </el-table>
+        <div style="margin-top: 20px;width: 100%;display: flex;align-items: center;justify-content: flex-end;">
+          <div style="margin-right: 20px;color: #606266;">共{{ dialogTotal }}条</div>
+          <el-pagination background layout="prev, pager, next" :total="dialogTotal" @change="chageDialogPage" />
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+
+
+    <el-dialog v-model="taskView" title="详情" width="85%" draggable>
+      <el-table :data="viewData" border empty-text="暂无数据">
+        <el-table-column prop="sapNo" label="订单" />
+        <el-table-column prop="wlNo" label="物料号" />
+        <el-table-column prop="wlMs" label="物料描述" />
+        <el-table-column prop="realQty" label="数量">
+          <template #default="scope">{{ scope.row.realQty }}({{ scope.row.dw }})</template>
+        </el-table-column>
+        <el-table-column prop="xmMs" label="项目名称" />
+        <el-table-column prop="gysMc" label="供应商" />
+        <el-table-column prop="cangkuName" label="所属仓库" />
+        <el-table-column prop="rkTime" label="入库时间">
+          <template #default="scope">{{ parseTime(scope.row.rkTime, '{y}-{m}-{d}') }}</template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="taskView=false">关闭</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="InventoryResult">
+import { getScanResult, getStockList } from "@/api/Inventory/autoInventory";
+import { onMounted, ref } from "vue";
+import { useRoute } from 'vue-router';
+
+const { proxy } = getCurrentInstance();
+
+const statusList = ref(
+  [
+    {
+      label: '正常',
+      value: 0
+    },
+    {
+      label: '未扫到',
+      value: 1
+    },
+    {
+      label: '无数据',
+      value: 2
+    }
+  ]
+)  // 盘点状态
+const activeTabs = ref(0)
+const dialogParams = ref({
+  status: 0,
+  pageNum: 1,
+  pageSize: 10,
+  taskId: ""
+})
+const dialogData = ref([])
+const dialogTotal = ref(0)
+
+const getHistoryInfo = () => {
+  getScanResult(dialogParams.value).then(res => {
+    dialogData.value = res.rows
+    dialogTotal.value = res.total
+  })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('/MatchScan/export', {taskId: dialogParams.value.taskId}, `盘点结果_${new Date().getTime()}.xlsx`)
+}
+
+const handleQueryInfo = (tab) => {
+  dialogParams.value.status = tab
+  dialogParams.value.pageNum = 1
+  getHistoryInfo()
+}
+const chageDialogPage = (e) => {
+  dialogParams.value.pageNum = e
+  getHistoryInfo()
+}
+
+
+const taskView = ref(false)
+const viewData = ref([])
+const handleView = (row) => {
+  // let obj = {
+  //   pageNum: 1,
+  //   pageSize: 100,
+  //   pcode: row.rkPcode
+  // }
+  getStockList(row.rkPcode).then(res => {
+    console.log(res)
+    viewData.value = res.data
+    taskView.value = true
+  })
+}
+
+
+const route = useRoute()
+onMounted(() => {
+  dialogParams.value.taskId = route.query.taskId
+  getHistoryInfo()
+})
+</script>
+
+<style scoped lang="scss">
+</style>