|
|
@ -17,7 +17,7 @@ |
|
|
</scroll-view> |
|
|
</scroll-view> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
<requiredLocation title="目标库位" :locationCode="toLocationCode" :isShowEdit="true" |
|
|
<requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode" :isShowEdit="true" |
|
|
:locationTypeList="tolocationTypeList"></requiredLocation> |
|
|
:locationTypeList="tolocationTypeList"></requiredLocation> |
|
|
<u-line></u-line> |
|
|
<u-line></u-line> |
|
|
|
|
|
|
|
|
@ -48,7 +48,9 @@ |
|
|
} from '@/api/request2.js'; |
|
|
} from '@/api/request2.js'; |
|
|
|
|
|
|
|
|
import { |
|
|
import { |
|
|
goHome |
|
|
goHome, |
|
|
|
|
|
updateTitle, |
|
|
|
|
|
getPackingNumberAndBatch |
|
|
} from '@/common/basic.js'; |
|
|
} from '@/common/basic.js'; |
|
|
|
|
|
|
|
|
import { |
|
|
import { |
|
|
@ -61,6 +63,9 @@ |
|
|
createDetailInfo, |
|
|
createDetailInfo, |
|
|
calcHandleQty |
|
|
calcHandleQty |
|
|
} from '@/common/record.js'; |
|
|
} from '@/common/record.js'; |
|
|
|
|
|
import { |
|
|
|
|
|
getManagementPrecisions |
|
|
|
|
|
} from '@/common/balance.js'; |
|
|
|
|
|
|
|
|
import winScanButton from '@/mycomponents/scan/winScanButton.vue' |
|
|
import winScanButton from '@/mycomponents/scan/winScanButton.vue' |
|
|
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' |
|
|
import requiredLocation from '@/mycomponents/location/requiredLocation.vue' |
|
|
@ -99,6 +104,17 @@ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
watch: { |
|
|
|
|
|
fromType: { |
|
|
|
|
|
handler(newName, oldName) { |
|
|
|
|
|
this.updateTitle() |
|
|
|
|
|
}, |
|
|
|
|
|
immediate: true, |
|
|
|
|
|
deep: true |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
data() { |
|
|
data() { |
|
|
return { |
|
|
return { |
|
|
id: '', |
|
|
id: '', |
|
|
@ -113,6 +129,7 @@ |
|
|
toLocationCode: '', |
|
|
toLocationCode: '', |
|
|
tolocationTypeList: [], |
|
|
tolocationTypeList: [], |
|
|
businessType: {}, |
|
|
businessType: {}, |
|
|
|
|
|
showToLoaction:false |
|
|
|
|
|
|
|
|
}; |
|
|
}; |
|
|
}, |
|
|
}, |
|
|
@ -135,7 +152,10 @@ |
|
|
this.$refs.comMessage.showBreakMessage(res.message); |
|
|
this.$refs.comMessage.showBreakMessage(res.message); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
//返回首页 |
|
|
//返回首页 |
|
|
onNavigationBarButtonTap(e) { |
|
|
onNavigationBarButtonTap(e) { |
|
|
if (e.index === 0) { |
|
|
if (e.index === 0) { |
|
|
@ -150,6 +170,25 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
methods: { |
|
|
methods: { |
|
|
|
|
|
updateTitle(){ |
|
|
|
|
|
if(this.businessTypeCode=='returnToStore'){ |
|
|
|
|
|
if(this.fromType == 'requestType'){ |
|
|
|
|
|
updateTitle("合格退料申请") |
|
|
|
|
|
this.showToLoaction=false |
|
|
|
|
|
}else { |
|
|
|
|
|
updateTitle("合格退料记录") |
|
|
|
|
|
this.showToLoaction=true |
|
|
|
|
|
} |
|
|
|
|
|
}else if(this.businessTypeCode=='returnToHold'){ |
|
|
|
|
|
if(this.fromType == 'requestType'){ |
|
|
|
|
|
updateTitle("隔离退料申请") |
|
|
|
|
|
this.showToLoaction=false |
|
|
|
|
|
}else { |
|
|
|
|
|
updateTitle("隔离退料记录") |
|
|
|
|
|
this.showToLoaction=true |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
showFromLocationPopup() { |
|
|
showFromLocationPopup() { |
|
|
this.$nextTick(() => { |
|
|
this.$nextTick(() => { |
|
|
this.$refs.scanFromLocationCode.openScanPopup(); |
|
|
this.$refs.scanFromLocationCode.openScanPopup(); |
|
|
@ -208,7 +247,6 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
removePack() { |
|
|
removePack() { |
|
|
for (var i = 0; i < this.detailSource.length; i++) { |
|
|
for (var i = 0; i < this.detailSource.length; i++) { |
|
|
var item = this.detailSource[i]; |
|
|
var item = this.detailSource[i]; |
|
|
@ -236,103 +274,97 @@ |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
commit() { |
|
|
commit() { |
|
|
if (this.toLocationCode == "") { |
|
|
if (this.showToLoaction &&this.toLocationCode == "") { |
|
|
this.showMessage("请先选择目标库位") |
|
|
this.showMessage("请先选择目标库位") |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
//允许部分提交 |
|
|
|
|
|
if (this.jobContent.allowPartialComplete == "TRUE") { |
|
|
uni.showLoading({ |
|
|
uni.showLoading({ |
|
|
title: "提交中....", |
|
|
title: "提交中....", |
|
|
mask: true |
|
|
mask: true |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
if(this.fromType=="requestType"){ |
|
|
var params = this.setParams(); |
|
|
var params = this.setParams(false) |
|
|
console.log("提交" + JSON.stringify(params)) |
|
|
console.log("提交" + JSON.stringify(params)) |
|
|
// (this.id, params).then(res => { |
|
|
// productionReturnRequestSubmit(params).then(res => { |
|
|
// uni.hideLoading() |
|
|
// uni.hideLoading() |
|
|
// if (res.data) { |
|
|
// if (res.data) { |
|
|
// var hint = res.data.Number; |
|
|
// this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, ) |
|
|
// this.showCommitSuccessMessage("提交成功" + hint, ) |
|
|
|
|
|
|
|
|
|
|
|
// } else { |
|
|
// } else { |
|
|
// this.showErrorMessage("提交失败") |
|
|
// this.showErrorMessage("提交失败[" + res.msg + "]") |
|
|
// } |
|
|
// } |
|
|
// }).catch(error => { |
|
|
// }).catch(error => { |
|
|
// uni.hideLoading() |
|
|
// uni.hideLoading() |
|
|
// this.showErrorMessage(error) |
|
|
// this.showErrorMessage(error) |
|
|
// }) |
|
|
// }) |
|
|
} else { |
|
|
}else { |
|
|
this.calcScanCount(); |
|
|
//记录有目标库位，需要查询管理模式 |
|
|
if (this.scanCount < this.subList.length) { |
|
|
var itemCodes = [] |
|
|
this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList.length + |
|
|
this.detailSource.forEach(item => { |
|
|
"]"); |
|
|
itemCodes.push(item.itemCode) |
|
|
} |
|
|
}) |
|
|
|
|
|
//获取管理模式，封装参数 |
|
|
|
|
|
getManagementPrecisions(itemCodes, this.toLocationCode, res => { |
|
|
|
|
|
if (res.success) { |
|
|
|
|
|
this.managementList = res.list; |
|
|
|
|
|
var params = this.setParams(true) |
|
|
|
|
|
console.log("提交参数", JSON.stringify(params)); |
|
|
|
|
|
|
|
|
|
|
|
// productionReturnRecordSubmit(params).then(res => { |
|
|
|
|
|
// uni.hideLoading() |
|
|
|
|
|
// if (res.data) { |
|
|
|
|
|
// this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, ) |
|
|
|
|
|
// } else { |
|
|
|
|
|
// this.showErrorMessage("提交失败"+res.msg) |
|
|
|
|
|
// } |
|
|
|
|
|
// }).catch(error => { |
|
|
|
|
|
// uni.hideLoading() |
|
|
|
|
|
// this.showErrorMessage(error) |
|
|
|
|
|
// }) |
|
|
|
|
|
} else { |
|
|
|
|
|
uni.hideLoading(); |
|
|
|
|
|
this.showErrorMessage(res.message); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
setParams() { |
|
|
setParams(queryModel) { |
|
|
var params = { |
|
|
var subList = [] |
|
|
requestNumber: this.jobContent.requestNumber, |
|
|
var creator = this.$store.state.user.id |
|
|
jobNumber: "", |
|
|
this.detailSource.forEach(item => { |
|
|
asnNumber: this.jobContent.asnNumber, |
|
|
item.subList.forEach(detail => { |
|
|
ppNumber: this.jobContent.ppNumber, |
|
|
if (detail.scaned) { |
|
|
supplierCode: this.jobContent.supplierCode, |
|
|
// var subItem = {}; |
|
|
ReceiptDock: this.jobContent.ReceiptDock, |
|
|
// Object.assign(subItem, detail) |
|
|
carrierCode: this.jobContent.carrierCode, |
|
|
if (queryModel) { |
|
|
transferMode: this.jobContent.transferMode, |
|
|
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, |
|
|
vehiclePlateNumber: this.jobContent.vehiclePlateNumber, |
|
|
detail.packingNumber, detail.batch); |
|
|
fromWarehouseCode: this.toLocationInfo.WarehouseCode, |
|
|
detail.toPackingNumber = info.packingNumber;; |
|
|
toWarehouseCode: this.toLocationInfo.WarehouseCode, |
|
|
detail.toContainerNumber = detail.containerNumber |
|
|
OutTransaction: this.businessType.OutTransactionType, //出库事务类型 |
|
|
detail.toBatch = info.batch; |
|
|
InTransaction: this.businessType.InTransactionType, //入库事务类型 |
|
|
detail.toInventoryStatus = detail.inventoryStatus |
|
|
executeTime: "2023-08-4 16:30:11", //执行时间 |
|
|
detail.toLocationCode = this.toLocationCode |
|
|
activeDate: "2023-08-4 16:30:11", //生效时间 |
|
|
} else { |
|
|
available: "1", //是否可用 0不可用,1可用 |
|
|
detail.toPackingNumber = detail.packingNumber; |
|
|
requestTime: this.jobContent.requestTime, |
|
|
detail.toContainerNumber = detail.containerNumber |
|
|
dueTime: "2023-08-4 16:30:11", //截止时间 |
|
|
detail.toBatch = detail.toBatch; |
|
|
departmentCode: this.jobContent.departmentCode, |
|
|
detail.toInventoryStatus = detail.inventoryStatus |
|
|
UserPositionCode: "", //岗位 |
|
|
detail.toLocationCode = "" |
|
|
interfaceType: "jklxPURCHASE_RECEIPT", //接口类型 |
|
|
} |
|
|
Number: this.jobContent.Number, |
|
|
|
|
|
businessType: this.jobContent.businessType, |
|
|
subList.push(detail) |
|
|
remark: this.jobContent.remark, |
|
|
|
|
|
creationTime: this.jobContent.creationTime, |
|
|
|
|
|
Creatorld: this.jobContent.Creatorld, |
|
|
|
|
|
creatorName: this.jobContent.creatorName, |
|
|
|
|
|
extraProperties: this.jobContent.extraProperties, |
|
|
|
|
|
Siteld: this.jobContent.Siteld, |
|
|
|
|
|
Code: "", |
|
|
|
|
|
subList: [ |
|
|
|
|
|
|
|
|
|
|
|
], |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
this.detailSource.forEach(res => { |
|
|
|
|
|
res.subList.forEach(res1 => { |
|
|
|
|
|
if (res1.scaned) { |
|
|
|
|
|
res1.record.FromLocationGroupCode = ""; |
|
|
|
|
|
res1.record.FromAreaCode = ""; |
|
|
|
|
|
res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode; |
|
|
|
|
|
res1.record.ToAreaCode = this.toLocationInfo.AreaCode; |
|
|
|
|
|
res1.record.VisualInspectResult = ""; //目检结果 |
|
|
|
|
|
res1.record.VisualInspectPhotos = ""; //目检照片 |
|
|
|
|
|
res1.record.FailedReason = ""; //不合格原因 |
|
|
|
|
|
res1.record.MassDefect = ""; //质量缺陷 |
|
|
|
|
|
res1.record.SinglePrice = ""; //单价 |
|
|
|
|
|
res1.record.Amount = ""; //金额 |
|
|
|
|
|
res1.record.Code = ""; |
|
|
|
|
|
res1.record.JobDetailID = res1.record.id; |
|
|
|
|
|
res1.record.interfaceType = "jklxPURCHASE_RECEIPT"; |
|
|
|
|
|
params.subList.push(res1.record) |
|
|
|
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
|
|
|
this.jobContent.subList = subList |
|
|
return params; |
|
|
this.jobContent.creator = creator; |
|
|
|
|
|
return this.jobContent; |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
showMessage(message) { |
|
|
showMessage(message) { |
|
|
this.scanPopupLoseFocus(); |
|
|
this.scanPopupLoseFocus(); |
|
|
this.$refs.comMessage.showMessage(message, res => { |
|
|
this.$refs.comMessage.showMessage(message, res => { |
|
|
|
