From fcb060b884381a71f43baa224bcf082f36ac10d1 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Wed, 10 Jul 2024 10:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/http/request.js        |  2 +-
 src/layout/goodsOut.vue    |  2 +-
 src/layout/stock.vue       |  8 ++++---
 src/layout/taskMonitor.vue | 45 +++++++++++++++++---------------------
 4 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/http/request.js b/src/http/request.js
index b969fc4..3d42d7b 100644
--- a/src/http/request.js
+++ b/src/http/request.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
 
 const request = axios.create({
-    baseURL: 'http://192.168.3.254:12315/wms',
+    baseURL: 'http://localhost:12315/wms',
     timeout: 5000
 })
 
diff --git a/src/layout/goodsOut.vue b/src/layout/goodsOut.vue
index 6189a0d..2e82faa 100644
--- a/src/layout/goodsOut.vue
+++ b/src/layout/goodsOut.vue
@@ -118,7 +118,7 @@
                             <el-col :span="8" :offset="8">
                                 <el-form-item>
                                     <el-button type="success" round
-                                        @click="confirmTask(pickConfirmRef, pickConfirmEntity)">确认完回库</el-button>
+                                        @click="confirmTask(pickConfirmRef, pickConfirmEntity)">拣货完成确认回库</el-button>
                                 </el-form-item>
                             </el-col>
                         </el-row>
diff --git a/src/layout/stock.vue b/src/layout/stock.vue
index 68b2a18..0832e60 100644
--- a/src/layout/stock.vue
+++ b/src/layout/stock.vue
@@ -17,11 +17,13 @@
                         <el-radio :label="scope.row.stockId" v-model="stockId">&nbsp;</el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column prop="vehicleId" label="型号" fixed="left" min-width="120px" />
-                <el-table-column prop="goodsRelated.goodsId" label="规格" fixed="left" min-width="120px" />
+                <el-table-column prop="goodsRelated.goodsId" label="物料号" fixed="left" min-width="120px" />
+                <el-table-column prop="goodsRelated.goodsName" label="物料名称" fixed="left" min-width="120px" />
+                <el-table-column prop="goodsRelated.remainNum" label="剩余数量" min-width="120px" />
+                <el-table-column prop="goodsRelated.totalNum" label="入库数量" min-width="120px" />
+                <el-table-column prop="vehicleId" label="载具号" min-width="120px" />
                 <el-table-column prop="locationId" label="库位" :formatter="locationFormat" min-width="120px" />
                 <el-table-column prop="isInventory" label="是否盘点" min-width="120px" />
-                <el-table-column prop="orderId" label="订单号" min-width="120px" />
                 <el-table-column prop="createTime" label="上架时间" :formatter="timeFormat" min-width="140px" />
                 <el-table-column prop="goodsRelated.goodsStatus" label="物料状态" :formatter="goodsStatusFormat" min-width="120px" />
                 <el-table-column prop="stockStatus" label="库存状态" :formatter="stockStatusFormat" fixed="right"
diff --git a/src/layout/taskMonitor.vue b/src/layout/taskMonitor.vue
index 6dcb93b..468acc4 100644
--- a/src/layout/taskMonitor.vue
+++ b/src/layout/taskMonitor.vue
@@ -3,8 +3,8 @@
     <div style="margin-bottom: 15px">
         <el-config-provider :locale="zhCn">
             <el-row>
-                <el-input v-model="goodsTypeQuery" style="width: 256px; margin-right: 10px;" placeholder="型号" />
-                <el-input v-model="specificationQuery" style="width: 256px; margin-right: 10px;" placeholder="规格" />
+                <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="物料号" />
+                <el-input v-model="vehicleIdQuery" style="width: 256px; margin-right: 10px;" placeholder="载具号" />
                 <el-button type="primary" @click="search()">搜索</el-button>
                 <el-button type="warning" @click="reset()">重置</el-button>
             </el-row>
@@ -18,14 +18,14 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" />
-                <el-table-column prop="goodsType" label="型号"  min-width="120px" />
-                <el-table-column prop="specification" label="规格" min-width="120px" />
-                <el-table-column prop="batchNo" label="批次号" min-width="120px" />
-                <el-table-column prop="taskGroup" label="任务单号" min-width="120px" />
+                <el-table-column prop="vehicleId" label="载具号"  min-width="120px" />
+                <el-table-column prop="goodsRelated.goodsId" label="规格" min-width="120px" />
+                <el-table-column prop="goodsRelated.goodsName" label="批次号" min-width="120px" />
+                <el-table-column prop="taskGroup" label="任务组" min-width="120px" />
                 <el-table-column prop="origin" label="起点" min-width="120px" />
                 <el-table-column prop="destination" label="终点" min-width="120px" />
-                <el-table-column prop="operateNum" label="操作数量" min-width="120px" />
-                <el-table-column prop="totalNum" label="库存数量" min-width="120px" />
+                <el-table-column prop="opNum" label="操作数量" min-width="120px" />
+                <el-table-column prop="originNum" label="库存数量" min-width="120px" />
                 <el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
                 <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
                 <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" />
@@ -106,7 +106,7 @@
 </template>
 
 <script setup>
-import { getTasks, changeTaskStatus } from '@/api/task.js'
+import { getTasksByPage, changeTaskStatus } from '@/api/task.js'
 import { getAvailableLocations } from '@/api/location.js'
 import { dateFormatter, locationFormatter, taskStatusFormatter, timeFormatter, dueFormatter } from '@/utils/formatter.js'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
@@ -124,8 +124,8 @@ export default {
             currentPage: 1,
             pageSize: 10,
             total: 0,
-            goodsTypeQuery: '',
-            specificationQuery: '',
+            goodsIdQuery: '',
+            vehicleIdQuery: '',
             loading: true,
             dialogVisible: false,
             taskFormEntity: reactive({}),
@@ -195,24 +195,19 @@ export default {
         },
         search() {
             this.loading = true
-            this.pageInfo.pageNum = this.currentPage
-            this.pageInfo.pageSize = this.pageSize
             const tableRequest = {
-                page: this.pageInfo,
-                param: {
-                    goodsType: this.goodsTypeQuery.trim(),
-                    specification: this.specificationQuery.trim(),
-                    userName: store.getters.getUserName
-                }
+                pageNo: this.currentPage,
+                pageSize: this.pageSize,
+                goodsId: this.goodsIdQuery.trim(),
+                vehicleId: this.vehicleIdQuery.trim()
             }
-            getTasks(tableRequest).then(res => {
+            getTasksByPage(tableRequest).then(res => {
                 const tableResponse = res.data
                 if (tableResponse.code != 0) {
-                    console.log(tableResponse.code + ':' + tableResponse.message)
                     ElMessage.error(tableResponse.message)
                 }
-                this.tasks = tableResponse.rows
-                this.total = tableResponse.total
+                this.tasks = tableResponse.returnData.lists
+                this.total = tableResponse.returnData.total
             }).catch(err => {
                 console.log(err)
                 ElMessage.error('查询任务错误')
@@ -220,8 +215,8 @@ export default {
             this.loading = false
         },
         reset() {
-            this.goodsTypeQuery = ''
-            this.specificationQuery = ''
+            this.goodsIdQuery = ''
+            this.vehicleIdQuery = ''
         },
         editCurrentRowTask(row) {
             if (row.taskType == 1) {