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 0000000..b382cbd Binary files /dev/null and b/static/icon/shifang.png differ