From 7da4d1171f7f6c40f8de3d07c7c846ed315b7685 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 19 Aug 2024 13:49:07 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=BA=93=E5=AD=98=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/customerReturn/record/returnRecord.vue | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue index d6502676..b1196720 100644 --- a/src/pages/customerReturn/record/returnRecord.vue +++ b/src/pages/customerReturn/record/returnRecord.vue @@ -9,7 +9,9 @@ + @removeItem="removeItem(index,item)" + :isShowParentToLocation="false" + @updateData="updateData" @removePack="removePack"> @@ -104,6 +106,7 @@ toLocationAreaTypeList: [], managementList: [], toWarehouseCode: '', + toInventoryStatuses:"" }; }, onLoad(option) { @@ -116,6 +119,7 @@ this.businessType = res.businessType; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.toLocationAreaTypeList = res.toLocationAreaTypeList; + this.toInventoryStatuses =res.toInventoryStatuses this.showFromLocationPopup(); } else { this.showErrorMessage(res.message) @@ -329,7 +333,7 @@ submitItem.itemDesc2 = detail.package.itemDesc2; submitItem.inventoryStatus = detail.inventoryStatus; - submitItem.toInventoryStatus = detail.inventoryStatus; + submitItem.toInventoryStatus = this.toInventoryStatuses; submitItem.fromPackingNumber = info.packingNumber; submitItem.toPackingNumber = info.packingNumber; @@ -363,13 +367,6 @@ if (res) {} }); }, - showErrorMessage(message) { - this.$refs.comMessage.showErrorMessage(message, res => { - if (res) { - - } - }); - }, showScanMessage(message) { this.$refs.comMessage.showScanMessage(message); From f11adc0d0a9ccc43721ed0015dc6a56ef2e50645 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 20 Aug 2024 09:47:56 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D=E8=B5=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/putaway/record/putawayRecord.vue | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue index b1b5c250..318d6569 100644 --- a/src/pages/putaway/record/putawayRecord.vue +++ b/src/pages/putaway/record/putawayRecord.vue @@ -483,12 +483,33 @@ this.$refs.comMessage.showQuestionMessage("系统异常:"+res.data.balanceMsg, confirmRes => { if (confirmRes) { this.editItem.toLocationCode = code; + var item = this.detailSource.find(res => { + if (res.itemCode == this.editItem.itemCode) { + return res + } + }) + if(item){ + item.subList.forEach(r=>{ + r.toLocationCode =code + }) + } }else { this.removeRecommendLocation(res.data.expectinNumberList) } }); }else { + //所有库位赋值 this.editItem.toLocationCode = code; + var item = this.detailSource.find(res => { + if (res.itemCode == this.editItem.itemCode) { + return res + } + }) + if(item){ + item.subList.forEach(r=>{ + r.toLocationCode =code + }) + } } } From 2b02a7e51f85d2d879255cd9a2018d4ce02017f5 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 20 Aug 2024 09:59:09 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/package/record/overPackageRecord.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index e648e73e..66f415f0 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -381,6 +381,11 @@ this.showErrorMessage("请选择目标包装规格") return; } + if(this.fromPackUnit==this.toPackUnit){ + this.showErrorMessage("来源包装规格与目标包装规格一致,不能进行翻包操作") + return; + } + this.checkSubmit(); } else { @@ -402,11 +407,11 @@ this.$refs.comMessage.showQuestionMessage("扫描数量【" + tempHandleQty + "】,将有1个非整包,是否提交?", res => { if (res) { - this.submitJob() + // this.submitJob() } }); } else { - this.submitJob() + // this.submitJob() } }, From 9cadc275947e91704d2595bcb79f225d5bac3fec Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 20 Aug 2024 10:30:00 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/package/record/overPackageRecord.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue index 66f415f0..88612def 100644 --- a/src/pages/package/record/overPackageRecord.vue +++ b/src/pages/package/record/overPackageRecord.vue @@ -407,11 +407,11 @@ this.$refs.comMessage.showQuestionMessage("扫描数量【" + tempHandleQty + "】,将有1个非整包,是否提交?", res => { if (res) { - // this.submitJob() + this.submitJob() } }); } else { - // this.submitJob() + this.submitJob() } }, From 0af78626a7ef168684f14ccc0da90f6f8a1b1978 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 20 Aug 2024 10:40:36 +0800 Subject: [PATCH 05/14] =?UTF-8?q?HL-5486PDA=E7=BF=BB=E5=8C=85=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 12 +++++++++- src/pages/package/job/overPackageJob.vue | 30 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/api/request2.js b/src/api/request2.js index c20c616f..a20af74d 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -2610,7 +2610,17 @@ export function deliverRequestClose(id) { data: {}, }); } - +/** + * 翻包任务 关闭任务 + * @param {*} params + */ +export function packageoverRequestClose(id) { + return request({ + url: baseApi + "/wms/packageover-job-main/close?id=" + id, + method: "put", + data: {}, + }); +} /** * 制品发货申请 提交审批 * @param {*} params diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue index f1473476..f30f0323 100644 --- a/src/pages/package/job/overPackageJob.vue +++ b/src/pages/package/job/overPackageJob.vue @@ -34,6 +34,7 @@ import { cancleTakeOverPageJob, getOverPageJobList, + packageoverRequestClose } from '@/api/request2.js'; import { goHome, @@ -113,6 +114,14 @@ onReady() { this.detailOptions = getDetailOption(); this.detailGiveupOptions = getDetailGiveupOption(); + this.detailOptions = [...this.detailOptions,{ + text:"关闭", + style:{ + backgroundColor:"#F56C6C" + } + }] + console.log('this.detailGiveupOptions',this.detailGiveupOptions) + console.log('this.detailOptions',this.detailOptions) }, onReachBottom() { //避免多次触发 @@ -278,12 +287,33 @@ this.cancleJob(dataContent.masterId); } }); + } else if (e.content.text == "关闭") { + this.$refs.comMessage.showQuestionMessage("确定要关闭当前任务?", + res => { + if (res) { + this.closeJob(dataContent.masterId); + } + }); } }, openjobInfoPopup(item) { this.$refs.jobInfoPopup.openPopup(item) }, + closeJob(id){ + packageoverRequestClose(id).then(res => { + if(res.data){ + this.getList("refresh") + uni.showToast({ + title:"关闭任务成功" + }) + }else { + this.showMessage("关闭任务失败") + } + }).catch(error => { + this.showMessage(error) + }) + }, cancleJob(id) { cancleTakeOverPageJob(id).then(res => { From 6ced12b2d8ee18ccb1572e2196d76e3b394cb160 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 20 Aug 2024 10:54:40 +0800 Subject: [PATCH 06/14] =?UTF-8?q?HL-5493PDA=E9=9B=B6=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=20-=20=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0=E6=88=96?= =?UTF-8?q?=E8=80=85=E6=8F=8F=E8=BF=B0=E4=BF=A1=E6=81=AF=E8=BF=87=E5=A4=9A?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=B8=8B=E9=9D=A2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=A2=AB=E9=81=AE=E6=8C=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/query/item.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/pages/query/item.vue b/src/pages/query/item.vue index 544a179a..891fb40c 100644 --- a/src/pages/query/item.vue +++ b/src/pages/query/item.vue @@ -3,14 +3,14 @@ - + - - 总数 : {{totalCount}} + + 总数 : {{totalCount}} { + this.topHeight = this.$refs.topContent.$el.clientHeight + + console.log('topContent',this.$refs.topContent) + }) this.tabChange(0) } else { this.showMessage('未查找到物料【' + code + '】'); From e3ace2ec119980ab33ab8879475c9c4410141c0f Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 20 Aug 2024 11:50:09 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/balance.js | 18 ------------------ .../customerReturn/record/returnRecord.vue | 9 ++++++--- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/common/balance.js b/src/common/balance.js index 460e9bf4..a8012fbd 100644 --- a/src/common/balance.js +++ b/src/common/balance.js @@ -345,12 +345,6 @@ export function byBatch(label, locationCode, fromInventoryStatuses, callback) { action: "in", value: status }) - - filters.push({ - column: "inventoryStatus", - action: "in", - value: status - }) } var params = { @@ -424,12 +418,6 @@ export function byQuantity(label, locationCode, fromInventoryStatuses, callback) action: "in", value: status }) - - filters.push({ - column: "inventoryStatus", - action: "in", - value: status - }) } var params = { @@ -485,12 +473,6 @@ export function byUniqueId(label, locationCode, fromInventoryStatuses, callback) action: "in", value: status }) - - filters.push({ - column: "inventoryStatus", - action: "in", - value: status - }) } var params = { diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue index b1196720..b95a08db 100644 --- a/src/pages/customerReturn/record/returnRecord.vue +++ b/src/pages/customerReturn/record/returnRecord.vue @@ -33,7 +33,10 @@ - + Date: Tue, 20 Aug 2024 12:04:59 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=89=E6=A0=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/coms/comMoveRecord.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 9cdc562b..b0559bff 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -305,7 +305,9 @@ } this.$refs.comMessage.showErrorMessage(message, res => { if (res) { - + if (this.$refs.scanPopup) { + this.$refs.scanPopup.packGetFocus() + } } }); }, @@ -393,8 +395,8 @@ this.dataContent.subList.forEach(res => { if (res.fromLocationCode == res.toLocationCode) { if (res.fromInventoryStatus == res.toInventoryStatus) { - var resultHint = res.fromPackingNumber?`包装号【${res.fromPackingNumber}】`:"" - hint += resultHint+`来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` + var resultHint = res.fromPackingNumber ? `包装号【${res.fromPackingNumber}】` : "" + hint += resultHint + `来源库位与目标库位 来源状态与目标状态一致,不可以提交\n` } } }) From 7fb6c6af99dea7ad9f99f80e250b8b86c2b2eea3 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 20 Aug 2024 12:05:24 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E7=9B=98=E5=BC=B9=E5=87=BA=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/pages.json b/src/pages.json index a9689c54..419f3380 100644 --- a/src/pages.json +++ b/src/pages.json @@ -458,7 +458,7 @@ "enablePullDownRefresh": false } }, - + { "path": "pages/putaway/job/quantityPutawayJob", "style": { @@ -469,15 +469,15 @@ "buttons": [ // 右边按钮 { - + "float": "right", "fontSize": "58rpx", //按钮上文字的大小 "text": "\ue696", "fontSrc": "/static/ali_icon/iconfont.ttf" - + }, { - + "float": "right", "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", @@ -487,7 +487,7 @@ } } }, - + { "path": "pages/putaway/job/quantityPutawayJobDetail", "style": { @@ -495,8 +495,8 @@ "enablePullDownRefresh": false } }, - - + + { "path": "pages/putaway/record/putawayRecord", "style": { @@ -639,15 +639,15 @@ "buttons": [ // 右边按钮 { - + "float": "right", "fontSize": "58rpx", //按钮上文字的大小 "text": "\ue696", "fontSrc": "/static/ali_icon/iconfont.ttf" - + }, { - + "float": "right", "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", @@ -684,15 +684,15 @@ "buttons": [ // 右边按钮 { - + "float": "right", "fontSize": "58rpx", //按钮上文字的大小 "text": "\ue696", "fontSrc": "/static/ali_icon/iconfont.ttf" - + }, { - + "float": "right", "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", @@ -712,15 +712,15 @@ "buttons": [ // 右边按钮 { - + "float": "right", "fontSize": "58rpx", //按钮上文字的大小 "text": "\ue696", "fontSrc": "/static/ali_icon/iconfont.ttf" - + }, { - + "float": "right", "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", @@ -823,15 +823,15 @@ "buttons": [ // 右边按钮 { - + "float": "right", "fontSize": "58rpx", //按钮上文字的大小 "text": "\ue696", "fontSrc": "/static/ali_icon/iconfont.ttf" - + }, { - + "float": "right", "fontSize": "52rpx", //按钮上文字的大小 "text": "\ue6e2", @@ -2435,8 +2435,9 @@ // "fontSize": "58rpx" // }] // }, - //手机软键盘升起不让其将页面头部上推 - "softinputMode": "adjustResize" //adjustResize + //adjustResize：软键盘弹出时，webview窗体高度挤压。屏幕高度=webview窗体高度+软键盘高度 + // adjustPan：软键盘弹出时，webview窗体高度不变，但窗体上推，以保证输入框不被软键盘盖住 + "softinputMode": "adjustPan" //adjustResize }, "tabBar": { "color": "#000000", From c68abb0b964b3a0d4c4d9b5ab3342192bb95a973 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 20 Aug 2024 13:44:52 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99?= =?UTF-8?q?=E3=80=81=E8=A1=A5=E6=96=99=E6=9F=A5=E8=AF=A2=E5=88=B0=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=80=89=E6=8B=A9=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/coms/comScanIssuePack.vue | 2 +- .../repleinsh/coms/comScanReplishPack.vue | 29 +++++++++---------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index de0229f1..2a1edfb9 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -489,7 +489,7 @@ }, selectBalanceItem(balance) { - this.afterGetBalance(this.label, balance, this.packageInfo); + this.afterGetBalance(balance, balance, this.packageInfo); }, afterGetBalance(label, balance, packageInfo) { diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue index b0345e9e..8a983675 100644 --- a/src/pages/repleinsh/coms/comScanReplishPack.vue +++ b/src/pages/repleinsh/coms/comScanReplishPack.vue @@ -26,8 +26,7 @@ + headerType="HPQ,HMQ" :isShowHistory="false"> @@ -418,9 +417,7 @@ }, selectBalanceItem(balance) { - if(balance){ - this.afterGetBalance(this.label, balance, this.packageInfo); - } + this.afterGetBalance(balance, balance, this.packageInfo); }, afterGetBalance(label, balance, packageInfo) { @@ -434,7 +431,7 @@ that.fromLocationCode = balance.locationCode; let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode); //如果库存余额中的库位与任务推荐的不一致 - if (fromLocation ) { + if (fromLocation) { let batch = fromLocation.Batchs.find(r => r.batch == lot); if (batch != undefined) { if (batch.Records == undefined) { @@ -627,7 +624,7 @@ } else { record = this.creatRecordByBalance(balance, packageInfo); } - + if (packageInfo.parentNumber) { var checkData = batch.Records.find(r => { if (r.packingNumber == packageInfo.parentNumber && @@ -659,7 +656,7 @@ packageInfo .batch + "]是父包装，是否移除子包装", res => { if (res) { - batch.Records=[] + batch.Records = [] batch.Records.push(record); this.issueRecord.unshift(record) this.calcBatchHandleQty(batch); @@ -673,15 +670,15 @@ this.calcBatchHandleQty(batch); this.getfocus(); } - + } - - - - - - - + + + + + + + }, getfocus() { From 96383ab625624422f5dacff7fdbe4a7569ba4f17 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 20 Aug 2024 18:58:33 +0800 Subject: [PATCH 11/14] =?UTF-8?q?HL-5227=E6=8F=90=E4=BE=9B=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E6=89=B9=E9=87=8F=E9=87=87=E8=B4=AD=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=B8=BA=E4=BA=86=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=9C=B0=E5=A0=86=E5=BA=93=E4=BD=8D=E7=9A=84?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=93=8D=E4=BD=9C=E7=B9=81=E7=90=90=E7=9A=84?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 38 ++++++ src/pages/putaway/job/quantityPutawayJob.vue | 131 ++++++++++++++++--- 2 files changed, 150 insertions(+), 19 deletions(-) diff --git a/src/api/request2.js b/src/api/request2.js index a20af74d..11749dd6 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -1263,6 +1263,44 @@ export function putawayJobSubmit(params) { }); } +/** + * 采购上架 全部承接任务 + * @param {*} id + * + */ +export function takeAllPutawayJob(data) { + return request({ + url: baseApi + "/wms/putaway-job-main/acceptBatch" , + method: "put", + data: data, + }); +} + +/** + * 采购上架 全部放弃承接任务 + * @param {*} id + * + */ +export function cancleAllTakePutawayJob(data) { + return request({ + url: baseApi + "/wms/putaway-job-main/abandonBatch", + method: "put", + data: data, + }); +} +/** + * 采购上架 任务全部提交 + * @param {*} data + */ +export function putawayJobAllExecute(data) { + return request({ + url: baseApi + "/wms/putaway-job-main/executeBatch", + method: "put", + data: data, + }); +} + + /** * 采购上架申请 获取任务列表 * 任务状态 diff --git a/src/pages/putaway/job/quantityPutawayJob.vue b/src/pages/putaway/job/quantityPutawayJob.vue index 9c903838..fbbae604 100644 --- a/src/pages/putaway/job/quantityPutawayJob.vue +++ b/src/pages/putaway/job/quantityPutawayJob.vue @@ -2,16 +2,18 @@ + :checkedWaitTask="checkedWaitTask" @onQuery="getListByFilter"> - + - + + @@ -21,12 +23,14 @@ - + - - + - + + + @@ -36,7 +40,9 @@ import { getPutawayJobList, - cancleTakePutawayJob + cancleTakePutawayJob, + putawayJobAllExecute, + takeAllPutawayJob } from '@/api/request2.js'; import { @@ -46,6 +52,7 @@ import { getDetailOption, + getDetailGiveupOption } from '@/common/array.js'; import winScanButton from '@/mycomponents/scan/winScanButton.vue' @@ -76,17 +83,18 @@ return { jobList: [], pageNo: 1, - pageSize: 10, + pageSize: 30, totalCount: 0, loadingType: "nomore", checkedToday: false, checkedWaitTask: false, todayTime: "", - status: '1,2', //待处理 、进行中 + status: '1', //待处理 detailOptions: [], detailGiveupOptions: [], title: '', - scanMessage: "" + scanMessage: "", + jobNumberList:[],//全部承接参数 }; }, @@ -134,7 +142,7 @@ }, methods: { - getList(type) { + getList(type,toAreaCode='') { let that = this; uni.showLoading({ title: "加载中­....", @@ -166,6 +174,14 @@ action: "==", value: this.$store.state.user.id }) + if(toAreaCode){ + //到库区 + filters.push({ + column: "toAreaCode", + action: "==", + value: toAreaCode + }) + } var params = { filters: filters, pageNo: this.pageNo, @@ -174,10 +190,10 @@ getPutawayJobList(params).then(res => { uni.hideLoading(); - if (type === "refresh") { - uni.stopPullDownRefresh(); - this.openScanPopup() - } + // if (type === "refresh") { + // uni.stopPullDownRefresh(); + // this.openScanPopup() + // } var list = res.data.list; this.totalCount = res.data.total @@ -188,6 +204,7 @@ return; } this.jobList = type === "refresh" ? list : this.jobList.concat(list); + this.jobNumberList = list.map(item=>item.number) this.pageNo++; }).catch(error => { @@ -274,7 +291,7 @@ filters.push({ column: "status", action: "in", - value: '1,2' + value: '1' }) filters.push({ column: "number", @@ -360,7 +377,7 @@ { column: "status", action: "in", - value: '1,2', + value: '1', }, // { // column: "accept_user_id", @@ -422,10 +439,86 @@ this.showMessage(e + "\n扫描[" + result.scanMessage + "]") } }, + getListByFilter(params) { + console.log('getListByFilter',params) + let that = this; + uni.showLoading({ + title: "加载中­....", + mask: true + }); + + if (params.status) { + this.status = params.status + + }else{ + this.status = "1" + } + if(params.creationTime==""){ + this.checkedToday = false; + } + if (params.toAreaCode) { + // 到库区 + this.toAreaCode = params.toAreaCode + }else{ + this.toAreaCode = '' + } + this.getList('refresh',this.toAreaCode) + }, + // 承接全部任务 + takeAllJob(){ + uni.showLoading({ + title: "加载中­....", + mask: true + }); + takeAllPutawayJob({ + jobNumberList:this.jobNumberList + }).then(res => { + if (res.data) { + this.executeAllJob() + } else { + uni.hideLoading() + this.showMessage("承接任务失败") + } + }).catch(error => { + uni.hideLoading() + this.showMessage(error) + }) + }, + executeAllJob(){ + putawayJobAllExecute({ + jobNumberList:this.jobNumberList + }).then(res => { + if (res.data) { + uni.hideLoading() + this.$refs.comMessage.showSuccessMessage( "执行任务成功", res => { + if (res) { + this.getList("refresh") + } + }); + } else { + uni.hideLoading() + this.showMessage("执行任务失败") + } + }).catch(error => { + uni.hideLoading() + this.showMessage(error) + }) + } + } } \ No newline at end of file From 3afa8b99194dfe74994b6521ad38b81a6d775665 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 20 Aug 2024 19:04:01 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/customerReturn/record/returnRecord.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/customerReturn/record/returnRecord.vue b/src/pages/customerReturn/record/returnRecord.vue index b95a08db..1d455b54 100644 --- a/src/pages/customerReturn/record/returnRecord.vue +++ b/src/pages/customerReturn/record/returnRecord.vue @@ -335,7 +335,7 @@ submitItem.itemDesc1 = detail.package.itemDesc1; submitItem.itemDesc2 = detail.package.itemDesc2; - submitItem.inventoryStatus = this.toInventoryStatuses; + submitItem.inventoryStatus = detail.InventoryStatuses; submitItem.toInventoryStatus = this.toInventoryStatuses; submitItem.fromPackingNumber = info.packingNumber; From 422b94e9b0dfe1de8cee0a0e5db617efb8edece0 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 20 Aug 2024 19:42:07 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/config.js | 8 +- src/mycomponents/job/jobFilter.vue | 35 +- src/pages/issue/job/issueJob.vue | 435 ++++++------------ src/pages/package/job/overPackageJob.vue | 146 ++---- .../job/productionReceiptJob.vue | 228 ++++----- src/pages/purchaseReceipt/job/receiptJob.vue | 5 + src/pages/repleinsh/job/repleinshJob.vue | 256 +++-------- 7 files changed, 372 insertions(+), 741 deletions(-) diff --git a/src/common/config.js b/src/common/config.js index 4c8cc3c4..416ed517 100644 --- a/src/common/config.js +++ b/src/common/config.js @@ -1,4 +1,10 @@ export const overPagePrint="overPage_print" export const overPageTemplate="overPage_Template" //3分钟刷新 -export const planRefreshTime=3*60*1000 \ No newline at end of file +export const planRefreshTime=3*60*1000 + +export const issueJobFilter="issue_job_filter" +export const repleinshJobFilter="repleinsh_job_filter" +export const overPackageJobFilter="over_package_job_filter" +export const productionReceiptJobFilter="production_receipt_job_filter" + diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index 32d1546f..0b47d7e6 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -52,7 +52,7 @@ 来源库区 + placeholder="请输入来源库区" /> @@ -60,7 +60,7 @@ 到库区 + placeholder="请输入到库区" /> - + @@ -164,7 +165,10 @@ toAreaCode: '', // 到库区 itemCode: '', //物料代码 creationTime: '', - status: '' + status: '1,2', + isOnToday: false, + isOnWait: false, + params: {} } }, watch: { @@ -197,16 +201,16 @@ } return params; }, - reset(){ + reset() { this.checkedTodayModel = false this.checkedWaitModel = false this.productionLineCode = '' this.fromLocationCode = '' - this.fromAreaCode = ''// 来源库区 - this.toAreaCode = ''// 到库区 + this.fromAreaCode = '' // 来源库区 + this.toAreaCode = '' // 到库区 this.itemCode = '' this.creationTime = '' - this.status = '' + this.status = '1,2' this.query() }, @@ -239,6 +243,21 @@ openFilter() { this.$refs['popup'].open("top"); }, + openFilterParams(params) { + this.$refs['popup'].open("top"); + if(params){ + this.productionLineCode = params.productionLineCode + this.fromLocationCode = params.fromLocationCode + this.fromAreaCode = params.fromAreaCode + this.toAreaCode = params.toAreaCode + this.itemCode = params.itemCode + this.creationTime = params.creationTime + this.status = params.status + this.checkedTodayModel=this.creationTime?true:false + this.checkedWaitModel=this.status=="1"?true:false + } + + }, closeScanPopup() { this.$refs.popup.close() }, diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 38acf2ac..5cd8a39a 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -1,18 +1,11 @@