diff --git a/src/router/index.js b/src/router/index.js
index e3c6ab4..61fae28 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -230,7 +230,7 @@ export const routes = [
path: 'goodsData',
name: 'goodsData',
meta: {
- title: '物品数据',
+ title: '物料数据',
icon: 'form'
},
component: () => import('@/views/wmsBasicData/goodsData.vue')
diff --git a/src/utils/wmsDic.js b/src/utils/wmsDic.js
index ad660e5..1fc05d9 100644
--- a/src/utils/wmsDic.js
+++ b/src/utils/wmsDic.js
@@ -27,17 +27,15 @@ export function getCustomerCodeList() {
// 成品规格List
export function getProductSpecList() {
- const list = ['50*50mm', '70*50mm', '70*70mm', '100*50mm', '100*70mm', '100*100mm', '100*120mm', '120*120mm']
+ const list = ['2.0-1128*1716', '2.0-1128*2251', '2.0-1128*2272', '3.2-1128*1716', '3.2-1128*1718', '3.2-1032*1747', '3.2-1033*2089']
const spec = list[parseInt(Math.random() * (list.length))]
return spec
}
// 批次List
export function getBatchList() {
- let batch = '2022'
- for (let i = 0; i < 8; i++) {
- batch += parseInt(Math.random() * 89 + 10)
- }
+ const sj = parseInt(Math.random() * 100 + 1)
+ const batch = moment().subtract(sj, 'days').format('YYYYMMDD')
return batch
}
@@ -94,7 +92,7 @@ export function getOperationCode2List() {
}
// 仓库
-const storeList = ['1号立体库', '2号立体库', '3号立体库', '4号立体库', '5号立体库', '6号立体库', '7号立体库', '8号立体库']
+const storeList = ['成品库A', '成品库B', '成品库C', '成品库D', '备件库', '辅材库']
export function getStoreList() {
let store = ''
store += storeList[parseInt(Math.random() * storeList.length)]
@@ -102,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)]
@@ -153,10 +151,8 @@ export function getTimeArr() {
// 物料编码List
export function getMaterialCodeList() {
- let materialCode = 'WL'
- for (let i = 0; i < 4; i++) {
- materialCode += parseInt(Math.random() * 89 + 10)
- }
+ const sj = parseInt(Math.random() * 365)
+ const materialCode = 'M' + (sj % 2 ? 'G' : 'F') + moment().subtract(sj, 'days').subtract(sj, 'hour').subtract(sj, 'minutes').subtract(sj, 'seconds').format('YYYYMMDDhhmmss')
return materialCode
}
@@ -169,7 +165,7 @@ export function getNameList() {
}
// 客户数据
-const compList = ['台玻', 'FUYAO福耀', 'SG南玻', 'XYG信义玻璃', '耀皮', '福莱特玻璃', 'CLFG洛玻', 'SHABO沙玻', 'KIBING旗滨', '金晶玻璃', '济南金昊', '东莞佳美特', '汇中矿产', '文盛新材料', '西点化学', '开源塑胶', '奥驰商贸', '竹中科技', '程龙玻璃']
+const compList = ['隆基绿能科技股份有限公司', '天合光能股份有限公司', '晶澳太阳能科技股份有限公司', '晶科能源股份有限公司', '阿特斯阳光电力集团', '东方日升新能源股份有限公司', '尚德集团', '浙江正泰新能源开发有限公司', '环晟光伏(江苏)有限公司', '江苏赛拉弗光伏系统有限公司', '唐山海泰新能科技股份有限公司', '阳光能源控股有限公司', '横店集团东磁股份有限公司', '常州亿晶光电科技有限公司', '协鑫集成科技股份有限公司', '苏州中来光伏新材股份有限公司', '中节能太阳能科技(镇江)有限公司', '苏州腾晖光伏技术有限公司', '英利绿色能源控股有限公司', '湖南红太阳新能源科技有限公司']
export function getCompTyleList() {
let comp = ''
comp = compList[parseInt(Math.random() * (compList.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/wmsInStore/acceptGoods.vue b/src/views/wmsInStore/acceptGoods.vue
index 68a63be..1df03f6 100644
--- a/src/views/wmsInStore/acceptGoods.vue
+++ b/src/views/wmsInStore/acceptGoods.vue
@@ -50,7 +50,7 @@ const tableProps = [
},
{
prop: 'internalControlCode',
- label: '成品内控码'
+ label: '成品内控码/商品条码'
},
{
prop: 'customerCode',
@@ -67,10 +67,6 @@ const tableProps = [
{
prop: 'batch',
label: '批次'
- },
- {
- prop: 'packCode',
- label: '包装机号'
}
]
const tableBtn = [
@@ -92,7 +88,7 @@ export default {
{
type: 'input',
label: '关键字',
- placeholder: '托盘号或成品内控码',
+ placeholder: '托盘号或成品内控码/商品条码',
param: 'name',
width: 300
},
@@ -133,7 +129,7 @@ export default {
obj.trayID = getTrayList()
obj.internalControlCode = getProductList()
obj.customerCode = getCustomerCodeList()
- obj.num = parseInt(Math.random() * 1000)
+ obj.num = parseInt(Math.random() * 180 + 100)
obj.productDpec = getProductSpecList()
obj.batch = getBatchList()
obj.packCode = getPackList()
diff --git a/src/views/wmsInStore/components/accetpGoodsAdd.vue b/src/views/wmsInStore/components/accetpGoodsAdd.vue
index 16fea4d..9749a7f 100644
--- a/src/views/wmsInStore/components/accetpGoodsAdd.vue
+++ b/src/views/wmsInStore/components/accetpGoodsAdd.vue
@@ -5,11 +5,11 @@
:visible.sync="dialogVisible"
width="50%"
>
-
+
-
+
@@ -24,9 +24,6 @@
-
-
-