Merge pull request '11-wms-zjl' (#16) from 11-wms-zjl into master

Reviewed-on: #16

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')

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))]

src/views/OperationalOverview/storageCockpit.vue

@@ -37,15 +37,15 @@
                 <div :style="{ fontSize: 13 * beilv + 'px' }">
                   <el-row :style="{ marginBottom: 15 * beilv + 'px'}">
                     <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">时间:</span><span class="rightText">2022.12.12 13:12:45</span></div></el-col>
-                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">成品编码:</span><span class="rightText">34394233442</span></div></el-col>
+                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">成品编码:</span><span class="rightText">CP5651696250</span></div></el-col>
                   </el-row>
                   <el-row :style="{ marginBottom: 15 * beilv + 'px'}">
-                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">入库作业号:</span><span class="rightText">347384734</span></div></el-col>
-                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">成品规格:</span><span class="rightText">234*345*34</span></div></el-col>
+                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">入库作业号:</span><span class="rightText">RQ5055348160</span></div></el-col>
+                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">成品规格:</span><span class="rightText">3.2-1033*2089</span></div></el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">执行叉车:</span><span class="rightText">叉车</span></div></el-col>
-                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">库位:</span><span class="rightText">A区34货位3层</span></div></el-col>
+                    <el-col :span="12"><div class="inTest" :style="{ padding: 9 * beilv + 'px'}"><span class="leftText">库位:</span><span class="rightText">成品库D-D区-14</span></div></el-col>
                   </el-row>
                 </div>
               </base-container>
@@ -69,18 +69,18 @@
                 <div :style="{ fontSize: 13 * beilv + 'px' }">
                   <el-row :style="{ marginBottom: 10 * beilv + 'px'}">
                     <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">时间:</span><span class="rightText">2022.12.12 13:12:45</span></div></el-col>
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">ERP订单:</span><span class="rightText">34394233442</span></div></el-col>
+                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">ERP订单:</span><span class="rightText">TCP203</span></div></el-col>
                   </el-row>
                   <el-row :style="{ marginBottom: 10 * beilv + 'px'}">
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">成品编码:</span><span class="rightText">34394233442</span></div></el-col>
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">出库作业号:</span><span class="rightText">347384734</span></div></el-col>
+                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">成品编码:</span><span class="rightText">CP3212128221</span></div></el-col>
+                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">出库作业号:</span><span class="rightText">CQ3727367699</span></div></el-col>
                   </el-row>
                   <el-row :style="{ marginBottom: 10 * beilv + 'px'}">
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">成品规格:</span><span class="rightText">234*345*34</span></div></el-col>
+                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">成品规格:</span><span class="rightText">3.2-1128*1716</span></div></el-col>
                     <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">执行叉车:</span><span class="rightText">叉车</span></div></el-col>
                   </el-row>
                   <el-row>
-                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">库位:</span><span class="rightText">A区34货位3层</span></div></el-col>
+                    <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">库位:</span><span class="rightText">成品库C-C区-1</span></div></el-col>
                     <el-col :span="12"><div class="outTest" :style="{ padding: 7 * beilv + 'px'}"><span class="leftText">库位前置区:</span><span class="rightText">A区34货位3层</span></div></el-col>
                   </el-row>
                 </div>
@@ -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'
           }
         ]
       },

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'

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)

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()

src/views/wmsInStore/components/accetpGoodsAdd.vue

@@ -5,11 +5,11 @@
       :visible.sync="dialogVisible"
       width="50%"
     >
-      <el-form ref="formList" label-position="right" label-width="80px" :model="formList">
+      <el-form ref="formList" label-position="right" label-width="140px" :model="formList">
         <el-form-item label="托盘号" prop="trayID">
           <el-input v-model="formList.trayID" />
         </el-form-item>
-        <el-form-item label="成品内控码" prop="internalControlCode">
+        <el-form-item label="成品内控码/商品条码" prop="internalControlCode">
           <el-input v-model="formList.internalControlCode" />
         </el-form-item>
         <el-form-item label="客户标签号" prop="customerCode">
@@ -24,9 +24,6 @@
         <el-form-item label="批次" prop="batch">
           <el-input v-model="formList.batch" />
         </el-form-item>
-        <el-form-item label="包装机号" prop="packCode">
-          <el-input v-model="formList.packCode" />
-        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="resetForm('formList')">取 消</el-button>
@@ -53,8 +50,7 @@ export default {
         customerCode: '',
         productDpec: '',
         num: '',
-        batch: '',
-        packCode: ''
+        batch: ''
       }
     }
   },
@@ -70,7 +66,6 @@ export default {
           this.formList.productDpec = val.productDpec
           this.formList.num = val.num
           this.formList.batch = val.batch
-          this.formList.packCode = val.packCode
         })
       }
       this.dialogVisible = true

src/views/wmsInStore/components/inStoreDocumentsAdd.vue

@@ -5,14 +5,14 @@
       :visible.sync="dialogVisible"
       width="50%"
     >
-      <el-form ref="formList" label-position="right" label-width="80px" :model="formList">
+      <el-form ref="formList" label-position="right" label-width="140px" :model="formList">
         <el-form-item label="入库单号" prop="receiptNo">
           <el-input v-model="formList.receiptNo" />
         </el-form-item>
         <el-form-item label="托盘号" prop="trayID">
           <el-input v-model="formList.trayID" />
         </el-form-item>
-        <el-form-item label="成品内控码" prop="internalControlCode">
+        <el-form-item label="成品内控码/商品条码" prop="internalControlCode">
           <el-input v-model="formList.internalControlCode" />
         </el-form-item>
         <el-form-item label="客户标签号" prop="customerCode">
@@ -27,9 +27,6 @@
         <el-form-item label="批次" prop="batch">
           <el-input v-model="formList.batch" />
         </el-form-item>
-        <el-form-item label="包装机号" prop="packCode">
-          <el-input v-model="formList.packCode" />
-        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="resetForm('formList')">取 消</el-button>
@@ -57,8 +54,7 @@ export default {
         customerCode: '',
         productDpec: '',
         num: '',
-        batch: '',
-        packCode: ''
+        batch: ''
       }
     }
   },
@@ -75,7 +71,6 @@ export default {
           this.formList.productDpec = val.productDpec
           this.formList.num = val.num
           this.formList.batch = val.batch
-          this.formList.packCode = val.packCode
         })
       }
       this.dialogVisible = true

src/views/wmsInStore/inStoreDocuments.vue

@@ -52,9 +52,13 @@ const tableProps = [
     prop: 'trayID',
     label: '托盘号'
   },
+  {
+    prop: 'type',
+    label: '类型'
+  },
   {
     prop: 'internalControlCode',
-    label: '成品内控码'
+    label: '成品内控码/商品条码'
   },
   {
     prop: 'customerCode',
@@ -71,10 +75,6 @@ const tableProps = [
   {
     prop: 'batch',
     label: '批次'
-  },
-  {
-    prop: 'packCode',
-    label: '包装机号'
   }
 ]
 const tableBtn = [
@@ -96,7 +96,7 @@ export default {
         {
           type: 'input',
           label: '关键字',
-          placeholder: '入库单号,托盘号或成品内控码',
+          placeholder: '入库单号,托盘号或成品内控码/商品条码',
           param: 'name',
           width: 300
         },
@@ -132,13 +132,17 @@ export default {
     getList() {
       const temp = []
       const num = 20
+      const typeList = ['成品', '辅料', '备件']
       for (let i = 0; i < num; i++) {
         const obj = {}
+        const sj = parseInt(Math.random() * 3 + 1)
+        console.log(sj)
         obj.receiptNo = getReceiptNoList()
         obj.trayID = getTrayList()
-        obj.internalControlCode = getProductList()
+        obj.type = typeList[sj - 1]
+        obj.internalControlCode = sj === 1 ? 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()

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]

src/views/wmsStatisticalReports/inventoryReport.vue

@@ -26,7 +26,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
-import { getReceiptNoList, getProductSpecList, getMaterialCodeList, getGoodsList } from '@/utils/wmsDic'
+import { getReceiptNoList, getProductSpecList, getMaterialCodeList } from '@/utils/wmsDic'
 import moment from 'moment'
 const tableProps = [
   {
@@ -37,10 +37,6 @@ const tableProps = [
     prop: 'type',
     label: '类型'
   },
-  {
-    prop: 'productName',
-    label: '品名'
-  },
   {
     prop: 'spec',
     label: '规格'
@@ -115,7 +111,6 @@ export default {
         const obj = {}
         obj.orderCode = getReceiptNoList()
         obj.type = '深加工玻璃'
-        obj.productName = getGoodsList()
         const sj = Math.floor(Math.random() * 100)
         obj.spec = getProductSpecList()
         obj.materialCode = getMaterialCodeList()

src/views/wmsStatisticalReports/outStoreReport.vue

@@ -34,7 +34,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination'
 import { tableHeight } from '@/utils/index'
-import { getOutboundNoList, getProductSpecList, getMaterialCodeList, getGoodsList } from '@/utils/wmsDic'
+import { getOutboundNoList, getProductSpecList, getMaterialCodeList } from '@/utils/wmsDic'
 import moment from 'moment'
 const tableProps = [
   {
@@ -45,10 +45,6 @@ const tableProps = [
     prop: 'type',
     label: '类型'
   },
-  {
-    prop: 'productName',
-    label: '品名'
-  },
   {
     prop: 'spec',
     label: '规格'
@@ -123,7 +119,6 @@ export default {
         const obj = {}
         obj.orderCode = getOutboundNoList()
         obj.type = '深加工玻璃'
-        obj.productName = getGoodsList()
         const sj = Math.floor(Math.random() * 5)
         obj.spec = getProductSpecList()
         obj.materialCode = getMaterialCodeList()