|
|
@ -13,10 +13,6 @@ |
|
|
</scroll-view> |
|
|
</scroll-view> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
<required-location ref="requiredLocation" title="目标库位" :locationCode="toLocationCode" |
|
|
|
|
|
:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode' |
|
|
|
|
|
:locationTypeList="locationTypeList"></required-location> |
|
|
|
|
|
|
|
|
|
|
|
<view class="page-footer"> |
|
|
<view class="page-footer"> |
|
|
<view class="uni-flex u-col-center space-between padding_10" |
|
|
<view class="uni-flex u-col-center space-between padding_10" |
|
|
style="background-color:ghostwhite; width: 100%; "> |
|
|
style="background-color:ghostwhite; width: 100%; "> |
|
|
@ -29,7 +25,7 @@ |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack> |
|
|
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location> |
|
|
<com-message ref="comMessage"></com-message> |
|
|
<com-message ref="comMessage"></com-message> |
|
|
</view> |
|
|
</view> |
|
|
</template> |
|
|
</template> |
|
|
@ -46,6 +42,7 @@ |
|
|
getCurrDateTime, |
|
|
getCurrDateTime, |
|
|
getPackingNumberAndBatch, |
|
|
getPackingNumberAndBatch, |
|
|
getDirectoryItemArray, |
|
|
getDirectoryItemArray, |
|
|
|
|
|
getInventoryStatusName, |
|
|
} from '@/common/basic.js'; |
|
|
} from '@/common/basic.js'; |
|
|
|
|
|
|
|
|
import { |
|
|
import { |
|
|
@ -54,25 +51,23 @@ |
|
|
|
|
|
|
|
|
import { |
|
|
import { |
|
|
getDataSource, |
|
|
getDataSource, |
|
|
createRecordInfo, |
|
|
calcHandleQty, |
|
|
calcHandleQty |
|
|
getScanCount |
|
|
} from '@/common/detail.js'; |
|
|
} from '@/common/detail.js'; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import winScanButton from '@/mycomponents/scan/winScanButton.vue' |
|
|
import winScanButton from '@/mycomponents/scan/winScanButton.vue' |
|
|
import winScanPack from '@/mycomponents/scan/winScanPack.vue' |
|
|
import winScanPack from '@/mycomponents/scan/winScanPack.vue' |
|
|
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' |
|
|
|
|
|
import comMessage from '@/mycomponents/common/comMessage.vue' |
|
|
import comMessage from '@/mycomponents/common/comMessage.vue' |
|
|
import comScrapDetailCard from '@/pages/scrap/coms/comScrapDetailCard.vue' |
|
|
import comScrapDetailCard from '@/pages/scrap/coms/comScrapDetailCard.vue' |
|
|
|
|
|
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" |
|
|
export default { |
|
|
export default { |
|
|
name: 'receipt_detail', |
|
|
name: 'receipt_detail', |
|
|
components: { |
|
|
components: { |
|
|
winScanButton, |
|
|
winScanButton, |
|
|
winScanPack, |
|
|
winScanPack, |
|
|
comScrapDetailCard, |
|
|
comScrapDetailCard, |
|
|
requiredLocation, |
|
|
comMessage, |
|
|
comMessage |
|
|
winScanPackAndLocation |
|
|
}, |
|
|
}, |
|
|
data() { |
|
|
data() { |
|
|
return { |
|
|
return { |
|
|
@ -83,8 +78,6 @@ |
|
|
jobContent: {}, //任务内容 |
|
|
jobContent: {}, //任务内容 |
|
|
subList: [], //接口返回的任务subList |
|
|
subList: [], //接口返回的任务subList |
|
|
detailSource: [], //绑定在页面上的数据源 |
|
|
detailSource: [], //绑定在页面上的数据源 |
|
|
locationTypeList: [], |
|
|
|
|
|
toLocationCode: '', |
|
|
|
|
|
toLocationInfo: {}, |
|
|
toLocationInfo: {}, |
|
|
businessTypeInfo: {}, |
|
|
businessTypeInfo: {}, |
|
|
managementList: [] |
|
|
managementList: [] |
|
|
@ -168,7 +161,6 @@ |
|
|
} else { |
|
|
} else { |
|
|
if (res.data.subList.length > 0) { |
|
|
if (res.data.subList.length > 0) { |
|
|
that.jobContent = res.data; |
|
|
that.jobContent = res.data; |
|
|
that.locationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes); |
|
|
|
|
|
that.subList = res.data.subList; |
|
|
that.subList = res.data.subList; |
|
|
that.detailSource = getDataSource(that.subList) |
|
|
that.detailSource = getDataSource(that.subList) |
|
|
} else { |
|
|
} else { |
|
|
@ -184,49 +176,68 @@ |
|
|
|
|
|
|
|
|
getScanResult(result) { |
|
|
getScanResult(result) { |
|
|
try { |
|
|
try { |
|
|
var packingNumber = result.label.packingNumber; |
|
|
var packingNumber = result.balance.packingNumber; |
|
|
var batch = result.label.batch; |
|
|
var batch = result.balance.batch; |
|
|
var qty = result.label.qty; |
|
|
var qty = result.balance.qty; |
|
|
var itemCode = result.label.itemCode; |
|
|
var itemCode = result.balance.itemCode; |
|
|
|
|
|
var locationCode = result.balance.locationCode; |
|
|
|
|
|
var inventoryStatus = result.balance.inventoryStatus; |
|
|
var detail = this.detailSource.find(r => r.itemCode == itemCode); |
|
|
var detail = this.detailSource.find(r => r.itemCode == itemCode); |
|
|
|
|
|
|
|
|
if (detail == undefined) { |
|
|
if (detail == undefined) { |
|
|
this.showMessage("物料号【" + itemCode + "】不在列表中") |
|
|
this.showErrorMessage("物料号【" + itemCode + "】不在列表中") |
|
|
} else { |
|
|
} else { |
|
|
var itemDetail = detail.subList.find(r => r.packingNumber == packingNumber && r.batch == batch); |
|
|
var itemDetail = detail.subList.find(r => { |
|
|
|
|
|
return r.packingNumber == packingNumber && |
|
|
|
|
|
r.batch == batch |
|
|
|
|
|
}) |
|
|
if (itemDetail == undefined) { |
|
|
if (itemDetail == undefined) { |
|
|
this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中") |
|
|
this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中") |
|
|
} else { |
|
|
} else { |
|
|
if (itemDetail.scaned) { |
|
|
if (itemDetail.scaned) { |
|
|
this.showMessage("箱码【" + packingNumber + "】已经扫描") |
|
|
this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描") |
|
|
} else { |
|
|
} else { |
|
|
|
|
|
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus); |
|
|
|
|
|
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus); |
|
|
|
|
|
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { |
|
|
|
|
|
this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + |
|
|
|
|
|
']不一致,是否继续上架?', res => { |
|
|
|
|
|
if (res) { |
|
|
itemDetail.scaned = true; |
|
|
itemDetail.scaned = true; |
|
|
itemDetail.record = this.createRecordInfo(itemDetail, result.label); |
|
|
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance |
|
|
calcHandleQty(this.detailSource); |
|
|
.qty) ? Number(result.balance.qty) : Number(result.label.qty); |
|
|
this.continueScan() |
|
|
itemDetail.balance = result.balance; |
|
|
|
|
|
itemDetail.balance.balanceQty = result.balance.qty; |
|
|
|
|
|
itemDetail.balance.stdPackQty = result.package.stdPackQty |
|
|
|
|
|
itemDetail.balance.stdPackUnit = result.package.stdPackUnit |
|
|
|
|
|
this.calcHandleQty(); |
|
|
|
|
|
} else { |
|
|
|
|
|
this.scanPopupGetFocus(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
} else { |
|
|
|
|
|
itemDetail.scaned = true; |
|
|
|
|
|
itemDetail.handleQty = Number(result.label.qty) > Number(result.balance.qty) ? Number( |
|
|
|
|
|
result.balance.qty) : Number(result.label.qty); |
|
|
|
|
|
itemDetail.balance = result.balance; |
|
|
|
|
|
itemDetail.balance.balanceQty = result.balance.qty; |
|
|
|
|
|
itemDetail.balance.stdPackQty = result.package.stdPackQty |
|
|
|
|
|
itemDetail.balance.stdPackUnit = result.package.stdPackUnit |
|
|
|
|
|
this.calcHandleQty(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} catch (e) { |
|
|
} catch (e) { |
|
|
this.showErrorMessage(e.message) |
|
|
this.showMessage(e.message) |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
createRecordInfo(detail, label) { |
|
|
|
|
|
var record = {} |
|
|
|
|
|
detail.scaned = true; |
|
|
|
|
|
// let record = JSON.parse(JSON.stringify(detail)); |
|
|
|
|
|
//克隆对象，深度克隆，防止双向绑定同一个变量 |
|
|
|
|
|
Object.assign(record, detail) |
|
|
|
|
|
record.qty = Number(label.qty); |
|
|
|
|
|
record.toLocationCode = this.toLocationCode; |
|
|
|
|
|
return record; |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//继续扫描 |
|
|
//继续扫描 |
|
|
continueScan() { |
|
|
continueScan() { |
|
|
this.scanCount = this.getScanCount(); |
|
|
this.scanCount = getScanCount(this.subList); |
|
|
if (this.scanCount == this.subList.length) { |
|
|
if (this.scanCount == this.subList.length) { |
|
|
this.closeScanPopup(); |
|
|
this.closeScanPopup(); |
|
|
} else { |
|
|
} else { |
|
|
@ -234,46 +245,35 @@ |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
getScanCount(closeScan) { |
|
|
|
|
|
let items = this.subList.filter(r => { |
|
|
|
|
|
if (r.scaned) { |
|
|
|
|
|
return r; |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
let scanCount = items != null ? items.length : 0; |
|
|
|
|
|
return scanCount; |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
updateData() { |
|
|
updateData() { |
|
|
calcHandleQty(this.detailSource); |
|
|
calcHandleQty(this.detailSource); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
scanLocationCode(location, code) { |
|
|
calcHandleQty() { |
|
|
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { |
|
|
calcHandleQty(this.detailSource) |
|
|
this.toLocationCode = code |
|
|
this.continueScan() |
|
|
this.detailSource.forEach(item => { |
|
|
this.$forceUpdate(); |
|
|
item.subList.forEach(detail => { |
|
|
|
|
|
detail.toLocationCode = code |
|
|
|
|
|
}) |
|
|
|
|
|
}) |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
async commit() { |
|
|
|
|
|
if (this.toLocationCode == "") { |
|
|
commit() { |
|
|
this.$refs.comMessage.showMessage('请扫描收货库位', res => { |
|
|
|
|
|
if (res) { |
|
|
this.scanCount = getScanCount(this.subList); |
|
|
this.$refs.requiredLocation.showLocation(); |
|
|
if (this.scanCount == 0) { |
|
|
} |
|
|
this.showErrorMessage("扫描数为0,请先扫描") |
|
|
}); |
|
|
|
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
//允许部分提交 |
|
|
//扫描数量和任务数量相等，直接提交 |
|
|
if (this.jobContent.AllowPartialComplete == 1) { |
|
|
if (this.scanCount == this.subList.length) { |
|
|
|
|
|
this.submitJob(); |
|
|
|
|
|
} else if (this.scanCount < this.subList.length) { |
|
|
|
|
|
//扫描数量小于任务数量，判断是否允许部分提交 |
|
|
|
|
|
if (this.jobContent.allowPartialComplete == "TRUE") { |
|
|
|
|
|
//提交 |
|
|
this.submitJob(); |
|
|
this.submitJob(); |
|
|
} else { |
|
|
} else { |
|
|
this.scanCount = this.getScanCount(); |
|
|
//不允许部分提交，提示 |
|
|
if (this.scanCount < this.subList.length) { |
|
|
|
|
|
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + |
|
|
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + |
|
|
"]箱总共[" + this |
|
|
"]箱总共[" + this |
|
|
.subList.length + "]箱", res => { |
|
|
.subList.length + "]箱", res => { |
|
|
@ -281,69 +281,47 @@ |
|
|
this.openScanPopup(); |
|
|
this.openScanPopup(); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} else { |
|
|
|
|
|
this.submitJob(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
async submitJob() { |
|
|
submitJob() { |
|
|
uni.showLoading({ |
|
|
uni.showLoading({ |
|
|
title: "提交中....", |
|
|
title: "提交中....", |
|
|
mask: true |
|
|
mask: true |
|
|
}); |
|
|
}); |
|
|
var itemCodes = [] |
|
|
//没有目标库位，不查询管理模式 |
|
|
this.detailSource.forEach(item => { |
|
|
var params = this.setParams() |
|
|
itemCodes.push(item.itemCode) |
|
|
console.log("提交参数", JSON.stringify(params)); |
|
|
}) |
|
|
// scrapJobSubmit(params).then(res => { |
|
|
|
|
|
|
|
|
getManagementPrecisions(itemCodes, this.toLocationCode, res => { |
|
|
|
|
|
if (res.success) { |
|
|
|
|
|
this.managementList = res.List; |
|
|
|
|
|
var params = this.setParams(); |
|
|
|
|
|
// scrapJobSubmit(this.id, params).then(res => { |
|
|
|
|
|
// uni.hideLoading() |
|
|
// uni.hideLoading() |
|
|
// if (res.data) { |
|
|
// if (res.data) { |
|
|
// this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data.Number, ) |
|
|
// this.showCommitSuccessMessage("提交成功<br>生成计划外出库记录" + res.data ) |
|
|
// } else { |
|
|
// } else { |
|
|
// this.showErrorMessage("提交失败") |
|
|
// this.showErrorMessage("提交失败"+res.msg) |
|
|
// } |
|
|
// } |
|
|
|
|
|
|
|
|
// }).catch(error => { |
|
|
// }).catch(error => { |
|
|
// uni.hideLoading() |
|
|
// uni.hideLoading() |
|
|
// this.showErrorMessage(error) |
|
|
// this.showErrorMessage(error) |
|
|
// }) |
|
|
// }) |
|
|
} else { |
|
|
|
|
|
uni.hideLoading(); |
|
|
|
|
|
this.showErrorMessage('未获取到管理模式'); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
setParams() { |
|
|
setParams() { |
|
|
var subList = [] |
|
|
var subList = [] |
|
|
var createTime = getCurrDateTime(); |
|
|
|
|
|
var creator = this.$store.state.user.id |
|
|
var creator = this.$store.state.user.id |
|
|
|
|
|
|
|
|
this.detailSource.forEach(item => { |
|
|
this.detailSource.forEach(item => { |
|
|
item.subList.forEach(detail => { |
|
|
item.subList.forEach(detail => { |
|
|
if (detail.scaned) { |
|
|
if (detail.scaned) { |
|
|
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, |
|
|
|
|
|
detail.packingNumber, detail.batch); |
|
|
|
|
|
detail.toPackingNumber = info.packingNumber; |
|
|
|
|
|
detail.toBatch = info.batch; |
|
|
|
|
|
subList.push(detail) |
|
|
subList.push(detail) |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
this.jobContent.subList = subList |
|
|
this.jobContent.subList = subList |
|
|
this.jobContent.createTime = createTime; |
|
|
|
|
|
this.jobContent.creator = creator; |
|
|
this.jobContent.creator = creator; |
|
|
return this.jobContent; |
|
|
return this.jobContent; |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
showMessage(message) { |
|
|
showMessage(message) { |
|
|
setTimeout(r => { |
|
|
setTimeout(r => { |
|
|
this.scanPopupLoseFocus(); |
|
|
this.scanPopupLoseFocus(); |
|
|
@ -367,7 +345,25 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
openScanPopup() { |
|
|
openScanPopup() { |
|
|
this.$refs.scanPopup.openScanPopup(); |
|
|
let fromlocationCode = ''; |
|
|
|
|
|
let fromlocationList = []; |
|
|
|
|
|
for (var i = 0; i < this.detailSource.length; i++) { |
|
|
|
|
|
let item = this.detailSource[i]; |
|
|
|
|
|
item.subList.forEach(l => { |
|
|
|
|
|
//重复的库位不往里面插入 |
|
|
|
|
|
var location = fromlocationList.filter(res => res.fromLocationCode != l.fromLocationCode) |
|
|
|
|
|
if (location.length == 0) { |
|
|
|
|
|
fromlocationList.push(l.fromLocationCode); |
|
|
|
|
|
} |
|
|
|
|
|
//来源库位赋默认值 |
|
|
|
|
|
if (fromlocationCode == '') { |
|
|
|
|
|
if (!l.scaned) { |
|
|
|
|
|
fromlocationCode = l.fromLocationCode; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent); |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
closeScanPopup() { |
|
|
closeScanPopup() { |
|
|
|
