diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js
index 710595e35..aeec136f2 100644
--- a/fe/PDA/api/index.js
+++ b/fe/PDA/api/index.js
@@ -202,8 +202,8 @@ export const getBalancesExpectByFilter = (params) => request(
data: params
});
// ERP料号模糊匹配查询库存
-export const getBalancesByItemCode = (params) => request(
- devUrl + "/api/pda/get-fuzzy-by-balances-request-many-parameter", {
+export const getBalancesByItemCode = (params) => promise(
+ devUrl + "/api/pda/inventory/balances/get-fuzzy-by-balances-request-many-parameter", {
method: 'post',
data: params
});
diff --git a/fe/PDA/pages/assemble/assembleTransfer.vue b/fe/PDA/pages/assemble/assembleTransfer.vue
index 540a1beea..43fe9b64f 100644
--- a/fe/PDA/pages/assemble/assembleTransfer.vue
+++ b/fe/PDA/pages/assemble/assembleTransfer.vue
@@ -173,6 +173,13 @@
});
}
},
+ remove(index) {
+ showConfirmMsg("确定移除?", res => {
+ if (res) {
+ this.itemList.splice(index, 1);
+ }
+ })
+ },
getScanResult(result) {
let that = this;
@@ -201,7 +208,7 @@
stdPackQty: result.stdPackQty,
uom: result.uom,
qty: result.stdPackQty,
- fromLocationCode: "ZPCP1",
+ fromLocationCode: result.locationCode,
fromStatus: 2,
toStatus:2
}
@@ -240,16 +247,21 @@
});
let that = this;
locations(code).then(res => {
- if (res == null) {
+ uni.hideLoading();
+ if (res) {
+ //不要待检、隔离、在途、
+ if (res.type == 1 || res.type == 6 || res.type == 13) {
+ that.showMessage("目标库位不可以是待检、隔离、在途库位类型");
+ } else {
+ that.toLocationCode = code;
+ that.toLocationErpCode = res.erpLocationCode;
+ }
+ } else {
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
this.locationGotFocus = true;
- } else {
- that.toLocationCode = code;
- that.toLocationErpCode = res.erpLocationCode;
}
- uni.hideLoading();
}).catch(err => {
that.toLocationCode = ''
this.locationGotFocus = true;
@@ -322,7 +334,10 @@
that.showMessage(err.message);
uni.hideLoading();
});
+ }else {
+ that.showMessage("库位[" + this.itemList[0].fromLocationCode + "]不存在");
}
+
})
},
diff --git a/fe/PDA/pages/container/containerCall.vue b/fe/PDA/pages/container/containerCall.vue
index 536a93157..d31ea9ece 100644
--- a/fe/PDA/pages/container/containerCall.vue
+++ b/fe/PDA/pages/container/containerCall.vue
@@ -13,22 +13,22 @@
-->
-
-
-
- *
-
-
- 目标库位 :
-
-
- {{locationCode}}
- ({{locationName}})
-
-
-
+
+
+
+ *
+
+
+ 目标库位 :
+
+
+ {{locationCode}}
+ ({{locationName}})
+
+
+
@@ -72,7 +72,7 @@
-
+
@@ -133,17 +133,28 @@
res.checked = false
})
item.checked = true;
- this.containerModelCode =item.code;
+ this.containerModelCode = item.code;
},
getContainerModelList() {
+ uni.showLoading({
+ title: '加载中...',
+ mask: true
+ });
getDictByCode("ContainerSpecificationsType").then(res => {
- res.items.forEach(item => {
- item.value = item.code;
- item.checked = false
- })
- this.containerModelList = res.items;
- }).catch(error => {
+ uni.hideLoading();
+ if (res && res.items.length > 0) {
+ res.items.forEach(item => {
+ item.value = item.code;
+ item.checked = false
+ })
+ this.containerModelList = res.items;
+ } else {
+ this.showMessage('获取器具规格失败,请在字典中维护器具规格');
+ }
+ }).catch(error => {
+ uni.hideLoading();
+ this.showMessage('获取器具规格失败【' + error + '】');
})
},
openScanLocation() {
@@ -183,7 +194,7 @@
afterClose() {
this.scanPopupGetFocus();
},
-
+
scanPopupGetFocus() {
this.$refs.scanLocation.getfocus();
},
@@ -192,7 +203,7 @@
},
clearData() {
this.containerModelCode = ""
- this.containerModelList.forEach(res=>{
+ this.containerModelList.forEach(res => {
res.checked = false
});
},
@@ -208,12 +219,12 @@
}
return data;
},
-
+
showCommitSuccess(message) {
this.$refs.comMessage.showCommitSuccess(message);
},
-
- closeCommitMessage(){
+
+ closeCommitMessage() {
navigateBack(1)
},
diff --git a/fe/PDA/pages/cotaing/coatingTransfer.vue b/fe/PDA/pages/cotaing/coatingTransfer.vue
index b507af8b4..373e6646c 100644
--- a/fe/PDA/pages/cotaing/coatingTransfer.vue
+++ b/fe/PDA/pages/cotaing/coatingTransfer.vue
@@ -173,6 +173,13 @@
});
}
},
+ remove(index) {
+ showConfirmMsg("确定移除?", res => {
+ if (res) {
+ this.itemList.splice(index, 1);
+ }
+ })
+ },
getScanResult(result) {
let that = this;
@@ -201,7 +208,7 @@
stdPackQty: result.stdPackQty,
uom: result.uom,
qty: result.stdPackQty,
- fromLocationCode: "ZPCP1",
+ fromLocationCode: result.locationCode,
fromStatus: 2,
toStatus:2
}
@@ -240,16 +247,21 @@
});
let that = this;
locations(code).then(res => {
- if (res == null) {
+ uni.hideLoading();
+ if (res) {
+ //不要待检、隔离、在途、
+ if (res.type == 1 || res.type == 6 || res.type == 13) {
+ that.showMessage("目标库位不可以是待检、隔离、在途库位类型");
+ } else {
+ that.toLocationCode = code;
+ that.toLocationErpCode = res.erpLocationCode;
+ }
+ } else {
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
this.locationGotFocus = true;
- } else {
- that.toLocationCode = code;
- that.toLocationErpCode = res.erpLocationCode;
}
- uni.hideLoading();
}).catch(err => {
that.toLocationCode = ''
this.locationGotFocus = true;
@@ -322,6 +334,8 @@
that.showMessage(err.message);
uni.hideLoading();
});
+ }else {
+ that.showMessage("库位[" + this.itemList[0].fromLocationCode + "]不存在");
}
})
diff --git a/fe/PDA/pages/injection/injectionTransfer.vue b/fe/PDA/pages/injection/injectionTransfer.vue
index 4ad2b3d9d..778272569 100644
--- a/fe/PDA/pages/injection/injectionTransfer.vue
+++ b/fe/PDA/pages/injection/injectionTransfer.vue
@@ -45,7 +45,7 @@
+ @click="remove(index)">移除
@@ -130,7 +130,7 @@
locationErpCode: '',
toLocationErpCode: '',
locationGotFocus: false,
- transferType:"Transfer_Injection"
+ transferType: "Transfer_Injection"
};
},
props: {
@@ -174,6 +174,14 @@
}
},
+ remove(index) {
+ showConfirmMsg("确定移除?", res => {
+ if (res) {
+ this.itemList.splice(index, 1);
+ }
+ })
+ },
+
getScanResult(result) {
let that = this;
let code = result.itemCode;
@@ -203,7 +211,7 @@
qty: result.stdPackQty,
fromLocationCode: result.locationCode,
fromStatus: 2,
- toStatus:2
+ toStatus: 2
}
this.itemList.unshift(item);
@@ -241,21 +249,21 @@
let that = this;
locations(code).then(res => {
uni.hideLoading();
- if(res){
+ if (res) {
//不要待检、隔离、在途、
- if(res.type==1||res.type==6||res.type==13){
+ if (res.type == 1 || res.type == 6 || res.type == 13) {
that.showMessage("目标库位不可以是待检、隔离、在途库位类型");
- }else {
+ } else {
that.toLocationCode = code;
that.toLocationErpCode = res.erpLocationCode;
}
- }else {
+ } else {
that.toLocationCode = ''
that.showMessage('目标库位【' + code + '】不存在');
this.$refs.location.clearLocation()
this.locationGotFocus = true;
}
-
+
}).catch(err => {
that.toLocationCode = ''
this.locationGotFocus = true;
@@ -300,17 +308,17 @@
this.itemList.forEach(r => {
r.toLocationCode = that.toLocationCode;
r.toLocationErpCode = this.toLocationErpCode
- r.fromLot ="";
+ r.fromLot = "";
r.fromLocationArea = this.fromLocationInfo.areaCode;
r.fromLocationGroup = this.fromLocationInfo.locationGroupCode;
r.fromLocationErpCode = this.fromLocationInfo.erpLocationCode;
r.fromWarehouseCode = localStorage.warehouseCode;
-
- r.toLot ="";
- r.fromPackingCode="";
+
+ r.toLot = "";
+ r.fromPackingCode = "";
r.toPackingCode = "";
-
- r.toWarehouseCode =localStorage.warehouseCode;
+
+ r.toWarehouseCode = localStorage.warehouseCode;
r.worker = localStorage.userName_CN == "" ? localStorage.userName :
localStorage.userName_CN
item.details.push(r);
@@ -328,8 +336,8 @@
that.showMessage(err.message);
uni.hideLoading();
});
- }else {
- that.showMessage("库位["+this.itemList[0].fromLocationCode+"]不存在");
+ } else {
+ that.showMessage("库位[" + this.itemList[0].fromLocationCode + "]不存在");
}
})
diff --git a/fe/PDA/pages/message/index.vue b/fe/PDA/pages/message/index.vue
index 51b83ca06..c95930de7 100644
--- a/fe/PDA/pages/message/index.vue
+++ b/fe/PDA/pages/message/index.vue
@@ -1,43 +1,69 @@
-
-
-