liangzhou/wms_client_miniload_bk7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
梁州 2024-07-10 10:52:21 +08:00
parent ddda8743d1
commit fcb060b884
4 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/request.js
View File

@ -1,7 +1,7 @@
import axios from 'axios' import axios from 'axios'
const request = axios.create({ const request = axios.create({
baseURL: 'http://192.168.3.254:12315/wms', baseURL: 'http://localhost:12315/wms',
timeout: 5000 timeout: 5000
}) })

2
src/layout/goodsOut.vue
View File

@ -118,7 +118,7 @@
<el-col :span="8" :offset="8"> <el-col :span="8" :offset="8">
<el-form-item> <el-form-item>
<el-button type="success" round <el-button type="success" round
@click="confirmTask(pickConfirmRef, pickConfirmEntity)">确认完回库</el-button> @click="confirmTask(pickConfirmRef, pickConfirmEntity)">拣货完成确认回库</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

8
src/layout/stock.vue
View File

@ -17,11 +17,13 @@
<el-radio :label="scope.row.stockId" v-model="stockId">&nbsp;</el-radio> <el-radio :label="scope.row.stockId" v-model="stockId">&nbsp;</el-radio>
</template> </template>
</el-table-column> </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="locationId" label="库位" :formatter="locationFormat" min-width="120px" />
<el-table-column prop="isInventory" label="是否盘点" 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="createTime" label="上架时间" :formatter="timeFormat" min-width="140px" />
<el-table-column prop="goodsRelated.goodsStatus" label="物料状态" :formatter="goodsStatusFormat" min-width="120px" /> <el-table-column prop="goodsRelated.goodsStatus" label="物料状态" :formatter="goodsStatusFormat" min-width="120px" />
<el-table-column prop="stockStatus" label="库存状态" :formatter="stockStatusFormat" fixed="right" <el-table-column prop="stockStatus" label="库存状态" :formatter="stockStatusFormat" fixed="right"

45
src/layout/taskMonitor.vue
View File

@ -3,8 +3,8 @@
<div style="margin-bottom: 15px"> <div style="margin-bottom: 15px">
<el-config-provider :locale="zhCn"> <el-config-provider :locale="zhCn">
<el-row> <el-row>
<el-input v-model="goodsTypeQuery" style="width: 256px; margin-right: 10px;" placeholder="型号" /> <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="物料号" />
<el-input v-model="specificationQuery" 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="primary" @click="search()">搜索</el-button>
<el-button type="warning" @click="reset()">重置</el-button> <el-button type="warning" @click="reset()">重置</el-button>
</el-row> </el-row>
@ -18,14 +18,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" /> <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="vehicleId" label="载具号" min-width="120px" />
<el-table-column prop="specification" label="规格" min-width="120px" /> <el-table-column prop="goodsRelated.goodsId" label="规格" min-width="120px" />
<el-table-column prop="batchNo" 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="taskGroup" label="任务组" min-width="120px" />
<el-table-column prop="origin" 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="destination" label="终点" min-width="120px" />
<el-table-column prop="operateNum" label="操作数量" min-width="120px" /> <el-table-column prop="opNum" label="操作数量" min-width="120px" />
<el-table-column prop="totalNum" 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="taskPriority" label="任务优先级" min-width="120px" />
<el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip /> <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
<el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" /> <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" />
@ -106,7 +106,7 @@
</template> </template>
<script setup> <script setup>
import { getTasks, changeTaskStatus } from '@/api/task.js' import { getTasksByPage, changeTaskStatus } from '@/api/task.js'
import { getAvailableLocations } from '@/api/location.js' import { getAvailableLocations } from '@/api/location.js'
import { dateFormatter, locationFormatter, taskStatusFormatter, timeFormatter, dueFormatter } from '@/utils/formatter.js' import { dateFormatter, locationFormatter, taskStatusFormatter, timeFormatter, dueFormatter } from '@/utils/formatter.js'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs' import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
@ -124,8 +124,8 @@ export default {
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,
goodsTypeQuery: '', goodsIdQuery: '',
specificationQuery: '', vehicleIdQuery: '',
loading: true, loading: true,
dialogVisible: false, dialogVisible: false,
taskFormEntity: reactive({}), taskFormEntity: reactive({}),
@ -195,24 +195,19 @@ export default {
}, },
search() { search() {
this.loading = true this.loading = true
this.pageInfo.pageNum = this.currentPage
this.pageInfo.pageSize = this.pageSize
const tableRequest = { const tableRequest = {
page: this.pageInfo, pageNo: this.currentPage,
param: { pageSize: this.pageSize,
goodsType: this.goodsTypeQuery.trim(), goodsId: this.goodsIdQuery.trim(),
specification: this.specificationQuery.trim(), vehicleId: this.vehicleIdQuery.trim()
userName: store.getters.getUserName
} }
} getTasksByPage(tableRequest).then(res => {
getTasks(tableRequest).then(res => {
const tableResponse = res.data const tableResponse = res.data
if (tableResponse.code != 0) { if (tableResponse.code != 0) {
console.log(tableResponse.code + ':' + tableResponse.message)
ElMessage.error(tableResponse.message) ElMessage.error(tableResponse.message)
} }
this.tasks = tableResponse.rows this.tasks = tableResponse.returnData.lists
this.total = tableResponse.total this.total = tableResponse.returnData.total
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)
ElMessage.error('查询任务错误') ElMessage.error('查询任务错误')
@ -220,8 +215,8 @@ export default {
this.loading = false this.loading = false
}, },
reset() { reset() {
this.goodsTypeQuery = '' this.goodsIdQuery = ''
this.specificationQuery = '' this.vehicleIdQuery = ''
}, },
editCurrentRowTask(row) { editCurrentRowTask(row) {
if (row.taskType == 1) { if (row.taskType == 1) {