diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js index 2eeba2ffd..d10421958 100644 --- a/fe/PDA/api/index.js +++ b/fe/PDA/api/index.js @@ -725,7 +725,19 @@ export const finshIssueJob = (id, params) => request( data: params, method: "post" }) +//非生产领料 承接任务 +export const takeUnProduceIssueJob = (params) => request( + devUrl + "/api/pda/job/unplanned-issue/take/" + params.id, { // + data: {}, + method: "post" + }); +//非生产领料 取消承接任务 +export const cancelTakeUnProduceIssueJob = (id) => request( + devUrl + "/api/pda/job/unplanned-issue/cancel-take/" + id, { // + data: {}, + method: "post" + }); //非生产领料任务 export const getUnProducePickList = (params) => request( @@ -748,6 +760,7 @@ export const finshUnProducePickJob = (id, params) => request( method: "post" }) + //非生产退料任务 export const getUnProduceReturnList = (params) => request( devUrl + "/api/pda/job/unplanned-receipt/list", { diff --git a/fe/PDA/mycomponents/comjob/comJobScanDetail.vue b/fe/PDA/mycomponents/comjob/comJobScanDetail.vue index b4e0d3bdc..ba1f42bf2 100644 --- a/fe/PDA/mycomponents/comjob/comJobScanDetail.vue +++ b/fe/PDA/mycomponents/comjob/comJobScanDetail.vue @@ -9,7 +9,7 @@ {{ jobContent.number }} --> - + {{allCountHint}} {{ allCount}} @@ -75,6 +75,12 @@ type: Boolean, default: true }, + + isShowAllCountHint:{ + type: Boolean, + default: true + }, + isShowOther:{ type: Boolean, default: false diff --git a/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue b/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue index 26d44c8d1..36e4f587e 100644 --- a/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue +++ b/fe/PDA/mycomponents/comjob/comJobUnScanDetail.vue @@ -13,22 +13,22 @@ {{jobContent.fromErpLocationCode}} - 料号： + ERP料号： {{jobContent.itemCode}} - 名称： + 料号名称： {{jobContent.itemName}} - 描述1： + 料号描述： {{jobContent.itemDesc1}} - 描述2： + 正厂编码： {{jobContent.itemDesc2}} diff --git a/fe/PDA/mycomponents/coms/task/comUnProduce.vue b/fe/PDA/mycomponents/coms/task/comUnProduce.vue index 866a48f62..293c6ae10 100644 --- a/fe/PDA/mycomponents/coms/task/comUnProduce.vue +++ b/fe/PDA/mycomponents/coms/task/comUnProduce.vue @@ -14,31 +14,33 @@ {{dataContent.unplannedIssueRequestNumber}} {{dataContent.unplannedReceiptRequestNumber}} - - - - ERP储位： - {{dataContent.fromErpLocationCode}} - - - 料号： - {{dataContent.itemCode}} - - - - 名称： - {{dataContent.itemName}} - - - 描述1： - {{dataContent.itemDesc1}} + + + ERP储位： + {{dataContent.fromErpLocationCode}} + + + ERP料号： + {{dataContent.itemCode}} + + + + 料号名称： + {{dataContent.itemName}} + + + + 料号描述： + {{dataContent.itemDesc1}} + + + + 正厂编码： + {{dataContent.itemDesc2}} + - - 描述2： - {{dataContent.itemDesc2}} - diff --git a/fe/PDA/mycomponents/popup/recommendList.vue b/fe/PDA/mycomponents/popup/recommendList.vue new file mode 100644 index 000000000..469fd0dda --- /dev/null +++ b/fe/PDA/mycomponents/popup/recommendList.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/pages/task/unProducePickDetail.vue b/fe/PDA/pages/task/unProducePickDetail.vue index 49c984c2d..9f611cd67 100644 --- a/fe/PDA/pages/task/unProducePickDetail.vue +++ b/fe/PDA/pages/task/unProducePickDetail.vue @@ -3,13 +3,17 @@ - + + + + - + @@ -22,23 +26,13 @@ - - - - 推荐 - 实际 - 数量 - - {{item.recommendQty}}({{item.uom}}) + - - + - @@ -49,33 +43,28 @@ 箱码 - - - {{ item.recommendPackingCode }} - + - - + + {{ item.handledPackingCode }} 批次 - - {{item.recommendLot }} + - - {{item.handledLot }} + + {{item.handledLot }} 来源库位 - - {{ item.recommendFromLocationCode }} + - - + + {{ item.handledFromLocationCode }} @@ -102,7 +91,7 @@ - + @@ -112,8 +101,8 @@ + \ No newline at end of file diff --git a/fe/PDA/pages/task/unProduceReturnDetail.vue b/fe/PDA/pages/task/unProduceReturnDetail.vue index 372819705..1cd7fd16f 100644 --- a/fe/PDA/pages/task/unProduceReturnDetail.vue +++ b/fe/PDA/pages/task/unProduceReturnDetail.vue @@ -7,13 +7,13 @@ + @scroll="scroll" class="scroll-detail"> - + - + @@ -26,7 +26,7 @@ - + 数量 @@ -34,7 +34,7 @@ - + - + @@ -78,7 +78,7 @@ - + @@ -159,7 +159,7 @@ isPack: true, titleArray: ['箱标签'], options: [], - locationInfo:null, + locationInfo: null, jobStatus: "", } }, @@ -227,7 +227,7 @@ }, //加载零件信息 getDetail() { - + let that = this; if (that.id == undefined) { return; @@ -245,6 +245,11 @@ that.datacontent = item; that.jobStatus = item.jobStatus; that.scanCount = 0 + that.details = [] + that.locationInfo = null; + if (that.$refs.comCollapseLocation) { + that.$refs.comCollapseLocation.clearLocation(); + } uni.hideLoading(); }) .catch(err => { @@ -265,9 +270,7 @@ if (res.confirm) { this.details.splice(index, 1) this.scanCount = 0; - var tempQty =Number(this.datacontent.qty)/Number(this.details.length) this.details.forEach(res => { - res.handledQty =tempQty this.scanCount += res.handledQty }) } @@ -290,24 +293,17 @@ this.showScanMessage('箱码【' + result.data.code + '】已经扫描'); } else { - // if (this.scanCount == this.datacontent.qty) { - // this.showMessage("扫描数量已经等于需求数量") - // return; - // } - var item = { itemCode: result.data.itemCode, handledPackingCode: result.data.code, handledLot: result.data.lot, - handledQty: Number(this.datacontent.qty) + handledQty: Number(result.data.qty) } - this.setParam(item,result) - this.details.push(item) - var tempQty =Number(this.datacontent.qty)/Number(this.details.length) - + this.setParam(item, result) + this.details.unshift(item) + this.scanCount = 0; this.details.forEach(res => { - res.handledQty =tempQty this.scanCount += res.handledQty }) this.$forceUpdate() @@ -333,15 +329,15 @@ } else { if (that.datacontent.fromErpLocationCode != res.erpLocationCode) { scanFailedAudio() - that.showMessage('目标库位的ERP储位【' + res.erpLocationCode + '】与【' + - this.datacontent.fromErpLocationCode + + that.showMessage('目标库位的ERP储位【' + res.erpLocationCode + '】与【' + + this.datacontent.fromErpLocationCode + '】不是同一ERP储位,请重新扫描'); this.$refs.comCollapseLocation.clearLocation(); } else { scanSuccessAudio() - this.locationInfo=res + this.locationInfo = res } - + } uni.hideLoading(); }).catch(err => { @@ -357,9 +353,9 @@ }, setParam(item, result) { - item.id = guid(), + item.id = guid() item.creationTime = getCurrDateTimeAndT() - item.creatorId =guid() + item.creatorId = guid() item.lastModificationTime = getCurrDateTimeAndT() item.lastModifierId = guid() item.masterID = this.datacontent.id @@ -369,7 +365,7 @@ item.itemDesc1 = result.data.itemDesc1 item.itemDesc2 = result.data.itemDesc2 item.itemCode = result.data.itemCode - item.stdPackQty = result.data.stdPackQty + item.stdPackQty = result.data.stdPackQty item.status = 2 item.recommendContainerCode = "" item.recommendPackingCode = result.data.packingCode @@ -385,7 +381,7 @@ item.recommendToWarehouseCode = "" item.recommendQty = item.handledQty item.uom = result.data.uom - + item.handledContainerCode = result.data.containerCode item.handledPackingCode = result.data.packingCode item.handledSupplierBatch = result.data.supplierBatch @@ -393,14 +389,14 @@ item.handledProduceDate = result.data.produceDate item.handledExpireDate = result.data.expireDate item.handledLot = result.data.lot - + item.handledToLocationCode = "" item.handledToLocationArea = "" item.handledToLocationGroup = "" item.handledToLocationErpCode = "" item.handledToWarehouseCode = "" item.handledQty = item.handledQty - item.extraProperties= { + item.extraProperties = { additionalProp1: "", additionalProp2: "", additionalProp3: "" @@ -408,62 +404,6 @@ }, - setParams(item, result) { - item.scaned = true; - item.scanDate = new Date() //增加扫描信息属性 - item.fromLocationCode = ""; - item.fromLocationErpCode = ""; - item.toLocationCode = result.data.locationCode; - item.toLocationErpCode = result.data.locationErpCode; - - //实际库存数量 - item.handledContainerCode = result.data.containerCode; - item.handledPackingCode = result.data.packingCode; - item.handledBatch = result.data.batch; - item.handledLot = result.data.lot; - - item.defaultHandleQty = result.data.qty > item.recommendQty ? item.recommendQty : result.data.qty; - item.handledQty = result.data.qty > item.recommendQty ? item.recommendQty : result.data.qty; - item.handledFromLocationCode = ""; - item.handledFromLocationArea = ""; - item.handledFromLocationGroup = ""; - item.handledFromLocationErpCode = ""; - item.handledFromWarehouseCode = ""; - - item.handledToLocationCode = item.recommendToLocationCode, - item.handledToLocationArea = item.recommendToLocationArea - item.handledToLocationGroup = item.recommendToLocationGroup - item.handledToLocationErpCode = item.recommendToLocationErpCode - item.handledToWarehouseCode = item.recommendToWarehouseCode - - item.toLocationCode = item.recommendToLocationCode; - - item.recommendLot = result.data.lot; - item.recommendPackingCode = result.data.packingCode; - - item.toLocationArea = ""; - item.toLocationGroup = ""; - item.toLocationErpCode = ""; - - //当前扫描标签的信息 - item.scanItemCode = this.currentScanLebel.data.itemCode; - item.scanPackingCode = this.currentScanLebel.data.code; - item.scanLot = this.currentScanLebel.data.lot; - - item.worker = localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN; - item.uom = result.data.uom; - - this.details.sort(compareDesc('scanDate')); //按扫描信息排 - this.calcScanCount(); //计算扫描的数量 - this.$forceUpdate(); - }, - - afterScanPackLabel(result) { - this.setParams(this.currentItem, result) - this.scanPopupGetFocus(); - scanSuccessAudio() - }, - // //接收 receive(callback) { let params = { @@ -474,24 +414,34 @@ callback(true); }) .catch(err => { - this.showMessage(err.message); - callback(false); + //this.showMessage("12"+err.message); + callback(true); }); }, submit() { - if (this.details.length == 0) { - this.showMessage('扫描列表为0,请先扫描'); - return; - } if (!this.locationInfo) { this.showMessage('请先扫描目标库位'); return; } - this.finsh(); - }, + if (this.details.length == 0) { + showConfirmMsg("扫描数量为0,是否继续提交?", res => { + if (res) { + this.finsh(); + } + }) + return; + }else { + if(this.scanCount>this.datacontent.qty){ + this.showMessage('提交的数量大于扫描的数量,不可以提交'); + }else { + this.finsh(); + } + } + + }, finsh() { let that = this; @@ -504,22 +454,23 @@ that.datacontent.completeTime = getCurrDateTime(); that.datacontent.worker = localStorage.userName_CN == "" ? localStorage.userName : localStorage .userName_CN; - //目标库位赋值 + //目标库位赋值 that.details.forEach(res => { res.recommendToLocationCode = this.locationInfo.code res.recommendToLocationArea = this.locationInfo.areaCode res.recommendToLocationGroup = this.locationInfo.locationGroupCode res.recommendToLocationErpCode = this.locationInfo.erpLocationCode - - res.handledToLocationCode =this.locationInfo.code - res.handledToLocationArea=this.locationInfo.areaCode - res.handledToLocationGroup =this.locationInfo.locationGroupCode - res.handledToLocationErpCode =this.locationInfo.erpLocationCode + + res.handledToLocationCode = this.locationInfo.code + res.handledToLocationArea = this.locationInfo.areaCode + res.handledToLocationGroup = this.locationInfo.locationGroupCode + res.handledToLocationErpCode = this.locationInfo.erpLocationCode }) that.datacontent.details = that.details; let params = JSON.stringify(that.details); console.log("提交", params) - finshUnProduceReturnJob(that.id,this.datacontent.number,localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN, params) + finshUnProduceReturnJob(that.id, this.datacontent.number, localStorage.userName_CN == "" ? localStorage + .userName : localStorage.userName_CN, params) .then(res => { uni.hideLoading(); if (res != null) { @@ -616,8 +567,8 @@ this.scanCount = this.datacontent.qty this.showMessage("实际退料数量不能大于申请数量") this.$refs['comNumberBox_' + index][0].setValue(this.scanCount); - }else { - this.scanCount=value; + } else { + this.scanCount = value; } }, } diff --git a/fe/PDA/pages/task/unProduceReturnWipDetail.vue b/fe/PDA/pages/task/unProduceReturnWipDetail.vue index b0284e867..ff987e3ce 100644 --- a/fe/PDA/pages/task/unProduceReturnWipDetail.vue +++ b/fe/PDA/pages/task/unProduceReturnWipDetail.vue @@ -283,6 +283,10 @@ that.datacontent = item; that.jobStatus = item.jobStatus; that.scanCount = 0 + that.locationInfo = null; + if (that.$refs.comCollapseLocation) { + that.$refs.comCollapseLocation.clearLocation(); + } }) .catch(err => { uni.hideLoading(); @@ -458,8 +462,8 @@ callback(true); }) .catch(err => { - this.showMessage(err.message); - callback(false); + // this.showMessage(err.message); + callback(true); }); },