From 6fee836447ac6b6d5693ff9cb601f8c047ed73a9 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 28 Nov 2023 15:12:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request2.js | 22 +- mycomponents/balance/handleBalance.vue | 2 +- mycomponents/balance/recommendBalance.vue | 2 +- mycomponents/package/packageBalance.vue | 2 +- mycomponents/package/packageHandle.vue | 2 +- mycomponents/recommend/recommendBalance.vue | 2 +- pages/count/record/countRecord.vue | 4 +- pages/demo/demo.vue | 4 +- .../coms/comIssueDetailCard.vue | 2 +- .../coms/comIssueRecommend.vue | 2 +- .../coms/comScanIssuePack.vue | 4 +- .../issue-按批次推荐/job/issueDetail.vue | 6 +- pages/issue/coms/comIssueDetailCard.vue | 21 +- pages/issue/coms/comIssueRecommend.vue | 2 +- pages/issue/coms/comIssueRequestCreator.vue | 14 +- pages/issue/coms/comIssueRequestPopup.vue | 111 +---- pages/issue/coms/comScanIssuePack.vue | 76 ++-- pages/issue/job/issueDetail.vue | 6 +- pages/issue/js/issue.js | 6 +- pages/issue/record/issueRecord.vue | 402 ++++++++++-------- pages/issue/request/issueRequest.vue | 5 +- pages/issue/request/issueRequestSubmit.vue | 51 ++- pages/purchaseReturn/record/returnRecord.vue | 38 +- 23 files changed, 373 insertions(+), 413 deletions(-) diff --git a/api/request2.js b/api/request2.js index 4cc6b412..dd80377e 100644 --- a/api/request2.js +++ b/api/request2.js @@ -807,7 +807,7 @@ export function getIssueJobDetail(id) { */ export function takeIssueJob(id) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id, + url: baseApi + "/wms/issue-job-main/accept?id=" + id, method: "put", data: {}, }); @@ -820,12 +820,24 @@ export function takeIssueJob(id) { */ export function cancleTakeIssueJob(id) { return request({ - url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id, - method: "get", + url: baseApi + "/wms/issue-job-main/abandon?id=" + id, + method: "put", data: {}, }); } +/** + * 发料任务 提交 + * @param {*} params + */ +export function issueJobSubmit(params) { + return request({ + url: baseApi + "/wms/issue-job-main/execute", + method: "put", + data: params, + }); +} + /** * 生产收料 任务列表 @@ -1958,8 +1970,8 @@ export function issueRequestSubmit(params) { */ export function issueRecordSubmit(params) { return request({ - url: baseApi + "/wms/purchasereturn-request-main/submit", - method: "put", + url: baseApi + "/wms/issue-record-main/create", + method: "post", data: params, }); } diff --git a/mycomponents/balance/handleBalance.vue b/mycomponents/balance/handleBalance.vue index f5dce70a..73c4e49b 100644 --- a/mycomponents/balance/handleBalance.vue +++ b/mycomponents/balance/handleBalance.vue @@ -8,7 +8,7 @@ - + diff --git a/mycomponents/balance/recommendBalance.vue b/mycomponents/balance/recommendBalance.vue index a0adcb27..ef40ad8d 100644 --- a/mycomponents/balance/recommendBalance.vue +++ b/mycomponents/balance/recommendBalance.vue @@ -8,7 +8,7 @@ - + diff --git a/mycomponents/package/packageBalance.vue b/mycomponents/package/packageBalance.vue index dd4cdbbf..8fab758b 100644 --- a/mycomponents/package/packageBalance.vue +++ b/mycomponents/package/packageBalance.vue @@ -8,7 +8,7 @@ - + diff --git a/mycomponents/package/packageHandle.vue b/mycomponents/package/packageHandle.vue index a3513fc3..ecb42742 100644 --- a/mycomponents/package/packageHandle.vue +++ b/mycomponents/package/packageHandle.vue @@ -9,7 +9,7 @@ - + diff --git a/mycomponents/recommend/recommendBalance.vue b/mycomponents/recommend/recommendBalance.vue index 407f87b8..df79f681 100644 --- a/mycomponents/recommend/recommendBalance.vue +++ b/mycomponents/recommend/recommendBalance.vue @@ -4,7 +4,7 @@ - + diff --git a/pages/count/record/countRecord.vue b/pages/count/record/countRecord.vue index ef7374db..302094d2 100644 --- a/pages/count/record/countRecord.vue +++ b/pages/count/record/countRecord.vue @@ -162,8 +162,8 @@ this.$forceUpdate(); }, selectedItem(item) { - if (item.locationCode != this.FromLocationCode) { - this.showErrorMessage("来源库位[" + this.FromLocationCode + "]无库存") + if (item.locationCode != this.fromLocationCode) { + this.showErrorMessage("来源库位[" + this.fromLocationCode + "]无库存") return; } }, diff --git a/pages/demo/demo.vue b/pages/demo/demo.vue index 7f2c7454..3df5a596 100644 --- a/pages/demo/demo.vue +++ b/pages/demo/demo.vue @@ -226,7 +226,7 @@ 库位 location - + @@ -459,7 +459,7 @@ packingNumber: "516456579", batch: "20230510", - FromLocationCode: "B0101", + fromLocationCode: "B0101", locationCode: "B0101", record: { qty: 1000 diff --git a/pages/issue-按批次推荐/coms/comIssueDetailCard.vue b/pages/issue-按批次推荐/coms/comIssueDetailCard.vue index 0059807a..80dcf056 100644 --- a/pages/issue-按批次推荐/coms/comIssueDetailCard.vue +++ b/pages/issue-按批次推荐/coms/comIssueDetailCard.vue @@ -16,7 +16,7 @@ - + diff --git a/pages/issue-按批次推荐/coms/comIssueRecommend.vue b/pages/issue-按批次推荐/coms/comIssueRecommend.vue index 6b6bd970..c9256fd9 100644 --- a/pages/issue-按批次推荐/coms/comIssueRecommend.vue +++ b/pages/issue-按批次推荐/coms/comIssueRecommend.vue @@ -4,7 +4,7 @@ - + diff --git a/pages/issue-按批次推荐/coms/comScanIssuePack.vue b/pages/issue-按批次推荐/coms/comScanIssuePack.vue index 1080be58..0c2c39aa 100644 --- a/pages/issue-按批次推荐/coms/comScanIssuePack.vue +++ b/pages/issue-按批次推荐/coms/comScanIssuePack.vue @@ -132,9 +132,9 @@ if (location != undefined) { location.Items.forEach(item => { item.Locations.forEach(f => { - list.push(f.FromLocationCode) + list.push(f.fromLocationCode) }) - this.fromLocationCode = item.Locations[0].FromLocationCode; + this.fromLocationCode = item.Locations[0].fromLocationCode; }) return list; } else { diff --git a/pages/issue-按批次推荐/job/issueDetail.vue b/pages/issue-按批次推荐/job/issueDetail.vue index 775791e2..64951b0a 100644 --- a/pages/issue-按批次推荐/job/issueDetail.vue +++ b/pages/issue-按批次推荐/job/issueDetail.vue @@ -207,7 +207,7 @@ } else { item.qty += detail.qty //在零件下查找库位 - let location = item.Locations.find(r => r.FromLocationCode == detail.FromLocationCode); + let location = item.Locations.find(r => r.fromLocationCode == detail.fromLocationCode); if (location == undefined) { location = that.createLocationInfo(detail); item.Locations.push(location); @@ -240,7 +240,7 @@ createLocationInfo(detail) { let location = { - FromLocationCode: detail.FromLocationCode, + fromLocationCode: detail.fromLocationCode, qty: detail.qty, uom: detail.uom, handleQty: 0, @@ -357,7 +357,7 @@ }) } else { - let fromLocation = item.Locations.find(r => r.FromLocationCode == locationCode); + let fromLocation = item.Locations.find(r => r.fromLocationCode == locationCode); let batch = fromLocation.Batchs.find(r => r.Bacth == result.label.batch) if (batch == undefined || batch == null) { if (jobContent.AllowModifyBach == 1) { diff --git a/pages/issue/coms/comIssueDetailCard.vue b/pages/issue/coms/comIssueDetailCard.vue index 3430b1de..4152252e 100644 --- a/pages/issue/coms/comIssueDetailCard.vue +++ b/pages/issue/coms/comIssueDetailCard.vue @@ -1,15 +1,20 @@ @@ -63,14 +68,14 @@ import location from '@/mycomponents/balance/location.vue' import comMessage from '@/mycomponents/common/comMessage.vue' import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue' - + import { getDetailOption, getEditRemoveOption } from '@/common/array.js'; export default { - emits:['updateData'], + emits: ['updateData'], components: { itemQty, recommend, diff --git a/pages/issue/coms/comIssueRecommend.vue b/pages/issue/coms/comIssueRecommend.vue index 6b6bd970..c9256fd9 100644 --- a/pages/issue/coms/comIssueRecommend.vue +++ b/pages/issue/coms/comIssueRecommend.vue @@ -4,7 +4,7 @@ - + diff --git a/pages/issue/coms/comIssueRequestCreator.vue b/pages/issue/coms/comIssueRequestCreator.vue index 92c3727d..05188a72 100644 --- a/pages/issue/coms/comIssueRequestCreator.vue +++ b/pages/issue/coms/comIssueRequestCreator.vue @@ -7,13 +7,11 @@