代码更新：

1.增加工站配置界面

src/api/kateWork.js

@@ -48,11 +48,38 @@ const updateOrders = (params) => {
   })
 }
 
+const getStationConfigs = (params) => {
+  return request({
+    url: '/kateWork/getStationConfigs',
+    method: 'post',
+    data: params
+  })
+}
+
+const deleteStationConfigs = (params) => {
+  return request({
+    url: '/kateWork/deleteStationConfigs',
+    method: 'post',
+    data: params
+  })
+}
+
+const updateStationConfigs = (params) => {
+  return request({
+    url: '/kateWork/updateStationConfigs',
+    method: 'post',
+    data: params
+  })
+}
+
 export {
     getDbs,
     deleteDbs,
     updateDbs,
     getOrders,
     deleteOrders,
-    updateOrders
+    updateOrders,
+    getStationConfigs,
+    deleteStationConfigs,
+    updateStationConfigs
 }

src/api/task.js

@@ -152,6 +152,30 @@ const requestSortBox = (params) => {
   })
 }
 
+const getPickTasksByPage = (params) => {
+  return request({
+    url: '/task/getPickTasksByPage',
+    method: 'post',
+    data: params
+  })
+}
+
+const deletePickTasks = (params) => {
+  return request({
+    url: '/task/deletePickTasks',
+    method: 'post',
+    data: params
+  })
+}
+
+const updatePickTasks = (params) => {
+  return request({
+    url: '/task/updatePickTasks',
+    method: 'post',
+    data: params
+  })
+}
+
 export {
   sendGoodsInTask,
   sendGoodsOutTask,
@@ -171,5 +195,8 @@ export {
   requestBackTest,
   requestInTest,
   requestPrintData,
-  requestSortBox
+  requestSortBox,
+  getPickTasksByPage,
+  deletePickTasks,
+  updatePickTasks
 }

src/http/request.js

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

src/layout/dbsTable.vue

@@ -28,7 +28,7 @@
                 <el-table-column prop="workOrder" label="工单" min-width="120px" />
                 <el-table-column prop="planStartDate" label="开工日期" :formatter="dateFormat" min-width="120px" />
                 <el-table-column prop="dbsStatus" label="状态" min-width="120px" />
-                <el-table-column prop="lastUpdateTime" label="最近更新时间" :formatter="timeFormat" min-width="120px" />
+                <el-table-column prop="lastUpdateTime" label="最近更新时间" :formatter="timeFormat" show-overflow-tooltip min-width="120px" />
                 <el-table-column prop="lastUpdateUser" label="最近更新用户" min-width="120px" />
                 <el-table-column fixed="right" label="操作" width="240px">
                     <template v-slot="scope">

src/layout/eLocationConfig.vue

@@ -0,0 +1,395 @@
+<template>
+    <div style="margin-bottom: 10px; height: 100%; padding-left: 1%; padding-right: 1%;">
+        <el-config-provider :locale="zhCn">
+            <div style="display: flex;justify-content: space-between;">
+                <el-row>
+                    <el-input v-model="workOrderQuery" style="width: 256px; margin-right: 10px;" placeholder="工单"
+                        :suffix-icon="Search" />
+                        <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="料号"
+                        :suffix-icon="Search" />
+                        <el-input v-model="smallBoxQuery" style="width: 256px; margin-right: 10px;" placeholder="小工位"
+                        :suffix-icon="Search" />
+                    <el-button type="primary" @click="search()">搜索</el-button>
+                    <el-button type="warning" @click="reset()">重置</el-button>
+                </el-row>
+                <el-row>
+                    <el-button style="background-color: #00CED1; color: #000;"
+                        @click="openUploadDialog()">导入</el-button>
+                </el-row>
+            </div>
+            <br />
+            <el-table :data="ordersList" stripe border v-loading="loading" class="table-class" highlight-current-row
+                max-height="650px" @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
+                :cell-style="{ 'text-align': 'center' }">
+                <el-table-column width="65px" fixed="left">
+                    <template v-slot="scope">
+                        <el-radio :label="scope.row.orderId" v-model="orderId">&nbsp;</el-radio>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="orderId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
+                <el-table-column prop="workOrder" label="工单" fixed="left" min-width="120px" />
+                <el-table-column prop="goodsId" label="料号" min-width="120px" />
+                <el-table-column prop="supplyArea" label="小工位" fixed="left" min-width="120px" />
+                <el-table-column prop="item" label="Item" min-width="120px" />
+                <el-table-column prop="description" label="描述" min-width="120px" />
+                <el-table-column prop="sLoc" label="SLoc" min-width="120px" />
+                <el-table-column prop="type" label="Type" min-width="120px" />
+                <el-table-column prop="originStatus" label="Status" min-width="120px" />
+                <el-table-column prop="sortString" label="SortStrng" min-width="120px" />
+                <el-table-column prop="requirementQuantity" label="需求数量" sortable min-width="120px" />
+                <el-table-column prop="goodsUnit" label="单位" min-width="120px" />
+                <el-table-column prop="orderStatus" label="状态" min-width="120px" />
+                <el-table-column prop="lackQuantity" label="缺少数量" min-width="120px" />
+                <el-table-column prop="pickedQuantity" label="已拣数量" min-width="120px" />
+                <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px" />
+                <el-table-column prop="userName" label="操作人员" min-width="120px" />
+                <el-table-column fixed="right" label="操作" width="240px">
+                    <template v-slot="scope">
+                        <el-button plain type="primary" @click="editCurrentRowOrders(scope.row)">编辑</el-button>
+                        <el-button plain type="danger" @click="deleteCurrentRowOrders(scope.row)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <br />
+            <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
+                :small="false" :disabled="false" :background="false" :default-page-size="10"
+                layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
+                @current-change="search" />
+            <el-dialog v-model="dialogVisible" title="DBS信息" width="40%" draggable :show-close="false">
+                <div
+                    style="max-width: 100%; max-height: 500px; overflow: auto; display: flex; justify-content: center;">
+                    <el-form ref="ordersFormRef" :model="ordersFormEntity" :label-position="labelPosition"
+                        label-width="100px" style="width: 95%;" :rules="rules" status-icon>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="id" prop="orderId">
+                                    <el-input v-model="ordersFormEntity.orderId" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="工单" prop="workOrder">
+                                    <el-input v-model="ordersFormEntity.workOrder" disabled />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="小工位" prop="supplyArea">
+                                    <el-input v-model="ordersFormEntity.supplyArea" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="料号" prop="goodsId">
+                                    <el-input v-model="ordersFormEntity.goodsId" disabled />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="需求数量" prop="requirementQuantity">
+                                    <el-input-number v-model.number="ordersFormEntity.requirementQuantity"
+                                        controls-position="right" :min="0" clearable />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="状态" prop="orderStatus">
+                                    <el-input-number v-model.number="ordersFormEntity.orderStatus"
+                                        controls-position="right" :min="0" :max="4" clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="缺少数量" prop="lackQuantity">
+                                    <el-input-number v-model.number="ordersFormEntity.lackQuantity"
+                                        controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity" clearable />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="已拣数量" prop="pickedQuantity">
+                                    <el-input-number v-model.number="ordersFormEntity.pickedQuantity"
+                                        controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity" clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-form>
+                </div>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="dialogVisible = false">取消</el-button>
+                        <el-button type="primary" @click="submitOrdersInfo(ordersFormEntity)">
+                            确定
+                        </el-button>
+                    </span>
+                </template>
+            </el-dialog>
+            <el-dialog v-model="uploadDialogVisible" title="工单" width="40%" draggable :show-close="true">
+                <fieldset class="title-area">
+                    <legend>上次更新</legend>
+                    <div style="padding: 5px;">
+                        <div style="display: flex; margin-bottom: 10px;">
+                            <div style="display: flex; width: 100%;">
+                                <div style="width: 30%; align-content: center;">时间：</div>
+                                <el-input v-model="uploadRecord.uploadTime" readonly />
+                            </div>
+                            <div style="display: flex; width: 100%; margin-left: 5px;">
+                                <div style="width: 30%; align-content: center;">人员：</div>
+                                <el-input v-model="uploadRecord.uploadUser" readonly />
+                            </div>
+                        </div>
+                        <div style="display: flex; width: 100%;">
+                            <div style="width: 13%; align-content: center;">文件名：</div>
+                            <el-input type="textarea" :rows="1" v-model="uploadRecord.fileName" :maxlength="-1"
+                                :show-word-limit="false" :autosize="{ minRows: 1, maxRows: 4 }" readonly>
+                            </el-input>
+                        </div>
+                    </div>
+                </fieldset>
+                <fieldset class="title-area">
+                    <legend>再次更新</legend>
+                    <UploadExcelOrders></UploadExcelOrders>
+                </fieldset>
+            </el-dialog>
+        </el-config-provider>
+    </div>
+</template>
+
+<script setup>
+import store from '@/store'
+import { getOrders, deleteOrders, updateOrders } from '@/api/kateWork.js'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref, reactive } from 'vue'
+import { dateFormatter, timeFormatter } from '@/utils/formatter.js'
+import UploadExcelOrders from '@/excel/UploadExcelOrders.vue'
+import { queryUploadRecord } from '@/api/excel.js'
+import { Search } from '@element-plus/icons-vue'
+</script>
+<script>
+export default {
+    name: 'kateOrders',
+    data() {
+        return {
+            ordersList: [],
+            currentPage: 1,
+            uploadRecord: reactive({
+                fileName: '',
+                uploadTime: '',
+                uploadUser: ''
+            }),
+            pageSize: 10,
+            total: 0,
+            workOrderQuery: '',
+            goodsIdQuery: '',
+            smallBoxQuery: '',
+            loading: true,
+            dialogVisible: false,
+            uploadDialogVisible: false,
+            orderId: '',
+            ordersFormEntity: reactive({}),
+            labelPosition: 'top',
+            ordersFormRef: ref(),
+            rules: reactive({})
+        }
+    },
+    mounted() {
+        this.search()
+    },
+    methods: {
+        search() {
+            this.loading = true
+            const request = {
+                pageNo: this.currentPage,
+                pageSize: this.pageSize,
+                workOrder: this.workOrderQuery.trim(),
+                goodsId: this.goodsIdQuery.trim(),
+                supplyArea: this.smallBoxQuery.trim(),
+                userName: store.getters.getUserName
+            }
+            getOrders(request).then(res => {
+                const tableResponse = res.data
+                if (tableResponse.code == 0) {
+                    this.ordersList = tableResponse.returnData.lists
+                    this.total = tableResponse.returnData.total
+                } else {
+                    ElMessage.error(tableResponse.message)
+                }
+            }).catch(err => {
+                ElMessage.error('查询工单错误' + err.message)
+            })
+            this.loading = false
+        },
+        dateFormat: (row, column, cellValue, index) => {
+            return dateFormatter(cellValue)
+        },
+        timeFormat: (row, column, cellValue, index) => {
+            return timeFormatter(cellValue)
+        },
+        reset() {
+            this.workOrderQuery = ''
+            this.goodsIdQuery = ''
+            this.smallBoxQuery = ''
+            this.search()
+        },
+        editCurrentRowOrders(row) {
+            this.orderId = row.orderId
+            this.ordersFormEntity = {
+                orderId: row.orderId,
+                workOrder: row.workOrder,
+                goodsId: row.goodsId,
+                supplyArea: row.supplyArea,
+                requirementQuantity: row.requirementQuantity,
+                orderStatus: row.orderStatus,
+                lackQuantity: row.lackQuantity,
+                pickedQuantity: row.pickedQuantity
+            }
+            this.dialogVisible = true
+        },
+        deleteCurrentRowOrders(row) {
+            this.orderId = row.orderId
+            ElMessageBox.confirm(
+                '该操作会删除选择的工单数据。\n是否继续',
+                '警告',
+                {
+                    confirmButtonText: '确认',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                }
+            ).then(() => {
+                const params = {
+                    orderId: this.orderId,
+                    userName: store.getters.getUserName
+                }
+                deleteOrders(params).then(res => {
+                    if (res.data.code == 0) {
+                        ElMessage({
+                            message: '删除工单信息成功',
+                            type: 'success',
+                        })
+                        this.search()
+                    } else {
+                        ElMessage.error(res.data.message)
+                    }
+                }).catch(err => {
+                    console.log(err)
+                    ElMessage.error('删除工单信息成功')
+                })
+            }).catch(() => {
+                ElMessage({
+                    type: 'info',
+                    message: '操作取消',
+                })
+            })
+        },
+        submitOrdersInfo(formData) {
+            const params = {
+                orderId: formData.orderId,
+                workOrder: formData.workOrder,
+                goodsId: formData.goodsId,
+                supplyArea: formData.supplyArea,
+                requirementQuantity: formData.requirementQuantity,
+                orderStatus: formData.orderStatus,
+                lackQuantity: formData.lackQuantity,
+                pickedQuantity: formData.pickedQuantity,
+                userName: store.getters.getUserName
+            }
+            updateOrders(params).then(res => {
+                if (res.data.code == 0) {
+                    this.dialogVisible = false
+                    ElMessage({
+                        message: '更新工单成功。',
+                        type: 'success',
+                    })
+                    this.search()
+                } else {
+                    ElMessage.error(res.data.message)
+                }
+            }).catch(err => {
+                ElMessage.error('更新工单失败。')
+            })
+        },
+        getCurrentRow(row) {
+            this.dbsId = row.dbsId
+        },
+        openUploadDialog() {
+            // 请求上传记录
+            const param = {
+                userName: store.getters.getUserName,
+                fileDescription: 'ORDERS',
+                isAsc: false,
+                sortBy: 'upload_time'
+            }
+            queryUploadRecord(param).then(res => {
+                if (res.data.code == 0) {
+                    if (res.data.returnData.total > 0) {
+                        this.uploadRecord = res.data.returnData.lists[0]
+                    } else {
+                        this.uploadRecord = reactive({
+                            fileName: '',
+                            uploadTime: '',
+                            uploadUser: ''
+                        })
+                    }
+                } else {
+                    this.uploadRecord = reactive({
+                        fileName: '',
+                        uploadTime: '',
+                        uploadUser: ''
+                    })
+                }
+            }).catch(err => {
+                console.log(err)
+                ElMessage.error('发生异常')
+            })
+            this.uploadDialogVisible = true
+        },
+    },
+}
+</script>
+
+<style scoped>
+.el-pagination {
+    padding-left: 5px;
+}
+
+.el-row .el-button {
+    width: 72px;
+    margin-left: 0px;
+    margin-right: 5px;
+}
+
+.table-class {
+    width: 100%;
+}
+
+.el-row .el-form-item {
+    width: 10% inherit;
+    justify-content: center;
+}
+
+.el-row .el-form-item .el-select-v2 {
+    width: 100% !important;
+}
+
+.el-row .el-form-item .el-input-number {
+    width: 100% !important;
+}
+
+.el-row .el-form-item .el-button {
+    margin: auto;
+}
+
+.title-area {
+    display: flex;
+    min-height: 10%;
+    max-height: max-content;
+    margin-bottom: 10px;
+    min-width: inherit;
+    border: solid 1px;
+    border-radius: 10px;
+    box-shadow: 0px 15px 10px -15px #000;
+    overflow: auto;
+    flex-direction: column;
+    padding: 10px;
+}
+</style>

src/layout/goodsToStation.vue

@@ -0,0 +1,395 @@
+<template>
+    <div style="margin-bottom: 10px; height: 100%; padding-left: 1%; padding-right: 1%;">
+        <el-config-provider :locale="zhCn">
+            <div style="display: flex;justify-content: space-between;">
+                <el-row>
+                    <el-input v-model="workOrderQuery" style="width: 256px; margin-right: 10px;" placeholder="工单"
+                        :suffix-icon="Search" />
+                        <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="料号"
+                        :suffix-icon="Search" />
+                        <el-input v-model="smallBoxQuery" style="width: 256px; margin-right: 10px;" placeholder="小工位"
+                        :suffix-icon="Search" />
+                    <el-button type="primary" @click="search()">搜索</el-button>
+                    <el-button type="warning" @click="reset()">重置</el-button>
+                </el-row>
+                <el-row>
+                    <el-button style="background-color: #00CED1; color: #000;"
+                        @click="openUploadDialog()">导入</el-button>
+                </el-row>
+            </div>
+            <br />
+            <el-table :data="ordersList" stripe border v-loading="loading" class="table-class" highlight-current-row
+                max-height="650px" @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
+                :cell-style="{ 'text-align': 'center' }">
+                <el-table-column width="65px" fixed="left">
+                    <template v-slot="scope">
+                        <el-radio :label="scope.row.orderId" v-model="orderId">&nbsp;</el-radio>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="orderId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
+                <el-table-column prop="workOrder" label="工单" fixed="left" min-width="120px" />
+                <el-table-column prop="goodsId" label="料号" min-width="120px" />
+                <el-table-column prop="supplyArea" label="小工位" fixed="left" min-width="120px" />
+                <el-table-column prop="item" label="Item" min-width="120px" />
+                <el-table-column prop="description" label="描述" min-width="120px" />
+                <el-table-column prop="sLoc" label="SLoc" min-width="120px" />
+                <el-table-column prop="type" label="Type" min-width="120px" />
+                <el-table-column prop="originStatus" label="Status" min-width="120px" />
+                <el-table-column prop="sortString" label="SortStrng" min-width="120px" />
+                <el-table-column prop="requirementQuantity" label="需求数量" sortable min-width="120px" />
+                <el-table-column prop="goodsUnit" label="单位" min-width="120px" />
+                <el-table-column prop="orderStatus" label="状态" min-width="120px" />
+                <el-table-column prop="lackQuantity" label="缺少数量" min-width="120px" />
+                <el-table-column prop="pickedQuantity" label="已拣数量" min-width="120px" />
+                <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px" />
+                <el-table-column prop="userName" label="操作人员" min-width="120px" />
+                <el-table-column fixed="right" label="操作" width="240px">
+                    <template v-slot="scope">
+                        <el-button plain type="primary" @click="editCurrentRowOrders(scope.row)">编辑</el-button>
+                        <el-button plain type="danger" @click="deleteCurrentRowOrders(scope.row)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <br />
+            <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
+                :small="false" :disabled="false" :background="false" :default-page-size="10"
+                layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
+                @current-change="search" />
+            <el-dialog v-model="dialogVisible" title="DBS信息" width="40%" draggable :show-close="false">
+                <div
+                    style="max-width: 100%; max-height: 500px; overflow: auto; display: flex; justify-content: center;">
+                    <el-form ref="ordersFormRef" :model="ordersFormEntity" :label-position="labelPosition"
+                        label-width="100px" style="width: 95%;" :rules="rules" status-icon>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="id" prop="orderId">
+                                    <el-input v-model="ordersFormEntity.orderId" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="工单" prop="workOrder">
+                                    <el-input v-model="ordersFormEntity.workOrder" disabled />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="小工位" prop="supplyArea">
+                                    <el-input v-model="ordersFormEntity.supplyArea" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="料号" prop="goodsId">
+                                    <el-input v-model="ordersFormEntity.goodsId" disabled />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="需求数量" prop="requirementQuantity">
+                                    <el-input-number v-model.number="ordersFormEntity.requirementQuantity"
+                                        controls-position="right" :min="0" clearable />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="状态" prop="orderStatus">
+                                    <el-input-number v-model.number="ordersFormEntity.orderStatus"
+                                        controls-position="right" :min="0" :max="4" clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="缺少数量" prop="lackQuantity">
+                                    <el-input-number v-model.number="ordersFormEntity.lackQuantity"
+                                        controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity" clearable />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="已拣数量" prop="pickedQuantity">
+                                    <el-input-number v-model.number="ordersFormEntity.pickedQuantity"
+                                        controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity" clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-form>
+                </div>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="dialogVisible = false">取消</el-button>
+                        <el-button type="primary" @click="submitOrdersInfo(ordersFormEntity)">
+                            确定
+                        </el-button>
+                    </span>
+                </template>
+            </el-dialog>
+            <el-dialog v-model="uploadDialogVisible" title="工单" width="40%" draggable :show-close="true">
+                <fieldset class="title-area">
+                    <legend>上次更新</legend>
+                    <div style="padding: 5px;">
+                        <div style="display: flex; margin-bottom: 10px;">
+                            <div style="display: flex; width: 100%;">
+                                <div style="width: 30%; align-content: center;">时间：</div>
+                                <el-input v-model="uploadRecord.uploadTime" readonly />
+                            </div>
+                            <div style="display: flex; width: 100%; margin-left: 5px;">
+                                <div style="width: 30%; align-content: center;">人员：</div>
+                                <el-input v-model="uploadRecord.uploadUser" readonly />
+                            </div>
+                        </div>
+                        <div style="display: flex; width: 100%;">
+                            <div style="width: 13%; align-content: center;">文件名：</div>
+                            <el-input type="textarea" :rows="1" v-model="uploadRecord.fileName" :maxlength="-1"
+                                :show-word-limit="false" :autosize="{ minRows: 1, maxRows: 4 }" readonly>
+                            </el-input>
+                        </div>
+                    </div>
+                </fieldset>
+                <fieldset class="title-area">
+                    <legend>再次更新</legend>
+                    <UploadExcelOrders></UploadExcelOrders>
+                </fieldset>
+            </el-dialog>
+        </el-config-provider>
+    </div>
+</template>
+
+<script setup>
+import store from '@/store'
+import { getOrders, deleteOrders, updateOrders } from '@/api/kateWork.js'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref, reactive } from 'vue'
+import { dateFormatter, timeFormatter } from '@/utils/formatter.js'
+import UploadExcelOrders from '@/excel/UploadExcelOrders.vue'
+import { queryUploadRecord } from '@/api/excel.js'
+import { Search } from '@element-plus/icons-vue'
+</script>
+<script>
+export default {
+    name: 'kateOrders',
+    data() {
+        return {
+            ordersList: [],
+            currentPage: 1,
+            uploadRecord: reactive({
+                fileName: '',
+                uploadTime: '',
+                uploadUser: ''
+            }),
+            pageSize: 10,
+            total: 0,
+            workOrderQuery: '',
+            goodsIdQuery: '',
+            smallBoxQuery: '',
+            loading: true,
+            dialogVisible: false,
+            uploadDialogVisible: false,
+            orderId: '',
+            ordersFormEntity: reactive({}),
+            labelPosition: 'top',
+            ordersFormRef: ref(),
+            rules: reactive({})
+        }
+    },
+    mounted() {
+        this.search()
+    },
+    methods: {
+        search() {
+            this.loading = true
+            const request = {
+                pageNo: this.currentPage,
+                pageSize: this.pageSize,
+                workOrder: this.workOrderQuery.trim(),
+                goodsId: this.goodsIdQuery.trim(),
+                supplyArea: this.smallBoxQuery.trim(),
+                userName: store.getters.getUserName
+            }
+            getOrders(request).then(res => {
+                const tableResponse = res.data
+                if (tableResponse.code == 0) {
+                    this.ordersList = tableResponse.returnData.lists
+                    this.total = tableResponse.returnData.total
+                } else {
+                    ElMessage.error(tableResponse.message)
+                }
+            }).catch(err => {
+                ElMessage.error('查询工单错误' + err.message)
+            })
+            this.loading = false
+        },
+        dateFormat: (row, column, cellValue, index) => {
+            return dateFormatter(cellValue)
+        },
+        timeFormat: (row, column, cellValue, index) => {
+            return timeFormatter(cellValue)
+        },
+        reset() {
+            this.workOrderQuery = ''
+            this.goodsIdQuery = ''
+            this.smallBoxQuery = ''
+            this.search()
+        },
+        editCurrentRowOrders(row) {
+            this.orderId = row.orderId
+            this.ordersFormEntity = {
+                orderId: row.orderId,
+                workOrder: row.workOrder,
+                goodsId: row.goodsId,
+                supplyArea: row.supplyArea,
+                requirementQuantity: row.requirementQuantity,
+                orderStatus: row.orderStatus,
+                lackQuantity: row.lackQuantity,
+                pickedQuantity: row.pickedQuantity
+            }
+            this.dialogVisible = true
+        },
+        deleteCurrentRowOrders(row) {
+            this.orderId = row.orderId
+            ElMessageBox.confirm(
+                '该操作会删除选择的工单数据。\n是否继续',
+                '警告',
+                {
+                    confirmButtonText: '确认',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                }
+            ).then(() => {
+                const params = {
+                    orderId: this.orderId,
+                    userName: store.getters.getUserName
+                }
+                deleteOrders(params).then(res => {
+                    if (res.data.code == 0) {
+                        ElMessage({
+                            message: '删除工单信息成功',
+                            type: 'success',
+                        })
+                        this.search()
+                    } else {
+                        ElMessage.error(res.data.message)
+                    }
+                }).catch(err => {
+                    console.log(err)
+                    ElMessage.error('删除工单信息成功')
+                })
+            }).catch(() => {
+                ElMessage({
+                    type: 'info',
+                    message: '操作取消',
+                })
+            })
+        },
+        submitOrdersInfo(formData) {
+            const params = {
+                orderId: formData.orderId,
+                workOrder: formData.workOrder,
+                goodsId: formData.goodsId,
+                supplyArea: formData.supplyArea,
+                requirementQuantity: formData.requirementQuantity,
+                orderStatus: formData.orderStatus,
+                lackQuantity: formData.lackQuantity,
+                pickedQuantity: formData.pickedQuantity,
+                userName: store.getters.getUserName
+            }
+            updateOrders(params).then(res => {
+                if (res.data.code == 0) {
+                    this.dialogVisible = false
+                    ElMessage({
+                        message: '更新工单成功。',
+                        type: 'success',
+                    })
+                    this.search()
+                } else {
+                    ElMessage.error(res.data.message)
+                }
+            }).catch(err => {
+                ElMessage.error('更新工单失败。')
+            })
+        },
+        getCurrentRow(row) {
+            this.dbsId = row.dbsId
+        },
+        openUploadDialog() {
+            // 请求上传记录
+            const param = {
+                userName: store.getters.getUserName,
+                fileDescription: 'ORDERS',
+                isAsc: false,
+                sortBy: 'upload_time'
+            }
+            queryUploadRecord(param).then(res => {
+                if (res.data.code == 0) {
+                    if (res.data.returnData.total > 0) {
+                        this.uploadRecord = res.data.returnData.lists[0]
+                    } else {
+                        this.uploadRecord = reactive({
+                            fileName: '',
+                            uploadTime: '',
+                            uploadUser: ''
+                        })
+                    }
+                } else {
+                    this.uploadRecord = reactive({
+                        fileName: '',
+                        uploadTime: '',
+                        uploadUser: ''
+                    })
+                }
+            }).catch(err => {
+                console.log(err)
+                ElMessage.error('发生异常')
+            })
+            this.uploadDialogVisible = true
+        },
+    },
+}
+</script>
+
+<style scoped>
+.el-pagination {
+    padding-left: 5px;
+}
+
+.el-row .el-button {
+    width: 72px;
+    margin-left: 0px;
+    margin-right: 5px;
+}
+
+.table-class {
+    width: 100%;
+}
+
+.el-row .el-form-item {
+    width: 10% inherit;
+    justify-content: center;
+}
+
+.el-row .el-form-item .el-select-v2 {
+    width: 100% !important;
+}
+
+.el-row .el-form-item .el-input-number {
+    width: 100% !important;
+}
+
+.el-row .el-form-item .el-button {
+    margin: auto;
+}
+
+.title-area {
+    display: flex;
+    min-height: 10%;
+    max-height: max-content;
+    margin-bottom: 10px;
+    min-width: inherit;
+    border: solid 1px;
+    border-radius: 10px;
+    box-shadow: 0px 15px 10px -15px #000;
+    overflow: auto;
+    flex-direction: column;
+    padding: 10px;
+}
+</style>

src/layout/kateOrdersTable.vue

@@ -41,7 +41,7 @@
                 <el-table-column prop="orderStatus" label="状态" min-width="120px" />
                 <el-table-column prop="lackQuantity" label="缺少数量" min-width="120px" />
                 <el-table-column prop="pickedQuantity" label="已拣数量" min-width="120px" />
-                <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px" />
+                <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
                 <el-table-column prop="userName" label="操作人员" min-width="120px" />
                 <el-table-column fixed="right" label="操作" width="240px">
                     <template v-slot="scope">
@@ -55,7 +55,7 @@
                 :small="false" :disabled="false" :background="false" :default-page-size="10"
                 layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
                 @current-change="search" />
-            <el-dialog v-model="dialogVisible" title="DBS信息" width="40%" draggable :show-close="false">
+            <el-dialog v-model="dialogVisible" title="工单信息" width="40%" draggable :show-close="false">
                 <div
                     style="max-width: 100%; max-height: 500px; overflow: auto; display: flex; justify-content: center;">
                     <el-form ref="ordersFormRef" :model="ordersFormEntity" :label-position="labelPosition"
@@ -309,7 +309,7 @@ export default {
             })
         },
         getCurrentRow(row) {
-            this.dbsId = row.dbsId
+            this.orderId = row.orderId
         },
         openUploadDialog() {
             // 请求上传记录

src/layout/pickTaskMonitor.vue

@@ -3,50 +3,37 @@
         <el-config-provider :locale="zhCn">
             <div style="display: flex;justify-content: space-between;">
                 <el-row>
-                    <el-input v-model="workOrderQuery" style="width: 256px; margin-right: 10px;" placeholder="工单"
+                    <el-input v-model="workStationQuery" style="width: 256px; margin-right: 10px;" placeholder="工站"
                         :suffix-icon="Search" />
-                        <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="料号"
+                        <el-input v-model="smallBoxQuery" style="width: 256px; margin-right: 10px;" placeholder="小盒子"
-                        :suffix-icon="Search" />
-                        <el-input v-model="smallBoxQuery" style="width: 256px; margin-right: 10px;" placeholder="小工位"
                         :suffix-icon="Search" />
                     <el-button type="primary" @click="search()">搜索</el-button>
                     <el-button type="warning" @click="reset()">重置</el-button>
                 </el-row>
-                <el-row>
-                    <el-button style="background-color: #00CED1; color: #000;"
-                        @click="openUploadDialog()">导入</el-button>
-                </el-row>
             </div>
             <br />
-            <el-table :data="ordersList" stripe border v-loading="loading" class="table-class" highlight-current-row
+            <el-table :data="stationConfigList" stripe border v-loading="loading" class="table-class" highlight-current-row
                 max-height="650px" @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
                 :cell-style="{ 'text-align': 'center' }">
                 <el-table-column width="65px" fixed="left">
                     <template v-slot="scope">
-                        <el-radio :label="scope.row.orderId" v-model="orderId">&nbsp;</el-radio>
+                        <el-radio :label="scope.row.configId" v-model="configId">&nbsp;</el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column prop="orderId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
+                <el-table-column prop="configId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="workOrder" label="工单" fixed="left" min-width="120px" />
+                <el-table-column prop="workStation" label="工站" fixed="left" min-width="120px" />
-                <el-table-column prop="goodsId" label="料号" min-width="120px" />
+                <el-table-column prop="smallBox" label="小盒子" fixed="left" min-width="120px" />
-                <el-table-column prop="supplyArea" label="小工位" fixed="left" min-width="120px" />
+                <el-table-column prop="model" label="机型" min-width="120px" />
-                <el-table-column prop="item" label="Item" min-width="120px" />
+                <el-table-column prop="workCenter" label="工位" min-width="120px" />
-                <el-table-column prop="description" label="描述" min-width="120px" />
+                <el-table-column prop="bigBox" label="工位大盒子" min-width="120px" />
-                <el-table-column prop="sLoc" label="SLoc" min-width="120px" />
+                <el-table-column prop="vehicle" label="车辆" min-width="120px" />
-                <el-table-column prop="type" label="Type" min-width="120px" />
+                <el-table-column prop="vehicleLocation" label="线边架/车位置" min-width="120px" />
-                <el-table-column prop="originStatus" label="Status" min-width="120px" />
+                <el-table-column prop="startDateAdjust" label="开工时间调整" min-width="120px" />
-                <el-table-column prop="sortString" label="SortStrng" min-width="120px" />
+                <el-table-column prop="lastUpdateTime" label="最近更新时间" :formatter="timeFormat" show-overflow-tooltip min-width="120px" />
-                <el-table-column prop="requirementQuantity" label="需求数量" sortable min-width="120px" />
+                <el-table-column prop="lastUpdateUser" label="最近更新用户" min-width="120px" />
-                <el-table-column prop="goodsUnit" label="单位" min-width="120px" />
+                <el-table-column fixed="right" label="操作" width="120px">
-                <el-table-column prop="orderStatus" label="状态" min-width="120px" />
-                <el-table-column prop="lackQuantity" label="缺少数量" min-width="120px" />
-                <el-table-column prop="pickedQuantity" label="已拣数量" min-width="120px" />
-                <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px" />
-                <el-table-column prop="userName" label="操作人员" min-width="120px" />
-                <el-table-column fixed="right" label="操作" width="240px">
                     <template v-slot="scope">
-                        <el-button plain type="primary" @click="editCurrentRowOrders(scope.row)">编辑</el-button>
+                        <el-button plain type="primary" @click="editCurrentRowConfig(scope.row)">编辑</el-button>
-                        <el-button plain type="danger" @click="deleteCurrentRowOrders(scope.row)">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -55,60 +42,64 @@
                 :small="false" :disabled="false" :background="false" :default-page-size="10"
                 layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
                 @current-change="search" />
-            <el-dialog v-model="dialogVisible" title="DBS信息" width="40%" draggable :show-close="false">
+            <el-dialog v-model="dialogVisible" title="工站配置信息" width="40%" draggable :show-close="false">
                 <div
                     style="max-width: 100%; max-height: 500px; overflow: auto; display: flex; justify-content: center;">
-                    <el-form ref="ordersFormRef" :model="ordersFormEntity" :label-position="labelPosition"
+                    <el-form ref="configFormRef" :model="configFormEntity" :label-position="labelPosition"
                         label-width="100px" style="width: 95%;" :rules="rules" status-icon>
                         <el-row :gutter="16">
                             <el-col :span="12" :offset="0">
-                                <el-form-item label="id" prop="orderId">
+                                <el-form-item label="id" prop="configId">
-                                    <el-input v-model="ordersFormEntity.orderId" disabled />
+                                    <el-input v-model="configFormEntity.configId" disabled />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="工单" prop="workOrder">
+                                <el-form-item label="工站" prop="workStation">
-                                    <el-input v-model="ordersFormEntity.workOrder" disabled />
+                                    <el-input v-model="configFormEntity.workStation" clearable />
                                 </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row :gutter="16">
                             <el-col :span="12" :offset="0">
-                                <el-form-item label="小工位" prop="supplyArea">
+                                <el-form-item label="小盒子" prop="smallBox">
-                                    <el-input v-model="ordersFormEntity.supplyArea" disabled />
+                                    <el-input v-model="configFormEntity.smallBox" disabled />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="料号" prop="goodsId">
+                                <el-form-item label="机型" prop="model">
-                                    <el-input v-model="ordersFormEntity.goodsId" disabled />
+                                    <el-input v-model="configFormEntity.model" disabled />
                                 </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row :gutter="16">
                             <el-col :span="12" :offset="0">
-                                <el-form-item label="需求数量" prop="requirementQuantity">
+                                <el-form-item label="工位" prop="workCenter">
-                                    <el-input-number v-model.number="ordersFormEntity.requirementQuantity"
+                                    <el-input v-model="configFormEntity.workCenter" disabled />
-                                        controls-position="right" :min="0" clearable />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="状态" prop="orderStatus">
+                                <el-form-item label="工位大盒子" prop="bigBox">
-                                    <el-input-number v-model.number="ordersFormEntity.orderStatus"
+                                    <el-input v-model="configFormEntity.bigBox" disabled />
-                                        controls-position="right" :min="0" :max="4" clearable />
                                 </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row :gutter="16">
                             <el-col :span="12" :offset="0">
-                                <el-form-item label="缺少数量" prop="lackQuantity">
+                                <el-form-item label="车辆" prop="vehicle">
-                                    <el-input-number v-model.number="ordersFormEntity.lackQuantity"
+                                    <el-input v-model="configFormEntity.vehicle" disabled />
-                                        controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity" clearable />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="已拣数量" prop="pickedQuantity">
+                                <el-form-item label="线边架/车位置" prop="vehicleLocation">
-                                    <el-input-number v-model.number="ordersFormEntity.pickedQuantity"
+                                    <el-input v-model="configFormEntity.vehicleLocation" disabled />
-                                        controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity" clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="开工时间调整" prop="startDateAdjust">
+                                    <el-input-number v-model.number="configFormEntity.startDateAdjust"
+                                        controls-position="right" clearable />
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -117,7 +108,7 @@
                 <template #footer>
                     <span class="dialog-footer">
                         <el-button @click="dialogVisible = false">取消</el-button>
-                        <el-button type="primary" @click="submitOrdersInfo(ordersFormEntity)">
+                        <el-button type="primary" @click="submitConfigInfo(configFormEntity)">
                             确定
                         </el-button>
                     </span>
@@ -147,7 +138,7 @@
                 </fieldset>
                 <fieldset class="title-area">
                     <legend>再次更新</legend>
-                    <UploadExcelOrders></UploadExcelOrders>
+                    <UploadExcelStationConfig></UploadExcelStationConfig>
                 </fieldset>
             </el-dialog>
         </el-config-provider>
@@ -156,21 +147,20 @@
 
 <script setup>
 import store from '@/store'
-import { getOrders, deleteOrders, updateOrders } from '@/api/kateWork.js'
+import { getStationConfigs, deleteStationConfigs, updateStationConfigs } from '@/api/kateWork.js'
-import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
 import { dateFormatter, timeFormatter } from '@/utils/formatter.js'
-import UploadExcelOrders from '@/excel/UploadExcelOrders.vue'
+import UploadExcelStationConfig from '@/excel/UploadExcelStationConfig.vue'
-import { queryUploadRecord } from '@/api/excel.js'
 import { Search } from '@element-plus/icons-vue'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 </script>
 <script>
 export default {
     name: 'kateOrders',
     data() {
         return {
-            ordersList: [],
+            stationConfigList: [],
             currentPage: 1,
             uploadRecord: reactive({
                 fileName: '',
@@ -179,16 +169,15 @@ export default {
             }),
             pageSize: 10,
             total: 0,
-            workOrderQuery: '',
+            workStationQuery: '',
-            goodsIdQuery: '',
             smallBoxQuery: '',
             loading: true,
             dialogVisible: false,
             uploadDialogVisible: false,
-            orderId: '',
+            configId: '',
-            ordersFormEntity: reactive({}),
+            configFormEntity: reactive({}),
             labelPosition: 'top',
-            ordersFormRef: ref(),
+            configFormRef: ref(),
             rules: reactive({})
         }
     },
@@ -201,21 +190,20 @@ export default {
             const request = {
                 pageNo: this.currentPage,
                 pageSize: this.pageSize,
-                workOrder: this.workOrderQuery.trim(),
+                workStation: this.workStationQuery.trim(),
-                goodsId: this.goodsIdQuery.trim(),
+                smallBox: this.smallBoxQuery.trim(),
-                supplyArea: this.smallBoxQuery.trim(),
                 userName: store.getters.getUserName
             }
-            getOrders(request).then(res => {
+            getStationConfigs(request).then(res => {
                 const tableResponse = res.data
                 if (tableResponse.code == 0) {
-                    this.ordersList = tableResponse.returnData.lists
+                    this.stationConfigList = tableResponse.returnData.lists
                     this.total = tableResponse.returnData.total
                 } else {
                     ElMessage.error(tableResponse.message)
                 }
             }).catch(err => {
-                ElMessage.error('查询工单错误' + err.message)
+                ElMessage.error('查询工站配置错误' + err.message)
             })
             this.loading = false
         },
@@ -226,78 +214,47 @@ export default {
             return timeFormatter(cellValue)
         },
         reset() {
-            this.workOrderQuery = ''
+            this.workStationQuery = ''
-            this.goodsIdQuery = ''
             this.smallBoxQuery = ''
             this.search()
         },
-        editCurrentRowOrders(row) {
+        editCurrentRowConfig(row) {
-            this.orderId = row.orderId
+            this.configId = row.configId
-            this.ordersFormEntity = {
+            this.configFormEntity = {
-                orderId: row.orderId,
+                configId: row.configId,
-                workOrder: row.workOrder,
+                workStation: row.workStation,
-                goodsId: row.goodsId,
+                smallBox: row.smallBox,
-                supplyArea: row.supplyArea,
+                model: row.model,
-                requirementQuantity: row.requirementQuantity,
+                workCenter: row.workCenter,
-                orderStatus: row.orderStatus,
+                bigBox: row.bigBox,
-                lackQuantity: row.lackQuantity,
+                vehicle: row.vehicle,
-                pickedQuantity: row.pickedQuantity
+                vehicleLocation: row.vehicleLocation,
+                startDateAdjust: row.startDateAdjust,
+                lastUpdateTime: row.lastUpdateTime,
+                lastUpdateUser: row.lastUpdateUser
             }
             this.dialogVisible = true
         },
-        deleteCurrentRowOrders(row) {
+        submitConfigInfo(formData) {
-            this.orderId = row.orderId
-            ElMessageBox.confirm(
-                '该操作会删除选择的工单数据。\n是否继续',
-                '警告',
-                {
-                    confirmButtonText: '确认',
-                    cancelButtonText: '取消',
-                    type: 'warning',
-                }
-            ).then(() => {
             const params = {
-                    orderId: this.orderId,
+                configId: formData.configId,
+                workStation: formData.workStation,
+                smallBox: formData.smallBox,
+                model: formData.model,
+                workCenter: formData.workCenter,
+                bigBox: formData.bigBox,
+                vehicle: formData.vehicle,
+                vehicleLocation: formData.vehicleLocation,
+                startDateAdjust: formData.startDateAdjust,
+                lastUpdateTime: formData.lastUpdateTime,
+                lastUpdateUser: formData.lastUpdateUser,
                 userName: store.getters.getUserName
             }
-                deleteOrders(params).then(res => {
+            updateStationConfigs(params).then(res => {
-                    if (res.data.code == 0) {
-                        ElMessage({
-                            message: '删除工单信息成功',
-                            type: 'success',
-                        })
-                        this.search()
-                    } else {
-                        ElMessage.error(res.data.message)
-                    }
-                }).catch(err => {
-                    console.log(err)
-                    ElMessage.error('删除工单信息成功')
-                })
-            }).catch(() => {
-                ElMessage({
-                    type: 'info',
-                    message: '操作取消',
-                })
-            })
-        },
-        submitOrdersInfo(formData) {
-            const params = {
-                orderId: formData.orderId,
-                workOrder: formData.workOrder,
-                goodsId: formData.goodsId,
-                supplyArea: formData.supplyArea,
-                requirementQuantity: formData.requirementQuantity,
-                orderStatus: formData.orderStatus,
-                lackQuantity: formData.lackQuantity,
-                pickedQuantity: formData.pickedQuantity,
-                userName: store.getters.getUserName
-            }
-            updateOrders(params).then(res => {
                 if (res.data.code == 0) {
                     this.dialogVisible = false
                     ElMessage({
-                        message: '更新工单成功。',
+                        message: '更新工站配置成功。',
                         type: 'success',
                     })
                     this.search()
@@ -305,43 +262,11 @@ export default {
                     ElMessage.error(res.data.message)
                 }
             }).catch(err => {
-                ElMessage.error('更新工单失败。')
+                ElMessage.error('更新工站配置失败。')
             })
         },
         getCurrentRow(row) {
-            this.dbsId = row.dbsId
+            this.configId = row.configId
-        },
-        openUploadDialog() {
-            // 请求上传记录
-            const param = {
-                userName: store.getters.getUserName,
-                fileDescription: 'ORDERS',
-                isAsc: false,
-                sortBy: 'upload_time'
-            }
-            queryUploadRecord(param).then(res => {
-                if (res.data.code == 0) {
-                    if (res.data.returnData.total > 0) {
-                        this.uploadRecord = res.data.returnData.lists[0]
-                    } else {
-                        this.uploadRecord = reactive({
-                            fileName: '',
-                            uploadTime: '',
-                            uploadUser: ''
-                        })
-                    }
-                } else {
-                    this.uploadRecord = reactive({
-                        fileName: '',
-                        uploadTime: '',
-                        uploadUser: ''
-                    })
-                }
-            }).catch(err => {
-                console.log(err)
-                ElMessage.error('发生异常')
-            })
-            this.uploadDialogVisible = true
         },
     },
 }

src/layout/stationConfig.vue

@@ -3,11 +3,9 @@
         <el-config-provider :locale="zhCn">
             <div style="display: flex;justify-content: space-between;">
                 <el-row>
-                    <el-input v-model="workOrderQuery" style="width: 256px; margin-right: 10px;" placeholder="工单"
+                    <el-input v-model="workStationQuery" style="width: 256px; margin-right: 10px;" placeholder="工站"
                         :suffix-icon="Search" />
-                        <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="料号"
+                        <el-input v-model="smallBoxQuery" style="width: 256px; margin-right: 10px;" placeholder="小盒子"
-                        :suffix-icon="Search" />
-                        <el-input v-model="smallBoxQuery" style="width: 256px; margin-right: 10px;" placeholder="小工位"
                         :suffix-icon="Search" />
                     <el-button type="primary" @click="search()">搜索</el-button>
                     <el-button type="warning" @click="reset()">重置</el-button>
@@ -18,35 +16,29 @@
                 </el-row>
             </div>
             <br />
-            <el-table :data="ordersList" stripe border v-loading="loading" class="table-class" highlight-current-row
+            <el-table :data="stationConfigList" stripe border v-loading="loading" class="table-class" highlight-current-row
                 max-height="650px" @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
                 :cell-style="{ 'text-align': 'center' }">
                 <el-table-column width="65px" fixed="left">
                     <template v-slot="scope">
-                        <el-radio :label="scope.row.orderId" v-model="orderId">&nbsp;</el-radio>
+                        <el-radio :label="scope.row.configId" v-model="configId">&nbsp;</el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column prop="orderId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
+                <el-table-column prop="configId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="workOrder" label="工单" fixed="left" min-width="120px" />
+                <el-table-column prop="workStation" label="工站" fixed="left" min-width="120px" />
-                <el-table-column prop="goodsId" label="料号" min-width="120px" />
+                <el-table-column prop="smallBox" label="小盒子" fixed="left" min-width="120px" />
-                <el-table-column prop="supplyArea" label="小工位" fixed="left" min-width="120px" />
+                <el-table-column prop="model" label="机型" min-width="120px" />
-                <el-table-column prop="item" label="Item" min-width="120px" />
+                <el-table-column prop="workCenter" label="工位" min-width="120px" />
-                <el-table-column prop="description" label="描述" min-width="120px" />
+                <el-table-column prop="bigBox" label="工位大盒子" min-width="120px" />
-                <el-table-column prop="sLoc" label="SLoc" min-width="120px" />
+                <el-table-column prop="vehicle" label="车辆" min-width="120px" />
-                <el-table-column prop="type" label="Type" min-width="120px" />
+                <el-table-column prop="vehicleLocation" label="线边架/车位置" min-width="120px" />
-                <el-table-column prop="originStatus" label="Status" min-width="120px" />
+                <el-table-column prop="startDateAdjust" label="开工时间调整" min-width="120px" />
-                <el-table-column prop="sortString" label="SortStrng" min-width="120px" />
+                <el-table-column prop="lastUpdateTime" label="最近更新时间" :formatter="timeFormat" show-overflow-tooltip min-width="120px" />
-                <el-table-column prop="requirementQuantity" label="需求数量" sortable min-width="120px" />
+                <el-table-column prop="lastUpdateUser" label="最近更新用户" min-width="120px" />
-                <el-table-column prop="goodsUnit" label="单位" min-width="120px" />
-                <el-table-column prop="orderStatus" label="状态" min-width="120px" />
-                <el-table-column prop="lackQuantity" label="缺少数量" min-width="120px" />
-                <el-table-column prop="pickedQuantity" label="已拣数量" min-width="120px" />
-                <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px" />
-                <el-table-column prop="userName" label="操作人员" min-width="120px" />
                 <el-table-column fixed="right" label="操作" width="240px">
                     <template v-slot="scope">
-                        <el-button plain type="primary" @click="editCurrentRowOrders(scope.row)">编辑</el-button>
+                        <el-button plain type="primary" @click="editCurrentRowConfig(scope.row)">编辑</el-button>
-                        <el-button plain type="danger" @click="deleteCurrentRowOrders(scope.row)">删除</el-button>
+                        <el-button plain type="danger" @click="deleteCurrentRowConfig(scope.row)">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -55,60 +47,64 @@
                 :small="false" :disabled="false" :background="false" :default-page-size="10"
                 layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
                 @current-change="search" />
-            <el-dialog v-model="dialogVisible" title="DBS信息" width="40%" draggable :show-close="false">
+            <el-dialog v-model="dialogVisible" title="工站配置信息" width="40%" draggable :show-close="false">
                 <div
                     style="max-width: 100%; max-height: 500px; overflow: auto; display: flex; justify-content: center;">
-                    <el-form ref="ordersFormRef" :model="ordersFormEntity" :label-position="labelPosition"
+                    <el-form ref="configFormRef" :model="configFormEntity" :label-position="labelPosition"
                         label-width="100px" style="width: 95%;" :rules="rules" status-icon>
                         <el-row :gutter="16">
                             <el-col :span="12" :offset="0">
-                                <el-form-item label="id" prop="orderId">
+                                <el-form-item label="id" prop="configId">
-                                    <el-input v-model="ordersFormEntity.orderId" disabled />
+                                    <el-input v-model="configFormEntity.configId" disabled />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="工单" prop="workOrder">
+                                <el-form-item label="工站" prop="workStation">
-                                    <el-input v-model="ordersFormEntity.workOrder" disabled />
+                                    <el-input v-model="configFormEntity.workStation" clearable />
                                 </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row :gutter="16">
                             <el-col :span="12" :offset="0">
-                                <el-form-item label="小工位" prop="supplyArea">
+                                <el-form-item label="小盒子" prop="smallBox">
-                                    <el-input v-model="ordersFormEntity.supplyArea" disabled />
+                                    <el-input v-model="configFormEntity.smallBox" disabled />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="料号" prop="goodsId">
+                                <el-form-item label="机型" prop="model">
-                                    <el-input v-model="ordersFormEntity.goodsId" disabled />
+                                    <el-input v-model="configFormEntity.model" disabled />
                                 </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row :gutter="16">
                             <el-col :span="12" :offset="0">
-                                <el-form-item label="需求数量" prop="requirementQuantity">
+                                <el-form-item label="工位" prop="workCenter">
-                                    <el-input-number v-model.number="ordersFormEntity.requirementQuantity"
+                                    <el-input v-model="configFormEntity.workCenter" disabled />
-                                        controls-position="right" :min="0" clearable />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="状态" prop="orderStatus">
+                                <el-form-item label="工位大盒子" prop="bigBox">
-                                    <el-input-number v-model.number="ordersFormEntity.orderStatus"
+                                    <el-input v-model="configFormEntity.bigBox" disabled />
-                                        controls-position="right" :min="0" :max="4" clearable />
                                 </el-form-item>
                             </el-col>
                         </el-row>
                         <el-row :gutter="16">
                             <el-col :span="12" :offset="0">
-                                <el-form-item label="缺少数量" prop="lackQuantity">
+                                <el-form-item label="车辆" prop="vehicle">
-                                    <el-input-number v-model.number="ordersFormEntity.lackQuantity"
+                                    <el-input v-model="configFormEntity.vehicle" disabled />
-                                        controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity" clearable />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="已拣数量" prop="pickedQuantity">
+                                <el-form-item label="线边架/车位置" prop="vehicleLocation">
-                                    <el-input-number v-model.number="ordersFormEntity.pickedQuantity"
+                                    <el-input v-model="configFormEntity.vehicleLocation" disabled />
-                                        controls-position="right" :min="0" :max="ordersFormEntity.requirementQuantity" clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="开工时间调整" prop="startDateAdjust">
+                                    <el-input-number v-model.number="configFormEntity.startDateAdjust"
+                                        controls-position="right" clearable />
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -117,7 +113,7 @@
                 <template #footer>
                     <span class="dialog-footer">
                         <el-button @click="dialogVisible = false">取消</el-button>
-                        <el-button type="primary" @click="submitOrdersInfo(ordersFormEntity)">
+                        <el-button type="primary" @click="submitConfigInfo(configFormEntity)">
                             确定
                         </el-button>
                     </span>
@@ -147,7 +143,7 @@
                 </fieldset>
                 <fieldset class="title-area">
                     <legend>再次更新</legend>
-                    <UploadExcelOrders></UploadExcelOrders>
+                    <UploadExcelStationConfig></UploadExcelStationConfig>
                 </fieldset>
             </el-dialog>
         </el-config-provider>
@@ -156,21 +152,21 @@
 
 <script setup>
 import store from '@/store'
-import { getOrders, deleteOrders, updateOrders } from '@/api/kateWork.js'
+import { getStationConfigs, deleteStationConfigs, updateStationConfigs } from '@/api/kateWork.js'
-import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
 import { dateFormatter, timeFormatter } from '@/utils/formatter.js'
-import UploadExcelOrders from '@/excel/UploadExcelOrders.vue'
+import UploadExcelStationConfig from '@/excel/UploadExcelStationConfig.vue'
 import { queryUploadRecord } from '@/api/excel.js'
 import { Search } from '@element-plus/icons-vue'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 </script>
 <script>
 export default {
     name: 'kateOrders',
     data() {
         return {
-            ordersList: [],
+            stationConfigList: [],
             currentPage: 1,
             uploadRecord: reactive({
                 fileName: '',
@@ -179,16 +175,15 @@ export default {
             }),
             pageSize: 10,
             total: 0,
-            workOrderQuery: '',
+            workStationQuery: '',
-            goodsIdQuery: '',
             smallBoxQuery: '',
             loading: true,
             dialogVisible: false,
             uploadDialogVisible: false,
-            orderId: '',
+            configId: '',
-            ordersFormEntity: reactive({}),
+            configFormEntity: reactive({}),
             labelPosition: 'top',
-            ordersFormRef: ref(),
+            configFormRef: ref(),
             rules: reactive({})
         }
     },
@@ -201,21 +196,20 @@ export default {
             const request = {
                 pageNo: this.currentPage,
                 pageSize: this.pageSize,
-                workOrder: this.workOrderQuery.trim(),
+                workStation: this.workStationQuery.trim(),
-                goodsId: this.goodsIdQuery.trim(),
+                smallBox: this.smallBoxQuery.trim(),
-                supplyArea: this.smallBoxQuery.trim(),
                 userName: store.getters.getUserName
             }
-            getOrders(request).then(res => {
+            getStationConfigs(request).then(res => {
                 const tableResponse = res.data
                 if (tableResponse.code == 0) {
-                    this.ordersList = tableResponse.returnData.lists
+                    this.stationConfigList = tableResponse.returnData.lists
                     this.total = tableResponse.returnData.total
                 } else {
                     ElMessage.error(tableResponse.message)
                 }
             }).catch(err => {
-                ElMessage.error('查询工单错误' + err.message)
+                ElMessage.error('查询工站配置错误' + err.message)
             })
             this.loading = false
         },
@@ -226,29 +220,31 @@ export default {
             return timeFormatter(cellValue)
         },
         reset() {
-            this.workOrderQuery = ''
+            this.workStationQuery = ''
-            this.goodsIdQuery = ''
             this.smallBoxQuery = ''
             this.search()
         },
-        editCurrentRowOrders(row) {
+        editCurrentRowConfig(row) {
-            this.orderId = row.orderId
+            this.configId = row.configId
-            this.ordersFormEntity = {
+            this.configFormEntity = {
-                orderId: row.orderId,
+                configId: row.configId,
-                workOrder: row.workOrder,
+                workStation: row.workStation,
-                goodsId: row.goodsId,
+                smallBox: row.smallBox,
-                supplyArea: row.supplyArea,
+                model: row.model,
-                requirementQuantity: row.requirementQuantity,
+                workCenter: row.workCenter,
-                orderStatus: row.orderStatus,
+                bigBox: row.bigBox,
-                lackQuantity: row.lackQuantity,
+                vehicle: row.vehicle,
-                pickedQuantity: row.pickedQuantity
+                vehicleLocation: row.vehicleLocation,
+                startDateAdjust: row.startDateAdjust,
+                lastUpdateTime: row.lastUpdateTime,
+                lastUpdateUser: row.lastUpdateUser
             }
             this.dialogVisible = true
         },
-        deleteCurrentRowOrders(row) {
+        deleteCurrentRowConfig(row) {
-            this.orderId = row.orderId
+            this.configId = row.configId
             ElMessageBox.confirm(
-                '该操作会删除选择的工单数据。\n是否继续',
+                '该操作会删除选择的工站配置数据。\n是否继续',
                 '警告',
                 {
                     confirmButtonText: '确认',
@@ -257,13 +253,13 @@ export default {
                 }
             ).then(() => {
                 const params = {
-                    orderId: this.orderId,
+                    configId: this.configId,
                     userName: store.getters.getUserName
                 }
-                deleteOrders(params).then(res => {
+                deleteStationConfigs(params).then(res => {
                     if (res.data.code == 0) {
                         ElMessage({
-                            message: '删除工单信息成功',
+                            message: '删除工站配置信息成功',
                             type: 'success',
                         })
                         this.search()
@@ -272,7 +268,7 @@ export default {
                     }
                 }).catch(err => {
                     console.log(err)
-                    ElMessage.error('删除工单信息成功')
+                    ElMessage.error('删除工站配置信息成功')
                 })
             }).catch(() => {
                 ElMessage({
@@ -281,23 +277,26 @@ export default {
                 })
             })
         },
-        submitOrdersInfo(formData) {
+        submitConfigInfo(formData) {
             const params = {
-                orderId: formData.orderId,
+                configId: formData.configId,
-                workOrder: formData.workOrder,
+                workStation: formData.workStation,
-                goodsId: formData.goodsId,
+                smallBox: formData.smallBox,
-                supplyArea: formData.supplyArea,
+                model: formData.model,
-                requirementQuantity: formData.requirementQuantity,
+                workCenter: formData.workCenter,
-                orderStatus: formData.orderStatus,
+                bigBox: formData.bigBox,
-                lackQuantity: formData.lackQuantity,
+                vehicle: formData.vehicle,
-                pickedQuantity: formData.pickedQuantity,
+                vehicleLocation: formData.vehicleLocation,
+                startDateAdjust: formData.startDateAdjust,
+                lastUpdateTime: formData.lastUpdateTime,
+                lastUpdateUser: formData.lastUpdateUser,
                 userName: store.getters.getUserName
             }
-            updateOrders(params).then(res => {
+            updateStationConfigs(params).then(res => {
                 if (res.data.code == 0) {
                     this.dialogVisible = false
                     ElMessage({
-                        message: '更新工单成功。',
+                        message: '更新工站配置成功。',
                         type: 'success',
                     })
                     this.search()
@@ -305,17 +304,17 @@ export default {
                     ElMessage.error(res.data.message)
                 }
             }).catch(err => {
-                ElMessage.error('更新工单失败。')
+                ElMessage.error('更新工站配置失败。')
             })
         },
         getCurrentRow(row) {
-            this.dbsId = row.dbsId
+            this.configId = row.configId
         },
         openUploadDialog() {
             // 请求上传记录
             const param = {
                 userName: store.getters.getUserName,
-                fileDescription: 'ORDERS',
+                fileDescription: 'STATION-CONFIG_',
                 isAsc: false,
                 sortBy: 'upload_time'
             }

src/router/index.js

@@ -31,6 +31,13 @@ const routes = [
       { path: '/testSortBoxs', component: () => import('@/layout/sortBoxs.vue') },// 整理盒子
       { path: '/uploadDbs', component: () => import('@/layout/dbsTable.vue') },// 上传DBS
       { path: '/uploadOrders', component: () => import('@/layout/kateOrdersTable.vue') },// 上传工单
+      { path: '/stationConfig', component: () => import('@/layout/stationConfig.vue') },// 工站配置
+      { path: '/workFlow', component: () => import('@/layout/workFlow.vue') },// 工作流
+      { path: '/workSummary', component: () => import('@/layout/workSummary.vue') },// 工作总结
+      { path: '/pickTask', component: () => import('@/layout/pickTaskMonitor.vue') },// 拣选任务
+      { path: '/eLocationConfig', component: () => import('@/layout/eLocationConfig.vue') },// 标签配置
+      { path: '/eLocationMonitor', component: () => import('@/layout/eLocationTable.vue') },// 标签库位监控
+      { path: '/goodsToStation', component: () => import('@/layout/goodsToStation.vue') },// 标签库位监控
     ]
   },
   {