Browse Source

添加扫描提示,扫描成功和扫描失败

pda_nev
李俊城 8 months ago
parent
commit
f25a3eb375
  1. 8
      fe/PDA/api/index.js
  2. 24
      fe/PDA/common/basic.js
  3. 8
      fe/PDA/components/uni-combox/uni-combox.vue
  4. 2
      fe/PDA/mycomponents/common/comMessage.vue
  5. 7
      fe/PDA/mycomponents/wincom/winScanByPack.vue
  6. 6
      fe/PDA/mycomponents/wincom/winScanByProductCode.vue
  7. 5
      fe/PDA/mycomponents/wincom/winScanLocationCode.vue
  8. 12
      fe/PDA/pages/assemble/assembleTransfer.vue
  9. 8
      fe/PDA/pages/cotaing/coatingTransfer.vue
  10. 10
      fe/PDA/pages/injection/injectionTransfer.vue
  11. 20
      fe/PDA/pages/inventory/comTransfer.vue
  12. 12
      fe/PDA/pages/inventory/scrap.vue
  13. 12
      fe/PDA/pages/putaway/purchasePutaway.vue
  14. 7
      fe/PDA/pages/putaway/rapReceipt.vue
  15. 8
      fe/PDA/pages/putaway/semiPutaway.vue
  16. 7
      fe/PDA/pages/query/item.vue
  17. 7
      fe/PDA/pages/query/location.vue
  18. 7
      fe/PDA/pages/record/completeInventoryTransfer.vue
  19. 132
      fe/PDA/pages/record/productionReturn.vue
  20. 75
      fe/PDA/pages/record/productionReturnPack.vue
  21. 5
      fe/PDA/pages/request/coatingIssueRequest.vue
  22. 5
      fe/PDA/pages/request/injectionIssueRequest.vue
  23. 7
      fe/PDA/pages/request/injectionPlanRequest.vue
  24. 5
      fe/PDA/pages/request/kittingIssueRequest.vue
  25. 16
      fe/PDA/pages/request/thirdLocationRequest.vue
  26. 18
      fe/PDA/pages/return/productionReturnFg.vue
  27. 16
      fe/PDA/pages/return/productionReturnRaw.vue
  28. 10
      fe/PDA/pages/return/purchaseReturnRequest.vue
  29. 7
      fe/PDA/pages/return/purchaseReturn_detail.vue
  30. 8
      fe/PDA/pages/return/returnBeforPutaway.vue
  31. 8
      fe/PDA/pages/return/returnToWarehouse.vue
  32. 7
      fe/PDA/pages/spray/sprayCompleteReceive.vue
  33. 9
      fe/PDA/pages/store/deliverRaw.vue
  34. 9
      fe/PDA/pages/store/issueDirect.vue
  35. 7
      fe/PDA/pages/task/assembleIssueJob.vue
  36. 13
      fe/PDA/pages/task/assembleIssueJobDetail.vue
  37. 11
      fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
  38. 7
      fe/PDA/pages/task/coatingIssuleJob.vue
  39. 23
      fe/PDA/pages/task/coatingIssuleJobDetail.vue
  40. 11
      fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
  41. 11
      fe/PDA/pages/task/countFg.vue
  42. 11
      fe/PDA/pages/task/countFgDetail.vue
  43. 11
      fe/PDA/pages/task/countRaw.vue
  44. 10
      fe/PDA/pages/task/countRawDetail.vue
  45. 11
      fe/PDA/pages/task/deliverBoard_detail.vue
  46. 8
      fe/PDA/pages/task/deliverJis_detail.vue
  47. 7
      fe/PDA/pages/task/injectionIssueJob.vue
  48. 15
      fe/PDA/pages/task/injectionIssueJobDetail.vue
  49. 11
      fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
  50. 3
      fe/PDA/pages/task/kittingIssueJob.vue
  51. 13
      fe/PDA/pages/task/kittingIssueJobDetail.vue
  52. 11
      fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
  53. 8
      fe/PDA/pages/task/receipt.vue
  54. 7
      fe/PDA/pages/task/receipt_detail.vue
  55. 7
      fe/PDA/pages/task/sparePartIssueJob.vue
  56. 14
      fe/PDA/pages/task/sparePartIssueJobDetail.vue
  57. 11
      fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
  58. 8
      fe/PDA/pages/task/thirdLocationJobDetail.vue
  59. 14
      fe/PDA/pages/task/unProducePickDetail.vue
  60. 10
      fe/PDA/pages/task/unProducePickWipDetail.vue
  61. 7
      fe/PDA/pages/task/unProduceReturnDetail.vue
  62. 9
      fe/PDA/pages/task/unProduceReturnWipDetail.vue
  63. BIN
      fe/PDA/static/video/scan_failed.mp3
  64. BIN
      fe/PDA/static/video/scan_success.mp3
  65. 2
      fe/PDA/uni_modules/wz-select-input/package.json
  66. 12
      fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue
  67. 15
      fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-select-popup.vue

8
fe/PDA/api/index.js

@ -2194,10 +2194,10 @@ export const getPoNumberByPackingCode = (toPackingCode) => promise(
})
//获取客户信息
export const getCustomerList = (id) => request(
devUrl + "/api/pda/customer/get-all/", { //
data: {},
method: "get"
export const getCustomerList = (params) => request(
devUrl + "/api/pda/customer/get-list/", { //
data: params,
method: "post"
});

24
fe/PDA/common/basic.js

@ -401,6 +401,30 @@ export function scanErrorAudio() {
});
}
export function scanSuccessAudio() {
var music = null;
music = uni.createInnerAudioContext(); //创建播放器对象
music.src = "../../static/video/scan_success.mp3";
music.volume = 1;
music.play(); //执行播放
music.onEnded(() => {
//播放结束
music = null;
});
}
export function scanFailedAudio() {
var music = null;
music = uni.createInnerAudioContext(); //创建播放器对象
music.src = "../../static/video/scan_failed.mp3";
music.volume = 1;
music.play(); //执行播放
music.onEnded(() => {
//播放结束
music = null;
});
}
export function newMessageAudio() {
var music = null;

8
fe/PDA/components/uni-combox/uni-combox.vue

@ -87,9 +87,10 @@
}
},
filterCandidates() {
return this.candidates.filter((item) => {
return item.toString().indexOf(this.inputVal) > -1
})
return this.candidates;
// return this.candidates.filter((item) => {
// return item.toString().indexOf(this.inputVal) > -1
// })
},
filterCandidatesLength() {
return this.filterCandidates.length
@ -173,6 +174,7 @@
font-size: 16px;
height: 22px;
line-height: 22px;
padding-left: 20rpx;
}
.uni-combox__input-arrow {

2
fe/PDA/mycomponents/common/comMessage.vue

@ -68,7 +68,7 @@
//
showScanMessage(content) {
this.openMessage(content, 'scan');
scanErrorAudio(); //
// scanErrorAudio(); //
},
//

7
fe/PDA/mycomponents/wincom/winScanByPack.vue

@ -31,6 +31,10 @@
import {
getInventoryLabel
} from '@/api/index.js';
import {
scanFailedAudio
} from '@/common/basic.js';
export default {
name: 'winScanByPack',
@ -85,10 +89,13 @@
uni.hideLoading();
this.callBack();
} else {
scanFailedAudio()
this.showMessage('标签【' + result.data.code + '】,在标签表中不存在')
uni.hideLoading();
}
}).catch(err => {
scanFailedAudio()
uni.hideLoading();
this.showMessage(err.message)
});

6
fe/PDA/mycomponents/wincom/winScanByProductCode.vue

@ -32,6 +32,10 @@
getitems,
getMesBarCode
} from '@/api/index.js';
import {
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
export default {
name: 'winScanByPack',
@ -95,10 +99,12 @@
};
this.callBack();
} else {
scanFailedAudio()
this.losefocus();
this.showMessage('单件码【' + result.data.code + '】,不存在')
}
}).catch(err => {
scanFailedAudio()
uni.hideLoading();
this.showMessage(err.message)
});

5
fe/PDA/mycomponents/wincom/winScanLocationCode.vue

@ -22,6 +22,10 @@
import {
locations
} from '@/api/index.js';
import {
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winComScan from '@/mycomponents/wincom/winComScan.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
export default {
@ -79,6 +83,7 @@
this.locationInfo=res
this.callBack()
} else {
scanFailedAudio()
this.showMessage('未查找到库位【' + code + '】');
this.locationInfo=null
}

12
fe/PDA/pages/assemble/assembleTransfer.vue

@ -84,7 +84,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -196,6 +198,7 @@
})
if (datas.length > 0) {
scanFailedAudio()
showConfirmMsg('物料【' + code + '】已经存在,是否要重新扫描?', confirm => {
if (confirm) {
that.itemList.forEach((r, i) => {
@ -219,9 +222,10 @@
fromStatus: 2,
toStatus:2
}
this.itemList.unshift(item);
this.$refs.scanPackPopup.closeScanPopup()
scanSuccessAudio()
}
},
@ -258,18 +262,22 @@
if (res) {
//
if (res.type == 1 || res.type == 6 || res.type == 13) {
scanFailedAudio()
that.showMessage("目标库位不可以是待检、隔离、在途库位类型");
} else {
scanSuccessAudio()
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
} else {
scanFailedAudio()
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
this.locationGotFocus = true;
}
}).catch(err => {
scanFailedAudio()
that.toLocationCode = ''
this.locationGotFocus = true;
that.showMessage(err.message);

8
fe/PDA/pages/cotaing/coatingTransfer.vue

@ -84,7 +84,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -259,18 +261,22 @@
if (res) {
//
if (res.type == 1 || res.type == 6 || res.type == 13) {
scanFailedAudio()
that.showMessage("目标库位不可以是待检、隔离、在途库位类型");
} else {
scanSuccessAudio()
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
} else {
scanFailedAudio()
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
this.locationGotFocus = true;
}
}).catch(err => {
scanFailedAudio()
that.toLocationCode = ''
this.locationGotFocus = true;
that.showMessage(err.message);

10
fe/PDA/pages/injection/injectionTransfer.vue

@ -84,7 +84,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -197,6 +199,7 @@
})
if (datas.length > 0) {
scanFailedAudio()
showConfirmMsg('物料【' + code + '】已经存在,是否要重新扫描?', confirm => {
if (confirm) {
that.itemList.forEach((r, i) => {
@ -223,6 +226,7 @@
this.itemList.unshift(item);
this.$refs.scanPackPopup.closeScanPopup()
scanSuccessAudio()
}
},
@ -259,12 +263,15 @@
if (res) {
//
if (res.type == 1 || res.type == 6 || res.type == 13) {
scanFailedAudio()
that.showMessage("目标库位不可以是待检、隔离、在途库位类型");
} else {
scanSuccessAudio()
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
} else {
scanFailedAudio()
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
@ -272,6 +279,7 @@
}
}).catch(err => {
scanFailedAudio()
that.toLocationCode = ''
this.locationGotFocus = true;
that.showMessage(err.message);

20
fe/PDA/pages/inventory/comTransfer.vue

@ -45,7 +45,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -140,6 +142,7 @@
})
if (datas.length > 0) {
scanFailedAudio()
showConfirmMsg('箱码【' + code + '】已经存在,是否要重新扫描?', confirm => {
if (confirm) {
that.itemList.forEach((r, i) => {
@ -173,18 +176,23 @@
.then(res => {
try {
if (res.totalCount === 0) {
scanFailedAudio()
this.showMessage('箱码【' + packingCode + '】在【原料库、成品库、半成品库】未查询到库存信息');
} else if (res.totalCount === 1) {
scanSuccessAudio()
this.pushItem(res.items[0]);
} else {
scanSuccessAudio()
this.$refs.balanceItems.openPopup(res.items);
}
} catch (e) {
scanFailedAudio()
this.showMessage(e.message);
}
uni.hideLoading();
})
.catch(err => {
scanFailedAudio()
this.showMessage(err.message);
uni.hideLoading();
});
@ -195,20 +203,24 @@
if (this.itemList.length == 0) {
this.locationErpCode = balanceItem.locationErpCode;
this.itemList.unshift(item);
scanSuccessAudio()
} else {
if (this.transferType == 'Transfer_Inside') //
{
if (this.locationErpCode != balanceItem.locationErpCode) {
scanFailedAudio()
this.showMessage('箱码【' + balanceItem.packingCode + '】的ERP储位【' + balanceItem.locationErpCode +
'】与默认的ERP储位[' + this
.locationErpCode +
'】不是同一ERP储位,不可以进行储位内移库');
} else {
this.itemList.unshift(item);
scanSuccessAudio()
}
} else if (this.transferType == 'Transfer_Area') //
{
this.itemList.unshift(item);
scanSuccessAudio()
}
}
},
@ -279,6 +291,7 @@
let that = this;
locations(code).then(res => {
if (res == null) {
scanFailedAudio()
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
@ -290,12 +303,14 @@
that.showMessage('目标库位的ERP储位【' + res.erpLocationCode + '】与【' + this
.locationErpCode +
'】不是同一ERP储位,请重新扫描目标库位');
scanFailedAudio()
that.toLocationCode = ''
that.$refs.location.clearLocation();
this.locationGotFocus = true;
} else {
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
scanSuccessAudio()
}
} else //
@ -314,14 +329,17 @@
that.toLocationCode = ''
that.$refs.location.clearLocation();
this.locationGotFocus = true;
scanFailedAudio()
} else {
that.toLocationCode = res.code;
that.toLocationErpCode = res.erpLocationCode;
scanSuccessAudio()
}
}
}
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
that.toLocationCode = ''
this.locationGotFocus = true;
that.showMessage(err.message);

12
fe/PDA/pages/inventory/scrap.vue

@ -47,7 +47,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import VUE from 'vue'
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -130,6 +132,7 @@
})
if (items.length > 0) {
scanFailedAudio()
this.showRescanMessage('箱码【' + code + '】已经存在,是否要重新扫描?');
// showConfirmMsg('' + code + ',?', confirm => {
// if (confirm) {
@ -179,6 +182,7 @@
};
getBalancesByFilter(params).then(res => {
if (res.totalCount == 0) {
scanFailedAudio()
this.showScanMessage('箱码【' + code + '】在【原料库】未查询到库存信息');
} else if (res.totalCount == 1) {
let balanceItem = res.items[0];
@ -186,11 +190,14 @@
let item = this.createItem(balanceItem);
that.itemList.unshift(item)
that.scanPopupGetFocus();
scanSuccessAudio()
} else {
scanSuccessAudio()
this.$refs.balanceItems.openPopup(res.items);
}
uni.hideLoading();
}).catch(ex => {
scanFailedAudio()
uni.hideLoading();
that.showMessage(ex.message);
});
@ -267,15 +274,18 @@
let that = this;
locations(code).then(res => {
if (res) {
scanSuccessAudio()
that.toLocationCode = res.code;
that.toLocationErpCode = res.erpLocationCode;
} else {
scanFailedAudio()
that.toLocationCode = '';
that.toLocationErpCode = '';
that.showMessage('目标库位不存在');
}
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
that.toLocationCode = '';
that.toLocationErpCode = '';
that.showMessage(err.message);

12
fe/PDA/pages/putaway/purchasePutaway.vue

@ -87,7 +87,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -240,6 +242,7 @@
let balanceRes = await getBalancesByFilterAsync(params);
if (balanceRes.totalCount === 0) {
scanFailedAudio()
that.showScanMessage('箱码【' + packingCode + '】在【待检库】未查询到库存状态为【合格】的库存信息');
} else if (balanceRes.totalCount === 1) {
let balanceItem = balanceRes.items[0];
@ -268,6 +271,7 @@
//ERP
let purchaseDetail = await getPurchaseDetailNewAsync(balanceItem.itemCode, fromTopPackingCode);
if (purchaseDetail.error) {
scanFailedAudio()
that.showScanMessage(purchaseDetail.error.message);
} else {
that.createBalanceItem(balanceItem, purchaseDetail);
@ -355,6 +359,7 @@
let newLabel = this.createLabel(balanceItem, purchaseDetail);
this.addLabel(itemInfo, newLabel);
this.scanPopupGetFocus();
scanSuccessAudio()
},
createLabel(balanceItem, purchaseDetail) {
@ -472,25 +477,30 @@
let that = this;
locations(code).then(res => {
if (res == null) {
scanFailedAudio()
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.comCollapseLocation.clearLocation();
} else {
if (res.type != 2) {
scanFailedAudio()
this.showMessage('目标库位必须是原材料库')
this.$refs.comCollapseLocation.clearLocation();
} else {
if (that.recommendErpLocationCode != res.erpLocationCode) {
scanFailedAudio()
that.showMessage('目标库位的ERP储位【' + res.erpLocationCode + '】与【' + this
.recommendErpLocationCode +
'】不是同一ERP储位,请重新扫描');
this.$refs.comCollapseLocation.clearLocation();
} else {
scanSuccessAudio()
this.location = res;
}
}
}
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
that.location = null;
that.showMessage(err.message);
uni.hideLoading();

7
fe/PDA/pages/putaway/rapReceipt.vue

@ -52,7 +52,9 @@
maxPageSize,
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
export default {
@ -241,8 +243,10 @@
.then(res => {
if (res != null) {
if (res.type != 2) {
scanFailedAudio()
this.showMessage('目标库位必须是【原材料库】')
} else {
scanSuccessAudio()
this.location = res;
}
} else {
@ -251,6 +255,7 @@
uni.hideLoading();
})
.catch(err => {
scanFailedAudio()
this.showMessage(err.message);
uni.hideLoading();
});

8
fe/PDA/pages/putaway/semiPutaway.vue

@ -60,7 +60,9 @@
showConfirmMsg,
goHome,
getRemoveOption,
getLocationTypeDesc
getLocationTypeDesc,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -354,17 +356,21 @@
let that = this;
locations(code).then(res => {
if (res == null) {
scanFailedAudio()
that.showMessage('目标库位【' + code + '】不存在');
that.$refs.comToLocation.clearLocation();
} else {
if (res.type != 3) {
scanFailedAudio()
this.showMessage('目标库位必须是【半成品库】')
} else {
scanSuccessAudio()
this.toLocation = res;
}
}
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
that.toLocationCode = ''
that.showMessage(err.message);
uni.hideLoading();

7
fe/PDA/pages/query/item.vue

@ -51,7 +51,9 @@
import {
getItemTypeStyle,
getItemStatusDesc,
goHome
goHome,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comItem from '@/mycomponents/coms/query/comItem.vue'
import comSummary from '@/mycomponents/coms/query/comSummary.vue'
@ -160,16 +162,19 @@
setTimeout(() => {
getitems(code).then((res) => {
if (res != null) {
scanSuccessAudio()
this.closeScanPopup();
this.itemCode = code;
this.itemDetail = res;
this.getContentByTab(this.tabIndex)
} else {
scanFailedAudio()
this.showMessage('未查找到ERP料号【' + code + '】');
this.itemCode = "";
}
uni.hideLoading();
}).catch((err) => {
scanFailedAudio()
this.showMessage(err.message);
this.itemCode = "";
uni.hideLoading();

7
fe/PDA/pages/query/location.vue

@ -43,7 +43,9 @@
maxPageSize,
goHome,
getInventoryTypeStyle,
getInventoryStatusDesc
getInventoryStatusDesc,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comLocation from '@/mycomponents/coms/query/comLocation.vue'
@ -141,6 +143,7 @@
});
locations(code).then((res) => {
if (res != null) {
scanSuccessAudio()
this.closeScanPopup();
this.locationCode = code;
this.locationDetail = res
@ -149,11 +152,13 @@
this.locationDetail.locationErpCode = res.erpLocationCode
this.getContentByTab(this.tabIndex);
} else {
scanFailedAudio()
this.showMessage('未查找到库位【' + code + '】');
this.locationCode = ''
}
uni.hideLoading();
}).catch((err) => {
scanFailedAudio()
this.showMessage(err.message);
this.locationCode = '';
uni.hideLoading();

7
fe/PDA/pages/record/completeInventoryTransfer.vue

@ -98,7 +98,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -301,16 +303,19 @@
let that = this;
locations(code).then(res => {
if (res == null) {
scanFailedAudio()
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
this.locationGotFocus = true;
} else {
scanSuccessAudio()
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
that.toLocationCode = ''
this.locationGotFocus = true;
that.showMessage(err.message);

132
fe/PDA/pages/record/productionReturn.vue

@ -1,8 +1,20 @@
<template>
<page-meta root-font-size="18px"></page-meta>
<view class="">
<view class="" style="display: flex; flex-direction: column;">
<win-blank-view @goScan='openScanPopup' v-if="allDataList.length==0"></win-blank-view>
<scroll-view scroll-y class="scroll-detail" style="margin-top: 10rpx;padding-bottom:100px" >
<view class="uni-flex uni-row " style="align-items: center; justify-content: space-between;"
v-if="allDataList.length>0">
<view class="" style=" font-size: 35rpx; margin-left: 20rpx; font-weight: bold;">
退货客户 : {{customerCode}}
</view>
<view class="" style="margin-right: 20rpx; margin-top: 10rpx;">
<button type="primary" @click="seletCustomer" size="mini"> 选择客户 </button>
</view>
</view>
<scroll-view scroll-y class="scroll-detail" style="margin-top: 10rpx;padding-bottom:100px">
<view class="detail-list " v-for="(item, index) in allDataList" :key="index">
<view class="detail-content">
<view class="" style="">
@ -64,6 +76,7 @@
</div>
<win-scan-button @goScan='openScanPopup' v-if="allDataList.length>0"></win-scan-button>
<winScanByProductCode ref="scanPackPopup" title="单件码" @getScanResult='getScanResult'></winScanByProductCode>
<wz-select-popup ref="wzSelectPopup" @select="selectCheckbox" title="选择客户" :isShowItem="false" />
<com-message ref="comMessage" @afterCloseScanMessage='closeScanMessage' @afterRescanMessage='afterRescan'
@afterCloseCommitMessage='closeCommitMessage'>
</com-message>
@ -76,12 +89,15 @@
getBalancesByFilterAsync,
getWipListAsync,
customerReturnCommit,
getCustomerList
} from '@/api/index.js';
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -119,7 +135,7 @@
return {
options: [],
currentItem: {},
toLocationInfo:{},
toLocationInfo: {},
toLocationCode: "",
allCount: 0,
allDataList: [],
@ -128,6 +144,13 @@
old: {
scrollTop: 0
},
customerList: ['客户1', '客户2'],
customerCode: '',
userForm: {
names: [],
values: [],
origin: []
}
};
},
props: {
@ -155,7 +178,7 @@
},
methods: {
qtyChanged(value, item, index) {
if (value <= 0) {
this.showMessage('退货数量必须大于0')
@ -168,7 +191,7 @@
if (res) {
this.allDataList.splice(index, 1);
this.allCount = this.allDataList.length;
var title =this.allCount>0?"客户退货单件码"+"("+this.allCount+")":"客户退货单件码"
var title = this.allCount > 0 ? "客户退货单件码" + "(" + this.allCount + ")" : "客户退货单件码"
uni.setNavigationBarTitle({
title: title
})
@ -177,6 +200,47 @@
})
},
seletCustomer() {
this.$refs.wzSelectPopup.open({
mode: 'radio', //radio checkbox
// dataList:[], //dataList使proxyConfig
selected: this.userForm.values, //
proxyConfig: { //
reqFun: this.reqGetList, //,Promise.resolve([])
localPaging: false //
},
search: {
type: 'remote', //local | remote
},
fields: {
label: 'name',
value: 'code'
}
})
},
reqGetList(data) {
var params = {
condition: {
filters: [{
logic: "And",
column: "code",
action: "Like",
value: data.searchValue
}]
},
Sorting: "",
SkipCount: (data.pageIndex-1)*data.pageSize,
MaxResultCount: data.pageSize
}
return getCustomerList(params);
},
selectCheckbox(mode, resultData){
console.log(mode, resultData)
this.customerCode =resultData.code
},
getScanResult(result) {
var filterItem = this.allDataList.filter(res => {
if (res.itemCode == result.itemCode) {
@ -200,9 +264,9 @@
this.allDataList.unshift(item)
this.allCount = this.allDataList.length;
uni.setNavigationBarTitle({
title: "客户退货单件码"+"("+this.allCount+")"
title: "客户退货单件码" + "(" + this.allCount + ")"
})
this.$forceUpdate();
},
@ -216,15 +280,18 @@
locations(locationCode).then(res => {
uni.hideLoading();
if (res) {
this.toLocationInfo =res;
this.toLocationInfo = res;
this.toLocationCode = res.code
scanSuccessAudio()
} else {
scanFailedAudio()
this.showMessage('目标库位【' + locationCode + '】不存在');
}
}).catch(err => {
scanFailedAudio()
uni.hideLoading();
this.toLocationInfo={}
this.toLocationInfo = {}
this.toLocationCode = ""
this.showMessage(err.message);
@ -245,9 +312,16 @@
this.showMessage('请扫描目标库位');
return;
}
var checkQtyItem =this.checkQty()
if(checkQtyItem!=undefined){
this.showMessage("【"+checkQtyItem.itemCode+'】数量为0,退货数量必须大于0');
if (this.customerCode == "") {
this.showMessage('请选择客户');
return;
}
var checkQtyItem = this.checkQty()
if (checkQtyItem != undefined) {
this.showMessage("【" + checkQtyItem.itemCode + '】数量为0,退货数量必须大于0');
return;
}
@ -257,27 +331,27 @@
});
let params = this.setSubmitParam();
console.log( JSON.stringify(params) )
console.log(JSON.stringify(params))
customerReturnCommit(params)
.then(res => {
uni.hideLoading();
this.showCommitSuccess();
this.clearInfo();
})
.catch(err => {
uni.hideLoading();
this.showMessage(err.message);
});
},
checkQty(){
var isCheck =true;
var result =undefined
checkQty() {
var isCheck = true;
var result = undefined
for (let item of this.allDataList) {
if(item.qty==0){
result =item
if (item.qty == 0) {
result = item
break
}
}
@ -287,6 +361,7 @@
setSubmitParam() {
let item = {
worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
customerCode: this.customerCode,
details: []
}
this.allDataList.forEach(res => {
@ -297,14 +372,14 @@
uom: res.uom,
qty: res.qty,
stdPackQty: res.stdPackQty,
toLocationCode:this.toLocationCode,
toLocationArea:this.toLocationInfo.areaCode,
toLocationGroup:this.toLocationInfo.locationGroupCode,
toLocationErpCode:this.toLocationInfo.erpLocationCode
toLocationCode: this.toLocationCode,
toLocationArea: this.toLocationInfo.areaCode,
toLocationGroup: this.toLocationInfo.locationGroupCode,
toLocationErpCode: this.toLocationInfo.erpLocationCode
}
item.details.push(detail)
})
return item;
},
@ -404,10 +479,11 @@
clearInfo() {
this.allDataList = [];
this.toLocationInfo={}
this.toLocationInfo = {}
this.toLocationCode = "";
this.allCount = 0;
this.loadingType = ""
this.customerCode = ""
uni.setNavigationBarTitle({
title: "客户退货单件码"
})

75
fe/PDA/pages/record/productionReturnPack.vue

@ -2,6 +2,15 @@
<page-meta root-font-size="18px"></page-meta>
<view class="">
<win-blank-view @goScan='openScanPopup' v-if="allDataList.length==0"></win-blank-view>
<view class="uni-flex uni-row " style="align-items: center; justify-content: space-between;"
v-if="allDataList.length>0">
<view class="" style=" font-size: 35rpx; margin-left: 20rpx; font-weight: bold;">
退货客户 : {{customerCode}}
</view>
<view class="" style="margin-right: 20rpx; margin-top: 10rpx;">
<button type="primary" @click="seletCustomer" size="mini"> 选择客户 </button>
</view>
</view>
<scroll-view scroll-y class="scroll-detail" style="margin-top: 10rpx;padding-bottom:100px">
<view class="detail-list " v-for="(item, index) in allDataList" :key="index">
<view class="detail-content">
@ -68,6 +77,7 @@
</div>
<win-scan-button @goScan='openScanPopup' v-if="allDataList.length>0"></win-scan-button>
<win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult'></win-scan-by-pack>
<wz-select-popup ref="wzSelectPopup" @select="selectCheckbox" title="选择客户" :isShowItem="false" />
<com-message ref="comMessage" @afterCloseScanMessage='closeScanMessage' @afterRescanMessage='afterRescan'
@afterCloseCommitMessage='closeCommitMessage'>
</com-message>
@ -80,12 +90,15 @@
getBalancesByFilterAsync,
getWipListAsync,
customerReturnCommit,
getCustomerList
} from '@/api/index.js';
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -132,6 +145,12 @@
old: {
scrollTop: 0
},
customerCode: '',
userForm: {
names: [],
values: [],
origin: []
}
};
},
props: {
@ -176,6 +195,46 @@
}
})
},
seletCustomer() {
this.$refs.wzSelectPopup.open({
mode: 'radio', //radio checkbox
// dataList:[], //dataList使proxyConfig
selected: this.userForm.values, //
proxyConfig: { //
reqFun: this.reqGetList, //,Promise.resolve([])
localPaging: false //
},
search: {
type: 'remote', //local | remote
},
fields: {
label: 'name',
value: 'code'
}
})
},
reqGetList(data) {
var params = {
condition: {
filters: [{
logic: "And",
column: "code",
action: "Like",
value: data.searchValue
}]
},
Sorting: "",
SkipCount: (data.pageIndex-1)*data.pageSize,
MaxResultCount: data.pageSize
}
return getCustomerList(params);
},
selectCheckbox(mode, resultData){
console.log(mode, resultData)
this.customerCode =resultData.code
},
getScanResult(result) {
var resultData = result.data
@ -185,6 +244,7 @@
}
})
if (filterItem.length > 0) {
scanFailedAudio()
this.showMessage("箱码【" + filterItem[0].packingCode + "】已经扫描")
return;
}
@ -207,6 +267,7 @@
})
this.$forceUpdate();
scanSuccessAudio()
},
@ -221,15 +282,18 @@
uni.hideLoading();
if (res) {
if (res.type == 2) {
scanSuccessAudio()
this.toLocationInfo = res;
this.toLocationCode = res.code
} else {
scanFailedAudio()
this.toLocationInfo = {}
this.toLocationCode = ""
this.$refs.comCollapseLocation.clearLocation();
this.showMessage('目标库位必须是原料库位类型');
}
} else {
scanFailedAudio()
this.toLocationInfo = {}
this.toLocationCode = ""
this.showMessage('目标库位【' + locationCode + '】不存在');
@ -237,6 +301,7 @@
}
}).catch(err => {
scanFailedAudio()
uni.hideLoading();
this.toLocationInfo = {}
this.toLocationCode = ""
@ -260,6 +325,12 @@
this.showMessage('请扫描目标库位');
return;
}
if (this.customerCode == "") {
this.showMessage('请选择客户');
return;
}
var checkQtyItem = this.checkQty()
if (checkQtyItem != undefined) {
this.showMessage("【" + checkQtyItem.itemCode + '】数量为0,退货数量必须大于0');
@ -301,6 +372,7 @@
setSubmitParam() {
let item = {
worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN,
customerCode: this.customerCode,
details: []
}
this.allDataList.forEach(res => {
@ -427,6 +499,7 @@
this.toLocationCode = "";
this.allCount = 0;
this.loadingType = ""
this.customerCode=""
uni.setNavigationBarTitle({
title: "客户退货箱码"
})

5
fe/PDA/pages/request/coatingIssueRequest.vue

@ -101,7 +101,9 @@
showConfirmMsg,
goHome,
getRemoveOption,
getISODateTime
getISODateTime,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -155,6 +157,7 @@
result.defaultHandleQty=result.qty
this.itemList.push(result)
this.$forceUpdate()
scanSuccessAudio()
},

5
fe/PDA/pages/request/injectionIssueRequest.vue

@ -101,7 +101,9 @@
showConfirmMsg,
goHome,
getRemoveOption,
getISODateTime
getISODateTime,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -155,6 +157,7 @@
result.defaultHandleQty=result.qty
this.itemList.push(result)
this.$forceUpdate()
scanSuccessAudio()
},

7
fe/PDA/pages/request/injectionPlanRequest.vue

@ -75,7 +75,9 @@
dateFormat,
getContainerTypeName,
showConfirmMsg,
getISODateTime
getISODateTime,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@ -186,12 +188,15 @@
locations(locationCode).then(res => {
uni.hideLoading();
if (res) {
scanSuccessAudio()
this.toLocationInfo = res
} else {
scanFailedAudio()
this.showMessage('目标库位【' + locationCode + '】不存在');
}
}).catch(err => {
scanFailedAudio()
uni.hideLoading();
this.toLocationInfo = null
this.showMessage(err.message);

5
fe/PDA/pages/request/kittingIssueRequest.vue

@ -102,7 +102,9 @@
showConfirmMsg,
goHome,
getRemoveOption,
getISODateTime
getISODateTime,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -156,6 +158,7 @@
result.defaultHandleQty = result.qty
this.itemList.push(result)
this.$forceUpdate()
scanSuccessAudio()
},

16
fe/PDA/pages/request/thirdLocationRequest.vue

@ -98,7 +98,9 @@
showConfirmMsg,
goHome,
getRemoveOption,
getISODateTime
getISODateTime,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -204,6 +206,7 @@
locations(code).then(res => {
uni.hideLoading();
if(res){
scanSuccessAudio()
this.fromLocationCode = res.code;
this.fromLocationArea = res.areaCode;
this.openPackLabel();
@ -217,10 +220,12 @@
// this.showMessage('' + code + '');
// }
}else {
scanFailedAudio()
this.showMessage('未查询到库位【' + code + '】');
}
}).catch(err => {
scanFailedAudio()
this.fromLocationCode = "";
this.fromLocationArea = "";
uni.hideLoading();
@ -267,6 +272,7 @@
let balanceRes = await getBalancesByFilterAsync(balanceParam);
if(balanceRes.totalCount==0){
scanFailedAudio()
this.showMessage("单件码【" + result.scanCode + "】在库位【"+this.fromLocationCode+"】没有库存")
return;
}
@ -277,6 +283,7 @@
}
})
if (filterItem.length > 0) {
scanFailedAudio()
this.showMessage("单件码【" + filterItem[0].itemCode + "】已经扫描")
return;
}
@ -300,6 +307,7 @@
this.updateTitle()
this.$refs.scanPackPopup.closeScanPopup()
this.$forceUpdate();
scanSuccessAudio()
},
@ -313,22 +321,26 @@
uni.hideLoading();
if (res) {
if(res.code==this.fromLocationCode){
scanFailedAudio()
this.showMessage('目标库位【' + locationCode + "】不能与来源库位【"+this.fromLocationCode+"]一致");
}else {
if(res.type==14){
scanSuccessAudio()
this.toLocationCode = res.code
this.toLocationArea =res.areaCode;
}else {
scanFailedAudio()
this.showMessage('目标库位【' + locationCode + '】的库位类型不是三方库');
}
}
} else {
scanFailedAudio()
this.showMessage('目标库位【' + locationCode + '】不存在');
}
}).catch(err => {
scanFailedAudio()
uni.hideLoading();
this.toLocationCode = ""
this.toLocationArea =""

18
fe/PDA/pages/return/productionReturnFg.vue

@ -100,7 +100,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -174,14 +176,18 @@
that.fromLocation = res;
this.openPackLabel();
this.closeScanFromLocationPopup();
scanSuccessAudio()
} else {
scanFailedAudio()
that.showMessage('扫描的库位【' + code + '】不是【半成品库】或【线边库位】或【成品库位】');
}
} else {
scanFailedAudio()
that.showMessage('未查询到库位【' + code + '】');
}
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
uni.hideLoading();
that.showMessage(err.message);
});
@ -231,6 +237,7 @@
});
if (item) {
scanFailedAudio()
this.showMessage("物料[" + result.itemCode + "]已经扫描")
} else {
this.getLabel(result.itemCode);
@ -251,12 +258,14 @@
let balanceRes = await getRecommendBalanceByLocationAsync(balanceParams, itemCode, false);
//
if (balanceRes.error) {
scanFailedAudio()
uni.hideLoading();
this.showMessage(balanceRes.error.message)
return;
}
if (balanceRes.length == 0) {
scanFailedAudio()
this.showScanMessage('零件【' + itemCode + '】在【' + this.fromLocation.code +
'】库位没有库存信息,不可以退库');
} else {
@ -274,7 +283,7 @@
labelList: []
};
this.addLabel(item);
scanSuccessAudio()
}
uni.hideLoading();
},
@ -317,6 +326,7 @@
getDefaultToLocation(locationCode) {
let that = this;
if (locationCode == this.fromLocation.code) {
scanFailedAudio()
this.showMessage('来源库位【' + this.fromLocation.code + '】不能与目标库位【' + locationCode + '】相同');
this.$refs.comCollapseLocation.clearLocation();
return;
@ -329,13 +339,16 @@
locations(locationCode).then(res => {
uni.hideLoading();
if (res == null) {
scanFailedAudio()
that.showMessage('目标库位【' + locationCode + '】不存在');
} else {
var locationType = res.type
//
if (locationType == 1 || locationType == 6 || locationType == 13) {
scanFailedAudio()
that.showMessage('目标库位的库位类型不可以是【待检库】或【隔离库】或【在途】')
} else {
scanSuccessAudio()
showConfirmMsg('是否要将所有未扫描目标库位的零件,指定目标库位【' + locationCode + '】',
confirm => {
if (confirm) {
@ -354,6 +367,7 @@
}
}).catch(err => {
scanFailedAudio()
that.toLocation = null;
that.showMessage(err.message);
uni.hideLoading();

16
fe/PDA/pages/return/productionReturnRaw.vue

@ -92,7 +92,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -162,14 +164,18 @@
that.fromLocation = res;
this.openPackLabel();
this.closeScanFromLocationPopup();
scanSuccessAudio()
} else {
scanFailedAudio()
that.showMessage('扫描的库位【' + code + '】不是【半成品库】或【线边库位】或【成品库位】');
}
} else {
scanFailedAudio()
that.showMessage('未查询到库位【' + code + '】');
}
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
uni.hideLoading();
that.showMessage(err.message);
});
@ -227,6 +233,7 @@
}
})
if (datas.length > 0) {
scanFailedAudio()
this.showRescanMessage('箱码【' + code + '】已经存在,是否要重新扫描?');
// showConfirmMsg('' + code + ',?', confirm => {
// if (confirm) {
@ -244,6 +251,7 @@
}
} else {
scanFailedAudio()
this.showMessage('请先扫描箱标签');
return;
}
@ -280,6 +288,7 @@
let balanceRes = await getBalancesByFilterAsync(balanceParams);
if (balanceRes.totalCount > 0) {
scanFailedAudio()
let locationCode = balanceRes.items[0].locationCode;
this.showScanMessage('箱码【' + that.currentLabel.packingCode + '】在【' + locationCode +
'】库位已经有库存信息,请重新扫描箱码');
@ -295,6 +304,7 @@
let wipRes = await getWipListAsync(params);
if (wipRes.totalCount == 0) {
scanFailedAudio()
this.showScanMessage('零件【' + that.currentLabel.itemCode + '】在【' + this.fromLocation.code +
'】库位没有库存信息,不可以退库');
} else {
@ -321,6 +331,7 @@
//
if (item.labelList.length == 0) {
if (this.currentLabel.qty > item.totalQty) {
scanFailedAudio()
this.showScanMessage('标签数量【' + this.currentLabel.qty +
'】大于零件的库存数量【' + item.totalQty + '】,不可以退库')
} else {
@ -331,6 +342,7 @@
this.calcScanQty(item, 0)
item.labelList.unshift(this.currentLabel);
this.scanPopupGetFocus();
scanSuccessAudio()
}
} else {
let scanQty = 0;
@ -338,12 +350,14 @@
scanQty += Number(r.qty)
})
if (scanQty + this.currentLabel.qty > item.totalQty) {
scanFailedAudio()
this.showScanMessage('已扫描数量【' + scanQty + '】加标签数量【' + this.currentLabel.qty +
'】大于零件的库存数量【' + item.totalQty + '】,不可以退库')
} else {
this.calcScanQty(item, scanQty)
item.labelList.unshift(this.currentLabel);
this.scanPopupGetFocus();
scanSuccessAudio()
}
}
},

10
fe/PDA/pages/return/purchaseReturnRequest.vue

@ -34,7 +34,9 @@
} from '@/api/index.js';
import {
navigateBack,
goHome
goHome,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -95,8 +97,8 @@
})
if (items.length > 0) {
scanFailedAudio()
this.showMessage('箱码【' + code + '】已经存在,请扫描其他箱码.');
} else {
this.getBalances()
}
@ -117,17 +119,21 @@
};
getBalancesByFilter(params).then(res => {
if (res.totalCount == 0) {
scanFailedAudio()
this.showScanMessage('箱码【' + code + '】在【原料库】未查询到库存信息');
} else if (res.totalCount == 1) {
let balanceItem = res.items[0];
let item = this.createItem(balanceItem);
that.itemList.unshift(item)
that.scanPopupGetFocus();
scanSuccessAudio()
} else {
scanSuccessAudio()
this.$refs.balanceItems.openPopup(res.items);
}
uni.hideLoading();
}).catch(ex => {
scanFailedAudio()
uni.hideLoading();
that.showMessage(ex.message);
});

7
fe/PDA/pages/return/purchaseReturn_detail.vue

@ -51,7 +51,9 @@
showConfirmMsg,
compareDesc,
goHome,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import {
getReturnReasonArray
@ -214,14 +216,17 @@
});
if (datas.length === 0) {
scanFailedAudio()
this.showMessage('在退货任务详情中,未找到箱码【' + code + '】');
} else {
if (datas.length === 1) {
let data = datas[0];
if (data.scaned) {
scanFailedAudio()
this.showMessage('箱码【' + data.recommendPackingCode + '】已经扫描,请扫描下一箱');
} else {
this.scanItem(data);
scanSuccessAudio()
}
}
this.scanCount = this.detail.details.filter(r => r.scaned).length;

8
fe/PDA/pages/return/returnBeforPutaway.vue

@ -37,7 +37,9 @@
import {
showConfirmMsg,
getRemoveOption,
goHome
goHome,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import VUE from 'vue'
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -151,16 +153,20 @@
};
getBalancesByFilter(params).then(res => {
if (res.totalCount == 0) {
scanFailedAudio()
that.showScanMessage('箱码【' + code + '】在【隔离库】未查询到库存信息');
} else if (res.totalCount == 1) {
res.items[0].poNumber = poNumber;
that.itemList.unshift(res.items[0])
this.scanPopupGetFocus();
scanSuccessAudio()
} else {
scanSuccessAudio()
this.$refs.balanceItems.openPopup(res.items);
}
uni.hideLoading();
}).catch(ex => {
scanFailedAudio()
uni.hideLoading();
that.showScanMessage(ex.message);
});

8
fe/PDA/pages/return/returnToWarehouse.vue

@ -92,7 +92,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -371,10 +373,11 @@
});
locations(locationCode).then(res => {
if (res == null) {
scanFailedAudio()
that.showMessage('目标库位【' + locationCode + '】不存在');
} else {
if (res.type == 2 || res.type == 3||res.type == 4 ||res.type == 6) {
scanSuccessAudio()
showConfirmMsg('是否要将所有未扫描目标库位的零件,指定目标库位【' + locationCode + '】',
confirm => {
if (confirm) {
@ -395,6 +398,7 @@
}
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
that.toLocation = null;
that.showMessage(err.message);
uni.hideLoading();

7
fe/PDA/pages/spray/sprayCompleteReceive.vue

@ -84,7 +84,9 @@
import {
showConfirmMsg,
goHome,
getRemoveOption
getRemoveOption,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -241,16 +243,19 @@
let that = this;
locations(code).then(res => {
if (res == null) {
scanFailedAudio()
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
this.locationGotFocus = true;
} else {
scanSuccessAudio()
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
that.toLocationCode = ''
this.locationGotFocus = true;
that.showMessage(err.message);

9
fe/PDA/pages/store/deliverRaw.vue

@ -72,7 +72,9 @@
showConfirmMsg,
goHome,
getRemoveOption,
getISODateTime
getISODateTime,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -212,20 +214,25 @@
.then(res => {
try {
if (res.totalCount === 0) {
scanFailedAudio()
this.showScanMessage('箱码【' + result.data.packingCode + '】在【原料库】未查询到库存信息');
} else if (res.totalCount === 1) {
let balanceItem = res.items[0];
this.createItem(balanceItem);
scanSuccessAudio()
} else {
scanSuccessAudio()
this.$refs.balanceItems.openPopup(res.items);
}
} catch (e) {
scanFailedAudio()
this.showScanMessage(e.message);
}
uni.hideLoading();
})
.catch(err => {
scanFailedAudio()
this.showScanMessage(err.message);
uni.hideLoading();
});

9
fe/PDA/pages/store/issueDirect.vue

@ -78,7 +78,9 @@
showConfirmMsg,
goHome,
getRemoveOption,
getISODateTime
getISODateTime,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
@ -389,16 +391,20 @@
let that = this;
locations(code).then(res => {
if (res == null) {
scanFailedAudio()
that.showMessage('目标库位【' + code + '】不存在');
that.$refs.comToLocation.clearLocation();
} else {
if (res.type != 5) {
scanFailedAudio()
this.showMessage('目标库位必须是【线边库】')
} else {
// this.toLocation = res;
if(res.erpLocationCode!=this.formlocationErpCode){
scanFailedAudio()
this.showMessage('来源库位的ERP储位【'+this.formlocationErpCode+'】与目标库位ERP储位【'+res.erpLocationCode+'】不相等')
}else{
scanSuccessAudio()
this.toLocation = res;
}
@ -406,6 +412,7 @@
}
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
that.toLocationCode = ''
that.showMessage(err.message);
uni.hideLoading();

7
fe/PDA/pages/task/assembleIssueJob.vue

@ -29,7 +29,9 @@
import {
goHome,
getIssueJobState
getIssueJobState,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@ -152,12 +154,15 @@
getAssembleIssueJobByPackingCode(result.data.code).then(res=>{
uni.hideLoading();
if(res){
scanSuccessAudio()
this.$refs.scanPopup.closeScanPopup();
this.openDetail(res)
}else {
scanFailedAudio()
this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
}
}).catch(error=>{
scanSuccessAudio()
uni.hideLoading();
this.showMessage(error.message);
})

13
fe/PDA/pages/task/assembleIssueJobDetail.vue

@ -185,7 +185,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -284,10 +286,12 @@
geToLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendToLocationCode) {
scanFailedAudio()
this.showMessage(" 扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current
.recommendToLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
current.handledToLocationGroup = locationInfo.locationGroupCode
@ -379,13 +383,16 @@
var fromData = result.data;
var data = this.details.filter(r => r.itemCode == result.data.itemCode)
if (data.length == 0) {
scanFailedAudio()
this.showMessage("扫描的箱码[" + fromData.code + "]的物品不在列表中")
return;
}
if (this.jobStatus == 30) {
scanFailedAudio()
if (fromData.code == this.details[0].recommendFromPackingCode) {
this.showMessage("请先完成库移后在扫描箱码")
} else {
scanFailedAudio()
setTimeout(res => {
showConfirmMsg("扫描的箱码[" + fromData.code + "]与推荐的箱码[" + this.details[0]
.recommendFromPackingCode +
@ -408,6 +415,7 @@
var balancesItem = res.items[0];
var item = data[0];
if (balancesItem.lot == item.recommendToLot) {
scanSuccessAudio()
item.handledToContainerCode = balancesItem.containerCode
item.handledToPackingCode = balancesItem.packingCode
item.handledToSupplierBatch = balancesItem.supplierBatch
@ -431,6 +439,7 @@
item.handledFromLocationCode = balancesItem.locationCode
item.handleToPackingCodeLocationCode = balancesItem.locationCode
} else {
scanFailedAudio()
showConfirmMsg("箱码[" + fromData.code + "]的批次[" + balancesItem.lot + "]与推荐目标批次[" + item
.recommendToLot + "]不一致,是否继续发料", res => {
if (res) {
@ -487,6 +496,7 @@
balances(params)
.then(res => {
if (res.totalCount === 0) {
scanFailedAudio()
this.showScanMessage('按箱码【' + result.data.code + '】未查询到库存信息');
} else {
callback(res);
@ -494,6 +504,7 @@
uni.hideLoading();
})
.catch(err => {
scanFailedAudio()
this.showScanMessage(err.message);
uni.hideLoading();
});

11
fe/PDA/pages/task/assembleIssueJobDetailByQty.vue

@ -153,7 +153,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButtonLeft from '@/mycomponents/wincom/winScanButtonLeft.vue'
@ -257,11 +259,12 @@
getFromLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendFromLocationCode) {
scanFailedAudio()
this.showMessage(" 扫描来源库位[" + locationInfo.code + "]与推荐来源库位[" + current
.recommendFromLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
current.handledFromLocationCode = locationInfo.code
current.handledFromLocationArea = locationInfo.locationArea
current.handledFromLocationGroup = locationInfo.locationGroup
@ -275,10 +278,12 @@
getToLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendToLocationCode) {
scanFailedAudio()
this.showMessage("扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current
.recommendToLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
this.toLocationInfo = locationInfo
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
@ -384,9 +389,11 @@
});
if (item == undefined) {
scanFailedAudio()
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
}
scanSuccessAudio()
this.singCode = result.itemCode
this.$refs.scanPackPopup.closeScanPopup();

7
fe/PDA/pages/task/coatingIssuleJob.vue

@ -29,7 +29,9 @@
import {
goHome,
getIssueJobState
getIssueJobState,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@ -159,10 +161,13 @@
if(res){
this.$refs.scanPopup.closeScanPopup();
this.openDetail(res)
scanSuccessAudio()
}else {
scanFailedAudio()
this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
}
}).catch(error=>{
scanFailedAudio()
uni.hideLoading();
this.showMessage(error.message);
})

23
fe/PDA/pages/task/coatingIssuleJobDetail.vue

@ -185,7 +185,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -286,14 +288,16 @@
geToLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendToLocationCode) {
scanFailedAudio()
this.showMessage(" 扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current
.recommendToLocationCode + "]不一致,请重新扫描")
return;
}
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
current.handledToLocationGroup = locationInfo.locationGroupCode
current.handledToLocationErpCode = locationInfo.erpLocationCode
scanSuccessAudio()
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
current.handledToLocationGroup = locationInfo.locationGroupCode
current.handledToLocationErpCode = locationInfo.erpLocationCode
},
//
getDetail() {
@ -382,13 +386,16 @@
var fromData = result.data;
var data = this.details.filter(r => r.itemCode == result.data.itemCode)
if (data.length == 0) {
scanFailedAudio()
this.showMessage("扫描的箱码[" + fromData.code + "]的物品不在列表中")
return;
}
if (this.jobStatus == 30) {
if (fromData.code == this.details[0].recommendFromPackingCode) {
scanFailedAudio()
this.showMessage("请先完成库移后在扫描箱码")
} else {
scanFailedAudio()
setTimeout(res => {
showConfirmMsg("扫描的箱码[" + fromData.code + "]与推荐的箱码[" + this.details[0]
.recommendFromPackingCode +
@ -411,6 +418,7 @@
var balancesItem = res.items[0];
var item = data[0];
if (balancesItem.lot == item.recommendToLot) {
scanSuccessAudio()
item.handledToContainerCode = balancesItem.containerCode
item.handledToPackingCode = balancesItem.packingCode
item.handledToSupplierBatch = balancesItem.supplierBatch
@ -434,6 +442,7 @@
item.handledFromLocationCode = balancesItem.locationCode
item.handleToPackingCodeLocationCode = balancesItem.locationCode
} else {
scanFailedAudio()
showConfirmMsg("箱码[" + fromData.code + "]的批次[" + balancesItem.lot + "]与推荐目标批次[" + item
.recommendToLot + "]不一致,是否继续发料", res => {
if (res) {
@ -490,6 +499,7 @@
balances(params)
.then(res => {
if (res.totalCount === 0) {
scanFailedAudio()
this.showScanMessage('按箱码【' + result.data.code + '】未查询到库存信息');
} else {
callback(res);
@ -497,6 +507,7 @@
uni.hideLoading();
})
.catch(err => {
scanFailedAudio()
this.showScanMessage(err.message);
uni.hideLoading();
});
@ -504,6 +515,7 @@
getBalanceRemoveInAndOut(params)
.then(res => {
if (res.totalCount === 0) {
scanFailedAudio()
this.showScanMessage('按箱码【' + result.data.code + '】未查询到库存信息');
} else {
callback(res);
@ -511,6 +523,7 @@
uni.hideLoading();
})
.catch(err => {
scanFailedAudio()
this.showScanMessage(err.message);
uni.hideLoading();
});

11
fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue

@ -162,7 +162,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButtonLeft from '@/mycomponents/wincom/winScanButtonLeft.vue'
@ -270,11 +272,12 @@
getFromLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendFromLocationCode) {
scanFailedAudio()
this.showMessage(" 扫描来源库位[" + locationInfo.code + "]与推荐来源库位[" + current
.recommendFromLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
current.handledFromLocationCode = locationInfo.code
current.handledFromLocationArea = locationInfo.locationArea
current.handledFromLocationGroup = locationInfo.locationGroup
@ -288,10 +291,12 @@
getToLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendToLocationCode) {
scanFailedAudio()
this.showMessage("扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current
.recommendToLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
this.toLocationInfo = locationInfo
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
@ -397,9 +402,11 @@
});
if (item == undefined) {
scanFailedAudio()
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
}
scanSuccessAudio()
this.singCode = result.itemCode
this.$refs.scanPackPopup.closeScanPopup();

11
fe/PDA/pages/task/countFg.vue

@ -26,7 +26,9 @@
getJobStatuStyle,
getJobStatuDesc,
maxPageSize,
goHome
goHome,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
import comCount from '@/mycomponents/coms/task/comCount.vue';
@ -198,11 +200,14 @@
getCountJobByNumber(code).then(res => {
uni.hideLoading();
if (res != null) {
scanSuccessAudio()
that.openDetail(res);
} else {
scanFailedAudio()
that.showMessage('未查找到' + type + '为【' + code + '】的盘点任务');
}
}).catch(err => {
scanFailedAudio()
that.showMessage(err.message);
uni.hideLoading();
});
@ -219,16 +224,20 @@
let jobRes = await getCountJobByLocationAsync(code);
if (jobRes.error == undefined) {
if (jobRes.totalCount == 0) {
scanFailedAudio()
that.showMessage('未查找到' + type + '为【' + code + '】的盘点任务');
} else if (jobRes.totalCount == 1) {
scanSuccessAudio()
this.openDetail(jobRes.items[0]);
} else {
this.openCountItems(jobRes.items);
}
} else {
scanFailedAudio()
that.showMessage('未查找到' + type + '为【' + code + '】的盘点任务');
}
} else {
scanFailedAudio()
this.showMessage('未查找到库位【' + code + '】');
}
uni.hideLoading();

11
fe/PDA/pages/task/countFgDetail.vue

@ -176,7 +176,9 @@
compare,
getRemoveOption,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import {
@ -486,6 +488,7 @@
)
if (itemScan.length > 0) {
setTimeout(res => {
scanFailedAudio()
showConfirmMsg("物料【" + itemCode + "】已经扫描,是否覆盖已经扫描的信息", res => {
if (res) {
this.setQty(itemScan[0], itemScan[0].inventoryQty, false);
@ -501,10 +504,12 @@
if (items.length == 0) {
this.addNewDetail(result)
} else if (items.length == 1) {
scanSuccessAudio()
var item = items[0];
item.isNew =true;
this.setQty(item, item.inventoryQty, true);
} else {
scanFailedAudio()
this.showMessage('盘点数量异常,箱码【' + packingCode + '】的出现多条数据');
}
@ -526,6 +531,7 @@
async addNewDetail(result) {
if (this.location == null) {
scanFailedAudio()
this.showMessage('未查找到库位信息,不可以添加为任务明细');
return;
}
@ -533,6 +539,7 @@
let detail = this.creatDetail(result);
if (balanceItem == null || balanceItem == undefined) {
setTimeout(res => {
scanFailedAudio()
showConfirmMsg("扫描的物料["+result.code+"]在任务中不存在,是否要添加为任务明细?", async confirm => {
if (confirm) {
this.setDetailNoBalance(detail, result)
@ -548,10 +555,12 @@
} else {
if (balanceItem.locationCode != this.location.code) {
scanFailedAudio()
this.showMessage("物料【" + result.code + "】在库位【" + balanceItem.locationCode + "】不在库位【" +
this.location.code + "】不可以添加为任务明细");
} else {
setTimeout(res => {
scanFailedAudio()
showConfirmMsg("扫描的物料["+result.itemCode+"]在任务中不存在,是否要添加为任务明细?", async confirm => {
if (confirm) {
this.setDetailByBalance(detail, balanceItem);

11
fe/PDA/pages/task/countRaw.vue

@ -26,7 +26,9 @@
getJobStatuStyle,
getJobStatuDesc,
maxPageSize,
goHome
goHome,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
import comCount from '@/mycomponents/coms/task/comCount.vue';
@ -184,11 +186,14 @@
getCountJobByNumber(code).then(res => {
uni.hideLoading();
if (res != null) {
scanSuccessAudio()
that.openDetail(res);
} else {
scanFailedAudio()
that.showMessage('未查找到' + type + '为【' + code + '】的盘点任务');
}
}).catch(err => {
scanFailedAudio()
that.showMessage(err.message);
uni.hideLoading();
});
@ -205,16 +210,20 @@
let jobRes = await getCountJobByLocationAsync(code);
if (jobRes.error == undefined) {
if (jobRes.totalCount == 0) {
scanFailedAudio()
that.showMessage('未查找到' + type + '为【' + code + '】的盘点任务');
} else if (jobRes.totalCount == 1) {
scanSuccessAudio()
this.openDetail(jobRes.items[0]);
} else {
this.openCountItems(jobRes.items);
}
} else {
scanFailedAudio()
that.showMessage('未查找到' + type + '为【' + code + '】的盘点任务');
}
} else {
scanFailedAudio()
this.showMessage('未查找到库位【' + code + '】');
}
uni.hideLoading();

10
fe/PDA/pages/task/countRawDetail.vue

@ -177,7 +177,9 @@
compare,
getRemoveOption,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import {
@ -405,6 +407,7 @@
var itemScan = this.scanAllDetails.filter(r =>
r.packingCode == packingCode && r.inventoryStage == this.datacontent.inventoryStage)
if (itemScan.length > 0) {
scanFailedAudio()
setTimeout(res => {
showConfirmMsg("箱码【" + packingCode + "】已经扫描,是否覆盖已经扫描的信息", res => {
if (res) {
@ -426,7 +429,9 @@
var item = items[0];
item.isNew = true;
this.setQty(item, item.inventoryQty, true);
scanSuccessAudio()
} else {
scanFailedAudio()
this.showMessage('盘点数量异常,箱码【' + packingCode + '】的出现多条数据');
}
},
@ -440,6 +445,7 @@
let balanceItem = await this.getBalanceAsync(result);
let detail = this.creatDetail(result);
if (balanceItem == null || balanceItem == undefined) {
scanFailedAudio()
setTimeout(res => {
showConfirmMsg('扫描的库存在任务中不存在,是否要添加为任务明细?', async confirm => {
if (confirm) {
@ -456,9 +462,11 @@
} else {
if (balanceItem.locationCode != this.location.code) {
scanFailedAudio()
this.showMessage("箱码【" + result.data.code + "】在库位【" + balanceItem.locationCode + "】不在库位【" +
this.location.code + "】不可以添加为任务明细");
} else {
scanFailedAudio()
setTimeout(res => {
showConfirmMsg('扫描的库存在任务中不存在,是否要添加为任务明细?', async confirm => {
if (confirm) {

11
fe/PDA/pages/task/deliverBoard_detail.vue

@ -100,7 +100,9 @@
getJobStatuDesc,
showConfirmMsg,
goHome,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue'
@ -220,10 +222,12 @@
});
if (item === undefined) {
scanFailedAudio()
this.showMessage('在发货任务详情中,未找到箱码【' + code + '】');
return;
} else {
if (item.scaned) {
scanFailedAudio()
this.showMessage('箱码【' + code + '】已经扫描,请扫描下一箱零件');
return;
}
@ -240,15 +244,20 @@
.then(res => {
try {
if (res.totalCount == 0) {
scanFailedAudio()
this.showMessage('箱码【' + code + '】在【成品库】未查询到库存信息');
} else if (res.totalCount == 1) {
that.balancesItem = res.items[0];
scanSuccessAudio()
this.createItem(item);
} else {
scanSuccessAudio()
this.$refs.balanceItems.openPopup(res.items);
}
uni.hideLoading();
} catch (e) {
uni.hideLoading();
scanFailedAudio()
this.showMessage(e.message)
}
})

8
fe/PDA/pages/task/deliverJis_detail.vue

@ -105,7 +105,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -244,15 +246,19 @@
//
let item = this.details.find(r => r.recommendContainerCode == result.containerCode);
if (item == undefined) {
scanFailedAudio()
this.showMessage("器具码【" + result.containerCode + "】不在列表中")
} else {
if (item.scaned) {
scanFailedAudio()
this.showMessage("器具码【" + result.containerCode + "】已经扫描")
} else {
if (this.allCount == this.scanCount) {
scanFailedAudio()
this.showMessage("零件已经全部扫描完成");
return;
}
scanSuccessAudio()
item.containerCode = result.containerCode;
item.scaned = true;
item.handleQty = 10;

7
fe/PDA/pages/task/injectionIssueJob.vue

@ -29,7 +29,9 @@
import {
goHome,
getIssueJobState
getIssueJobState,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@ -152,12 +154,15 @@
getInjectionIssueJobByPackingCode(result.data.code).then(res=>{
uni.hideLoading();
if(res){
scanSuccessAudio()
this.$refs.scanPopup.closeScanPopup();
this.openDetail(res)
}else {
scanFailedAudio()
this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
}
}).catch(error=>{
scanFailedAudio()
uni.hideLoading();
this.showMessage(error.message);
})

15
fe/PDA/pages/task/injectionIssueJobDetail.vue

@ -189,7 +189,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -288,10 +290,12 @@
geToLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendToLocationCode) {
scanFailedAudio()
this.showMessage(" 扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current
.recommendToLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
current.handledToLocationGroup = locationInfo.locationGroupCode
@ -385,13 +389,16 @@
var fromData = result.data;
var data = this.details.filter(r => r.itemCode == result.data.itemCode)
if (data.length == 0) {
scanFailedAudio()
this.showMessage("扫描的箱码[" + fromData.code + "]的物品不在列表中")
return;
}
if (this.jobStatus == 30) {
if (fromData.code == this.details[0].recommendFromPackingCode) {
scanFailedAudio()
this.showMessage("请先完成库移后在扫描箱码")
} else {
scanFailedAudio()
setTimeout(res => {
showConfirmMsg("扫描的箱码[" + fromData.code + "]与推荐的箱码[" + this.details[0]
.recommendFromPackingCode +
@ -415,6 +422,7 @@
var balancesItem = res.items[0];
var item = data[0];
if (balancesItem.lot == item.recommendToLot) {
scanSuccessAudio()
item.handledToContainerCode = balancesItem.containerCode
item.handledToPackingCode = balancesItem.packingCode
item.handledToSupplierBatch = balancesItem.supplierBatch
@ -439,6 +447,7 @@
item.handleToPackingCodeLocationCode = balancesItem.locationCode
} else {
scanFailedAudio()
showConfirmMsg("箱码[" + fromData.code + "]的批次[" + balancesItem.lot + "]与推荐目标批次[" + item
.recommendToLot + "]不一致,是否继续发料", res => {
if (res) {
@ -494,6 +503,7 @@
balances(params)
.then(res => {
if (res.totalCount === 0) {
scanFailedAudio()
this.showScanMessage('按箱码【' + result.data.code + '】未查询到库存信息');
} else {
callback(res);
@ -501,6 +511,7 @@
uni.hideLoading();
})
.catch(err => {
scanFailedAudio()
this.showScanMessage(err.message);
uni.hideLoading();
});
@ -508,6 +519,7 @@
getBalanceRemoveInAndOut(params)
.then(res => {
if (res.totalCount === 0) {
scanFailedAudio()
this.showScanMessage('按箱码【' + result.data.code + '】未查询到库存信息');
} else {
callback(res);
@ -515,6 +527,7 @@
uni.hideLoading();
})
.catch(err => {
scanFailedAudio()
this.showScanMessage(err.message);
uni.hideLoading();
});

11
fe/PDA/pages/task/injectionIssueJobDetailByQty.vue

@ -152,7 +152,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButtonLeft from '@/mycomponents/wincom/winScanButtonLeft.vue'
@ -254,11 +256,12 @@
getFromLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendFromLocationCode) {
scanFailedAudio()
this.showMessage(" 扫描来源库位[" + locationInfo.code + "]与推荐来源库位[" + current
.recommendFromLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
current.handledFromLocationCode = locationInfo.code
current.handledFromLocationArea = locationInfo.locationArea
current.handledFromLocationGroup = locationInfo.locationGroup
@ -272,10 +275,12 @@
getToLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendToLocationCode) {
scanFailedAudio()
this.showMessage("扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current
.recommendToLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
this.toLocationInfo = locationInfo
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
@ -380,9 +385,11 @@
});
if (item == undefined) {
scanFailedAudio()
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
}
scanSuccessAudio()
this.singCode = result.itemCode
this.$refs.scanPackPopup.closeScanPopup();

3
fe/PDA/pages/task/kittingIssueJob.vue

@ -153,12 +153,15 @@
getKitingIssueJobPackingCode(result.data.code).then(res=>{
uni.hideLoading();
if(res){
scanSuccessAudio()
this.$refs.scanPopup.closeScanPopup();
this.openDetail(res)
}else {
scanFailedAudio()
this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
}
}).catch(error=>{
scanFailedAudio()
uni.hideLoading();
this.showMessage(error.message);
})

13
fe/PDA/pages/task/kittingIssueJobDetail.vue

@ -185,7 +185,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -285,10 +287,12 @@
geToLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendToLocationCode) {
scanFailedAudio()
this.showMessage(" 扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current
.recommendToLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
current.handledToLocationGroup = locationInfo.locationGroupCode
@ -380,13 +384,16 @@
var fromData = result.data;
var data = this.details.filter(r => r.itemCode == result.data.itemCode)
if (data.length == 0) {
scanFailedAudio()
this.showMessage("扫描的箱码[" + fromData.code + "]的物品不在列表中")
return;
}
if (this.jobStatus == 30) {
if (fromData.code == this.details[0].recommendFromPackingCode) {
scanFailedAudio()
this.showMessage("请先完成库移后在扫描箱码")
} else {
scanFailedAudio()
setTimeout(res => {
showConfirmMsg("扫描的箱码[" + fromData.code + "]与推荐的箱码[" + this.details[0]
.recommendFromPackingCode +
@ -410,6 +417,7 @@
var balancesItem = res.items[0];
var item = data[0];
if (balancesItem.lot == item.recommendToLot) {
scanSuccessAudio()
item.handledToContainerCode = balancesItem.containerCode
item.handledToPackingCode = balancesItem.packingCode
item.handledToSupplierBatch = balancesItem.supplierBatch
@ -433,6 +441,7 @@
item.handledFromLocationCode =balancesItem.locationCode
item.handleToPackingCodeLocationCode = balancesItem.locationCode
} else {
scanFailedAudio()
showConfirmMsg("箱码[" + fromData.code + "]的批次[" + balancesItem.lot +
"]与推荐目标批次[" + item
.recommendToLot + "]不一致,是否继续发料", res => {
@ -491,6 +500,7 @@
balances(params)
.then(res => {
if (res.totalCount === 0) {
scanFailedAudio()
this.showScanMessage('按箱码【' + result.data.code + '】未查询到库存信息');
} else {
callback(res);
@ -498,6 +508,7 @@
uni.hideLoading();
})
.catch(err => {
scanFailedAudio()
this.showScanMessage(err.message);
uni.hideLoading();
});

11
fe/PDA/pages/task/kittingIssueJobDetailByQty.vue

@ -152,7 +152,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButtonLeft from '@/mycomponents/wincom/winScanButtonLeft.vue'
@ -256,11 +258,12 @@
getFromLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendFromLocationCode) {
scanFailedAudio()
this.showMessage(" 扫描来源库位[" + locationInfo.code + "]与推荐来源库位[" + current
.recommendFromLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
current.handledFromLocationCode = locationInfo.code
current.handledFromLocationArea = locationInfo.locationArea
current.handledFromLocationGroup = locationInfo.locationGroup
@ -274,10 +277,12 @@
getToLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendToLocationCode) {
scanFailedAudio()
this.showMessage("扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current
.recommendToLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
this.toLocationInfo = locationInfo
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
@ -383,9 +388,11 @@
});
if (item == undefined) {
scanFailedAudio()
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
}
scanSuccessAudio()
this.singCode = result.itemCode
this.$refs.scanPackPopup.closeScanPopup();

8
fe/PDA/pages/task/receipt.vue

@ -38,7 +38,9 @@
import {
getJobStatuStyle,
getJobStatuDesc,
goHome
goHome,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
@ -233,13 +235,17 @@
getReceiptJobByAsnNumber(params).then(res => {
uni.hideLoading();
if (res.totalCount == 0) {
scanFailedAudio()
that.showMessage('未查找到' + type + '为【' + code + '】的收货任务');
} else if (res.totalCount == 1) {
scanSuccessAudio()
that.openDetail(res.items[0]);
} else {
scanSuccessAudio()
this.showItemList(res.items);
}
}).catch(err => {
scanFailedAudio()
that.showMessage(err.message);
uni.hideLoading();
});

7
fe/PDA/pages/task/receipt_detail.vue

@ -102,7 +102,9 @@
getJobStatuDesc,
showConfirmMsg,
compareDesc,
goHome
goHome,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
@ -283,6 +285,7 @@
});
if (datas.length === 0) {
scanFailedAudio()
this.showScanMessage('在收货任务详情中,未找到箱码【' + code + '】');
} else {
if (datas.length === 1) {
@ -320,9 +323,11 @@
if (res != null) {
this.afterPurchase();
}
scanSuccessAudio()
this.scanPopupGetFocus();
uni.hideLoading();
}).catch(err => {
scanFailedAudio()
this.showMessage(err.message)
uni.hideLoading();
})

7
fe/PDA/pages/task/sparePartIssueJob.vue

@ -29,7 +29,9 @@
import {
goHome,
getIssueJobState
getIssueJobState,
scanSuccessAudio,
scanFailedAudio,
} from '@/common/basic.js';
import winEmptyView from '@/mycomponents/wincom/winEmptyView.vue'
@ -151,12 +153,15 @@
getSparePartIssueJobByPackingCode(result.data.code).then(res=>{
uni.hideLoading();
if(res){
scanSuccessAudio()
this.$refs.scanPopup.closeScanPopup();
this.openDetail(res)
}else {
scanFailedAudio()
this.showMessage("按箱码["+result.data.code+"]没有查找到发料任务");
}
}).catch(error=>{
scanFailedAudio()
uni.hideLoading();
this.showMessage(error.message);
})

14
fe/PDA/pages/task/sparePartIssueJobDetail.vue

@ -185,7 +185,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -283,10 +285,12 @@
geToLocationss(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendToLocationCode) {
scanFailedAudio()
this.showMessage(" 扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current
.recommendToLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
current.handledToLocationGroup = locationInfo.locationGroupCode
@ -298,15 +302,19 @@
locations(locationCode).then((res) => {
uni.hideLoading();
if (res) {
scanSuccessAudio()
current.handledToLocationCode = res.code
current.handledToLocationArea = res.locationArea
current.handledToLocationGroup = res.locationGroup
current.handledToLocationErpCode = res.locationErpCode
} else {
scanFailedAudio()
this.showMessage('未查找到库位【' + locationCode + '】');
}
}).catch((err) => {
scanFailedAudio()
uni.hideLoading();
this.showMessage(err.message);
})
},
@ -397,13 +405,16 @@
var fromData = result.data;
var data = this.details.filter(r => r.itemCode == result.data.itemCode)
if (data.length == 0) {
scanFailedAudio()
this.showMessage("扫描的箱码[" + fromData.code + "]的物品不在列表中")
return;
}
if (this.jobStatus == 30) {
if (fromData.code == this.details[0].recommendFromPackingCode) {
scanFailedAudio()
this.showMessage("请先完成库移后在扫描箱码")
} else {
scanFailedAudio()
setTimeout(res => {
showConfirmMsg("扫描的箱码[" + fromData.code + "]与推荐的箱码[" + this.details[0]
.recommendFromPackingCode +
@ -451,6 +462,7 @@
item.handleToPackingCodeLocationCode = balancesItem.locationCode
this.getToLocation(this.details[0].recommendToLocationCode)
} else {
scanFailedAudio()
showConfirmMsg("箱码[" + fromData.code + "]的批次[" + balancesItem.lot + "]与推荐目标批次[" + item
.recommendToLot + "]不一致,是否继续发料", res => {
if (res) {

11
fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue

@ -153,7 +153,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButtonLeft from '@/mycomponents/wincom/winScanButtonLeft.vue'
@ -255,11 +257,12 @@
getFromLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendFromLocationCode) {
scanFailedAudio()
this.showMessage(" 扫描来源库位[" + locationInfo.code + "]与推荐来源库位[" + current
.recommendFromLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
current.handledFromLocationCode = locationInfo.code
current.handledFromLocationArea = locationInfo.locationArea
current.handledFromLocationGroup = locationInfo.locationGroup
@ -273,10 +276,12 @@
getToLocation(locationInfo) {
var current = this.details[0]
if (locationInfo.code != current.recommendToLocationCode) {
scanFailedAudio()
this.showMessage("扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current
.recommendToLocationCode + "]不一致,请重新扫描")
return;
}
scanSuccessAudio()
this.toLocationInfo = locationInfo
current.handledToLocationCode = locationInfo.code
current.handledToLocationArea = locationInfo.areaCode
@ -381,9 +386,11 @@
});
if (item == undefined) {
scanFailedAudio()
this.showMessage('在任务详情中,未找到ERP料号【' + result.itemCode + '】');
return;
}
scanSuccessAudio()
this.singCode = result.itemCode
this.$refs.scanPackPopup.closeScanPopup();

8
fe/PDA/pages/task/thirdLocationJobDetail.vue

@ -120,7 +120,9 @@
showConfirmMsg,
goHome,
navigateBack,
deepCopyData
deepCopyData,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import {
calc
@ -217,6 +219,7 @@
//
getDefaultToLocation(locationCode) {
if(this.details[0].toLocationCode!=locationCode){
scanFailedAudio()
this.showMessage("扫描库位["+locationCode+"]与目标库位["+this.details[0].toLocationCode+"]不一致");
this.$refs.comCollapseLocation.clearLocation()
return;
@ -228,13 +231,16 @@
locations(locationCode).then(res => {
uni.hideLoading();
if (res) {
scanSuccessAudio()
this.toLocationInfo = res
} else {
scanFailedAudio()
this.$refs.comCollapseLocation.clearLocation()
this.showMessage('目标库位【' + locationCode + '】不存在');
}
}).catch(err => {
scanFailedAudio()
uni.hideLoading();
this.toLocationInfo = null
this.$refs.comCollapseLocation.clearLocation()

14
fe/PDA/pages/task/unProducePickDetail.vue

@ -124,7 +124,9 @@
goHome,
compareDesc,
compareStr,
getCurrDateTime
getCurrDateTime,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -265,6 +267,7 @@
let item = this.details.find(r => r.recommendPackingCode === result.data.packingCode && r
.scanPackingCode != result.data.packingCode);
if (item != undefined && item.scaned) {
scanFailedAudio()
showConfirmMsg('扫描的箱码【' + result.data.packingCode + '】匹配到任务中的【' + item.scanPackingCode +
'】箱,是否要重新匹配任务中的【' + item.scanPackingCode + '】箱?',
confirm => {
@ -276,6 +279,7 @@
})
} else {
if (this.allCount === this.scanCount) {
scanFailedAudio()
this.showMessage("零件已经全部扫描完成");
return;
}
@ -295,6 +299,7 @@
r.scanLot === that.currentScanLebel.data.lot &&
r.scaned == true)
if (scanItem != undefined) {
scanFailedAudio()
this.showScanMessage('箱码【' + that.currentScanLebel.data.packingCode + '】已经扫描,请扫描下一箱零件');
} else {
this.dyIssue(result, scaned);
@ -308,6 +313,7 @@
r.scaned === scaned
})
if (itemCode == undefined) {
scanFailedAudio()
that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中');
} else {
//ERP
@ -327,6 +333,7 @@
if (itemCode2 == undefined) {
//ERP
console.log("ERP料号相同、箱码不相同、批次不相同")
scanFailedAudio()
setTimeout(res => {
showConfirmMsg(itemCode.recommendPackingCode + '未执行先进先出或不是最先批次,是否继续?', confirm => {
if (confirm) {
@ -357,6 +364,7 @@
if (itemCode3 == undefined) {
//ERP
console.log("ERP料号相同、箱码相同、批次不同")
scanFailedAudio()
setTimeout(res => {
showConfirmMsg(itemCode1.recommendPackingCode + '未执行先进先出或不是最先批次,是否继续?',
confirm => {
@ -374,6 +382,7 @@
//ERP
that.currentItem = itemCode3;
that.afterScanPackLabel(result);
}
}
}
@ -414,15 +423,18 @@
getBalancesByFilter(params)
.then(res => {
if (res.totalCount === 0) {
scanFailedAudio()
this.showScanMessage('按ERP料号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' +
result
.data.lot + '】在【原料库】或【半成品库】或【成品库】未查询到库存信息');
} else {
scanSuccessAudio()
callback(res);
}
uni.hideLoading();
})
.catch(err => {
scanFailedAudio()
this.showScanMessage(err.message);
uni.hideLoading();
});

10
fe/PDA/pages/task/unProducePickWipDetail.vue

@ -119,7 +119,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -223,10 +225,12 @@
getToLocation(locationInfo) {
if (this.currentItem.recommendFromLocationCode != locationInfo.code) {
scanFailedAudio()
this.showMessage("扫描库位[" + locationInfo.code + "]与推荐来源库位[" + this.currentItem
.recommendFromLocationCode + "]不一致")
return;
}
scanSuccessAudio()
this.currentItem.handledFromLocationCode = locationInfo.code;
this.currentItem.handledFromLocationArea = locationInfo.areaCode
this.currentItem.handledFromLocationGroup = locationInfo.locationGroupCode
@ -331,6 +335,7 @@
}
this.getScanResult(result,false)
} else {
scanFailedAudio()
this.showMessage('未查找到ERP料号【' + code + '】');
}
}).catch((err) => {
@ -348,6 +353,7 @@
if (item == undefined) {
if(isMesCode){
scanFailedAudio()
this.showMessage('在任务详情中,单件码【' + result.scanCode + '】所对应的ERP料号与任务中的ERP料号不一致,请重新扫描');
}else {
this.showMessage('在任务详情中,没有找到ERP料号[' + result.itemCode+"]的信息,请重新扫描");
@ -357,12 +363,14 @@
}
if (item.scaned) {
if(isMesCode){
scanFailedAudio()
this.showMessage('单件码[' + result.scanCode + "]已经扫描")
}else {
this.showMessage('ERP料号[' + result.itemCode + "]已经扫描")
}
} else {
scanSuccessAudio()
item.scaned = true;
item.scanDate = new Date()
this.details.sort(compareDesc('scanDate'));

7
fe/PDA/pages/task/unProduceReturnDetail.vue

@ -122,7 +122,9 @@
goHome,
compareDesc,
compareStr,
getCurrDateTime
getCurrDateTime,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -264,6 +266,7 @@
.scanPackingCode != result.data.packingCode);
if (item != undefined && item.scaned) {
scanFailedAudio()
showConfirmMsg('扫描的箱码【' + result.data.packingCode + '】匹配到任务中的【' + item.scanPackingCode +
'】箱,是否要重新匹配任务中的【' + item.scanPackingCode + '】箱?',
confirm => {
@ -275,6 +278,7 @@
})
} else {
if (this.allCount === this.scanCount) {
scanFailedAudio()
this.showMessage("零件已经全部扫描完成");
return;
}
@ -458,6 +462,7 @@
afterScanPackLabel(result) {
this.setParams(this.currentItem, result)
this.scanPopupGetFocus();
scanSuccessAudio()
},
// //

9
fe/PDA/pages/task/unProduceReturnWipDetail.vue

@ -119,7 +119,9 @@
compareDesc,
compareStr,
getCurrDateTime,
navigateBack
navigateBack,
scanSuccessAudio,
scanFailedAudio
} from '@/common/basic.js';
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@ -329,9 +331,11 @@
}
this.getScanResult(result,false)
} else {
scanFailedAudio()
this.showMessage('未查找到ERP料号【' + code + '】');
}
}).catch((err) => {
scanFailedAudio()
this.showMessage(err.message);
uni.hideLoading();
})
@ -346,6 +350,7 @@
if (item == undefined) {
if(isMesCode){
scanFailedAudio()
this.showMessage('在任务详情中,单件码【' + result.scanCode + '】所对应的ERP料号与任务中的ERP料号不一致,请重新扫描');
}else {
this.showMessage('在任务详情中,没有找到ERP料号[' + result.itemCode+"]的信息,请重新扫描");
@ -355,12 +360,14 @@
}
if (item.scaned) {
if(isMesCode){
scanFailedAudio()
this.showMessage('单件码[' + result.scanCode + "]已经扫描")
}else {
this.showMessage('ERP料号[' + result.itemCode + "]已经扫描")
}
} else {
scanSuccessAudio()
item.scaned = true;
item.scanDate = new Date()
this.details.sort(compareDesc('scanDate'));

BIN
fe/PDA/static/video/scan_failed.mp3

Binary file not shown.

BIN
fe/PDA/static/video/scan_success.mp3

Binary file not shown.

2
fe/PDA/uni_modules/wz-select-input/package.json

@ -31,7 +31,7 @@
"npmurl": ""
},
"uni_modules": {
"dependencies": ["wz-select-popup"],
"dependencies": ["wz-select-popup","wz-select-popup-customer"],
"encrypt": [],
"platforms": {
"cloud": {

12
fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue

@ -8,11 +8,16 @@
</view>
({{index+1}})
<view class="uni-flex" style="flex-direction: column; font-size: 32rpx;">
<view v-if="isShowItem" class="uni-flex" style="flex-direction: column; font-size: 32rpx;">
<view class="list-item-text">ERP料号 : {{item.itemCode}}</view>
<view class="list-item-text">名称 : {{item.itemName}}</view>
<view class="list-item-text">描述 : {{item.itemDesc1}}</view>
</view>
<view v-else class="uni-flex" style="flex-direction: column; font-size: 32rpx;">
<view class="list-item-text">客户代码 : {{item.code}}</view>
<view class="list-item-text">客户名称 : {{item.name}}</view>
</view>
</view>
<view class="loadmore" @click="$emit('loadmore')">
@ -32,6 +37,11 @@
type: Array,
default: () => []
},
isShowItem: {
type: Boolean,
default: true
},
isShowIcon: {
type: Boolean,
default: true

15
fe/PDA/uni_modules/wz-select-popup/components/wz-select-popup/wz-select-popup.vue

@ -16,7 +16,9 @@
<scroll-view class="popup-scroll-y" :scroll-top="scroll.newTop" scroll-y
:style="{'--popup-scroll-height': scrollH}" @scrolltolower="scrolltolower" @scroll="viewScroll">
<wz-list :list="dataList" :fields="popConfig.fields" :page="pageStatus" @checkList="checkList"
@loadmore="scrolltolower" :isShowIcon="false" />
@loadmore="scrolltolower"
:isShowItem="isShowItem"
:isShowIcon="false" />
</scroll-view>
<view v-if="popConfig.mode =='checkbox'" class="footer-button">
<view class="button-item">
@ -68,6 +70,12 @@
type: String,
default: '物料查询'
},
isShowItem: {
type: Boolean,
default: true
},
},
@ -239,6 +247,11 @@
this.handleSelected(list.items)
this.dataList = this.dataList.concat(list.items)
}).catch(error=>{
uni.hideLoading()
uni.showToast({
title:"请求失败"
})
})
},
close() {

Loading…
Cancel
Save