sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改装配报工和收货库位提示

hella_online_20240803
lijuncheng 3 weeks ago
parent
5838093178
commit
2f85651343
2 changed files with 82 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      src/pages/productReceipt/job/ccProductReceiptDetail.vue
  2. 80
      src/pages/productReceipt/job/fgProductReceiptDetail.vue

49
src/pages/productReceipt/job/ccProductReceiptDetail.vue
View File

@ -56,7 +56,7 @@
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref="comScanLocation" title="收货库位"
:isShowEdit="jobContent.allowModifyLocation=='TRUE'" :recommendLocationCode="jobToLocationCode"
:recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view>
@ -303,12 +303,27 @@
scanLocationCode(location, code) {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
if(this.jobContent.allowModifyLocation=="TRUE"){
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
})
})
}else {
//不允许修改库位
if(code!=this.jobToLocationCode){
this.showMessageHint("任务中不允许修改库位\n扫描库位["+code+"]推荐库位是["+this.jobToLocationCode+"]",callBack=>{
})
}else {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
})
}
}
},
checkLocation() {
@ -412,17 +427,17 @@
this.managementList = res.list;
var params = this.setParams();
console.log("提交参数", JSON.stringify(params));
ccProductReceiptJobsubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
// ccProductReceiptJobsubmit(params).then(res => {
// uni.hideLoading()
// if (res.data) {
// this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + res.data)
// } else {
// this.showErrorMessage("提交失败[" + res.msg + "]")
// }
// }).catch(error => {
// uni.hideLoading()
// this.showErrorMessage(error)
// })
} else {
uni.hideLoading();
this.showErrorMessage(res.message);

80
src/pages/productReceipt/job/fgProductReceiptDetail.vue
View File

@ -52,9 +52,9 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<locationCompare ref ="comScanLocation" title="收货库位" :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
:recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode"
@getLocation='scanLocationCode' :locationTypeList="toLocationTypeList"></locationCompare>
<locationCompare ref="comScanLocation" title="收货库位" :recommendLocationCode="jobToLocationCode"
:locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationTypeList="toLocationTypeList"></locationCompare>
</view>
<view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -231,9 +231,9 @@
that.subList = res.data.subList;
that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode
that.productionLineCode = that.subList[0].productionLineCode;
// if (that.jobContent.allowModifyLocation == 'FALSE') {
// that.toLocationCode = that.subList[0].toLocationCode
that.productionLineCode = that.subList[0].productionLineCode;
// if (that.jobContent.allowModifyLocation == 'FALSE') {
// that.toLocationCode = that.subList[0].toLocationCode
// }
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.subList)
@ -333,12 +333,32 @@
},
scanLocationCode(location, code) {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
//允许修改库位
if (this.jobContent.allowModifyLocation == "TRUE") {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
})
})
} else {
//不允许修改库位
if (code != this.jobToLocationCode) {
this.showMessageHint("任务中不允许修改库位\n扫描库位[" + code + "]推荐库位是[" + this.jobToLocationCode + "]",
callBack => {})
} else {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
})
}
}
},
checkLocation() {
@ -441,14 +461,14 @@
// this.showErrorMessage("扫描数为0,请先扫描")
// return;
// }
var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
//校验库位
if(valiDate){
if (!this.checkLocation()) {
return
}
}else{
this.toLocationCode = this.toLocationCode?this.toLocationCode:this.jobToLocationCode
var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
//校验库位
if (valiDate) {
if (!this.checkLocation()) {
return
}
} else {
this.toLocationCode = this.toLocationCode ? this.toLocationCode : this.jobToLocationCode
}
this.detailSource.forEach(item => {
item.subList.forEach(subitem => {
@ -492,17 +512,17 @@
this.managementList = res.list;
var params = this.setParams();
console.log("提交参数", JSON.stringify(params));
productReceiptJobsubmit(params).then(res => {
uni.hideLoading()
if (res.data) {
this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + res.data, )
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
}).catch(error => {
uni.hideLoading()
this.showErrorMessage(error)
})
// productReceiptJobsubmit(params).then(res => {
// uni.hideLoading()
// if (res.data) {
// this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + res.data, )
// } else {
// this.showErrorMessage("提交失败[" + res.msg + "]")
// }
// }).catch(error => {
// uni.hideLoading()
// this.showErrorMessage(error)
// })
} else {
uni.hideLoading();
this.showErrorMessage(res.message);

Write Preview
Loading…
Cancel
Save