diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js index 6a56a9e2d..a511538df 100644 --- a/fe/PDA/api/index.js +++ b/fe/PDA/api/index.js @@ -1667,64 +1667,97 @@ export const finshAssemblingIssueJob = (id, params) => request( method: "post" }) - //kiting发料任务列表 - export const getKittingIssueList = (pageIndex,pageSize,isFinished) => request( - devUrl + "/api/pda/job/kitting-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&isFinished="+isFinished, { - method: 'post', - data: {} - }); - - //根据Number 获取kiting发料任务列表 - export const getKitingIssueJobByNumber = (jobNumber) => request( - devUrl + "/api/pda/job/kitting-issue/by-number/" + jobNumber, { - data: {}, - method: "get" - }); - - // 根据MaterialRequest Number获取kiting发料任务列表 - export const getKitingIssueListByRequest = (requestNumber) => request( - devUrl + "/api/pda/job/issue/list/by-request/" + requestNumber, { // - data: {}, - method: "get" - }); - - //kiting发料任务详情 - export const getKittingIssueDetail = (params) => request( - devUrl + "/api/pda/job/kitting-issue/" + params.id, { // - data: {}, - method: "get" - }); - - //承接kiting发料任务 - export const takeKittingIssueJob = (params) => request( - devUrl + "/api/pda/job/kitting-issue/take/" + params.id, { // - data: {}, - method: "post" - }); +//kiting发料任务列表 +export const getKittingIssueList = (pageIndex,pageSize,isFinished) => request( + devUrl + "/api/pda/job/kitting-issue/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&isFinished="+isFinished, { + method: 'post', + data: {} + }); + +//根据Number 获取kiting发料任务列表 +export const getKitingIssueJobByNumber = (jobNumber) => request( + devUrl + "/api/pda/job/kitting-issue/by-number/" + jobNumber, { + data: {}, + method: "get" + }); + +// 根据MaterialRequest Number获取kiting发料任务列表 +export const getKitingIssueListByRequest = (requestNumber) => request( + devUrl + "/api/pda/job/issue/list/by-request/" + requestNumber, { // + data: {}, + method: "get" + }); + +//kiting发料申请列表 +export const getKittingRequestList = (pageIndex,pageSize,isFinished) => request( + devUrl + "/api/pda/store/kitting-request/list?pageIndex="+pageIndex+"&pageSize="+pageSize+"&isFinished="+isFinished, { + method: 'post', + data: {} + }) + +//kiting发料申请 执行 +export const kittingRequestHandle = (id) => promise( + devUrl + "/api/pda/store/kitting-request/handle/"+id, { + method: 'post', + data: {} + }) +//kiting发料申请 获取任务号 +export const getkittingRequestJobByRequest = (requestNumber) => promise( + devUrl + "/api/pda/job/kitting-issue/by-request-number/"+requestNumber, { + method: 'post', + data: {} + }) + +//kiting发料 是否有新任务 +export const iskittingHasNewJob = (data) => promise( + devUrl + "/api/pda/store/kitting-request/isHasNewJob", { + method: 'post', + data: data + }) +//kiting发料申请 详情 +export const getKittingRequestDetail = (id) => request( + devUrl + "/api/pda/store/kitting-request/" + id, { // + data: {}, + method: "get" + }); - //取消承接kiting发料任务 - export const cancelTakeKittingIssueJob = (id) => request( - devUrl + "/api/pda/job/issue/cancel-take/" + id, { // - data: {}, - method: "post" - }); - //完成kiting发料任务 - export const finshKittingIssueJob = (masterId,detailId, params) => request( - devUrl + "/api/pda/job/kitting-issue/ExecuteDetail/" + masterId+"?detailId="+detailId, { // - data: params, - method: "post" - }) - //创建 kiting叫料申请 - export const kittingIssueRequest = (params) => request( - devUrl + "/api/pda/store/kitting-request", { // - data: params, - method: "post" - }) - //通过物料号查询收容数 - export const getCountByItemCode = (itemCode) => request( - devUrl + "/api/pda/item-container/by-item?itemCode="+itemCode, { // - data: {}, - method: "get" - }) +//kiting发料任务详情 +export const getKittingIssueDetail = (params) => request( + devUrl + "/api/pda/job/kitting-issue/" + params.id, { // + data: {}, + method: "get" + }); + +//承接kiting发料任务 +export const takeKittingIssueJob = (params) => request( + devUrl + "/api/pda/job/kitting-issue/take/" + params.id, { // + data: {}, + method: "post" + }); + +//取消承接kiting发料任务 +export const cancelTakeKittingIssueJob = (id) => request( + devUrl + "/api/pda/job/issue/cancel-take/" + id, { // + data: {}, + method: "post" + }); +//完成kiting发料任务 +export const finshKittingIssueJob = (masterId,detailId, params) => request( + devUrl + "/api/pda/job/kitting-issue/ExecuteDetail/" + masterId+"?detailId="+detailId, { // + data: params, + method: "post" + }) +//创建 kiting叫料申请 +export const kittingIssueRequest = (params) => request( + devUrl + "/api/pda/store/kitting-request", { // + data: params, + method: "post" + }) +//通过物料号查询收容数 +export const getCountByItemCode = (itemCode) => request( + devUrl + "/api/pda/item-container/by-item?itemCode="+itemCode, { // + data: {}, + method: "get" + }) \ No newline at end of file diff --git a/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue b/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue new file mode 100644 index 000000000..153b94c63 --- /dev/null +++ b/fe/PDA/mycomponents/comRequest/comKittingRequestItem.vue @@ -0,0 +1,107 @@ + + + + + + diff --git a/fe/PDA/mycomponents/coms/request/comInjectIssue.vue b/fe/PDA/mycomponents/coms/request/comInjectIssue.vue new file mode 100644 index 000000000..8dd90369f --- /dev/null +++ b/fe/PDA/mycomponents/coms/request/comInjectIssue.vue @@ -0,0 +1,80 @@ + + + + + + diff --git a/fe/PDA/mycomponents/wincom/winScanButtonTop.vue b/fe/PDA/mycomponents/wincom/winScanButtonTop.vue index b5738ba84..611136df0 100644 --- a/fe/PDA/mycomponents/wincom/winScanButtonTop.vue +++ b/fe/PDA/mycomponents/wincom/winScanButtonTop.vue @@ -33,7 +33,7 @@ opacity: 0.4; position: fixed; z-index: 11; - left: 20rpx; + right: 20rpx; bottom: 35%; width: 110rpx; height: 110rpx; diff --git a/fe/PDA/pages.js b/fe/PDA/pages.js index 2efe20a17..6cb54d0f4 100644 --- a/fe/PDA/pages.js +++ b/fe/PDA/pages.js @@ -793,6 +793,20 @@ module.exports = () => ({ "navigationBarTitleText": "kiting叫料申请", "enablePullDownRefresh": false } + }, + { + "path": "pages/request/kittingIssueRequestList", + "style": { + "navigationBarTitleText": "kiting叫料申请列表", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/request/kittingIssueRequestListDetail", + "style": { + "navigationBarTitleText": "kiting叫料申请详情", + "enablePullDownRefresh": false + } } diff --git a/fe/PDA/pages.json b/fe/PDA/pages.json index 18a71e1fd..762d0e858 100644 --- a/fe/PDA/pages.json +++ b/fe/PDA/pages.json @@ -772,9 +772,25 @@ "navigationBarTitleText": "kiting叫料申请", "enablePullDownRefresh": false } + }, + + { + "path": "pages/request/kittingIssueRequestList", + "style": { + "navigationBarTitleText": "kiting叫料申请列表", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/request/kittingIssueRequestListDetail", + "style": { + "navigationBarTitleText": "kiting叫料申请详情", + "enablePullDownRefresh": false + } } + ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/fe/PDA/pages/index/index.vue b/fe/PDA/pages/index/index.vue index 768910831..cb7e31377 100644 --- a/fe/PDA/pages/index/index.vue +++ b/fe/PDA/pages/index/index.vue @@ -76,7 +76,7 @@ - + {{item.title}} diff --git a/fe/PDA/pages/request/injectionIssueRequest.vue b/fe/PDA/pages/request/injectionIssueRequest.vue index 54298de9a..8c14c3703 100644 --- a/fe/PDA/pages/request/injectionIssueRequest.vue +++ b/fe/PDA/pages/request/injectionIssueRequest.vue @@ -212,7 +212,7 @@ toLocationErpCode: this.toLocationInfo.erpLocationCode, toWarehouseCode: localStorage.warehouseCode, positionCode: "", - recommendType: "B", + recommendType: "SEMI", boxQty: 1 } params.details.push(item) diff --git a/fe/PDA/pages/request/kittingIssueRequestList.vue b/fe/PDA/pages/request/kittingIssueRequestList.vue new file mode 100644 index 000000000..55ad4a9f9 --- /dev/null +++ b/fe/PDA/pages/request/kittingIssueRequestList.vue @@ -0,0 +1,195 @@ + + + + diff --git a/fe/PDA/pages/request/kittingIssueRequestListDetail.vue b/fe/PDA/pages/request/kittingIssueRequestListDetail.vue new file mode 100644 index 000000000..7db4e4c73 --- /dev/null +++ b/fe/PDA/pages/request/kittingIssueRequestListDetail.vue @@ -0,0 +1,216 @@ + + + + + \ No newline at end of file diff --git a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue index 3ec5abc36..f53037071 100644 --- a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue +++ b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue @@ -7,7 +7,7 @@ + class="scroll-detail" style="padding-bottom: 40rpx;"> @@ -71,13 +71,13 @@ 数量({{item.uom}}) {{item.handledFromQty}} - - - - + + + + @@ -91,26 +91,27 @@ - - + + - 单件码 + 单件码 - + - 来源库位 + 来源库位 - + - 目标库位 + 目标库位 - + @@ -158,7 +159,7 @@ import comNumberBox from '@/mycomponents/common/comNumberBox.vue'; import winScanLocationCode from '@/mycomponents/wincom/winScanLocationCode.vue'; import winScanByProductCode from '@/mycomponents/wincom/winScanByProductCode.vue' - + export default { components: { comMessage, @@ -190,7 +191,7 @@ titleArray: ['箱标签'], jobStatus: "", toLocationInfo: {}, - singCode:"" + singCode: "" } }, props: { @@ -254,7 +255,7 @@ .recommendFromLocationCode + "]不一致,请重新扫描") return; } - + current.handledFromLocationCode = locationInfo.code current.handledFromLocationArea = locationInfo.locationArea current.handledFromLocationGroup = locationInfo.locationGroup @@ -266,9 +267,9 @@ }, geToLocation(locationInfo) { - var current =this.details[0] + var current = this.details[0] if (locationInfo.code != current.recommendToLocationCode) { - this.showMessage("扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" +current + this.showMessage("扫描目标库位[" + locationInfo.code + "]与推荐目标库位[" + current .recommendToLocationCode + "]不一致,请重新扫描") return; } @@ -305,12 +306,12 @@ r => { r.scaned = false; r.scanDate = new Date() - + } ); that.ispending = item.jobStatus === 2; this.allCount = that.details.length; - that.details[0].defaultHandleQty =that.details[0].handledFromQty; + that.details[0].defaultHandleQty = that.details[0].handledFromQty; } uni.hideLoading(); @@ -331,17 +332,17 @@ return; } //查找收容数 - getCountByItemCode(result.itemCode).then(res=>{ - if(res){ - this.singCode =result.itemCode + getCountByItemCode(result.itemCode).then(res => { + if (res) { + this.singCode = result.itemCode var qty = res.qty; - this.details[0].handledFromQty = this.details[0].handledFromQty+qty; + this.details[0].handledFromQty = this.details[0].handledFromQty + qty; this.details[0].handledToQty = this.details[0].handledFromQty; - }else { - this.showMessage("没有查找到["+result.itemCode+"]的收容数") + } else { + this.showMessage("没有查找到[" + result.itemCode + "]的收容数") } - console.log("数量",res) - }).catch(error=>{ + console.log("数量", res) + }).catch(error => { this.showMessage(error) }) @@ -433,11 +434,11 @@ this.showMessage('该任务没有零件'); return; } - if(this.singCode==""){ + if (this.singCode == "") { this.showMessage('请先扫描单件码'); return; } - + if (!that.details[0].handledFromLocationCode) { this.showMessage('请先扫描来源库位'); return; @@ -446,8 +447,8 @@ this.showMessage('请先扫描目标库位'); return; } - - if (that.details[0].handledToQty==0||that.details[0].handledToQty=="") { + + if (that.details[0].handledToQty == 0 || that.details[0].handledToQty == "") { this.showMessage('发料数量必须大于0'); return; } @@ -462,6 +463,7 @@ title: "提交中...", mask: true }); + that.details[0].handledFromQty =that.details[0].handledToQty; let params = that.details[0]; finshKittingIssueJob(that.id, params.id, params) .then(res => { @@ -509,27 +511,32 @@ }, qtyChanged(value, item, index) { - if(value==0){ - this.showMessage('发料数量不能小于或等于0') + if (item.handledToQty == 0) { + this.$refs.comNumberBoxRef[0].setValue(0); + this.showMessage('请先扫描单件码') + return; + } + if (value == 0) { + this.showMessage('发料数量必须大于0') item.handledToQty = item.handledFromQty - this.$refs.comNumberBox.setValue(item.handledToQty); - }else { - if(value>item.defaultHandleQty){ - this.showMessage('发料数量不能大于实际来源数量') - item.handledToQty = item.handledFromQty - this.$refs.comNumberBox.setValue(item.handledToQty); + this.$refs.comNumberBoxRef[0].setValue(item.handledToQty); + } else { + if (value < item.defaultHandleQty) { + this.showMessage('发料数量不能小于实际来源数量' + item.defaultHandleQty) + item.handledToQty = item.defaultHandleQty==0?item.handledFromQty:item.defaultHandleQty + this.$refs.comNumberBoxRef[0].setValue(item.handledToQty); + }else { + item.handledFromQty = value } - item.handledFromQty =item.handledToQty - this.$forceUpdate() } - + }, } }