From 0841251bdd5ec9068e46fce61bbd64e1dd9436f9 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Mon, 12 Aug 2024 16:38:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E5=A2=9E=E5=8A=A0=E5=B7=A5=E7=AB=99=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E3=80=82=202.=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DuserName=E5=AD=97=E6=AE=B5=E8=AE=BE=E5=AE=9A?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/excel.js                       | 12 +++-
 src/api/goods.js                       | 59 +------------------
 src/excel/UploadExcelStationConfig.vue | 80 ++++++++++++++++++++++++++
 src/http/request.js                    |  2 +-
 src/layout/goods.vue                   | 43 +++++++-------
 src/layout/inTaskRecord.vue            |  1 +
 src/layout/location.vue                |  1 +
 src/layout/locationsTable.vue          |  1 +
 src/layout/standSettings.vue           |  1 +
 src/layout/stock.vue                   |  1 +
 src/layout/vehicle.vue                 |  1 +
 src/layout/wmsConfig.vue               |  1 +
 src/layout/wmsLog.vue                  |  3 +-
 13 files changed, 127 insertions(+), 79 deletions(-)
 create mode 100644 src/excel/UploadExcelStationConfig.vue

diff --git a/src/api/excel.js b/src/api/excel.js
index be7ee30..8765f86 100644
--- a/src/api/excel.js
+++ b/src/api/excel.js
@@ -33,6 +33,15 @@ const uploadExcelGoods = (data) => {
     })
 }
 
+const uploadStationConfig = (data) => {
+    return request({
+        url: '/excel/uploadStationConfig',
+        method: 'post',
+        data: data,
+        timeout: 100000
+    })
+}
+
 const uploadExcelDbs = (data) => {
     return request({
         url: '/excel/uploadDbs',
@@ -155,5 +164,6 @@ export {
     downloadInRecordExcel,
     downloadOutRecordExcel,
     downloadInventoryRecordExcel,
-    downloadLocationsExcel
+    downloadLocationsExcel,
+    uploadStationConfig
 }
\ No newline at end of file
diff --git a/src/api/goods.js b/src/api/goods.js
index 5ee2e95..fd64579 100644
--- a/src/api/goods.js
+++ b/src/api/goods.js
@@ -1,66 +1,13 @@
 import request from "@/http/request";
 
-const getAllGoods = () => {
+const getGoodsInfoByPage = (params) => {
     return request({
-        url: '/goods/getAllGoods',
-        method: 'get'
-    })
-}
-
-const getPartInfo = (params) => {
-    return request({
-        url: '/goods/getPartInfo',
-        method: 'post',
-        data: params
-    })
-}
-
-const updateGoodsInfo = (params) => {
-    return request({
-        url: '/goods/updateGoodsInfo',
-        method: 'post',
-        data: params
-    })
-}
-
-const queryPartInfoByPartNo = (params) => {
-    return request({
-        url: '/goods/queryPartInfoByPartNo',
-        method: 'post',
-        data: params
-    })
-}
-
-const updatePartInfo = (params) => {
-    return request({
-        url: '/goods/updatePartInfo',
-        method: 'post',
-        data: params
-    })
-}
-
-const queryPartNo = (params) => {
-    return request({
-        url: '/goods/queryPartNo',
-        method: 'post',
-        data: params
-    })
-}
-
-const deleteCurrentPartInfo = (params) => {
-    return request({
-        url: '/goods/deletePartInfo',
+        url: '/goods/getGoodsInfoByPage',
         method: 'post',
         data: params
     })
 }
 
 export {
-    getAllGoods,
-    updateGoodsInfo,
-    queryPartInfoByPartNo,
-    getPartInfo,
-    updatePartInfo,
-    queryPartNo,
-    deleteCurrentPartInfo
+    getGoodsInfoByPage
 }
\ No newline at end of file
diff --git a/src/excel/UploadExcelStationConfig.vue b/src/excel/UploadExcelStationConfig.vue
new file mode 100644
index 0000000..a495ea6
--- /dev/null
+++ b/src/excel/UploadExcelStationConfig.vue
@@ -0,0 +1,80 @@
+<template>
+    <el-upload ref="uploadRef" :on-preview="previewFile" :limit="1" :on-change="changeFile" :auto-upload="false"
+        :data="uploadForm.data">
+        <template #trigger>
+            <el-button type="primary">选取工站配置文件</el-button>
+        </template>
+        <el-button style="margin-left: 10px;" type="success" @click="uploadDbs">上传工站配置数据</el-button>
+    </el-upload>
+</template>
+<script setup>
+import store from '@/store'
+import { ref, reactive } from 'vue';
+import { uploadStationConfig } from '@/api/excel.js'
+import { ElMessage } from 'element-plus'
+import { sizeFormatter } from '@/utils/formatter.js'
+const file = ref()
+const uploadForm = reactive({
+    data: {
+        fileId: '',
+        name: '',
+        type: '',
+        size: null,
+        userName: store.getters.getUserName
+    }
+})
+const changeFile = (uploadFile) => {
+    file.value = uploadFile
+    uploadForm.data = {
+        fileId: file.value.raw.uid,
+        name: file.value.raw.name,
+        type: file.value.raw.type,
+        size: sizeFormatter(file.value.raw.size),
+        userName: store.getters.getUserName
+    }
+}
+const uploadRef = ref()
+const uploadDbs = () => {
+    if (uploadForm == undefined || file.value == undefined) {
+        ElMessage.error('请选择文件之后再上传')
+    }
+    const jsonStr = JSON.stringify(uploadForm.data);
+    const blob = new Blob([jsonStr], {
+        type: 'application/json'
+    });
+    let formData = new FormData();
+    // 这里很重要 file.value.raw才是真实的file文件，file.value只是一个Proxy代理对象
+    formData.append("obj", blob);
+    formData.append("file", file.value.raw);
+    uploadStationConfig(formData).then(res => {
+        if (res.data.code == 0) {
+            ElMessage({
+                message: '上传成功',
+                type: 'success',
+            })
+            clearFileInfos()
+        } else {
+            ElMessage.error(res.data.message)
+        }
+    }).catch(err => {
+        console.log(err)
+        ElMessage.error('上传错误')
+    })
+}
+const clearFileInfos = () => {
+    // 清空选择的文件项
+    uploadRef.value.clearFiles()
+    uploadForm.data = {
+        fileId: '',
+        name: '',
+        type: '',
+        size: null,
+        userName: store.getters.getUserName
+    }
+    file.value = undefined
+}
+const previewFile = () => {
+
+}
+</script>
+<style scoped></style>
\ No newline at end of file
diff --git a/src/http/request.js b/src/http/request.js
index f931042..140e628 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://localhost:12315/wms',
+    baseURL: 'http://10.90.36.70:443/wmsServer/wms',
     timeout: 5000
 })
 
diff --git a/src/layout/goods.vue b/src/layout/goods.vue
index 69126ae..32bcb68 100644
--- a/src/layout/goods.vue
+++ b/src/layout/goods.vue
@@ -4,19 +4,22 @@
             <el-row>
                 <UploadExcelGoods></UploadExcelGoods>
             </el-row>
+            <el-row>
+                <UploadExcelStationConfig></UploadExcelStationConfig>
+            </el-row>
             <el-row style="margin-top: 10px;">
-                <el-input v-model="queryKey" style="width: 256px; margin-right: 10px;" placeholder="零件号" />
+                <el-input v-model="goodsIdQuery" style="width: 256px; margin-right: 10px;" placeholder="料号" />
                 <el-button type="primary" @click="search()">搜索</el-button>
                 <el-button type="warning" @click="reset()">重置</el-button>
                 <el-button type="success" @click="exportExcel()">导出信息</el-button>
             </el-row>
             <br />
-            <el-table :data="partInfos" stripe border v-loading="loading" class="table-class" max-height="650px"
+            <el-table :data="goodsList" stripe border v-loading="loading" class="table-class" max-height="650px"
                 highlight-current-row @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.material" v-model="material">&nbsp;</el-radio>
+                        <el-radio :label="scope.row.goodsId" v-model="goodsId">&nbsp;</el-radio>
                     </template>
                 </el-table-column>
                 <el-table-column prop="material" label="零件号" fixed="left" sortable min-width="120px" />
@@ -176,12 +179,14 @@
 </template>
 
 <script setup>
-import { getPartInfo, updatePartInfo, deleteCurrentPartInfo } from '@/api/goods.js'
+import store from '@/store'
+import { getGoodsInfoByPage } from '@/api/goods.js'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { ElMessage } from 'element-plus'
 import { ref, reactive } from 'vue'
 import { dateFormatter } from '@/utils/formatter.js'
 import UploadExcelGoods from '@/excel/UploadExcelGoods.vue'
+import UploadExcelStationConfig from '@/excel/UploadExcelStationConfig.vue'
 import { downloadMaterialExcel } from '@/api/excel.js'
 </script>
 <script>
@@ -189,12 +194,12 @@ export default {
     name: 'goods',
     data() {
         return {
-            partInfos: [],
-            pageInfo: {},
+            goodsList: [],
+            goodsInfo: {},
             currentPage: 1,
             pageSize: 10,
             total: 0,
-            queryKey: '',
+            goodsIdQuery: '',
             loading: true,
             dialogVisible: false,
             material: '',
@@ -210,22 +215,20 @@ export default {
     methods: {
         search() {
             this.loading = true
-            this.pageInfo.pageNum = this.currentPage
-            this.pageInfo.pageSize = this.pageSize
-            const tableRequest = {
-                page: this.pageInfo,
-                param: {
-                    material: this.queryKey.trim()
-                },
+            const request = {
+                pageNo: this.currentPage,
+                pageSize: this.pageSize,
+                goodsId: this.goodsIdQuery.trim(),
+                userName: store.getters.getUserName
             }
-            getPartInfo(tableRequest).then(res => {
+            getGoodsInfoByPage(request).then(res => {
                 const tableResponse = res.data
-                if (tableResponse.code != 0) {
-                    console.log(tableResponse.code + ':' + tableResponse.message)
+                if (tableResponse.code == 0) {
+                    this.goodsList = tableResponse.returnData.lists
+                    this.total = tableResponse.returnData.total
+                } else {
                     ElMessage.error(tableResponse.message)
                 }
-                this.partInfos = tableResponse.rows
-                this.total = tableResponse.total
             }).catch(err => {
                 ElMessage.error('查询物料错误' + err.message)
             })
@@ -235,7 +238,7 @@ export default {
             return dateFormatter(cellValue)
         },
         reset() {
-            this.queryKey = ''
+            this.goodsIdQuery = ''
             this.search
         },
         // getCurrentPageGoods() {
diff --git a/src/layout/inTaskRecord.vue b/src/layout/inTaskRecord.vue
index 9f97823..7d80094 100644
--- a/src/layout/inTaskRecord.vue
+++ b/src/layout/inTaskRecord.vue
@@ -39,6 +39,7 @@
 </template>
 
 <script setup>
+import store from '@/store'
 import { getTaskRecords } from '@/api/record.js'
 import { dateFormatter, taskStatusFormatter, timeFormatter } from '@/utils/formatter.js'
 import { downloadInRecordExcel } from '@/api/excel.js'
diff --git a/src/layout/location.vue b/src/layout/location.vue
index 0296bbf..b33920d 100644
--- a/src/layout/location.vue
+++ b/src/layout/location.vue
@@ -62,6 +62,7 @@
 </template>
 
 <script setup>
+import store from '@/store'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { getLocations, updateLocation } from '@/api/location.js'
 import { ElMessage, ElLoading } from 'element-plus'
diff --git a/src/layout/locationsTable.vue b/src/layout/locationsTable.vue
index 3fd3cf2..d78c2de 100644
--- a/src/layout/locationsTable.vue
+++ b/src/layout/locationsTable.vue
@@ -128,6 +128,7 @@
 </template>
 
 <script setup>
+import store from '@/store'
 import { getLocations, updateLocation } from '@/api/location.js'
 import { Search } from '@element-plus/icons-vue'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
diff --git a/src/layout/standSettings.vue b/src/layout/standSettings.vue
index eab025d..92c46b7 100644
--- a/src/layout/standSettings.vue
+++ b/src/layout/standSettings.vue
@@ -75,6 +75,7 @@
 </template>
 
 <script setup>
+import store from '@/store'
 import { getAllVehicles, updateVehicleInfo, deleteCurrentVehicle } from '@/api/vehicle'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { ElMessage } from 'element-plus'
diff --git a/src/layout/stock.vue b/src/layout/stock.vue
index f62a1b0..6443985 100644
--- a/src/layout/stock.vue
+++ b/src/layout/stock.vue
@@ -120,6 +120,7 @@
 </template>
 
 <script setup>
+import store from '@/store'
 import { getAllStocks, updateStockInfo } from '@/api/stock.js'
 import { downloadStockExcel } from '@/api/excel.js'
 import { dateFormatter, locationFormatter, timeFormatter } from '@/utils/formatter.js'
diff --git a/src/layout/vehicle.vue b/src/layout/vehicle.vue
index 6866499..0317c1e 100644
--- a/src/layout/vehicle.vue
+++ b/src/layout/vehicle.vue
@@ -87,6 +87,7 @@ import { ref, reactive } from 'vue'
 import { vehicleStatusFormatter, locationFormatter, dateFormatter, timeFormatter } from '@/utils/formatter.js'
 // import uploadVehicles from '@/excel/uploadVehicles.vue'
 import { downloadVehicleExcel } from '@/api/excel.js'
+import store from '@/store'
 </script>
 <script>
 export default {
diff --git a/src/layout/wmsConfig.vue b/src/layout/wmsConfig.vue
index 6f9e704..4ff8be4 100644
--- a/src/layout/wmsConfig.vue
+++ b/src/layout/wmsConfig.vue
@@ -92,6 +92,7 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { Search } from '@element-plus/icons-vue'
 import { ref, reactive } from 'vue'
 import { ElMessage } from 'element-plus'
+import store from '@/store'
 </script>
 <script>
 export default {
diff --git a/src/layout/wmsLog.vue b/src/layout/wmsLog.vue
index 160cd76..1da3bb3 100644
--- a/src/layout/wmsLog.vue
+++ b/src/layout/wmsLog.vue
@@ -1,7 +1,7 @@
 <template>
     <div style="margin-bottom: 10px">
         <el-config-provider :locale="zhCn">
-            <el-row style="margin-top: 10px;">
+            <el-row>
                 <el-input v-model="queryKey" style="width: 256px; margin-right: 10px;" placeholder="请输入搜索信息" />
                 <el-button type="primary" @click="search()">搜索</el-button>
                 <el-button type="warning" @click="reset()">重置</el-button>
@@ -103,6 +103,7 @@
 </template>
 
 <script setup>
+import store from '@/store'
 import { queryLogs } from '@/api/wmsLog.js'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { ElMessage } from 'element-plus'