diff --git a/fe/PDA/common/modelConfig.js b/fe/PDA/common/modelConfig.js
index b0826b49d..037f24211 100644
--- a/fe/PDA/common/modelConfig.js
+++ b/fe/PDA/common/modelConfig.js
@@ -1,5 +1,7 @@
let maxPageSize = 10;
+let version ="1.0"
export default{
- maxPageSize
+ maxPageSize,
+ version
}
\ No newline at end of file
diff --git a/fe/PDA/main.js b/fe/PDA/main.js
index 1a2be9a41..060c034ae 100644
--- a/fe/PDA/main.js
+++ b/fe/PDA/main.js
@@ -47,6 +47,7 @@ Vue.use(VueAxios, axios)
Vue.prototype.$request = request
Vue.prototype.$url = url.url_config
Vue.prototype.modelConfig = modelConfig.maxPageSize
+Vue.prototype.versionCode = modelConfig.version
Vue.prototype.utils = utils;
Vue.config.productionTip = false
diff --git a/fe/PDA/pages/login/index.vue b/fe/PDA/pages/login/index.vue
index cdd59f6ad..008b95a28 100644
--- a/fe/PDA/pages/login/index.vue
+++ b/fe/PDA/pages/login/index.vue
@@ -2,6 +2,7 @@
+
您好，欢迎使用
WMS仓库管理系统
@@ -57,6 +58,7 @@
+ version : {{version}}
@@ -82,7 +84,8 @@
password: "",
tapstyle: 2,
loading: false,
- showPassword: true
+ showPassword: true,
+ version:"0"
}
},
computed: mapState(['forcedLogin', 'hasLogin']),
@@ -96,6 +99,7 @@
frontColor: '#ffffff',
backgroundColor: "#476DF5 !important"
})
+ this.version = this.versionCode;
},
onLoad() {},
methods: {
diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue
index a274c8596..85d8bb6e5 100644
--- a/fe/PDA/pages/task/issue_detail.vue
+++ b/fe/PDA/pages/task/issue_detail.vue
@@ -8,7 +8,7 @@
-
+
@@ -36,13 +36,14 @@
{{item.recommendQty}}({{item.uom}})
-
-
-
+
+
+
- ({{item.uom}})
+ ({{item.uom}})
@@ -74,7 +75,8 @@
{{ item.recommendFromLocationCode }}
- {{ item.handledFromLocationCode }}
+
+ {{ item.handledFromLocationCode }}
@@ -97,7 +99,8 @@
-
+
@@ -253,7 +256,7 @@
// }
this.allCount = that.details.length;
this.scanCount = 0;
-
+
}
uni.hideLoading();
})
@@ -307,64 +310,140 @@
dyIssue(result, scaned) {
let that = this;
-
- that.currentItem = that.details.find(r => {
- return r.itemCode === result.data.itemCode &&
- r.recommendPackingCode === result.data.code &&
- r.recommendLot === result.data.lot &&
+ var itemCode = that.details.find(r => {
+ return r.itemCode === result.data.itemCode&&
+ r.scaned === scaned
+ })
+ if (itemCode == undefined) {
+ that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中');
+ }else {
+ //零件号相同、箱码相同
+ var itemCode1 = that.details.find(r => {
+ return r.itemCode === result.data.itemCode&&
+ r.recommendPackingCode === result.data.code
r.scaned === scaned
- });
-
- //没找到符合的箱码
- if (that.currentItem === undefined) {
- var itemCode = that.details.find(res=>{
- return res.itemCode ===result.data.itemCode&&
- res.scaned === scaned
})
- //零件号相等
- if(itemCode!=undefined){
- var lot = that.details.find(res=>{
- return res.itemCode===result.data.itemCode&&
- res.recommendLot ===result.data.lot&&
- res.scaned === scaned
- })
- if(lot!=undefined){
- //通过
- that.currentItem =lot;
- that.afterScanPackLabel(result);
- }else {
- //批次不相等
- // 提示未执行先进先出或者不是最先批次。
- setTimeout(res=>{
- showConfirmMsg('未执行先进先出或不是最先批次,是否继续?', confirm => {
+ //零件号相同、箱码不相同
+ if(itemCode1 == undefined){
+ var itemCode2 = that.details.find(r => {
+ return r.itemCode === result.data.itemCode&&
+ r.recommendLot === result.data.lot
+ &&r.scaned === scaned
+ })
+ //零件号相同、箱码不相同、批次相同
+ if(itemCode2==undefined){
+ //零件号相同、箱码不相同、批次不相同
+ console.log("零件号相同、箱码不相同、批次不相同")
+ setTimeout(res => {
+ showConfirmMsg(itemCode.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => {
if (confirm) {
that.currentItem = itemCode;
that.afterScanPackLabel(result);
- }else {
+ } else {
that.scanPopupGetFocus();
}
});
- },100)
+ }, 100)
+ }else {
+ console.log("零件号相同、箱码不相同、批次相同")
+ //零件号相同、箱码不相同、批次相同
+ that.currentItem = itemCode2;
+ that.afterScanPackLabel(result);
}
- }else{
- //零件号不相等
- var lot = that.details.find(res=>{
- return res.recommendLot ===result.data.lot&&
- res.scaned === scaned
- })
- //批次相等
- if(lot!=undefined){
- // 在该任务中未找到零件。
- that.showScanMessage('在该任务中未找到零件');
+
+
+ }else {
+ //零件号相同、箱码相同、批次相同
+ var itemCode3 = that.details.find(r => {
+ return r.itemCode === result.data.itemCode&&
+ r.recommendPackingCode === result.data.code&&
+ r.recommendLot === result.data.lot
+ &&r.scaned === scaned
+ })
+ if(itemCode3==undefined){
+ //零件号相同、箱码相同、批次不同
+ console.log("零件号相同、箱码相同、批次不同")
+ setTimeout(res => {
+ showConfirmMsg(itemCode1.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => {
+ if (confirm) {
+ that.currentItem = itemCode1;
+ that.afterScanPackLabel(result);
+ } else {
+ that.scanPopupGetFocus();
+ }
+ });
+ }, 100)
+
}else {
- //零件号不相等,批次不相等
- that.showScanMessage('所扫描的物料不在任务中');
+ console.log("零件号相同、箱码相同、批次相同")
+ //零件号相同、箱码相同、批次相同
+ that.currentItem = itemCode3;
+ that.afterScanPackLabel(result);
}
}
- } else {
- that.afterScanPackLabel(result);
}
+
+
+ // that.currentItem = that.details.find(r => {
+ // return r.itemCode === result.data.itemCode &&
+ // r.recommendPackingCode === result.data.code &&
+ // r.recommendLot === result.data.lot &&
+ // r.scaned === scaned
+ // });
+
+
+
+ // //没找到符合的箱码、零件号、箱码、批次都相等
+ // if (that.currentItem === undefined) {
+ // var itemCode = that.details.find(res => {
+ // return res.itemCode === result.data.itemCode &&
+ // res.scaned === scaned
+ // })
+ // //零件号相等
+ // if (itemCode != undefined) {
+ // var lot = that.details.find(res => {
+ // return res.itemCode === result.data.itemCode &&
+ // res.recommendLot === result.data.lot &&
+ // res.scaned === scaned
+ // })
+ // if (lot != undefined) {
+ // //通过
+ // that.currentItem = lot;
+ // that.afterScanPackLabel(result);
+ // } else {
+ // //批次不相等
+ // // 提示未执行先进先出或者不是最先批次。
+ // setTimeout(res => {
+ // showConfirmMsg('未执行先进先出或不是最先批次,是否继续?', confirm => {
+ // if (confirm) {
+ // that.currentItem = itemCode;
+ // that.afterScanPackLabel(result);
+ // } else {
+ // that.scanPopupGetFocus();
+ // }
+ // });
+ // }, 100)
+
+ // }
+ // } else {
+ // //零件号不相等
+ // var lot = that.details.find(res => {
+ // return res.recommendLot === result.data.lot &&
+ // res.scaned === scaned
+ // })
+ // //批次相等
+ // if (lot != undefined) {
+ // // 在该任务中未找到零件。
+ // that.showScanMessage('在该任务中未找到零件');
+ // } else {
+ // //零件号不相等,批次不相等
+ // that.showScanMessage('所扫描的物料不在任务中');
+ // }
+ // }
+ // } else {
+ // that.afterScanPackLabel(result);
+ // }
},
afterScanPackLabel(result) {
@@ -428,18 +507,18 @@
item.handledPackingCode = balanceItem.packingCode;
item.handledBatch = balanceItem.batch;
item.handledLot = balanceItem.lot;
-
- item.defaultHandleQty =balanceItem.qty;
+
+ item.defaultHandleQty = balanceItem.qty;
item.handledQty = balanceItem.qty;
item.handledFromLocationCode = balanceItem.locationCode;
item.handledFromLocationArea = balanceItem.locationArea;
item.handledFromLocationGroup = balanceItem.locationErpCode;
item.handledFromLocationErpCode = balanceItem.locationGroup;
item.handledFromWarehouseCode = balanceItem.warehouseCode;
-
- item.toLocationArea =balanceItem.locationArea;
- item.toLocationGroup= balanceItem.locationGroup;
- item.toLocationErpCode= balanceItem.locationErpCode;
+
+ item.toLocationArea = balanceItem.locationArea;
+ item.toLocationGroup = balanceItem.locationGroup;
+ item.toLocationErpCode = balanceItem.locationErpCode;
//当前扫描标签的信息
item.scanItemCode = this.currentScanLebel.data.itemCode;
@@ -615,15 +694,15 @@
this.$refs.scanPopup.closeScanPopup();
}
},
-
+
closeScanMessage() {
this.scanPopupGetFocus();
},
-
+
scanPopupGetFocus() {
this.$refs.scanPopup.getfocus();
},
-
+
scrollToTop() {
let that = this;
// 解决view层不同步的问题
@@ -643,15 +722,15 @@
// console.log(e)
this.old.scrollTop = e.detail.scrollTop;
},
- qtyChanged(value, item,index) {
+ qtyChanged(value, item, index) {
if (value <= 0) {
this.showMessage('发料数量不能小于或等于0')
- item.handledQty =item.defaultHandleQty
- this.$refs['comNumberBox_'+index][0].setValue(item.handledQty);
- }else if(value>item.defaultHandleQty){
item.handledQty = item.defaultHandleQty
- this.showMessage('发料数量不能大于库存数量:'+item.handledQty)
- this.$refs['comNumberBox_'+index][0].setValue(item.handledQty);
+ this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
+ } else if (value > item.defaultHandleQty) {
+ item.handledQty = item.defaultHandleQty
+ this.showMessage('发料数量不能大于库存数量:' + item.handledQty)
+ this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
}
},
}