niantianya 1 year ago
parent bd79ab66c1
commit 7b811ef5e3
  1. 2
      common/http.api.js
  2. 115
      pages/AvgCarry/index.vue
  3. 6
      pages/AvgOrderPkg/index.vue
  4. 28
      pages/checkAccept/checkHomework.vue
  5. 8
      pages/checkAccept/checkHomeworks.vue
  6. 48
      pages/checkAccept/index.vue
  7. 4
      pages/index/index.vue
  8. 8
      pages/payInto/index.vue
  9. 36
      pages/queryPoint/index.vue
  10. 18
      pages/receive/index.vue
  11. 2
      pages/receive/receiveHomeWork/receiveHomeWork.vue
  12. 2
      pages/receive/receiveHomeWorks/receiveHomeWork.vue
  13. 6
      pages/release/index.vue
  14. 5
      uni_modules/select-lay/components/select-lay/select-lay.vue

@ -232,6 +232,8 @@ const install = (Vue, vm) => {
getTaskNumber: (params = {}) => vm.$u.get('/system/dict/data/type/once_pick_task_number'),
// 获取盘点类型的字典
getInvType: (params = {}) => vm.$u.get('/system/dict/data/type/inv_type_dict'),
// 订单类型
orderTypeDict: (params = {}) => vm.$u.get('/system/dict/data/type/order_type_dict'),
//获取AGV点位的字典
getCarry:(params = {}) => vm.$u.get('/system/dict/data/type/agv_move_location'),
//获取托盘状态字典

@ -4,16 +4,17 @@
<view class="task global-font" style="font-size: 32rpx;">
<span>扫描托盘条码:</span>
<u-input v-model="dataForm.containerCode" border
style="background-color: #ffffff;margin-bottom: 20px;margin-top: 20rpx;" placeholder="请输入或输入要搬运的托盘条码"
:focus="focusFlag" @confirm="changeCode()"></u-input>
style="background-color: #ffffff;margin-bottom: 20px;margin-top: 20rpx;" placeholder="请扫描或输入要搬运的托盘条码"
:focus="focusFlag" @input="changeCode()"></u-input>
<span>搬运起始点位:</span>
<u-input v-model="begin" style="background-color: #ffffff;margin-bottom: 20px;margin-top: 20rpx;" border
<!-- <u-input v-model="begin" style="background-color: #ffffff;margin-bottom: 20px;margin-top: 20rpx;" border
type="select" font-size='32' placeholder="请选择起始点位" prop="wareHouse" class="u-input"
placeholder-style="color:#000000" @click="show = true" />
<u-select v-model="show" :list="pointList1" @confirm="confirm" mode="single-column"></u-select>
<u-select v-model="show" :list="pointList1" @confirm="confirm" mode="single-column"></u-select> -->
<select-lay @transfer="reomveValue" :pointNoChild="begin" :options="pointList" style="width: 100%; margin-top: 1vh;"
smoldName="ptName" slabel="label" smodel="ptName" name="name3" svalue="value" @selectitem="queryList"
:value="begin" placeholder="选择要释放位置编码" > </select-lay>
</view>
<view class="img1" style="text-align: center;font-size: 32rpx;">
<!-- <img src="@/static/icon/down.png" alt="" style="width: 300rpx;"> -->
@ -21,10 +22,14 @@
</view>
<view class="task global-font" style="font-size: 32rpx;">
<span>搬运目标点位:</span>
<u-input v-model="end" style="background-color: #ffffff;margin-bottom: 20px;margin-top: 20rpx;" border
<!-- <u-input v-model="end" style="background-color: #ffffff;margin-bottom: 20px;margin-top: 20rpx;" border
type="select" font-size='32' placeholder="请选择目标点位" prop="wareHouse" class="u-input"
placeholder-style="color:#000000" @click="showTwo = true" />
<u-select v-model="showTwo" :list="pointList1" @confirm="confirmTwo" mode="single-column"></u-select>
<u-select v-model="showTwo" :list="pointList1" @confirm="confirmTwo" mode="single-column"></u-select> -->
<select-lay @transfer="reomveValue1" :pointNoChild="end" :options="pointList1" style="margin-top: 1vh;"
smoldName="ptName" slabel="label" smodel="ptName" name="name3" svalue="value" @selectitem="queryList1"
:value="end" placeholder="选择要释放位置编码"> </select-lay>
</view>
<view class="footer" style="position: absolute;bottom:8%;left: 50%;transform: translateX(-50%);">
<u-button type="success" @click="checkOutPick()" style="width: 400rpx;background-color: #41ABE2;">开始搬运
@ -40,6 +45,7 @@
show: false,
showTwo: false,
focusFlag: true,
flag: true,
begin: '',
endValue: '',
end: '',
@ -49,16 +55,18 @@
containerCode: '',
endPoint: '',
},
timer: 0,
pointList: [],
pointList1: [],
pointList2:[],
pointList3:[],
}
},
onLoad() {
// this.getDic()
this.$u.api.AvgCarry.getPointList({
pageNum: 1,
pageSize: 100
pageSize: 999,
// pointGroup:1
}).then(res => {
this.pointList = []
this.pointList1 = []
@ -73,39 +81,43 @@
this.pointList1.push(obj);
}
}
})
// this.getList()
// this.$u.api.AvgCarry.getPointList({
// pageNum: 1,
// pageSize: 999
// }).then(res => {
// this.pointList2 = []
// this.pointList3 = []
// if (res.code == 200) {
// let dataArry = res.rows;
// for (var i = 0; i < dataArry.length; i++) {
// var obj = {
// value: dataArry[i].pointNo,
// label: dataArry[i].pointName,
// };
// this.pointList2.push(obj);
// this.pointList3.push(obj);
// }
// }
// })
},
methods: {
changeCode() {
clearTimeout(this.timer)
//
this.flag = true
if (this.flag === false) return;
this.flag = false;
this.timer = setTimeout(() => {
this.flag = true
this.focusFlag = false
// this.query = {
// pageNum: 1,
// pageSize: 10
// }
// this.getDataList()
this.$u.api.AvgCarry.queryBillingDByContainerCode({
containerCode: this.dataForm.containerCode
}).then(res => {
// console.log(res);
// res.data=[{
// "targetPoint":"0460"
// }]
// this.endValue = res.data[0].targetPoint
// this.beginValue= res.data[1].startPoint
// this.pointList.forEach(item=>{
// if(res.data[0].targetPoint == item.value){
// this.end = item.label
// }
// if(res.data[1].startPoint == item.value){
// this.begin = item.label
// }
// })
this.endValue = res.data[0] ? res.data[0].targetPoint : ''
this.beginValue = res.data[1] ? res.data[1].startPoint : ''
this.pointList.forEach(item => {
@ -114,22 +126,25 @@
this.end = item.label
}
}
if (res.data[1]) {
if (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)
// this.pointList1 = this.pointList.filter(item => item.value != this.beginValue && item.value !=
// this.endValue)
// this.dataForm.endPoint = res.data
// this.endValue=res.data
this.pointList = this.pointList.filter(item => item.value != this.beginValue && item.value !=
this.endValue)
})
this.$forceUpdate()
},800)
},
//
checkOutPick() {
@ -150,7 +165,6 @@
this.$u.toast("请选择目标位置");
return;
}
// }).catch(err=>console.log(err))
this.$u.api.AvgCarry.agvCarry({
startPoint: this.beginValue,
toLocation: this.endValue,
@ -188,6 +202,17 @@
}
}).catch(err => {})
},
//
queryList(index,item){
this.begin=item.label
this.beginValue=item.value
this.judge()
},
queryList1(index,item){
this.end = item.label
this.endValue = item.value
this.judge()
},
//
async getList() {
this.list = [];
@ -206,14 +231,22 @@
}
});
this.showList = [...this.list]
// console.log(this.list)
},
reomveValue(){
this.beginValue = ''
this.begin = ''
},
reomveValue1(){
this.end = ''
this.endValue = ''
},
//
judge(e) {
// console.log(e);
// console.log(this.pointList);
this.pointList1 = this.pointList.filter(item => item.value != this.beginValue && item.value != this
.endValue)
// this.pointList = this.pointList1.filter(item => item.value != this.beginValue && item.value != this
// .endValue)
},
confirm(e) {
this.begin = e[0].label
@ -234,7 +267,7 @@
@import "index.scss";
.img1 {
height: 220px;
height: 200px;
background-image: url(@/static/down.png);
background-size: 50% 100%;
background-repeat: no-repeat;

@ -3,7 +3,7 @@
<view class="sh-search">
<u-form labelPosition="left" :model="dataForm" class="sh-form global-font">
<u-form-item prop="barCode">
<u-input v-model="dataForm.containerCode" border input-align="left" height="70" style="background-color: #ffffff;height: 38px;line-height: 38px;" placeholder="请扫描台车编号"
<u-input v-model="dataForm.containerCode" border input-align="left" height="70" style="background-color: #ffffff;height: 38px;line-height: 38px;" placeholder="请扫描托盘编号"
@confirm="inputQuery()" :focus="firstFocus">
</u-input>
</u-form-item>
@ -303,7 +303,7 @@
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("当前托盘不存在");
this.dataList=res.data
}else if(res.code == '200'){
// console.log(res);
@ -335,7 +335,7 @@
|| this.dataForm.containerCode === 0
|| this.dataForm.containerCode === undefined
|| this.dataForm.containerCode ==='undefined'){
this.$u.toast("请扫描台车编号");
this.$u.toast("请扫描托盘编号");
return;
}
var obj ={

@ -30,12 +30,12 @@
<span class="title">件装量</span>
<span v-if="result.businInReceivingDForPdaVo"> {{result.businInReceivingDForPdaVo.bpPackageQty}}</span>
</view>
<!--
<view class="titleValue global-font">
<span class="title"> </span>
<span class="value"
v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.unitName}}</span>
</view>
</view> -->
<view class="titleValue global-font">
<span class="title">未验数量</span>
@ -49,15 +49,15 @@
</view>
<view class="titleValue global-font">
<span class="title">是否缠膜</span>
<span class="value" >{{dataForm.extend3 == '1'?'是':'否'}}</span>
<span class="value" >{{dataForm.isWrap == '1'?'是':'否'}}</span>
</view>
<view class="titleValue global-font">
<span class="title">是否验重</span>
<span class="value">{{dataForm.extend4 == '1'?'是':'否'}}</span>
<span class="value">{{dataForm.isVerWeight == '1'?'是':'否'}}</span>
</view>
<view class="titleValue global-font">
<span class="title"> </span>
<u-input v-model="dataForm.actualCaseQty" border placeholder="请输入件数" @input="changeCase"></u-input>
<u-input v-model="dataForm.actualQty" border placeholder="请输入件数" @input="changeCase"></u-input>
</view>
<view class="titleValue global-font">
@ -100,6 +100,8 @@
result: '',
extend3:'',
extend4:'',
isWrap:'',
isVerWeight:'',
actualQty: '',
//
@ -137,8 +139,9 @@
onLoad: function(options) {
this.sid = options.sid
this.detailId = options.did
this.dataForm.extend3 = options.extend3
this.dataForm.extend4 = options.extend4
options.isWrap ?this.dataForm.isWrap = options.isWrap :''
options.isVerWeight ?this.dataForm.isVerWeight = options.isVerWeight:''
options.ableQty?this.dataForm.actualQty = options.ableQty:''
this.getList(options)
//
this.getByDicReceivingStatus()
@ -298,6 +301,14 @@
if (res.code === 200) {
this.$u.toast('验收成功');
this.result = {}
this.dataForm={}
setTimeout(() => {
this.$u.route({
url: 'pages/checkAccept/index',
type: 'navigateBack'
})
}, 500)
} else {
this.$u.toast(res.msg);
}
@ -322,7 +333,10 @@
getList(params) {
this.$u.api.acceptance.getReceiving(params).then(res => {
if (res.code === 200) {
// res.data.actualQty = res.data.ableQty
this.result = res.data
// this.dataForm.actualQty = this.result.ableQty
if (!this.result.businInReceivingDForPdaVo) {
this.$u.toast('当前商品待验收信息')
}

@ -53,10 +53,10 @@
<view class="titleValue">
<span class="title">是否缠膜</span>
<view style="width: 80px;">
<span class="title" style="margin-left: 10px;text-align: center;">{{item.extend3 == '1'?'是':'否'}}</span>
<span class="title" style="margin-left: 10px;text-align: center;">{{item.isWrap == '1'?'是':'否'}}</span>
</view>
<span class="title" style="margin-left: 15px;">是否验重:</span>
<span class="title" style="margin-left: 10px;text-align: center;">{{item.extend4 == '1'?'是':'否'}}</span>
<span class="title" style="margin-left: 10px;text-align: center;">{{item.isVerWeight == '1'?'是':'否'}}</span>
</view>
<!-- <view class="titleValue">
<span class="title"> </span>
@ -246,9 +246,9 @@
setTimeout(() => {
this.$u.route({
url: 'pages/checkAccept/index',
type: 'navigateTo'
type: 'navigateBack'
})
}, 1000)
}, 500)
} else {
this.$u.toast(res.msg);
}

@ -53,11 +53,11 @@
<!-- <text class="item-value">{{item.extend3 == '1'?'是':'否'}}</text> -->
<!-- <text class="item-value">{{item.extend3 == '1'?'是':'否'}}</text> -->
<!-- <switch checked /> -->
<switch style="transform:scale(0.6)" @change="changeFilm(item)" :checked="item.extend3 == '1'"/>
<switch style="transform:scale(0.6)" @change="changeFilm(item)" :checked="item.isWrap == '1'"/>
</view>
<view class="card-content-item">
<text class="item-title">是否验重</text>
<switch style="transform:scale(0.6)" @change="changeWeight(item)" :checked="item.extend4 == '1'"/>
<switch style="transform:scale(0.6)" @change="changeWeight(item)" :checked="item.isVerWeight == '1'"/>
</view>
</view>
@ -73,7 +73,7 @@
</view>
</view>
<u-icon size="40" name="../../static/icon/bg-right.png" @click="goodDetail(item.sid, item.id,item.extend3,item.extend4)"></u-icon>
<u-icon size="40" name="../../static/icon/bg-right.png" @click="goodDetail(item.sid, item.id,item.isWrap,item.isVerWeight,item.ableQty)"></u-icon>
</view>
</view>
@ -195,31 +195,32 @@
}
},
changeFilm(item){
if(item.extend3 == 0 ){
item.extend3 = 1
}else if(item.extend3 == 1 ){
item.extend3 = 0
}else if(item.extend3 == "" ){
item.extend3 = 1
if(item.isWrap == 0 ){
item.isWrap = 1
}else if(item.isWrap == 1 ){
item.isWrap = 0
}else if(item.isWrap == "" || item.isWrap == undefined || item.isWrap == 'undefined' || item.isWrap == 0 ){
item.isWrap = 1
}
this.orderNoList.forEach(item1=>{
if(item1.orderNo === item.orderNo){
item1.extend3 = item.extend3
item1.isWrap = item.isWrap
}
})
},
changeWeight(item){
if(item.extend4 == 0 ){
item.extend4 = 1
}else if(item.extend4 == 1 ){
item.extend4 = 0
}else if(item.extend4 == "" ){
item.extend4 = 1
if(item.isVerWeight == 0 ){
item.isVerWeight = '1'
}else if(item.isVerWeight == 1 ){
item.isVerWeight = '0'
}else if(item.isVerWeight == "" || item.isVerWeight == undefined || item.isVerWeight == 'undefined' || item.isVerWeight == 0 ){
item.isVerWeight = '1'
}
this.orderNoList.forEach(item1=>{
if(item1.orderNo === item.orderNo){
item1.extend4 = item.extend4
item1.isVerWeight = item.isVerWeight
}
})
@ -234,7 +235,6 @@
handleOrderNoOne(item){
let _ = this;
let detailIds = [];
console.log(item.extend3,item.extend4);
detailIds.push(item.id);
let tempData = {
orderNo: item.orderNo,
@ -243,13 +243,12 @@
detailIds:detailIds,
goodNo:item.goodNo,
bgGoodName:item.bgGoodName,
extend3:item.extend3,
extend4:item.extend4,
isWrap:item.isWrap,
isVerWeight:item.isVerWeight,
actualQty:item.ableQty,
packageQty:0
};
_.orderNoList.push(tempData);
console.log(_.orderNoList);
},
//
handleOrderNoMulti(item){
@ -367,15 +366,16 @@
});
this.$u.toast("数据列表已刷新");
},
goodDetail(sid, did,extend3,extend4) {
goodDetail(sid, did,isWrap,isVerWeight,ableQty) {
this.$u.route({
url: 'pages/checkAccept/checkHomework',
type: 'navigateTo',
params: {
sid,
did,
extend3,
extend4
isWrap,
isVerWeight,
ableQty,
}
})
},

@ -23,10 +23,10 @@
<image class="in-img" src="../../static/icon/6.png" alt="">
<view class="wk-text">出库分拣</view>
</u-grid-item>
<u-grid-item @click="PagerJump(10015)">
<!-- <u-grid-item @click="PagerJump(10015)">
<image class="in-img" src="../../static/icon/qita.png" alt="">
<view class="wk-text">其他入库</view>
</u-grid-item>
</u-grid-item> -->
<u-grid-item @click="PagerJump(2103)">
<image class="in-img" src="../../static/icon/3.png" alt="">
<view class="wk-text">库存查询</view>

@ -5,10 +5,10 @@
<u-form labelPosition="left" :model="dataForm" class="sh-form global-font">
<view style="display: flex;line-height:5vh;margin-bottom: 2vh;">
<text style="font-size: 34rpx;">台车编号:</text><input
<text style="font-size: 34rpx;">托盘编号:</text><input
style="width: 72%; text-align: left;padding-left: 15rpx;" class="barNo"
v-model="dataForm.containerCode" @confirm="inputQuery()" :focus="firstFocus" ref="input"
type="text" placeholder="请扫描台车编号" :border="true" />
type="text" placeholder="请扫描托盘编号" :border="true" />
</view>
<view style="display: flex;line-height: 65rpx;">
<text style="font-size: 34rpx;margin-top: 3px;width:78px;">选择物料:</text>
@ -90,7 +90,7 @@
</view>
<view class="card-content">
<view class="card-content-item">
<text class="item-title">台车编号:</text>
<text class="item-title">托盘编号:</text>
<text class="item-value">{{item.containerCode}}</text>
</view>
@ -271,7 +271,7 @@
e.text = 111
this.$u.api.mouldStorage.callEmptyContainer().then(res => {
if (res.code == 200) {
this.$u.toast("已呼叫台车");
this.$u.toast("已呼叫托盘");
}
})

@ -105,6 +105,12 @@
// this.typeList = res.data
// })
// this.loadList();
// this.$u.api.AvgCarry.getPointList(this.dataForm).then(res=>{
// if(res.code == '200'){
// this.dataList = res.rows
// }
// })
this.$u.api.AvgCarry.getPointList({...this.dataForm,pageSize: 9999}).then(res=>{
this.nextDataList=[]
if(res.code == '200'){
@ -122,21 +128,21 @@
},
//(100pages.json)
onReachBottom() {
this.loadStatus = "loading";
setTimeout(() => {
this.dataForm.pageNum += 1;
this.loadList();
}, 100);
},
onPullDownRefresh () {
this.list = []
//
setTimeout(() => {
//
uni.stopPullDownRefresh ();
}, 1000);
},
// onReachBottom() {
// this.loadStatus = "loading";
// setTimeout(() => {
// this.dataForm.pageNum += 1;
// this.loadList();
// }, 100);
// },
// onPullDownRefresh () {
// this.list = []
// //
// setTimeout(() => {
// //
// uni.stopPullDownRefresh ();
// }, 1000);
// },
methods: {
//
btn(index,item){

@ -3,7 +3,7 @@
<view class="sh-search">
<u-form labelPosition="left" :model="dataForm" class="sh-form global-font">
<u-form-item style="font-size: 32rpx;" label="单据编号" prop="sourceOrderNo" labelWidth="150rpx">
<u-input v-model="dataForm.sourceOrderNo" border style="background-color: #ffffff;"
<u-input v-model="dataForm.orderNo" border style="background-color: #ffffff;"
placeholder="请输入或扫描单号"></u-input>
</u-form-item>
<u-form-item style="font-size: 32rpx;" label="供货单位" prop="companyMnemonic" labelWidth="150rpx">
@ -26,7 +26,7 @@
<view class="sh-card-title" :class="{'borderBottom':!item.businInOrderDVos.length}">
<view class="receipt-number">
<text class="receipt-number-title">单据编号</text>
<text class="receipt-number-value">{{item.sourceOrderNo}}</text>
<text class="receipt-number-value">{{item.orderNo}}</text>
</view>
<view class="card-content">
<view class="card-content-item">
@ -41,6 +41,12 @@
<text class="item-value">{{item.companyName}}</text>
</view>
</view>
<view class="card-content">
<view class="card-content-item">
<text class="item-title">订单类型</text>
<text class="item-value">{{ orderTypeObj[item.orderType] }}</text>
</view>
</view>
<view class="card-content">
<view class="card-content-item">
@ -131,10 +137,18 @@ import { nextTick } from "vue";
bgSpecificationsList:[],
loadStatus: 'loadmore',
detailIds:[],
orderTypeList:[],
orderTypeObj:{},
}
},
onLoad() {
this.loadList();
this.$u.api.orderTypeDict().then(res=>{
// console.log(res.data);
res.data.forEach(item=>{
this.orderTypeObj[item.dictValue] = item.dictLabel
})
})
},
//(100pages.json)
onReachBottom() {

@ -425,7 +425,7 @@
this.$u.toast('收货成功!');
this.$u.route({
url: 'pages/receive/index',
type: 'navigateTo'
type: 'navigateBack'
})
} else {
this.$u.toast(res.msg);

@ -298,7 +298,7 @@
setTimeout(() => {
this.$u.route({
url: 'pages/receive/index',
type: 'navigateTo'
type: 'navigateBack'
})
}, 500)
} else {

@ -121,8 +121,8 @@
let dataArry = res.rows;
for (var i = 0; i < dataArry.length; i++) {
var obj = {
value: dataArry[i].pointNo,
label: dataArry[i].pointName,
value: dataArry[i].pointNo ,
label: dataArry[i].pointName +'----'+ (dataArry[i].isOccupy=='1'?'占用':(dataArry[i].isOccupy=='2'?'已分配':'未占用')) ,
};
this.pointList.push(obj);
}
@ -160,7 +160,7 @@
methods: {
pickUp(){
this.$u.api.release.releasePoint({pointNo:this.dataForm.pointNo}).then(res=>{
this.$u.toast(res.msg);
this.$u.toast(res.msg+'请确认托盘已取走');
this.dataForm.pointNo = ''
})
},

@ -107,8 +107,9 @@
watch: {
//pointNoChild
pointNoChild(){
// console.log(this.pointNoChild);
if(this.pointNoChild === ''){
if(this.pointNoChild === '' || this.pointNoChild === null || this.pointNoChild == undefined){
this.changevalue =this.pointNoChild
}else{
this.changevalue =this.pointNoChild
}
},

Loading…
Cancel
Save