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

修改制品收货

hella_vue3
niexiting 8 months ago
parent
6241e913ae
commit
e50e73f3e0
4 changed files with 52 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/pages/productPutaway/job/productPutawayDetail.vue
  2. 27
      src/pages/productReceipt/job/productReceiptDetail.vue
  3. 17
      src/pages/productionReceipt/job/productionReceiptDetail.vue
  4. 52
      src/pages/putaway/job/putawayDetail.vue

4
src/pages/productPutaway/job/productPutawayDetail.vue
View File

@ -314,13 +314,13 @@
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code this.toLocationCode = code
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
detail.toLocationCode = code detail.toLocationCode = code
}) })
}) // })
}) })
}, },

27
src/pages/productReceipt/job/productReceiptDetail.vue
View File

@ -15,7 +15,8 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false" <comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</comProductDetailCard> </comProductDetailCard>
</view> </view>
<u-line /> <u-line />
@ -27,8 +28,8 @@
<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%; ">
<view class=""> <view class="">
<locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare title="收货库位" :recommendLocationCode="jobToLocationCode"
@getLocation='scanLocationCode' :locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
@ -103,8 +104,8 @@
detailSource: [], //绑定在页面上的数据源 detailSource: [], //绑定在页面上的数据源
toLocationAreaTypeList: [], toLocationAreaTypeList: [],
managementList: [], managementList: [],
jobStatus:"", jobStatus: "",
jobToLocationCode:"" jobToLocationCode: ""
}; };
}, },
@ -132,7 +133,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus=="2") { if (this.jobStatus == "2") {
//取消承接任务 //取消承接任务
cancleTakeProductReceiptJob(this.id).then(res => { cancleTakeProductReceiptJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -255,14 +256,14 @@
scanLocationCode(location, code) { scanLocationCode(location, code) {
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code this.toLocationCode = code
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
detail.toLocationCode = code detail.toLocationCode = code
})
}) })
}) })
// })
}, },
checkLocation() { checkLocation() {
@ -415,4 +416,4 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>

17
src/pages/productionReceipt/job/productionReceiptDetail.vue
View File

@ -244,11 +244,11 @@
getScanResult(result) { getScanResult(result) {
try { try {
var supplierCode = result.label.supplierCode; // var supplierCode = result.label.supplierCode;
if (supplierCode == '' || supplierCode == undefined) { // if (supplierCode == '' || supplierCode == undefined) {
this.showErrorMessage("标签中未解析到供应商信息,请重新扫描") // this.showErrorMessage("标签中未解析到供应商信息,请重新扫描")
return; // return;
} // }
var packingNumber = result.balance.packingNumber; var packingNumber = result.balance.packingNumber;
var batch = result.balance.batch; var batch = result.balance.batch;
var qty = result.balance.qty; var qty = result.balance.qty;
@ -282,7 +282,7 @@
']不一致,是否继续上架?', res => { ']不一致,是否继续上架?', res => {
if (res) { if (res) {
itemDetail.scaned = true; itemDetail.scaned = true;
itemDetail.supplierCode = supplierCode // itemDetail.supplierCode = supplierCode
itemDetail.handleQty = Number(result.balance.qty) itemDetail.handleQty = Number(result.balance.qty)
itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.toInventoryStatus = result.balance.inventoryStatus;
itemDetail.balance = result.balance; itemDetail.balance = result.balance;
@ -322,13 +322,14 @@
}, },
scanLocationCode(location, code) { scanLocationCode(location, code) {
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code this.toLocationCode = code
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
detail.toLocationCode = code detail.toLocationCode = code
}) })
}) // })
}) })
}, },

52
src/pages/putaway/job/putawayDetail.vue
View File

@ -15,7 +15,8 @@
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent" <comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'> @remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</comJobDetailCard> </comJobDetailCard>
</view> </view>
</view> </view>
@ -26,8 +27,8 @@
<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%; ">
<view class=""> <view class="">
<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode" :locationCode="toLocationCode" <locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
@getLocation='scanLocationCode' :locationCode="toLocationCode" @getLocation='scanLocationCode'
:locationAreaTypeList="toLocationAreaTypeList"></locationCompare> :locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
</view> </view>
<view class=" uni-flex uni-row"> <view class=" uni-flex uni-row">
@ -37,7 +38,8 @@
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
<winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance ="true"></winScanPackAndLocationNoBalance> <winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
</winScanPackAndLocationNoBalance>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
@ -101,8 +103,8 @@
fromLocationCode: "", fromLocationCode: "",
toLocationCode: "", toLocationCode: "",
toLocationAreaTypeList: [], toLocationAreaTypeList: [],
jobStatus:"", jobStatus: "",
jobToLocationCode:"", jobToLocationCode: "",
}; };
}, },
onLoad(option) { onLoad(option) {
@ -128,7 +130,7 @@
onBackPress(e) { onBackPress(e) {
//已经接收但是没提交任务 //已经接收但是没提交任务
if (e.from == 'backbutton') { if (e.from == 'backbutton') {
if (this.jobStatus=="2") { if (this.jobStatus == "2") {
//取消承接任务 //取消承接任务
cancleTakePutawayJob(this.id).then(res => { cancleTakePutawayJob(this.id).then(res => {
uni.navigateBack(); uni.navigateBack();
@ -272,7 +274,7 @@
r.batch == batch && r.batch == batch &&
r.fromLocationCode == result.fromLocationCode r.fromLocationCode == result.fromLocationCode
}) })
if (itemDetail == undefined) { if (itemDetail == undefined) {
var isExit; var isExit;
for (let subItem of detail.subList) { for (let subItem of detail.subList) {
@ -288,13 +290,13 @@
if (item != undefined) { if (item != undefined) {
subItem.scaned = true subItem.scaned = true
subItem.handleQty = 0; subItem.handleQty = 0;
item=undefined item = undefined
} }
} }
if(isExit == undefined){ if (isExit == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中") .fromLocationCode + "】不在列表中")
}else { } else {
if (isExit.scaned) { if (isExit.scaned) {
this.showMessage("箱码【" + packingNumber + "】已经扫描") this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else { } else {
@ -306,13 +308,13 @@
calcTreeHandleQty(this.detailSource); calcTreeHandleQty(this.detailSource);
this.$forceUpdate() this.$forceUpdate()
} else { } else {
var scanedLength =0; var scanedLength = 0;
itemDetail.packList.forEach(res=>{ itemDetail.packList.forEach(res => {
if(res.scaned){ if (res.scaned) {
scanedLength++; scanedLength++;
} }
}) })
if (itemDetail.scaned&&scanedLength==itemDetail.packList.length) { if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
this.showMessage("箱码【" + packingNumber + "】已经扫描") this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;
@ -324,7 +326,7 @@
pac.handleQty = Number(pac.qty); pac.handleQty = Number(pac.qty);
pac.toLocationCode = this.toLocationCode; pac.toLocationCode = this.toLocationCode;
}) })
calcTreeHandleQty(this.detailSource); calcTreeHandleQty(this.detailSource);
this.continueScan() this.continueScan()
this.$forceUpdate() this.$forceUpdate()
@ -338,12 +340,12 @@
scanLocationCode(location, code) { scanLocationCode(location, code) {
// this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code this.toLocationCode = code
this.detailSource.forEach(item => { this.detailSource.forEach(item => {
item.subList.forEach(detail => { item.subList.forEach(detail => {
detail.toLocationCode = code detail.toLocationCode = code
})
}) })
})
// }) // })
}, },
@ -448,14 +450,14 @@
detail.toPackingNumber = info.packingNumber; detail.toPackingNumber = info.packingNumber;
detail.toBatch = info.batch; detail.toBatch = info.batch;
detail.toContainerNumber = ''; detail.toContainerNumber = '';
detail.singlePrice = 1; detail.singlePrice = 1;
detail.amount = 11; detail.amount = 11;
detail.arriveDate = getCurrDateTime(); detail.arriveDate = getCurrDateTime();
detail.produceDate = getCurrDateTime(); detail.produceDate = getCurrDateTime();
detail.expireDate = getCurrDateTime(); detail.expireDate = getCurrDateTime();
// detail.singlePrice = detail.balance.singlePrice; // detail.singlePrice = detail.balance.singlePrice;
// detail.amount = detail.balance.singlePrice * detail.handleQty; // detail.amount = detail.balance.singlePrice * detail.handleQty;
@ -530,4 +532,4 @@
<style scoped lang="scss"> <style scoped lang="scss">
</style> </style>
Write Preview
Loading…
Cancel
Save