|
|
@ -70,13 +70,13 @@ |
|
|
</uni-th> |
|
|
</uni-th> |
|
|
</uni-tr> |
|
|
</uni-tr> |
|
|
<uni-tr> |
|
|
<uni-tr> |
|
|
<uni-th width="60">库位</uni-th> |
|
|
<uni-th width="60">目标库位</uni-th> |
|
|
<uni-th width="100" align="center"> |
|
|
<uni-th width="100" align="center"> |
|
|
<view class="text_black">{{ item.recommendFromLocationCode }}</view> |
|
|
<view class="text_black">{{ item.recommendToLocationCode }}</view> |
|
|
</uni-th> |
|
|
</uni-th> |
|
|
<uni-th width="100" align="center"> |
|
|
<uni-th width="100" align="center"> |
|
|
<view class="text_black" v-if="item.scaned"> |
|
|
<view class="text_black" v-if="item.scaned"> |
|
|
{{ item.handledFromLocationCode }} |
|
|
{{ item.toLocationCode }} |
|
|
</view> |
|
|
</view> |
|
|
</uni-th> |
|
|
</uni-th> |
|
|
</uni-tr> |
|
|
</uni-tr> |
|
|
@ -84,8 +84,12 @@ |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<view class="choose_marked" v-if="item.scaned"> |
|
|
<view v-if="item.scaned" class="choose_marked_count" |
|
|
<image src="@/static/image_marked.svg"></image> |
|
|
style="background-color: #5FCB94; opacity: 0.65"> |
|
|
|
|
|
<view class="" style="background-color: #5FCB94; width: 200rpx;height: 300rpx;"> |
|
|
|
|
|
|
|
|
|
|
|
</view> |
|
|
|
|
|
<!-- <image src="@/static/image_marked.svg"></image> --> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
@ -106,11 +110,11 @@ |
|
|
|
|
|
|
|
|
<script> |
|
|
<script> |
|
|
import { |
|
|
import { |
|
|
getUnProducePickDetail, |
|
|
getUnProduceReturnDetail, |
|
|
takeIssueJob, |
|
|
takeIssueJob, |
|
|
cancelTakeIssueJob, |
|
|
cancelTakeIssueJob, |
|
|
finshUnProduceReturnJob, |
|
|
finshUnProduceReturnJob, |
|
|
issueBalances |
|
|
getBalancesByFilter |
|
|
} from '@/api/index.js'; |
|
|
} from '@/api/index.js'; |
|
|
import { |
|
|
import { |
|
|
getJobStatuStyle, |
|
|
getJobStatuStyle, |
|
|
@ -183,13 +187,12 @@ |
|
|
// } |
|
|
// } |
|
|
this.getDetail(); |
|
|
this.getDetail(); |
|
|
}, |
|
|
}, |
|
|
onReady() { |
|
|
onReady() {}, |
|
|
}, |
|
|
|
|
|
//返回首页 |
|
|
//返回首页 |
|
|
onNavigationBarButtonTap(e) { |
|
|
onNavigationBarButtonTap(e) { |
|
|
if (e.index === 0) { |
|
|
if (e.index === 0) { |
|
|
goHome(); |
|
|
goHome(); |
|
|
}else if(e.index === 1){ |
|
|
} else if (e.index === 1) { |
|
|
window.location.reload(); |
|
|
window.location.reload(); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
@ -231,7 +234,7 @@ |
|
|
let params = { |
|
|
let params = { |
|
|
id: that.id, |
|
|
id: that.id, |
|
|
}; |
|
|
}; |
|
|
getUnProducePickDetail(params) |
|
|
getUnProduceReturnDetail(params) |
|
|
.then(item => { |
|
|
.then(item => { |
|
|
console.log('item', item); |
|
|
console.log('item', item); |
|
|
that.datacontent = item; |
|
|
that.datacontent = item; |
|
|
@ -261,9 +264,10 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
getScanResult(result) { |
|
|
getScanResult(result) { |
|
|
//零件是否已经被扫描过 |
|
|
|
|
|
let item = this.details.find(r => r.recommendPackingCode === result.data.packingCode && r |
|
|
let item = this.details.find(r => r.recommendPackingCode === result.data.packingCode && r |
|
|
.scanPackingCode != result.data.packingCode); |
|
|
.scanPackingCode != result.data.packingCode); |
|
|
|
|
|
|
|
|
if (item != undefined && item.scaned) { |
|
|
if (item != undefined && item.scaned) { |
|
|
showConfirmMsg('扫描的箱码【' + result.data.packingCode + '】匹配到任务中的【' + item.scanPackingCode + |
|
|
showConfirmMsg('扫描的箱码【' + result.data.packingCode + '】匹配到任务中的【' + item.scanPackingCode + |
|
|
'】箱,是否要重新匹配任务中的【' + item.scanPackingCode + '】箱?', |
|
|
'】箱,是否要重新匹配任务中的【' + item.scanPackingCode + '】箱?', |
|
|
@ -282,6 +286,29 @@ |
|
|
this.handledPackCode(result, false); |
|
|
this.handledPackCode(result, false); |
|
|
} |
|
|
} |
|
|
this.scrollToTop(); |
|
|
this.scrollToTop(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// //零件是否已经被扫描过 |
|
|
|
|
|
// let item = this.details.find(r => r.recommendPackingCode === result.data.packingCode && r |
|
|
|
|
|
// .scanPackingCode != result.data.packingCode); |
|
|
|
|
|
// if (item != undefined && item.scaned) { |
|
|
|
|
|
// showConfirmMsg('扫描的箱码【' + result.data.packingCode + '】匹配到任务中的【' + item.scanPackingCode + |
|
|
|
|
|
// '】箱,是否要重新匹配任务中的【' + item.scanPackingCode + '】箱?', |
|
|
|
|
|
// confirm => { |
|
|
|
|
|
// if (confirm) { |
|
|
|
|
|
// this.handledPackCode(result, true); |
|
|
|
|
|
// } else { |
|
|
|
|
|
// return; |
|
|
|
|
|
// } |
|
|
|
|
|
// }) |
|
|
|
|
|
// } else { |
|
|
|
|
|
// if (this.allCount === this.scanCount) { |
|
|
|
|
|
// this.showMessage("零件已经全部扫描完成"); |
|
|
|
|
|
// return; |
|
|
|
|
|
// } |
|
|
|
|
|
// this.handledPackCode(result, false); |
|
|
|
|
|
// } |
|
|
|
|
|
// this.scrollToTop(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
//处理箱标签 |
|
|
//处理箱标签 |
|
|
@ -304,71 +331,76 @@ |
|
|
dyIssue(result, scaned) { |
|
|
dyIssue(result, scaned) { |
|
|
let that = this; |
|
|
let that = this; |
|
|
var itemCode = that.details.find(r => { |
|
|
var itemCode = that.details.find(r => { |
|
|
return r.itemCode === result.data.itemCode&& |
|
|
return r.itemCode === result.data.itemCode && |
|
|
r.scaned === scaned |
|
|
r.scaned === scaned |
|
|
}) |
|
|
}) |
|
|
if (itemCode == undefined) { |
|
|
if (itemCode == undefined) { |
|
|
that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中'); |
|
|
that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中'); |
|
|
}else { |
|
|
} else { |
|
|
|
|
|
|
|
|
//零件号相同、箱码相同 |
|
|
//零件号相同、箱码相同 |
|
|
var itemCode1 = that.details.find(r => { |
|
|
var itemCode1 = that.details.find(r => { |
|
|
return r.itemCode === result.data.itemCode&& |
|
|
return r.itemCode === result.data.itemCode && |
|
|
r.recommendPackingCode === result.data.code |
|
|
r.recommendPackingCode === result.data.code |
|
|
r.scaned === scaned |
|
|
r.scaned === scaned |
|
|
}) |
|
|
}) |
|
|
//零件号相同、箱码不相同 |
|
|
//零件号相同、箱码不相同 |
|
|
if(itemCode1 == undefined){ |
|
|
if (itemCode1 == undefined) { |
|
|
var itemCode2 = that.details.find(r => { |
|
|
var itemCode2 = that.details.find(r => { |
|
|
return r.itemCode === result.data.itemCode&& |
|
|
return r.itemCode === result.data.itemCode && |
|
|
r.recommendLot === result.data.lot |
|
|
r.recommendLot === result.data.lot && |
|
|
&&r.scaned === scaned |
|
|
r.scaned === scaned |
|
|
}) |
|
|
}) |
|
|
//零件号相同、箱码不相同、批次相同 |
|
|
//零件号相同、箱码不相同、批次相同 |
|
|
if(itemCode2==undefined){ |
|
|
if (itemCode2 == undefined) { |
|
|
//零件号相同、箱码不相同、批次不相同 |
|
|
//零件号相同、箱码不相同、批次不相同 |
|
|
console.log("零件号相同、箱码不相同、批次不相同") |
|
|
console.log("零件号相同、箱码不相同、批次不相同") |
|
|
setTimeout(res => { |
|
|
that.currentItem = itemCode; |
|
|
showConfirmMsg(itemCode.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => { |
|
|
that.afterScanPackLabel(result); |
|
|
if (confirm) { |
|
|
// setTimeout(res => { |
|
|
that.currentItem = itemCode; |
|
|
// showConfirmMsg(itemCode.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => { |
|
|
that.afterScanPackLabel(result); |
|
|
// if (confirm) { |
|
|
} else { |
|
|
// that.currentItem = itemCode; |
|
|
that.scanPopupGetFocus(); |
|
|
// that.afterScanPackLabel(result); |
|
|
} |
|
|
// } else { |
|
|
}); |
|
|
// that.scanPopupGetFocus(); |
|
|
}, 100) |
|
|
// } |
|
|
|
|
|
// }); |
|
|
}else { |
|
|
// }, 100) |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
console.log("零件号相同、箱码不相同、批次相同") |
|
|
console.log("零件号相同、箱码不相同、批次相同") |
|
|
//零件号相同、箱码不相同、批次相同 |
|
|
//零件号相同、箱码不相同、批次相同 |
|
|
that.currentItem = itemCode2; |
|
|
that.currentItem = itemCode2; |
|
|
that.afterScanPackLabel(result); |
|
|
that.afterScanPackLabel(result); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else { |
|
|
} else { |
|
|
//零件号相同、箱码相同、批次相同 |
|
|
//零件号相同、箱码相同、批次相同 |
|
|
var itemCode3 = that.details.find(r => { |
|
|
var itemCode3 = that.details.find(r => { |
|
|
return r.itemCode === result.data.itemCode&& |
|
|
return r.itemCode === result.data.itemCode && |
|
|
r.recommendPackingCode === result.data.code&& |
|
|
r.recommendPackingCode === result.data.code && |
|
|
r.recommendLot === result.data.lot |
|
|
r.recommendLot === result.data.lot && |
|
|
&&r.scaned === scaned |
|
|
r.scaned === scaned |
|
|
}) |
|
|
}) |
|
|
if(itemCode3==undefined){ |
|
|
if (itemCode3 == undefined) { |
|
|
//零件号相同、箱码相同、批次不同 |
|
|
//零件号相同、箱码相同、批次不同 |
|
|
console.log("零件号相同、箱码相同、批次不同") |
|
|
console.log("零件号相同、箱码相同、批次不同") |
|
|
setTimeout(res => { |
|
|
that.currentItem = itemCode1; |
|
|
showConfirmMsg(itemCode1.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => { |
|
|
that.afterScanPackLabel(result); |
|
|
if (confirm) { |
|
|
// setTimeout(res => { |
|
|
that.currentItem = itemCode1; |
|
|
// showConfirmMsg(itemCode1.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => { |
|
|
that.afterScanPackLabel(result); |
|
|
// if (confirm) { |
|
|
} else { |
|
|
// that.currentItem = itemCode1; |
|
|
that.scanPopupGetFocus(); |
|
|
// that.afterScanPackLabel(result); |
|
|
} |
|
|
// } else { |
|
|
}); |
|
|
// that.scanPopupGetFocus(); |
|
|
}, 100) |
|
|
// } |
|
|
|
|
|
// }); |
|
|
}else { |
|
|
// }, 100) |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
console.log("零件号相同、箱码相同、批次相同") |
|
|
console.log("零件号相同、箱码相同、批次相同") |
|
|
//零件号相同、箱码相同、批次相同 |
|
|
//零件号相同、箱码相同、批次相同 |
|
|
that.currentItem = itemCode3; |
|
|
that.currentItem = itemCode3; |
|
|
@ -376,160 +408,63 @@ |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// that.currentItem = that.details.find(r => { |
|
|
|
|
|
// return r.itemCode === result.data.itemCode && |
|
|
|
|
|
// r.recommendPackingCode === result.data.code && |
|
|
|
|
|
// r.recommendLot === result.data.lot && |
|
|
|
|
|
// r.scaned === scaned |
|
|
|
|
|
// }); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// //没找到符合的箱码、零件号、箱码、批次都相等 |
|
|
|
|
|
// if (that.currentItem === undefined) { |
|
|
|
|
|
// var itemCode = that.details.find(res => { |
|
|
|
|
|
// return res.itemCode === result.data.itemCode && |
|
|
|
|
|
// res.scaned === scaned |
|
|
|
|
|
// }) |
|
|
|
|
|
// //零件号相等 |
|
|
|
|
|
// if (itemCode != undefined) { |
|
|
|
|
|
// var lot = that.details.find(res => { |
|
|
|
|
|
// return res.itemCode === result.data.itemCode && |
|
|
|
|
|
// res.recommendLot === result.data.lot && |
|
|
|
|
|
// res.scaned === scaned |
|
|
|
|
|
// }) |
|
|
|
|
|
// if (lot != undefined) { |
|
|
|
|
|
// //通过 |
|
|
|
|
|
// that.currentItem = lot; |
|
|
|
|
|
// that.afterScanPackLabel(result); |
|
|
|
|
|
// } else { |
|
|
|
|
|
// //批次不相等 |
|
|
|
|
|
// // 提示未执行先进先出或者不是最先批次。 |
|
|
|
|
|
// setTimeout(res => { |
|
|
|
|
|
// showConfirmMsg('未执行先进先出或不是最先批次,是否继续?', confirm => { |
|
|
|
|
|
// if (confirm) { |
|
|
|
|
|
// that.currentItem = itemCode; |
|
|
|
|
|
// that.afterScanPackLabel(result); |
|
|
|
|
|
// } else { |
|
|
|
|
|
// that.scanPopupGetFocus(); |
|
|
|
|
|
// } |
|
|
|
|
|
// }); |
|
|
|
|
|
// }, 100) |
|
|
|
|
|
|
|
|
|
|
|
// } |
|
|
|
|
|
// } else { |
|
|
|
|
|
// //零件号不相等 |
|
|
|
|
|
// var lot = that.details.find(res => { |
|
|
|
|
|
// return res.recommendLot === result.data.lot && |
|
|
|
|
|
// res.scaned === scaned |
|
|
|
|
|
// }) |
|
|
|
|
|
// //批次相等 |
|
|
|
|
|
// if (lot != undefined) { |
|
|
|
|
|
// // 在该任务中未找到零件。 |
|
|
|
|
|
// that.showScanMessage('在该任务中未找到零件'); |
|
|
|
|
|
// } else { |
|
|
|
|
|
// //零件号不相等,批次不相等 |
|
|
|
|
|
// that.showScanMessage('所扫描的物料不在任务中'); |
|
|
|
|
|
// } |
|
|
|
|
|
// } |
|
|
|
|
|
// } else { |
|
|
|
|
|
// that.afterScanPackLabel(result); |
|
|
|
|
|
// } |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
afterScanPackLabel(result) { |
|
|
|
|
|
let that = this; |
|
|
|
|
|
that.getBalance(result, res => { |
|
|
|
|
|
if (res.totalCount === 1) { |
|
|
|
|
|
that.balancesItem = res.items[0]; |
|
|
|
|
|
if (that.balancesItem != null || that.balancesItem != undefined) { |
|
|
|
|
|
that.setBalanceInfo(this.currentItem, that.balancesItem); |
|
|
|
|
|
that.scanPopupGetFocus(); |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
this.$refs['issueitems'].openPopup(res.items); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
setParams(item, result) { |
|
|
//查询库存记录 |
|
|
|
|
|
getBalance(result, callback) { |
|
|
|
|
|
uni.showLoading({ |
|
|
|
|
|
title: '扫描中...', |
|
|
|
|
|
mask: true |
|
|
|
|
|
}) |
|
|
|
|
|
let params = { |
|
|
|
|
|
pageSize: 1000, |
|
|
|
|
|
pageIndex: 1, |
|
|
|
|
|
packingCode: result.data.code, |
|
|
|
|
|
itemCode: result.data.itemCode, |
|
|
|
|
|
lot: result.data.lot, |
|
|
|
|
|
inventoryStatus: 2, //库存状态默认2 |
|
|
|
|
|
locationTypes: [2, 3], |
|
|
|
|
|
sortBy: 'PackingCode asc' |
|
|
|
|
|
}; |
|
|
|
|
|
issueBalances(params) |
|
|
|
|
|
.then(res => { |
|
|
|
|
|
if (res.totalCount === 0) { |
|
|
|
|
|
this.showScanMessage('按零件号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' + |
|
|
|
|
|
result |
|
|
|
|
|
.data.lot + '】在【原料库、半成品库】未查询到库存信息'); |
|
|
|
|
|
} else { |
|
|
|
|
|
callback(res); |
|
|
|
|
|
} |
|
|
|
|
|
uni.hideLoading(); |
|
|
|
|
|
}) |
|
|
|
|
|
.catch(err => { |
|
|
|
|
|
this.showScanMessage(err.message); |
|
|
|
|
|
uni.hideLoading(); |
|
|
|
|
|
}); |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
setBalanceInfo(item, balanceItem) { |
|
|
|
|
|
item.scaned = true; |
|
|
item.scaned = true; |
|
|
item.scanDate = new Date() //增加扫描信息属性 |
|
|
item.scanDate = new Date() //增加扫描信息属性 |
|
|
item.fromLocationCode = balanceItem.locationCode; |
|
|
item.fromLocationCode = ""; |
|
|
item.fromLocationErpCode = balanceItem.locationErpCode; |
|
|
item.fromLocationErpCode = ""; |
|
|
item.toLocationCode = item.locationCode; |
|
|
item.toLocationCode = result.data.locationCode; |
|
|
item.toLocationErpCode = item.locationErpCode; |
|
|
item.toLocationErpCode = result.data.locationErpCode; |
|
|
|
|
|
|
|
|
//实际库存数量 |
|
|
//实际库存数量 |
|
|
item.handledContainerCode = balanceItem.containerCode; |
|
|
item.handledContainerCode = result.data.containerCode; |
|
|
item.handledPackingCode = balanceItem.packingCode; |
|
|
item.handledPackingCode = result.data.packingCode; |
|
|
item.handledBatch = balanceItem.batch; |
|
|
item.handledBatch = result.data.batch; |
|
|
item.handledLot = balanceItem.lot; |
|
|
item.handledLot = result.data.lot; |
|
|
|
|
|
|
|
|
item.defaultHandleQty = balanceItem.qty; |
|
|
item.defaultHandleQty = result.data.qty; |
|
|
item.handledQty = balanceItem.qty; |
|
|
item.handledQty = result.data.qty; |
|
|
item.handledFromLocationCode = balanceItem.locationCode; |
|
|
item.handledFromLocationCode = ""; |
|
|
item.handledFromLocationArea = balanceItem.locationArea; |
|
|
item.handledFromLocationArea = ""; |
|
|
item.handledFromLocationGroup = balanceItem.locationErpCode; |
|
|
item.handledFromLocationGroup = ""; |
|
|
item.handledFromLocationErpCode = balanceItem.locationGroup; |
|
|
item.handledFromLocationErpCode = ""; |
|
|
item.handledFromWarehouseCode = balanceItem.warehouseCode; |
|
|
item.handledFromWarehouseCode = ""; |
|
|
|
|
|
|
|
|
item.toLocationArea = balanceItem.locationArea; |
|
|
item.handledToLocationCode = item.recommendToLocationCode, |
|
|
item.toLocationGroup = balanceItem.locationGroup; |
|
|
item.handledToLocationArea = item.recommendToLocationArea |
|
|
item.toLocationErpCode = balanceItem.locationErpCode; |
|
|
item.handledToLocationGroup = item.recommendToLocationGroup |
|
|
|
|
|
item.handledToLocationErpCode = item.recommendToLocationErpCode |
|
|
|
|
|
item.handledToWarehouseCode = item.recommendToWarehouseCode |
|
|
|
|
|
|
|
|
|
|
|
item.toLocationCode = item.recommendToLocationCode; |
|
|
|
|
|
|
|
|
|
|
|
item.recommendLot = result.data.lot; |
|
|
|
|
|
item.recommendPackingCode = result.data.packingCode; |
|
|
|
|
|
|
|
|
|
|
|
item.toLocationArea = ""; |
|
|
|
|
|
item.toLocationGroup = ""; |
|
|
|
|
|
item.toLocationErpCode = ""; |
|
|
|
|
|
|
|
|
//当前扫描标签的信息 |
|
|
//当前扫描标签的信息 |
|
|
item.scanItemCode = this.currentScanLebel.data.itemCode; |
|
|
item.scanItemCode = this.currentScanLebel.data.itemCode; |
|
|
item.scanPackingCode = this.currentScanLebel.data.code; |
|
|
item.scanPackingCode = this.currentScanLebel.data.code; |
|
|
item.scanLot = this.currentScanLebel.data.lot; |
|
|
item.scanLot = this.currentScanLebel.data.lot; |
|
|
|
|
|
|
|
|
item.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; |
|
|
item.worker = localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN; |
|
|
item.uom = balanceItem.uom; |
|
|
item.uom = result.data.uom; |
|
|
|
|
|
|
|
|
this.details.sort(compareDesc('scanDate')); //按扫描信息排 |
|
|
this.details.sort(compareDesc('scanDate')); //按扫描信息排 |
|
|
this.calcScanCount(); //计算扫描的数量 |
|
|
this.calcScanCount(); //计算扫描的数量 |
|
|
this.$forceUpdate(); |
|
|
this.$forceUpdate(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
selectedBalanceItem(balanceItem) { |
|
|
afterScanPackLabel(result) { |
|
|
this.setBalanceInfo(this.currentItem, balanceItem); |
|
|
this.setParams(this.currentItem, result) |
|
|
|
|
|
this.scanPopupGetFocus(); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
// //接收 |
|
|
// //接收 |
|
|
receive(callback) { |
|
|
receive(callback) { |
|
|
let params = { |
|
|
let params = { |
|
|
@ -548,12 +483,12 @@ |
|
|
submit() { |
|
|
submit() { |
|
|
let that = this; |
|
|
let that = this; |
|
|
if (that.datacontent.details.length === 0) { |
|
|
if (that.datacontent.details.length === 0) { |
|
|
this.showMessage('该任务没有要上架的零件'); |
|
|
this.showMessage('该任务没有选择的零件'); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
let checkItems = that.details.filter(r => r.scaned === true); |
|
|
let checkItems = that.details.filter(r => r.scaned === true); |
|
|
if (checkItems.length < that.details.length) { |
|
|
if (checkItems.length < that.details.length) { |
|
|
showConfirmMsg('还有未扫描的零件,是否继续发料', confirm => { |
|
|
showConfirmMsg('还有未扫描的零件,是否提交?', confirm => { |
|
|
if (confirm) { |
|
|
if (confirm) { |
|
|
that.finsh(); |
|
|
that.finsh(); |
|
|
} |
|
|
} |
|
|
@ -563,27 +498,6 @@ |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
handleLocation() { |
|
|
|
|
|
let that = this; |
|
|
|
|
|
if (that.details[0].requestLocationCode != that.toLocation) { |
|
|
|
|
|
showConfirmMsg('目标库位【' + that.toLocation + '】与需求库位不一致,是否要将以上零件发到目标库位?', confirm => { |
|
|
|
|
|
if (confirm) { |
|
|
|
|
|
that.handledPackingCode(); |
|
|
|
|
|
} else { |
|
|
|
|
|
that.clearScanLocation(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
} else { |
|
|
|
|
|
showConfirmMsg('是否要将以上零件发到目标库位:【' + that.toLocation + "】", confirm => { |
|
|
|
|
|
if (confirm) { |
|
|
|
|
|
that.handledPackingCode(); |
|
|
|
|
|
} else { |
|
|
|
|
|
that.clearScanLocation(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
//判断是否有推荐箱码为空的情况 |
|
|
//判断是否有推荐箱码为空的情况 |
|
|
handledPackingCode() { |
|
|
handledPackingCode() { |
|
|
let that = this; |
|
|
let that = this; |
|
|
@ -596,7 +510,7 @@ |
|
|
items.forEach(r => { |
|
|
items.forEach(r => { |
|
|
packingCodes += r.recommendPackingCode + ',' |
|
|
packingCodes += r.recommendPackingCode + ',' |
|
|
}) |
|
|
}) |
|
|
showConfirmMsg('以下箱码对应的实际箱码为空,是否要继续发料?【' + packingCodes + "】", confirm => { |
|
|
showConfirmMsg('以下箱码对应的实际箱码为空,是否要继续退料?【' + packingCodes + "】", confirm => { |
|
|
if (confirm) { |
|
|
if (confirm) { |
|
|
that.finsh(); |
|
|
that.finsh(); |
|
|
} else { |
|
|
} else { |
|
|
@ -617,9 +531,11 @@ |
|
|
that.datacontent.completeUserId = localStorage.getItem('userId') |
|
|
that.datacontent.completeUserId = localStorage.getItem('userId') |
|
|
that.datacontent.completeUserName = localStorage.getItem('userName_CN') |
|
|
that.datacontent.completeUserName = localStorage.getItem('userName_CN') |
|
|
that.datacontent.completeTime = getCurrDateTime(); |
|
|
that.datacontent.completeTime = getCurrDateTime(); |
|
|
that.datacontent.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; |
|
|
that.datacontent.worker = localStorage.userName_CN == "" ? localStorage.userName : localStorage |
|
|
|
|
|
.userName_CN; |
|
|
that.datacontent.details = that.details; |
|
|
that.datacontent.details = that.details; |
|
|
let params = JSON.stringify(that.datacontent); |
|
|
let params = JSON.stringify(that.datacontent); |
|
|
|
|
|
console.log("提交", params) |
|
|
finshUnProduceReturnJob(that.id, params) |
|
|
finshUnProduceReturnJob(that.id, params) |
|
|
.then(res => { |
|
|
.then(res => { |
|
|
uni.hideLoading(); |
|
|
uni.hideLoading(); |
|
|
@ -636,11 +552,12 @@ |
|
|
|
|
|
|
|
|
//返回任务列表页 |
|
|
//返回任务列表页 |
|
|
backJobList(delay) { |
|
|
backJobList(delay) { |
|
|
setTimeout(() => { |
|
|
uni.navigateBack() |
|
|
uni.navigateTo({ |
|
|
// setTimeout(() => { |
|
|
url: './issueNoFIFO' |
|
|
// uni.navigateTo({ |
|
|
}) |
|
|
// url: './unProduceReturn' |
|
|
}, 1000) |
|
|
// }) |
|
|
|
|
|
// }, 1000) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
clear() { |
|
|
clear() { |
|
|
@ -712,12 +629,12 @@ |
|
|
}, |
|
|
}, |
|
|
qtyChanged(value, item, index) { |
|
|
qtyChanged(value, item, index) { |
|
|
if (value <= 0) { |
|
|
if (value <= 0) { |
|
|
this.showMessage('发料数量不能小于或等于0') |
|
|
this.showMessage('退料数量不能小于或等于0') |
|
|
item.handledQty = item.defaultHandleQty |
|
|
item.handledQty = item.defaultHandleQty |
|
|
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); |
|
|
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); |
|
|
} else if (value > item.defaultHandleQty) { |
|
|
} else if (value > item.defaultHandleQty) { |
|
|
item.handledQty = item.defaultHandleQty |
|
|
item.handledQty = item.defaultHandleQty |
|
|
this.showMessage('发料数量不能大于库存数量:' + item.handledQty) |
|
|
this.showMessage('退料数量不能大于库存数量:' + item.handledQty) |
|
|
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); |
|
|
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
