diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index ab5affd..0b1d510 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version);
}
///********版本号修改区域**********
- version = '0.0.109'; //正式版本号
+ version = '0.0.110'; //正式版本号
//version = '0.0.14'; //测试版本号
//***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本****************
//isTest = true;
diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue
index 0b1ca1b..920792a 100644
--- a/src/pages/wms/Raw/ReceivePO/index.vue
+++ b/src/pages/wms/Raw/ReceivePO/index.vue
@@ -18,8 +18,11 @@
提单
-
-
+
+
+
+
+
物料编码:
{{ item.handlematerialCode }}
-
+
+
应收/已收:
{{ item.planNumber }}/{{ item.realityNumber }}
@@ -241,6 +244,16 @@ export default class receivePO extends BasePage {
}
//标志卡查询
async querybyidcard() {
+ if (this.receivedlist.length) {
+ let ischongfu = this.receivedlist.some((item) => item.userDefined1 == this.Idcard);
+ if (ischongfu) {
+ (this.$refs.uToast as any).show({
+ title: '请勿重复扫描标志卡',
+ });
+ this.Idcard = '';
+ return;
+ }
+ }
let item = {
factoryCode: session.FactoryCode,
userDefined1: this.Idcard,
diff --git a/src/pages/wms/Raw/ReceiveSRM/index.vue b/src/pages/wms/Raw/ReceiveSRM/index.vue
index ff09d66..6606fd1 100644
--- a/src/pages/wms/Raw/ReceiveSRM/index.vue
+++ b/src/pages/wms/Raw/ReceiveSRM/index.vue
@@ -19,8 +19,11 @@
提单
-
-
+
+
+
+
+
@@ -46,30 +49,30 @@
{{ item.orderStatus == 0 ? '未收货' : item.orderStatus == 1 ? '正在收货' : '收货完成' }}
-
+
采购单号:
{{ item.procureCode }}
-
+
物料编码:
{{ item.handlematerialCode }}
-
+
+
应收/实收:
{{ item.planNumber }}/{{ item.realityNumber }}
@@ -328,14 +331,16 @@ export default class receiveSRM extends BasePage {
}
//标志卡查询
async querybyidcard() {
- // if(this.receivedlist.length!=0){
- // const result = this.receivedlist.every(item => item.userDefined4 == this.prodobj.id);
- // (this.$refs.uToast as any).show({
- // title: '不允许在不同采购单下扫描标志卡',
- // type: 'default',
- // });
- // return;
- // }
+ if (this.receivedlist.length) {
+ let ischongfu = this.receivedlist.some((item) => item.userDefined1 == this.Idcard);
+ if (ischongfu) {
+ (this.$refs.uToast as any).show({
+ title: '请勿重复扫描标志卡',
+ });
+ this.Idcard = '';
+ return;
+ }
+ }
let item = {
factoryCode: session.FactoryCode,
userDefined1: this.Idcard,