From edeca04d3684542a873158666c42e1a4aa16d6d2 Mon Sep 17 00:00:00 2001 From: "Mr.sun" <2290907227@qq.com> Date: Mon, 26 Feb 2024 18:24:57 +0800 Subject: [PATCH] =?UTF-8?q?agv=E6=90=AC=E8=BF=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.api.js | 7 +- pages.json | 9 +- pages/AvgCarry/index.vue | 77 +++++++-- pages/AvgOrderPkg/index.vue | 8 +- pages/index/index.vue | 9 ++ pages/release/index.scss | 234 +++++++++++++++++++++++++++ pages/release/index.vue | 307 ++++++++++++++++++++++++++++++++++++ static/icon/shifang.png | Bin 0 -> 2769 bytes 8 files changed, 633 insertions(+), 18 deletions(-) create mode 100644 pages/release/index.scss create mode 100644 pages/release/index.vue create mode 100644 static/icon/shifang.png diff --git a/common/http.api.js b/common/http.api.js index 9ad6f86..a245753 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -87,7 +87,12 @@ const install = (Vue, vm) => { //AGV搬运 AvgCarry:{ - moveByAGV:(params = {}) => vm.$u.post('/wms/pick/pda/v2/moveByAGV',params) + // moveByAGV:(params = {}) => vm.$u.post('/wms/pick/pda/v2/moveByAGV',params) + queryBillingDByContainerCode:(params = {}) => vm.$u.post('/wms/billing/pda/queryBillingDByContainerCode',params), + //点位 + getPointList:(params = {}) => vm.$u.get('/wcs/base/point/list',params), + //呼叫AGV搬运 + agvCarry:(params = {}) => vm.$u.post('/wcs/agv/agvCarry',params) }, //入库上架 diff --git a/pages.json b/pages.json index de054b6..6f81dcc 100644 --- a/pages.json +++ b/pages.json @@ -317,7 +317,14 @@ "navigationBarTitleText": "AGV搬运", "navigationBarBackgroundColor": "#228B22" } - } + }, + { + "path": "pages/release/index", + "style": { + "navigationBarTitleText": "点位释放", + "navigationBarBackgroundColor": "#228B22" + } + } ], "globalStyle": { diff --git a/pages/AvgCarry/index.vue b/pages/AvgCarry/index.vue index 8512383..41f9488 100644 --- a/pages/AvgCarry/index.vue +++ b/pages/AvgCarry/index.vue @@ -4,12 +4,12 @@ 扫描托盘条码 + placeholder="请输入或输入要搬运的托盘条码" @confirm="changeCode()"> 搬运起始点位: - + @@ -17,9 +17,9 @@ 搬运目标点位: - - + 开始搬运 @@ -38,32 +38,79 @@ list:[], showList:[], dataForm:{ - containerCode:'' - } + containerCode:'', + endPoint:'', + }, + pointList:[] } }, onLoad(){ // this.getDic() - this.getList() + + this.$u.api.AvgCarry.getPointList().then(res=>{ + this.pointList=[] + if(res.code==200){ + let dataArry = res.rows; + for (var i = 0; i < dataArry.length; i++) { + var obj = { + value: dataArry[i].pointName, + label: dataArry[i].pointName, + }; + this.pointList.push(obj); + console.log(this.pointList); + } + } + }) + + // this.getList() + }, methods:{ changeCode() { - this.query = { - pageNum: 1, - pageSize: 10 - } + // this.query = { + // pageNum: 1, + // pageSize: 10 + // } // this.getDataList() + this.$u.api.AvgCarry.queryBillingDByContainerCode({containerCode:this.dataForm.containerCode}).then(res=>{ + this.dataForm.endPoint = res.data + this.pointList = this.pointList.filter(item=>item.value != this.beginValue && item.value != this.dataForm.endPoint) + } + ) }, //呼叫搬运 checkOutPick(){ - this.$u.api.AvgCarry.moveByAGV({fromLocation:this.begin,toLocation:this.end,containerCode:dataForm.containerCode}).then(res=>{ + // this.$u.api.AvgCarry.moveByAGV({fromLocation:this.begin,toLocation:this.end,containerCode:this.dataForm.containerCode}).then(res=>{ + // this.$u.toast(res.msg) + // if(res.code==200){ + // this.begin='' + // this.end='' + // this.judge() + // } + // }).catch(err=>console.log(err)) + this.$u.api.AvgCarry.agvCarry({startPoint:this.begin,toLocation:this.dataForm.endPoint,containerCode:this.dataForm.containerCode}).then(res=>{ this.$u.toast(res.msg) if(res.code==200){ this.begin='' this.end='' + this.dataForm.startPoint='' + this.dataForm.containerCode='' this.judge() + this.$u.api.AvgCarry.getPointList().then(res=>{ + this.pointList=[] + if(res.code==200){ + let dataArry = res.rows; + for (var i = 0; i < dataArry.length; i++) { + var obj = { + value: dataArry[i].pointName, + label: dataArry[i].pointName, + }; + this.pointList.push(obj); + } + } + }) } }).catch(err=>console.log(err)) }, @@ -89,7 +136,9 @@ }, //过滤数组 judge(e){ - this.showList = this.list.filter(item=>item.value != this.beginValue && item.value != this.endValue) + // console.log(e); + // console.log(this.pointList); + this.pointList = this.pointList.filter(item=>item.value != this.beginValue && item.value != this.endValue) }, confirm(e) { this.begin = e[0].label @@ -97,7 +146,7 @@ this.judge(e) }, confirmTwo(e) { - this.end = e[0].label + this.dataForm.endPoint= e[0].label this.endValue = e[0].value this.judge(e) }, diff --git a/pages/AvgOrderPkg/index.vue b/pages/AvgOrderPkg/index.vue index 255e1c1..2e6fe56 100644 --- a/pages/AvgOrderPkg/index.vue +++ b/pages/AvgOrderPkg/index.vue @@ -37,17 +37,21 @@ - + 缴库数量: {{item.ttQtyRct}} + + + 缴库数量: + {{item.ttQtyRct}} diff --git a/pages/index/index.vue b/pages/index/index.vue index 4614972..299936c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -35,6 +35,10 @@ 盘点计划 + + + 点位释放 + + + + + + + + + 点位物料信息 + + + + + + + + + + + 物料编号: + {{item.ttPart}} + + + + + 物料信息: + {{item.ptName}}--{{item.ptDesc}} + + + + + + + 缴库数量: + {{item.ttQtyRct}} + + + 缴库数量: + {{item.ttQtyRct}} + + + + + + + + + 数量确认 + + + 拣货数量: + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/icon/shifang.png b/static/icon/shifang.png new file mode 100644 index 0000000000000000000000000000000000000000..b382cbd2fec1019908360f43398a4f877eb2cfd0 GIT binary patch literal 2769 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 XQbT!pdYC6&00000NkvXXu0mjf1bY{O literal 0 HcmV?d00001