From 2ca47d4f6948f69ae95e7168f5cf0da3e98b4c46 Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Thu, 7 Mar 2024 13:08:35 +0800
Subject: [PATCH] =?UTF-8?q?AGV=E5=BC=80=E5=A7=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/AvgCarry/index.vue | 8 ++++--
pages/AvgOrderPkg/index.scss | 8 +++---
pages/AvgOrderPkg/index.vue | 54 +++++++++++++++++++++++++++---------
3 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/pages/AvgCarry/index.vue b/pages/AvgCarry/index.vue
index 9937573..5bbcd66 100644
--- a/pages/AvgCarry/index.vue
+++ b/pages/AvgCarry/index.vue
@@ -84,11 +84,15 @@
// this.getDataList()
this.$u.api.AvgCarry.queryBillingDByContainerCode({containerCode:this.dataForm.containerCode}).then(res=>{
// console.log(res);
- this.endValue = res.data
+ this.endValue = res.data[0].targetPoint
+ this.beginValue= res.data[1].startPoint
this.pointList.forEach(item=>{
- if(res.data == item.value){
+ if(res.res.data[0].targetPoint == item.value){
this.end = item.label
}
+ if(res.res.data[1].startPoint == item.value){
+ this.begin = item.label
+ }
})
// this.end = res.data
this.pointList1 = this.pointList.filter(item=>item.value != this.beginValue&& item.value != this.endValue)
diff --git a/pages/AvgOrderPkg/index.scss b/pages/AvgOrderPkg/index.scss
index 2734273..64ed9db 100644
--- a/pages/AvgOrderPkg/index.scss
+++ b/pages/AvgOrderPkg/index.scss
@@ -121,7 +121,7 @@
align-items: center;
width: 70%;
.goods-title {
- font-size: 28rpx;
+ font-size: 32rpx;
color: #555555;
}
.goods-value {
@@ -152,14 +152,14 @@
// align-items: center;
// position: relative;
.item-title {
- font-size: 22rpx;
+ font-size: 36rpx;
color: #555555;
- width: 130rpx;
+ width: 165rpx;
text-align: right;
// right: 0;
}
.item-value {
- font-size: 24rpx;
+ font-size: 36rpx;
color: #666666;
margin-left: 14rpx; }
}
diff --git a/pages/AvgOrderPkg/index.vue b/pages/AvgOrderPkg/index.vue
index 2e6fe56..c911068 100644
--- a/pages/AvgOrderPkg/index.vue
+++ b/pages/AvgOrderPkg/index.vue
@@ -27,13 +27,13 @@
物料编号:
- {{item.ttPart}}
+ {{item.goodNo}}
物料信息:
- {{item.ptName}}--{{item.ptDesc}}
+ {{item.goodName}}--{{item.specifications}}
@@ -47,12 +47,12 @@
缴库数量:
- {{item.ttQtyRct}}
+ {{item.qty}}
-
+
@@ -63,7 +63,7 @@
数量确认
- 拣货数量:
+ 缴库数量:
@@ -107,7 +107,28 @@
containerId:'',
dtlAddBos:[]
},
- dataList: [],
+ dataList: [
+ {
+ "id": 3,
+ "orderNo": "FL20240306002",
+ "waveCode": "BC120240300606",
+ "lineId": 0,
+ "goodId": 14,
+ "locationId": 172,
+ "qty": 10.0000,
+ "packageId": 14,
+ "taskType": "1",
+ "sourceOrderNo": "FL20240306002",
+ "sourceLineId": "",
+ "upperOrderNo": "FL20240306002",
+ "goodNo": "L010002",
+ "locationCode": "20-18-0",
+ "specifications": "件",
+ "containerCode": "P10000002",
+ "goodName": "铝合金规格2",
+ "batchNo": "07144961"
+ }
+ ],
query: {
current: 1,
size: 20
@@ -185,10 +206,11 @@
},
enterUp(item){
- console.log(item);
- this.$u.api.replaceCar.upateBusinItemInDataForQty(item).then(res=>{
- console.log(res);
- })
+
+ this.show=false
+ // this.$u.api.replaceCar.upateBusinItemInDataForQty(item).then(res=>{
+ // console.log(res);
+ // })
},
/**搜索框查询*/
inputQuery() {
@@ -234,10 +256,10 @@
flag = true
this.firstFocus=false
- this.$u.api.replaceCar.getBusinItemInData(this.dataForm).then(res=>{
+ this.$u.api.pickBy.pickByContainerCode(this.dataForm).then(res=>{
if(!res.data || res.data.length == 0){
// console.log(res);
- this.$u.toast("当前托盘模具不存在");
+ this.$u.toast("当前托盘不存在");
}else if(res.code == '200'){
// console.log(res);
res.data.forEach((item)=>{
@@ -260,6 +282,12 @@
},400)
},
+
+ pickUp(){
+ this.$u.api.pickBy.pickAGV(this.dataForm).then(res=>{
+ console.log(res);
+ })
+ },
// 下一个界面
enterNext(item,index){
this.$u.route({