From 2774079150619ae7b488b71964be838bd1bd95ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 17 Jun 2024 17:32:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E5=B9=B3=E6=9D=BF=E3=80=91?= =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9api=E8=81=94=E8=B0=83=E6=9A=82?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/public/config.js | 2 + fe/PC/src/App.vue | 1 + fe/PC/src/api/wms-pad.js | 39 ++- fe/PC/src/layout/index.vue | 3 + fe/PC/src/mixins/padListPageMixins.js | 1 + fe/PC/src/router/index.js | 51 ++++ fe/PC/src/styles/padMain.scss | 11 +- fe/PC/src/utils/index.js | 10 +- fe/PC/src/utils/tableColumns/index.js | 1 - fe/PC/src/utils/tabsDesTions/index.js | 1 - fe/PC/src/views/login/index.vue | 10 +- .../components/padListPage/index.vue | 15 +- .../src/views/padManage/isPadForMenuPage.vue | 3 + .../padManage/isPadForOutStockFinish.vue | 203 +++++++++++++ .../padManage/isPadForReceiveBackStock.vue | 138 +++++++++ .../isPadForReceiveTractorAction.vue | 80 +++++ .../padManage/isPadForTransferLibJob_old.vue | 278 ------------------ 17 files changed, 555 insertions(+), 292 deletions(-) create mode 100644 fe/PC/src/views/padManage/isPadForOutStockFinish.vue create mode 100644 fe/PC/src/views/padManage/isPadForReceiveBackStock.vue create mode 100644 fe/PC/src/views/padManage/isPadForReceiveTractorAction.vue delete mode 100644 fe/PC/src/views/padManage/isPadForTransferLibJob_old.vue diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js index ae382113b..788283122 100644 --- a/fe/PC/public/config.js +++ b/fe/PC/public/config.js @@ -26,6 +26,8 @@ window.SITE_CONFIG['companyName'] = '长春一汽富维东阳汽车塑料零部 window.SITE_CONFIG['padKittingPackUpdate'] = 180000 // 高拍仪获取地址 window.SITE_CONFIG['grabimageURL'] = 'http://192.168.1.75:33336/video/index.html' +// 供应商接口地址（如立体库等） +window.SITE_CONFIG['supplierOuterURL'] = 'http://7e42682n64.goho.co:21171' // 接口看板地址 window.SITE_CONFIG['interfaceBoardUrl'] = 'http://dev.ccwin-in.com:60090/' diff --git a/fe/PC/src/App.vue b/fe/PC/src/App.vue index 08c13ae32..7370bfd7b 100644 --- a/fe/PC/src/App.vue +++ b/fe/PC/src/App.vue @@ -24,6 +24,7 @@ localStorage.setItem('company',window.SITE_CONFIG['company']) localStorage.setItem('largeScreen',window.SITE_CONFIG['largeScreen']) localStorage.setItem('padKittingPackUpdate',window.SITE_CONFIG['padKittingPackUpdate']) localStorage.setItem('grabimageURL',window.SITE_CONFIG['grabimageURL']) +localStorage.setItem('supplierOuterURL',window.SITE_CONFIG['supplierOuterURL']) localStorage.setItem('apifoxToken',window.SITE_CONFIG['apifoxToken']) localStorage.setItem('reportsUrl',window.SITE_CONFIG['reportsUrl']) localStorage.setItem('companyName',window.SITE_CONFIG['companyName']) diff --git a/fe/PC/src/api/wms-pad.js b/fe/PC/src/api/wms-pad.js index e99b182f8..4ae92e57c 100644 --- a/fe/PC/src/api/wms-pad.js +++ b/fe/PC/src/api/wms-pad.js @@ -1,5 +1,15 @@ import request from '@/utils/request' let baseURL = localStorage.getItem('base') + '/api/' +let supplierOuterURL = localStorage.getItem('supplierOuterURL') + +//分页+筛选(外界接口) +export function getPageListForOuter(url,data) { + return request({ + url: url, + method: 'post', + data + }) +} // 【pad】 Kitting组包 - 获取中间底盘数据 export function ChassisGetListWithNextCount(params) { @@ -45,4 +55,31 @@ export function inventoryBalanceRecommendList(params) { method: 'get', params: params, }) -} \ No newline at end of file +} + +// 出库任务完成-提交 +export function outStockFinishCommit(data) { + return request({ + url: supplierOuterURL + '/zozocnApi/custom/OutStockByDY', + method: 'post', + data + }) +} + +// 回库器具或空器具AGV搬运-转换位置码为locationCode +export function getLocationCodeByPosition(code) { + return request({ + url: baseURL + 'basedata/position-code/by-code/'+code, + method: 'get', + }) +} + +// 回库器具或空器具AGV搬运-提交 +export function receiveBackStockAction(data) { + return request({ + url: supplierOuterURL + '/zozocnApi/custom/receiveBackStockAction', + method: 'post', + data + }) +} + diff --git a/fe/PC/src/layout/index.vue b/fe/PC/src/layout/index.vue index 1c1b6e112..dcc60c218 100644 --- a/fe/PC/src/layout/index.vue +++ b/fe/PC/src/layout/index.vue @@ -61,6 +61,9 @@ export default { 'isPadForTransferLibJob', 'isPadForTransferLibJob_new', 'isPadForKittingPack', + 'isPadForReceiveTractorAction', + 'isPadForOutStockFinish', + 'isPadForReceiveBackStock' ] } }, diff --git a/fe/PC/src/mixins/padListPageMixins.js b/fe/PC/src/mixins/padListPageMixins.js index 2200e57ff..3e40fdb29 100644 --- a/fe/PC/src/mixins/padListPageMixins.js +++ b/fe/PC/src/mixins/padListPageMixins.js @@ -82,6 +82,7 @@ export const padListPageMixins = { // 查询条件拼接 intSearchFilters(){ let _filters = [] + if(!this.searchForm)return this.searchForm.forEach(item => { if(this.searchFormData[item.prop]){ _filters.push( diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index 9a9295c24..04b1494d5 100644 --- a/fe/PC/src/router/index.js +++ b/fe/PC/src/router/index.js @@ -205,6 +205,57 @@ export const constantRoutes = [ } }] }, + // 下架指导牵引车 + { + path: '/', + component: Layout, + redirect: '/isPadForReceiveTractorAction', + hidden: false, + children: [{ + path: 'isPadForReceiveTractorAction', + component: () => import('@/views/padManage/isPadForReceiveTractorAction'), + name: 'isPadForReceiveTractorAction', + meta: { + keepAlive : true, + title: '下架指导牵引车', + icon: '系统首页', + } + }] + }, + // 出库任务完成 + { + path: '/', + component: Layout, + redirect: '/isPadForOutStockFinish', + hidden: false, + children: [{ + path: 'isPadForOutStockFinish', + component: () => import('@/views/padManage/isPadForOutStockFinish'), + name: 'isPadForOutStockFinish', + meta: { + keepAlive : true, + title: '出库任务完成', + icon: '系统首页', + } + }] + }, + // 回库器具或空器具AGV搬运 + { + path: '/', + component: Layout, + redirect: '/isPadForReceiveBackStock', + hidden: false, + children: [{ + path: 'isPadForReceiveBackStock', + component: () => import('@/views/padManage/isPadForReceiveBackStock'), + name: 'isPadForReceiveBackStock', + meta: { + keepAlive : true, + title: '回库器具或空器具AGV搬运', + icon: '系统首页', + } + }] + }, // { // path: '/', // component: Layout, diff --git a/fe/PC/src/styles/padMain.scss b/fe/PC/src/styles/padMain.scss index 4215fef70..1df7aa791 100644 --- a/fe/PC/src/styles/padMain.scss +++ b/fe/PC/src/styles/padMain.scss @@ -9,7 +9,6 @@ } .padListPageOuter{ height: 100%; - padding:15px; overflow: auto; } .padListPage{ @@ -30,6 +29,16 @@ ::v-deep .el-form-item{ margin-bottom: 10px; } + + .pageTitle{ + margin: 0; + padding: 0; + font-weight: bold; + height: 38px; + line-height: 30px; + padding-left: 10px; + overflow: hidden; + } .pageToTop{ width: 30px; diff --git a/fe/PC/src/utils/index.js b/fe/PC/src/utils/index.js index 35b36122d..41e1ce524 100644 --- a/fe/PC/src/utils/index.js +++ b/fe/PC/src/utils/index.js @@ -559,11 +559,13 @@ export function createNewTabs (url) { // 生成UUID export function generateUUID() { - return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { - const r = crypto.randomBytes(1)[0] % 16 | 0, - v = c === 'x' ? r : (r & 0x3 | 0x8); - return v.toString(16); + let d = new Date().getTime(); + const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { + const r = (d + Math.random() * 16) % 16 | 0; + d = Math.floor(d / 16); + return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16); }); + return uuid; } // 接口对应类型转义封装 diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 529233e1b..40db098ed 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1619,7 +1619,6 @@ export const ScrapNote = [ width: orderWidth }, { label: "报废日期", prop: "activeDate",type: "dateTime" }, - { label: "报废类型", prop: 'type' }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 1fcd67cf1..19f4e6922 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1011,7 +1011,6 @@ export const PurchaseReturnNote = [ export const ScrapNote = [ { label: "报废记录单号", prop: "number" }, { label: "报废日期", prop: "activeDate",type: "dateTime" }, - { label: "报废类型", prop: 'type' }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] diff --git a/fe/PC/src/views/login/index.vue b/fe/PC/src/views/login/index.vue index 603ac3bc8..90e4a209b 100644 --- a/fe/PC/src/views/login/index.vue +++ b/fe/PC/src/views/login/index.vue @@ -1,7 +1,7 @@ diff --git a/fe/PC/src/views/padManage/isPadForOutStockFinish.vue b/fe/PC/src/views/padManage/isPadForOutStockFinish.vue new file mode 100644 index 000000000..0cdb84d33 --- /dev/null +++ b/fe/PC/src/views/padManage/isPadForOutStockFinish.vue @@ -0,0 +1,203 @@ + + + + \ No newline at end of file diff --git a/fe/PC/src/views/padManage/isPadForReceiveBackStock.vue b/fe/PC/src/views/padManage/isPadForReceiveBackStock.vue new file mode 100644 index 000000000..5fe7f753a --- /dev/null +++ b/fe/PC/src/views/padManage/isPadForReceiveBackStock.vue @@ -0,0 +1,138 @@ + + + + \ No newline at end of file diff --git a/fe/PC/src/views/padManage/isPadForReceiveTractorAction.vue b/fe/PC/src/views/padManage/isPadForReceiveTractorAction.vue new file mode 100644 index 000000000..190a90791 --- /dev/null +++ b/fe/PC/src/views/padManage/isPadForReceiveTractorAction.vue @@ -0,0 +1,80 @@ + + + + \ No newline at end of file diff --git a/fe/PC/src/views/padManage/isPadForTransferLibJob_old.vue b/fe/PC/src/views/padManage/isPadForTransferLibJob_old.vue deleted file mode 100644 index 5344bbd1e..000000000 --- a/fe/PC/src/views/padManage/isPadForTransferLibJob_old.vue +++ /dev/null @@ -1,278 +0,0 @@ - - - \ No newline at end of file