From 93ea975af5abe7f63f91448f6c6154f91c7f8446 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 18 Nov 2022 11:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/wmsDic.js | 2 +-
.../OperationalOverview/storageCockpit.vue | 42 +++++++++----------
src/views/wmsBasicData/goodsAreaData.vue | 7 ++--
src/views/wmsBasicData/warehouseData.vue | 2 +-
src/views/wmsOutStore/outStoreOperation.vue | 6 ++-
5 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/src/utils/wmsDic.js b/src/utils/wmsDic.js
index 669af11..1fc05d9 100644
--- a/src/utils/wmsDic.js
+++ b/src/utils/wmsDic.js
@@ -100,7 +100,7 @@ export function getStoreList() {
}
// 库区
-const KQList = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N']
+const KQList = ['A', 'B', 'C', 'D']
export function getKQList() {
let KQ = ''
KQ += KQList[parseInt(Math.random() * KQList.length)]
diff --git a/src/views/OperationalOverview/storageCockpit.vue b/src/views/OperationalOverview/storageCockpit.vue
index 8e91f3e..27c2303 100644
--- a/src/views/OperationalOverview/storageCockpit.vue
+++ b/src/views/OperationalOverview/storageCockpit.vue
@@ -37,15 +37,15 @@
时间:2022.12.12 13:12:45
- 成品编码:34394233442
+ 成品编码:CP5651696250
- 入库作业号:347384734
- 成品规格:234*345*34
+ 入库作业号:RQ5055348160
+ 成品规格:3.2-1033*2089
执行叉车:叉车
- 库位:A区34货位3层
+ 库位:成品库D-D区-14
@@ -69,18 +69,18 @@
时间:2022.12.12 13:12:45
- ERP订单:34394233442
+ ERP订单:TCP203
- 成品编码:34394233442
- 出库作业号:347384734
+ 成品编码:CP3212128221
+ 出库作业号:CQ3727367699
- 成品规格:234*345*34
+ 成品规格:3.2-1128*1716
执行叉车:叉车
- 库位:A区34货位3层
+ 库位:成品库C-C区-1
库位前置区:A区34货位3层
@@ -368,22 +368,22 @@ export default {
test1: 'RQ5055348178',
test2: 'D4288603319',
test3: 'CP5651696263',
- test4: '100*50mm',
- test5: 'A区'
+ test4: '3.2-1033*2089',
+ test5: '成品库D-D区-15'
},
{
test1: 'RQ3722771932',
test2: 'D3732827773',
test3: 'CP4140258231',
- test4: '100*100mm',
- test5: 'K区'
+ test4: '2.0-1128*2272',
+ test5: '成品库B-A区-13'
},
{
test1: 'RQ1342208728',
test2: 'D6178738555',
test3: 'CP5284407553',
- test4: '70*50mm',
- test5: 'G区'
+ test4: '2.0-1128*1716',
+ test5: '成品库A-B区-9'
}
]
},
@@ -401,22 +401,22 @@ export default {
test1: 'CQ3727367714',
test2: 'TCP231',
test3: 'CP3212128336',
- test4: '50*50mm',
- test5: 'H区'
+ test4: '3.2-1128*1716',
+ test5: '成品库C-C区-4'
},
{
test1: 'CQ7080508785',
test2: 'TCP186',
test3: 'CP2760242729',
- test4: '100*120mm',
- test5: 'B区'
+ test4: '3.2-1128*1718',
+ test5: '成品库D-D区-1'
},
{
test1: 'CQ8843212447',
test2: 'TCP67',
test3: 'CP1569191519',
- test4: '120*120mm',
- test5: 'A区'
+ test4: '3.2-1032*1747',
+ test5: '成品库C-B区-12'
}
]
},
diff --git a/src/views/wmsBasicData/goodsAreaData.vue b/src/views/wmsBasicData/goodsAreaData.vue
index 6c78951..e30297a 100644
--- a/src/views/wmsBasicData/goodsAreaData.vue
+++ b/src/views/wmsBasicData/goodsAreaData.vue
@@ -43,7 +43,7 @@ import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import i18n from '@/lang'
-import { getHWList } from '@/utils/wmsDic'
+import { getStoreList, getKQList } from '@/utils/wmsDic'
import moment from 'moment'
/**
* 表格表头配置项 TypeScript接口注释
@@ -201,8 +201,9 @@ export default {
const obj = {}
const sj = Math.floor(Math.random() * 720 + 10)
obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
- obj.name2 = getHWList()
- obj.name1 = obj.name2[2] + '区'
+ obj.store = getStoreList()
+ obj.name1 = (obj.store === '辅材库' || obj.store === '备件库') ? '' : getKQList() + '区'
+ obj.name2 = obj.store + (obj.name1 ? '-' + obj.name1 : '') + '-' + (obj.store === '备件库' ? (parseInt(Math.random() * 19 + 1) + '-' + parseInt(Math.random() * 2 + 1)) : parseInt(Math.random() * 16))
obj.name3 = obj.name2
obj.name4 = parseInt(Math.random() * 2) ? '有货' : '无货'
obj.name5 = parseInt(Math.random() * 2) ? 'Y' : 'N'
diff --git a/src/views/wmsBasicData/warehouseData.vue b/src/views/wmsBasicData/warehouseData.vue
index 3ec25d4..4ed5aa3 100644
--- a/src/views/wmsBasicData/warehouseData.vue
+++ b/src/views/wmsBasicData/warehouseData.vue
@@ -179,7 +179,7 @@ export default {
const sj = Math.floor(Math.random() * 720 + 10)
obj.createTime = moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYY-MM-DD hh:mm:ss')
obj.name1 = getStoreList()
- obj.name2 = getKQList() + '区'
+ obj.name2 = (obj.name1 === '辅材库' || obj.name1 === '备件库') ? '' : getKQList() + '区'
obj.name3 = '成品仓'
obj.name4 = 'TCP' + sj
temp.push(obj)
diff --git a/src/views/wmsOutStore/outStoreOperation.vue b/src/views/wmsOutStore/outStoreOperation.vue
index 35a6759..81dc5b4 100644
--- a/src/views/wmsOutStore/outStoreOperation.vue
+++ b/src/views/wmsOutStore/outStoreOperation.vue
@@ -34,7 +34,7 @@ import Pagination from '@/components/Pagination'
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import { tableHeight } from '@/utils/index'
import outStoreDocumentsAdd from './components/outStoreDocumentsAdd.vue'
-import { getOperationCode2List, getOutboundNoList, getHWList, getHCQList, getTimeArr, getDriverCodeList } from '@/utils/wmsDic'
+import { getOperationCode2List, getOutboundNoList, getStoreList, getHCQList, getTimeArr, getDriverCodeList, getKQList } from '@/utils/wmsDic'
const tableProps = [
{
prop: 'operationCode',
@@ -135,7 +135,9 @@ export default {
const timeArrList = getTimeArr()
obj.operationCode = getOperationCode2List()
obj.outboundOrderNo = getOutboundNoList()
- obj.goodsArea = getHWList()
+ obj.store = getStoreList()
+ obj.name1 = (obj.store === '辅材库' || obj.store === '备件库') ? '' : getKQList() + '区'
+ obj.goodsArea = obj.store + (obj.name1 ? '-' + obj.name1 : '') + '-' + (obj.store === '备件库' ? (parseInt(Math.random() * 19 + 1) + '-' + parseInt(Math.random() * 2 + 1)) : parseInt(Math.random() * 16))
obj.shipmentCacheArea = getHCQList()
obj.startTime = timeArrList[0]
obj.endTime = timeArrList[1]