diff --git a/src/api/basicData/Warehouse/StorageBoxInfo.js b/src/api/basicData/Warehouse/StorageBoxInfo.js index aff83f9..c7cc981 100644 --- a/src/api/basicData/Warehouse/StorageBoxInfo.js +++ b/src/api/basicData/Warehouse/StorageBoxInfo.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2020-12-29 16:00:14 * @LastEditors: zwq - * @LastEditTime: 2022-01-17 13:59:54 + * @LastEditTime: 2022-03-11 16:23:43 * @Description: */ import request from '@/utils/request' @@ -84,3 +84,19 @@ export function StorageBoxRackDelete(id) { // 删除存储箱上架单条数据 data: { id } }) } + +export function batchListAdd(data) { // 新增工序库位关联 + return request({ + url: '/api/wms/processlocation/batchList', + method: 'post', + data + }) +} + +export function locationByProcessList(data) { // 工序库位列表获取 + return request({ + url: '/api/wms/processlocation/locationByProcess', + method: 'post', + data + }) +} diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js index ae4cedb..735dd4a 100644 --- a/src/lang/i18n/en/module/basicData.js +++ b/src/lang/i18n/en/module/basicData.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2021-03-04 16:13:51 * @LastEditors: zwq - * @LastEditTime: 2022-03-11 08:28:27 + * @LastEditTime: 2022-03-15 10:17:01 * @Description: file content */ export default { @@ -54,7 +54,8 @@ export default { editLocation: 'Edit Location Point', location: 'Location', locationTip: 'Click the picture below to select a point. After selecting a point, select a location in the pop-up box. If you do not select a location when adding a new point, you cannot select the next point. If you want to adjust the order of the points, drag the label at the bottom of the picture to the position you want to adjust. Click to confirm the submission point information and click Reset to reset the point information to the state when the pop-up box is opened', - locationInfo: 'Location Point Info' + locationInfo: 'Location Point Info', + storageCode: 'storageBoxCode' }, factory: { placeholderName: 'Name Or Code', @@ -165,7 +166,10 @@ export default { addCacheArea: 'add Ports Shelf', warning: 'Layers and Columns must be integer!', logisticsEquipment: 'Logistics Equipment', - processEquipment: 'Process Equipment' + processEquipment: 'Process Equipment', + sheCode: 'Shelf Code', + sheName: 'Shelf Name', + locaNum: 'Location Number' }, storageBox: { name: 'Name', @@ -177,7 +181,10 @@ export default { remark: 'Remark', PositionNo: 'PositionNo', PositionCode: 'PositionCode', - PositionCodeAlias: 'PositionCodeAlias' + PositionCodeAlias: 'PositionCodeAlias', + scrapped: 'Scrapped', + normal: 'Normal', + repairing: 'Repairing' }, equipment: { EquipmentName: 'Equipment Name', @@ -255,7 +262,7 @@ export default { entryType: 'Manual/Automatic', automatic: 'automatic', manual: 'Manual', - workOrderId: 'workOrderId' + workOrderName: 'Work Order Name' }, productPool: { productName: 'Product Name', @@ -343,6 +350,10 @@ export default { PerformTaskManual: 'Perform Task Manual', processStorageLink: 'Process Storage Link', SelectStorageType: 'Select Storage Type', - LocationStorageSetting: 'Location Storage Setting' + LocationStorageSetting: 'Location Storage Setting', + publishTask: 'Publish The Task', + startPosition: 'Start', + endPosition: 'End', + taskType: 'Task Type' } } diff --git a/src/lang/i18n/en/module/dashboard.js b/src/lang/i18n/en/module/dashboard.js new file mode 100644 index 0000000..2029cf6 --- /dev/null +++ b/src/lang/i18n/en/module/dashboard.js @@ -0,0 +1,16 @@ +/* + * @Author: gtz + * @Date: 2022-03-15 16:42:34 + * @LastEditors: gtz + * @LastEditTime: 2022-03-15 16:58:26 + * @Description: file content + * @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js + */ + +export default { + first: 'First Row', + second: 'Second Row', + title: 'WMS Inventory Information', + pageHeader: 'No.', + pageFooter: ' Page' +} diff --git a/src/lang/i18n/en/module/index.js b/src/lang/i18n/en/module/index.js index c0d70e8..4be86f7 100644 --- a/src/lang/i18n/en/module/index.js +++ b/src/lang/i18n/en/module/index.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2021-03-04 16:12:46 * @LastEditors: gtz - * @LastEditTime: 2021-04-22 19:49:39 + * @LastEditTime: 2022-03-15 16:44:11 * @Description: file content */ @@ -17,6 +17,7 @@ import quality from './quality' import factory from './factory' import formManage from './formManage' import report from './report' +import dashboard from './dashboard' export default { basicData, @@ -29,5 +30,6 @@ export default { quality, factory, formManage, - report + report, + dashboard } diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js index 14a5168..25a9836 100644 --- a/src/lang/i18n/zh/module/basicData.js +++ b/src/lang/i18n/zh/module/basicData.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2021-03-04 16:13:51 * @LastEditors: zwq - * @LastEditTime: 2022-03-11 08:28:40 + * @LastEditTime: 2022-03-15 10:16:52 */ export default { visual: { @@ -53,7 +53,8 @@ export default { editLocation: '编辑库位点', location: '库位', locationTip: '点击下方图片选点,选点后在弹出框内选择库位,新增点位时未选择库位无法进行下一个选点,若想调整点位顺序可拖动图片下方的标签到你想调整的位置,点击确定提交点位信息,点击重置将点位信息重置到打开弹出框时的状态', - locationInfo: '库位点信息' + locationInfo: '库位点信息', + storageCode: '存储箱号' }, factory: { placeholderName: '名称或编码', @@ -155,7 +156,10 @@ export default { status: '状态', warning: '行列标必须为整数!', logisticsEquipment: '物流设备', - processEquipment: '工艺设备' + processEquipment: '工艺设备', + sheCode: '货架编码', + sheName: '货架名', + locaNum: '库存数量' }, storageBox: { name: '存储箱名称', @@ -167,7 +171,11 @@ export default { remark: '备注', PositionNo: '位置序号', PositionCode: '位置编码', - PositionCodeAlias: '位置编码别名' + PositionCodeAlias: '位置编码别名', + scrapped: '报废', + normal: '正常', + repairing: '维修中' + }, equipment: { shortName: '名称缩写', @@ -247,7 +255,7 @@ export default { entryType: '手动/自动', automatic: '自动', manual: '手动', - workOrderId: '工单名称' + workOrderName: '工单名称' }, processLocation: { sequence: '顺序', @@ -349,6 +357,10 @@ export default { PerformTaskManual: '手动执行任务', processStorageLink: '工序关联库位', SelectStorageType: '选择库位类型', - LocationStorageSetting: '库位存储箱设置' + LocationStorageSetting: '库位存储箱设置', + publishTask: '发布任务', + startPosition: '起点', + endPosition: '终点', + taskType: '任务类型' } } diff --git a/src/lang/i18n/zh/module/dashboard.js b/src/lang/i18n/zh/module/dashboard.js new file mode 100644 index 0000000..6b4bdb9 --- /dev/null +++ b/src/lang/i18n/zh/module/dashboard.js @@ -0,0 +1,16 @@ +/* + * @Author: gtz + * @Date: 2022-03-15 16:42:34 + * @LastEditors: gtz + * @LastEditTime: 2022-03-15 16:58:30 + * @Description: file content + * @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js + */ + +export default { + first: '第一排', + second: '第二排', + title: 'WMS库存信息', + pageHeader: '第', + pageFooter: '页' +} diff --git a/src/lang/i18n/zh/module/index.js b/src/lang/i18n/zh/module/index.js index 7fb206d..3ed9beb 100644 --- a/src/lang/i18n/zh/module/index.js +++ b/src/lang/i18n/zh/module/index.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2021-03-04 16:12:46 * @LastEditors: gtz - * @LastEditTime: 2021-04-22 19:49:47 + * @LastEditTime: 2022-03-15 16:44:05 * @Description: file content */ @@ -17,6 +17,7 @@ import quality from './quality' import factory from './factory' import formManage from './formManage' import report from './report' +import dashboard from './dashboard' export default { basicData, @@ -29,5 +30,6 @@ export default { quality, factory, formManage, - report + report, + dashboard } diff --git a/src/router/index.js b/src/router/index.js index ed1f480..85cf483 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -218,9 +218,9 @@ export const constantRoutes = [ meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true } }, { - path: '/dataDictionary', + path: '/DataDictionary', component: () => import('@/views/basicData/index'), - name: 'dataDictionary', + name: 'DataDictionary', meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true }, children: [{ path: 'dataDictionary', @@ -260,7 +260,7 @@ export const constantRoutes = [ { path: 'processList', component: () => import('@/views/art/processList'), - name: 'Process', + name: 'processList', meta: { title: routerTitle.technology.processList?.[language] || routerTitle.technology.processList.en, icon: 'form', affix: true, required: true, requireToken: true } } ] @@ -268,7 +268,7 @@ export const constantRoutes = [ { path: '/Warehouse', component: Layout, - redirect: '/Warehouse/workOrderManage', + redirect: '/Warehouse/StorageBoxInfo', name: 'Warehouse', meta: { title: routerTitle.Warehouse?.[language] || routerTitle.Warehouse.en, icon: 'form', iconPart: 'orderManage', affix: true, required: true, requireToken: true }, children: [ @@ -281,6 +281,7 @@ export const constantRoutes = [ }, { path: '/StorageBoxRack', + hidden: true, component: () => import('@/views/basicData/Warehouse/StorageBoxRack'), name: 'StorageBoxRack', @@ -496,7 +497,7 @@ export const constantRoutes = [ path: '/basic', component: Layout, redirect: '/user/manager', - name: 'ArticleManager', + name: 'basic', meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true }, children: [ { diff --git a/src/views/QualityManager/scrap/ScrapInfo-add.vue b/src/views/QualityManager/scrap/ScrapInfo-add.vue index aca8d97..6256350 100644 --- a/src/views/QualityManager/scrap/ScrapInfo-add.vue +++ b/src/views/QualityManager/scrap/ScrapInfo-add.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2020-12-29 16:37:56 * @LastEditors: zwq - * @LastEditTime: 2022-03-11 09:48:52 + * @LastEditTime: 2022-03-11 10:55:27 * @Description: -->