diff --git a/src/api/excel.js b/src/api/excel.js
index d8562b7..be7ee30 100644
--- a/src/api/excel.js
+++ b/src/api/excel.js
@@ -6,16 +6,16 @@ const downloadExcel = () => {
})
}
-const uploadExcel = (formData) => {
+const uploadExcel = (data) => {
return request({
url: '/test/testExcelImport',
method: 'post',
- data: formData,
+ data: data,
timeout: 100000
})
}
-const uploadExcelParts = (data) => {
+const uploadExcelStock = (data) => {
return request({
url: '/excel/uploadStocks',
method: 'post',
@@ -24,23 +24,59 @@ const uploadExcelParts = (data) => {
})
}
-const downloadStockExcel = (params) => {
+const uploadExcelGoods = (data) => {
+ return request({
+ url: '/excel/uploadGoods',
+ method: 'post',
+ data: data,
+ timeout: 100000
+ })
+}
+
+const uploadExcelDbs = (data) => {
+ return request({
+ url: '/excel/uploadDbs',
+ method: 'post',
+ data: data,
+ timeout: 100000
+ })
+}
+
+const uploadExcelOrders = (data) => {
+ return request({
+ url: '/excel/uploadKateOrders',
+ method: 'post',
+ data: data,
+ timeout: 100000
+ })
+}
+
+const uploadExcelInventoryList = (data) => {
+ return request({
+ url: '/excel/uploadInventoryList',
+ method: 'post',
+ data: data,
+ timeout: 100000
+ })
+}
+
+const downloadStockExcel = (data) => {
return request({
url: '/excel/downloadStockExcel',
method: 'post',
responseType: 'blob',
- data: params
+ data: data
})
}
-const downloadInRecordExcel = (params) => {
+const downloadInRecordExcel = (data) => {
return request({
url: '/excel/downloadInRecordExcel',
method: 'get',
responseType: 'blob',
params: {
- vehicleId: params.vehicleId,
- goodsId: params.goodsId
+ vehicleId: data.vehicleId,
+ goodsId: data.goodsId
}
})
}
@@ -108,7 +144,11 @@ const downloadLocationsExcel = (params) => {
export {
downloadExcel,
uploadExcel,
- uploadExcelParts,
+ uploadExcelStock,
+ uploadExcelGoods,
+ uploadExcelDbs,
+ uploadExcelOrders,
+ uploadExcelInventoryList,
downloadStockExcel,
downloadMaterialExcel,
downloadVehicleExcel,
diff --git a/src/api/task.js b/src/api/task.js
index e89aaa3..bb1e28f 100644
--- a/src/api/task.js
+++ b/src/api/task.js
@@ -112,6 +112,22 @@ const queryFinishByStandAndGoods = (params) => {
})
}
+const requestPickTest = (params) => {
+ return request({
+ url: '/task/requestPickTest',
+ method: 'post',
+ data: params
+ })
+}
+
+const requestBackTest = (params) => {
+ return request({
+ url: '/task/requestBackTest',
+ method: 'post',
+ data: params
+ })
+}
+
export {
sendGoodsInTask,
sendGoodsOutTask,
@@ -126,5 +142,7 @@ export {
confirmFinishWork,
getFinishedWorkInfo,
callEmptyVehicle,
- queryFinishByStandAndGoods
+ queryFinishByStandAndGoods,
+ requestPickTest,
+ requestBackTest
}
\ No newline at end of file
diff --git a/src/excel/UploadInventoryList.vue b/src/excel/UploadExcelDbs.vue
similarity index 65%
rename from src/excel/UploadInventoryList.vue
rename to src/excel/UploadExcelDbs.vue
index 39fed90..ce6e7a3 100644
--- a/src/excel/UploadInventoryList.vue
+++ b/src/excel/UploadExcelDbs.vue
@@ -1,15 +1,16 @@
-
+
- 选取文件
+ 选取DBS文件
- 确认导入库存数据
+ 上传DBS数据
+
\ No newline at end of file
diff --git a/src/excel/UploadExcelInventoryList.vue b/src/excel/UploadExcelInventoryList.vue
new file mode 100644
index 0000000..befc9af
--- /dev/null
+++ b/src/excel/UploadExcelInventoryList.vue
@@ -0,0 +1,80 @@
+
+
+
+ 选取盘点清单
+
+ 上传盘点清单
+
+
+
+
\ No newline at end of file
diff --git a/src/excel/UploadExcelOrders.vue b/src/excel/UploadExcelOrders.vue
new file mode 100644
index 0000000..8744efc
--- /dev/null
+++ b/src/excel/UploadExcelOrders.vue
@@ -0,0 +1,80 @@
+
+
+
+ 选取工单文件
+
+ 上传工单数据
+
+
+
+
\ No newline at end of file
diff --git a/src/excel/UploadExcelPart.vue b/src/excel/UploadExcelPart.vue
deleted file mode 100644
index 2f312e0..0000000
--- a/src/excel/UploadExcelPart.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- 选取文件
-
- 确认导入库存数据
-
-
-
-
\ No newline at end of file
diff --git a/src/excel/UploadExcelStock.vue b/src/excel/UploadExcelStock.vue
new file mode 100644
index 0000000..c504cd1
--- /dev/null
+++ b/src/excel/UploadExcelStock.vue
@@ -0,0 +1,80 @@
+
+
+
+ 选取库存文件
+
+ 上传库存数据
+
+
+
+
\ No newline at end of file
diff --git a/src/http/request.js b/src/http/request.js
index 2489669..f931042 100644
--- a/src/http/request.js
+++ b/src/http/request.js
@@ -5,7 +5,7 @@ const request = axios.create({
timeout: 5000
})
-// axios.defaults.baseURL = 'http://192.168.3.254:12315/wms'
+// axios.defaults.baseURL = 'http://10.90.36.70:443/wmsServer/wms'
// axios.defaults.baseURL = 'http://localhost:12315/wms'
// axios.defaults.baseURL = 'http://192.168.8.93:12315/wms'
diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue
index f01c587..2fd98ba 100644
--- a/src/layout/doKitting.vue
+++ b/src/layout/doKitting.vue
@@ -228,9 +228,18 @@ export default {
if (response.code == 0) {
if (response.returnData != null) {
this.workFormEntity.tip = response.returnData.tip
+ ElMessage({
+ message: response.returnData.tip,
+ type: 'warning',
+ showClose: true
+ })
}
this.resetForms()
- ElMessage.success(response.message)
+ ElMessage({
+ message: response.returnData.tip,
+ type: 'success',
+ showClose: true
+ })
}
}).catch(err => {
console.log(err)
diff --git a/src/layout/goods.vue b/src/layout/goods.vue
index 32cbeee..69126ae 100644
--- a/src/layout/goods.vue
+++ b/src/layout/goods.vue
@@ -2,13 +2,12 @@
-
+
搜索
重置
- 刷新
导出信息
@@ -182,7 +181,7 @@ 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 UploadExcelPart from '@/excel/UploadExcelPart.vue'
+import UploadExcelGoods from '@/excel/UploadExcelGoods.vue'
import { downloadMaterialExcel } from '@/api/excel.js'
+
+
+
+
\ No newline at end of file
diff --git a/src/layout/uploadDbs.vue b/src/layout/uploadDbs.vue
new file mode 100644
index 0000000..00d7c10
--- /dev/null
+++ b/src/layout/uploadDbs.vue
@@ -0,0 +1,332 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/layout/uploadOrders.vue b/src/layout/uploadOrders.vue
new file mode 100644
index 0000000..a0f04c0
--- /dev/null
+++ b/src/layout/uploadOrders.vue
@@ -0,0 +1,332 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/layout/wmsLog.vue b/src/layout/wmsLog.vue
index 538afd4..9905419 100644
--- a/src/layout/wmsLog.vue
+++ b/src/layout/wmsLog.vue
@@ -18,10 +18,12 @@
-
-
+
+
-
+
@@ -64,17 +66,15 @@
-
+
-
+
@@ -106,7 +106,7 @@
import { queryLogs } from '@/api/wmsLog.js'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import { ElMessage } from 'element-plus'
-import { timeFormatter } from '@/utils/formatter.js'
+import { timeFormatter, jsonFormatter } from '@/utils/formatter.js'
import { ref, reactive } from 'vue'
diff --git a/src/router/index.js b/src/router/index.js
index e216534..0daf1cd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -27,8 +27,11 @@ const routes = [
{ path: '/wmsLog', component: () => import('@/layout/wmsLog.vue') },// 日志
{ path: '/testDoKitting', component: () => import('@/layout/doKitting.vue') },// 备料执行
{ path: '/testFinishKitting', component: () => import('@/layout/finishKitting.vue') },// 备料完成
- { path: '/testCallEmptyVehicle', component: () => import('@/layout/callEmptyVehicle.vue') },// 备料完成
- { path: '/testSortBoxs', component: () => import('@/layout/sortBoxs.vue') },// 备料完成
+ { path: '/testCallEmptyVehicle', component: () => import('@/layout/callEmptyVehicle.vue') },// 呼叫空箱
+ { path: '/testSortBoxs', component: () => import('@/layout/sortBoxs.vue') },// 整理盒子
+ { path: '/uploadDbs', component: () => import('@/layout/uploadDbs.vue') },// 上传DBS
+ { path: '/uploadOrders', component: () => import('@/layout/uploadOrders.vue') },// 上传工单
+ { path: '/play_boy', component: () => import('@/layout/play_boy.vue') },// 体验拣选
]
},
{
diff --git a/src/store/index.js b/src/store/index.js
index 3fc144f..1f390f3 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -28,6 +28,9 @@ export default createStore({
},
getStandId(state) {
return state.standId
+ },
+ getUser(state) {
+ return state.user
}
},
mutations: {
diff --git a/src/utils/formatter.js b/src/utils/formatter.js
index c6f0790..7d08522 100644
--- a/src/utils/formatter.js
+++ b/src/utils/formatter.js
@@ -162,6 +162,18 @@ function sizeFormatter(value) {
}
}
+function jsonFormatter(value) {
+ if (typeof value == 'string') {
+ try {
+ return JSON.stringify(JSON.parse(value), null, 4)
+ } catch (e) {
+ return "error"
+ }
+ } else {
+ return JSON.stringify(value, null, 4)
+ }
+}
+
export {
timeFormatter,
dateFormatter,
@@ -173,5 +185,6 @@ export {
configTypeFormatter,
dueFormatter,
locationStatusFormatter,
- sizeFormatter
+ sizeFormatter,
+ jsonFormatter
}
\ No newline at end of file
diff --git a/src/views/SystemCenter.vue b/src/views/SystemCenter.vue
index 1049b27..f038db2 100644
--- a/src/views/SystemCenter.vue
+++ b/src/views/SystemCenter.vue
@@ -33,12 +33,6 @@ const token = store.getters.getToken// 密码
const loginToWms = () => {
router.replace({ path: '/home' })
}
-const loginToPda = () => {
- router.replace({ path: '/goodsInPda' })
-}
-const loginToSideScan = () => {
- router.replace({ path: '/sideScan' })
-}
// 登录到WCS系统
const loginToWcs = () => {
const wcsUrl = `https://cxlasrs.ecorp.cat.com/wcs/#/login?user=user&pwd=user`
diff --git a/vue.config.js b/vue.config.js
index 80d94bf..fa332d0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,6 +2,7 @@ const { defineConfig } = require('@vue/cli-service')
const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')
module.exports = defineConfig({
+ publicPath: '/wms',
transpileDependencies: true,
configureWebpack: {
plugins: [new NodePolyfillPlugin()]