From c286acdd1114bd53a0b0814466c494227de54b5e Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Fri, 14 Jun 2024 16:52:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=A0=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PDA/common/array.js | 1 + fe/PDA/common/basic.js | 19 +++++++++++++++ .../mycomponents/wincom/winScanByPosition.vue | 23 +++++++++++++++---- fe/PDA/pages/request/assembleIssueRequest.vue | 12 ++++------ fe/PDA/pages/request/coatingIssueRequest.vue | 12 ++++------ .../pages/request/injectionIssueRequest.vue | 12 ++++------ fe/PDA/pages/request/kittingIssueRequest.vue | 22 ++++++++---------- .../pages/request/sparePartIssueRequest.vue | 10 +++----- 8 files changed, 63 insertions(+), 48 deletions(-) diff --git a/fe/PDA/common/array.js b/fe/PDA/common/array.js index 5d7be0191..d1f4ac020 100644 --- a/fe/PDA/common/array.js +++ b/fe/PDA/common/array.js @@ -132,3 +132,4 @@ export function getReturnReasonArray() { }] return array; } + diff --git a/fe/PDA/common/basic.js b/fe/PDA/common/basic.js index 020876468..830c9cc03 100644 --- a/fe/PDA/common/basic.js +++ b/fe/PDA/common/basic.js @@ -244,6 +244,25 @@ export function getContainerTypeName(val) { let item = array.find(r => r.value == val); return item.name; } +//位置码类型 +export function getPositionCodeName(type) { + let array = [{ + name: '注塑区', + type: 1, + },{ + name: '喷涂区', + type: 2, + },{ + name: '装配区', + type: 3, + }, { + name: 'kitting区', + type: 4, + }]; + + let item = array.find(r => r.type == type); + return item.name; +} //提示是否消息 export function showConfirmMsg(content, callback) { diff --git a/fe/PDA/mycomponents/wincom/winScanByPosition.vue b/fe/PDA/mycomponents/wincom/winScanByPosition.vue index 11df72ff0..a0bd512b9 100644 --- a/fe/PDA/mycomponents/wincom/winScanByPosition.vue +++ b/fe/PDA/mycomponents/wincom/winScanByPosition.vue @@ -28,6 +28,10 @@ import { getPositionCodeInfo } from '@/api/index.js'; + import { + getPositionCodeName + } from '@/common/basic.js'; + export default { name: 'winScanByPack', @@ -40,6 +44,10 @@ type: String, default: '' }, + codeType: { + type: String, + default: "" + } }, data() { return { @@ -103,10 +111,17 @@ getPositionCodeInfo(result.data.code).then(res=>{ uni.hideLoading() if(res){ - this.scanResult = res; - this.scanResult.qty =1; - this.callBack() - this.closeScanPopup() + console.log("类型"+this.codeType) + if(res.type==this.codeType){ + this.scanResult = res; + this.scanResult.qty =1; + this.callBack() + this.closeScanPopup() + }else { + var type = + this.showMessage("位置码【"+res.code+"】的类型是["+getPositionCodeName(res.type) + "不是["+getPositionCodeName(this.codeType)+"]类型") + } + }else { this.showMessage("未查找到位置码【"+result.data.code+"】") } diff --git a/fe/PDA/pages/request/assembleIssueRequest.vue b/fe/PDA/pages/request/assembleIssueRequest.vue index b1f35ec1e..d3aed1a4e 100644 --- a/fe/PDA/pages/request/assembleIssueRequest.vue +++ b/fe/PDA/pages/request/assembleIssueRequest.vue @@ -85,7 +85,7 @@ - + @@ -152,6 +152,7 @@ getScanResult(result) { this.dataContent = result; result.qty =result.stdPackQty; + result.defaultHandleQty=result.qty this.itemList.push(result) this.$forceUpdate() @@ -230,16 +231,11 @@ qtyChanged(value, item, index) { if (value <= 0) { + item.qty = item.defaultHandleQty + this.$refs['comNumberBox_' + index][0].setValue(item.qty); this.showMessage('发料数量不能小于或等于0') - item.handledQty = item.defaultHandleQty - this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); return; } - // else if (value > item.defaultHandleQty) { - // item.handledQty = item.defaultHandleQty - // this.showMessage('发料数量不能大于库存数量:' + item.handledQty) - // this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); - // } }, showMessage(message) { this.$refs.comMessage.showMessage(message); diff --git a/fe/PDA/pages/request/coatingIssueRequest.vue b/fe/PDA/pages/request/coatingIssueRequest.vue index 3d4823d13..b23b6f392 100644 --- a/fe/PDA/pages/request/coatingIssueRequest.vue +++ b/fe/PDA/pages/request/coatingIssueRequest.vue @@ -85,7 +85,7 @@ - + @@ -152,6 +152,7 @@ getScanResult(result) { this.dataContent = result; result.qty =result.stdPackQty; + result.defaultHandleQty=result.qty this.itemList.push(result) this.$forceUpdate() @@ -230,16 +231,11 @@ qtyChanged(value, item, index) { if (value <= 0) { + item.qty = item.defaultHandleQty + this.$refs['comNumberBox_' + index][0].setValue(item.qty); this.showMessage('发料数量不能小于或等于0') - item.handledQty = item.defaultHandleQty - this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); return; } - // else if (value > item.defaultHandleQty) { - // item.handledQty = item.defaultHandleQty - // this.showMessage('发料数量不能大于库存数量:' + item.handledQty) - // this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); - // } }, showMessage(message) { this.$refs.comMessage.showMessage(message); diff --git a/fe/PDA/pages/request/injectionIssueRequest.vue b/fe/PDA/pages/request/injectionIssueRequest.vue index 8819ab29f..14067db90 100644 --- a/fe/PDA/pages/request/injectionIssueRequest.vue +++ b/fe/PDA/pages/request/injectionIssueRequest.vue @@ -85,7 +85,7 @@ - + @@ -152,6 +152,7 @@ getScanResult(result) { this.dataContent = result; result.qty =result.stdPackQty; + result.defaultHandleQty=result.qty this.itemList.push(result) this.$forceUpdate() @@ -230,16 +231,11 @@ qtyChanged(value, item, index) { if (value <= 0) { + item.qty = item.defaultHandleQty + this.$refs['comNumberBox_' + index][0].setValue(item.qty); this.showMessage('发料数量不能小于或等于0') - item.handledQty = item.defaultHandleQty - this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); return; } - // else if (value > item.defaultHandleQty) { - // item.handledQty = item.defaultHandleQty - // this.showMessage('发料数量不能大于库存数量:' + item.handledQty) - // this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); - // } }, showMessage(message) { this.$refs.comMessage.showMessage(message); diff --git a/fe/PDA/pages/request/kittingIssueRequest.vue b/fe/PDA/pages/request/kittingIssueRequest.vue index 3b6e7eb8f..fe5d6cf48 100644 --- a/fe/PDA/pages/request/kittingIssueRequest.vue +++ b/fe/PDA/pages/request/kittingIssueRequest.vue @@ -86,7 +86,7 @@ - + @@ -152,7 +152,8 @@ getScanResult(result) { this.dataContent = result; - result.qty =result.stdPackQty; + result.qty = result.stdPackQty; + result.defaultHandleQty = result.qty this.itemList.push(result) this.$forceUpdate() @@ -206,13 +207,13 @@ this.itemList.forEach(res => { var data = { remark: "", - qty:res.qty, + qty: res.qty, itemCode: res.partCode, itemName: res.partName, itemDesc1: res.itemDesc2, - uom: res.basicUom, + uom: res.basicUom, stdPackQty: res.stdPackQty, - toLocationCode: res.locationCode, + toLocationCode: res.locationCode, prodLine: null, requestStatus: 1, issuedQty: res.qty, @@ -220,7 +221,7 @@ status: 1, positionCode: this.dataContent.code, recommendType: 0, - boxQty: res.qty + boxQty: res.qty } param.details.push(data) @@ -231,16 +232,11 @@ qtyChanged(value, item, index) { if (value <= 0) { + item.qty = item.defaultHandleQty + this.$refs['comNumberBox_' + index][0].setValue(item.qty); this.showMessage('发料数量不能小于或等于0') - item.handledQty = item.defaultHandleQty - this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); return; } - // else if (value > item.defaultHandleQty) { - // item.handledQty = item.defaultHandleQty - // this.showMessage('发料数量不能大于库存数量:' + item.handledQty) - // this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); - // } }, showMessage(message) { this.$refs.comMessage.showMessage(message); diff --git a/fe/PDA/pages/request/sparePartIssueRequest.vue b/fe/PDA/pages/request/sparePartIssueRequest.vue index d1dddae05..321275c64 100644 --- a/fe/PDA/pages/request/sparePartIssueRequest.vue +++ b/fe/PDA/pages/request/sparePartIssueRequest.vue @@ -152,6 +152,7 @@ getScanResult(result) { this.dataContent = result; result.qty =result.stdPackQty; + result.defaultHandleQty=result.qty this.itemList.push(result) this.$forceUpdate() @@ -230,16 +231,11 @@ qtyChanged(value, item, index) { if (value <= 0) { + item.qty = item.defaultHandleQty + this.$refs['comNumberBox_' + index][0].setValue(item.qty); this.showMessage('发料数量不能小于或等于0') - item.handledQty = item.defaultHandleQty - this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); return; } - // else if (value > item.defaultHandleQty) { - // item.handledQty = item.defaultHandleQty - // this.showMessage('发料数量不能大于库存数量:' + item.handledQty) - // this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); - // } }, showMessage(message) { this.$refs.comMessage.showMessage(message);