diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js index abe04fa2b..0837d76de 100644 --- a/fe/PDA/api/index.js +++ b/fe/PDA/api/index.js @@ -1342,6 +1342,12 @@ export const semiPutaway = (params) => request( data: params, method: "post" }); +//通过箱码获取采购订单详细箱码 +export const getPurchaseDetailAsyncNew = (toPackingCode) => promise( + devUrl + "/api/pda/split-packing-rec/get-same-ponumber-list-by-topackingcode?toPackingCode=" + toPackingCode, { // + data: {}, + method: "get" + }); // export const getPurchaseDetailAsync = (itemCode, packingCode) => promise( @@ -1620,7 +1626,7 @@ export const injectionRequestHandle = (id) => promise( //注塑发料申请 获取任务号 export const getInjectionRequestJobByRequest = (requestNumber) => promise( - devUrl + "/api/pda/job/injection-request/by-request-number/"+requestNumber, { + devUrl + "/api/pda/job/injection-issue/by-request-number/"+requestNumber, { method: 'post', data: {} }) diff --git a/fe/PDA/pages/container/containerCall.vue b/fe/PDA/pages/container/containerCall.vue index d57baa49a..536a93157 100644 --- a/fe/PDA/pages/container/containerCall.vue +++ b/fe/PDA/pages/container/containerCall.vue @@ -218,8 +218,6 @@ }, submit() { - this.showCommitSuccess("提交成功"); - return; if (this.containerModelCode == "") { this.showMessage("请选择器具规格") return; @@ -237,7 +235,7 @@ console.log(JSON.stringify(params)) containerRequest(params).then(res => { uni.hideLoading(); - this.showMessage("提交成功"); + this.showCommitSuccess("提交成功"); this.clearData(); }).catch(err => { uni.hideLoading(); diff --git a/fe/PDA/pages/putaway/purchasePutaway.vue b/fe/PDA/pages/putaway/purchasePutaway.vue index 4910abe15..9761f0225 100644 --- a/fe/PDA/pages/putaway/purchasePutaway.vue +++ b/fe/PDA/pages/putaway/purchasePutaway.vue @@ -79,7 +79,8 @@ getBalancesByFilterAsync, getPurchaseDetailAsync, purchasePutaway, - getPurchasePutawayAsyncDetail + getPurchasePutawayAsyncDetail, + getPurchaseDetailAsyncNew } from '@/api/index.js'; import { @@ -241,9 +242,27 @@ that.showScanMessage('箱码【' + packingCode + '】在【待检库】未查询到库存状态为【合格】的库存信息'); } else if (balanceRes.totalCount === 1) { let balanceItem = balanceRes.items[0]; + //获取采购订单信息和原箱码 + let infoList = await getPurchaseDetailAsyncNew(balanceItem + .packingCode) + if (infoList) { + var fromTopPackingCode="" + for (var i = 0; i < infoList.length; i++) { + if(infoList[i].fromPackingCode==balanceItem.packingCode){ + fromTopPackingCode=infoList[i].fromTopPackingCode + break + } + } + + this.poNumber = infoList[0].purchaseInfo_PoNumber + this.showPopList=[] + infoList.forEach(res=>{ + this.showPopList.push(res.fromTopPackingCode) + }) + } + //根据零件号和箱码获取采购信息 - let purchaseDetail = await getPurchaseDetailAsync(balanceItem.itemCode, balanceItem - .packingCode); + let purchaseDetail = await getPurchaseDetailAsync(balanceItem.itemCode, fromTopPackingCode); if (purchaseDetail.error) { that.showScanMessage(purchaseDetail.error.message); } else { @@ -260,14 +279,16 @@ let locationErpCode = purchaseDetail.recommendErpCode; if (this.itemList.length == 0) { this.recommendErpLocationCode = locationErpCode; - this.checkData(balanceItem, purchaseDetail) + // this.checkData(balanceItem, purchaseDetail) + this.createItem(balanceItem, purchaseDetail); } else { if (this.recommendErpLocationCode != locationErpCode) { this.showScanMessage('当前零件的ERP储位是【' + locationErpCode + '】与【' + this .recommendErpLocationCode + '】不是同一ERP储位,请重新扫描'); } else { - this.checkData(balanceItem, purchaseDetail) + this.createItem(balanceItem, purchaseDetail); + // this.checkData(balanceItem, purchaseDetail) } } }, @@ -500,8 +521,8 @@ number: "", worker: localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN, jobNumber: "", - supplierCode:"", - asnNumber:"", + supplierCode: "", + asnNumber: "", details: [] } @@ -606,4 +627,4 @@ + \ No newline at end of file diff --git a/fe/PDA/pages/task/assembleIssueJobDetail.vue b/fe/PDA/pages/task/assembleIssueJobDetail.vue index 3243b626f..6d96aad49 100644 --- a/fe/PDA/pages/task/assembleIssueJobDetail.vue +++ b/fe/PDA/pages/task/assembleIssueJobDetail.vue @@ -389,17 +389,17 @@ "]不一致,是否继续发料?", res => { if (res) { - this.setData(result,data) + this.setData(result,data,fromData) } }) }) } } else { - this.setData(result,data) + this.setData(result,data,fromData) } }, - setData(result,data) { + setData(result,data,fromData) { this.getBalance(result, res => { if (res.totalCount > 0) { var balancesItem = res.items[0]; @@ -414,7 +414,8 @@ item.handledToLot = balancesItem.lot item.handledToWarehouseCode = balancesItem.warehouseCode item.handledToQty = balancesItem.qty - + item.stdPackQty =balancesItem.stdPackQty + item.handledFromContainerCode = balancesItem.containerCode item.handledFromPackingCode = balancesItem.packingCode item.handledFromSupplierBatch = balancesItem.supplierBatch @@ -438,7 +439,8 @@ item.handledToLot = balancesItem.lot item.handledToWarehouseCode = balancesItem.warehouseCode item.handledToQty = balancesItem.qty - + item.stdPackQty =balancesItem.stdPackQty + item.handledFromContainerCode = balancesItem.containerCode item.handledFromPackingCode = balancesItem.packingCode item.handledFromSupplierBatch = balancesItem.supplierBatch diff --git a/fe/PDA/pages/task/coatingIssuleJobDetail.vue b/fe/PDA/pages/task/coatingIssuleJobDetail.vue index 58282cb32..0211f0759 100644 --- a/fe/PDA/pages/task/coatingIssuleJobDetail.vue +++ b/fe/PDA/pages/task/coatingIssuleJobDetail.vue @@ -389,17 +389,17 @@ "]不一致,是否继续发料?", res => { if (res) { - this.setData(result,data) + this.setData(result,data,fromData) } }) }) } } else { - this.setData(result,data) + this.setData(result,data,fromData) } }, - setData(result,data) { + setData(result,data,fromData) { this.getBalance(result, res => { if (res.totalCount > 0) { var balancesItem = res.items[0]; @@ -414,7 +414,8 @@ item.handledToLot = balancesItem.lot item.handledToWarehouseCode = balancesItem.warehouseCode item.handledToQty = balancesItem.qty - + item.stdPackQty =balancesItem.stdPackQty + item.handledFromContainerCode = balancesItem.containerCode item.handledFromPackingCode = balancesItem.packingCode item.handledFromSupplierBatch = balancesItem.supplierBatch @@ -438,7 +439,8 @@ item.handledToLot = balancesItem.lot item.handledToWarehouseCode = balancesItem.warehouseCode item.handledToQty = balancesItem.qty - + item.stdPackQty =balancesItem.stdPackQty + item.handledFromContainerCode = balancesItem.containerCode item.handledFromPackingCode = balancesItem.packingCode item.handledFromSupplierBatch = balancesItem.supplierBatch diff --git a/fe/PDA/pages/task/injectionIssueJobDetail.vue b/fe/PDA/pages/task/injectionIssueJobDetail.vue index 6e464a280..e6366732f 100644 --- a/fe/PDA/pages/task/injectionIssueJobDetail.vue +++ b/fe/PDA/pages/task/injectionIssueJobDetail.vue @@ -389,18 +389,18 @@ "]不一致,是否继续发料?", res => { if (res) { - this.setData(result,data) + this.setData(result,data,fromData) } }) }) } } else { - this.setData(result,data) + this.setData(result,data,fromData) } }, - setData(result,data) { + setData(result,data,fromData) { this.getBalance(result, res => { if (res.totalCount > 0) { var balancesItem = res.items[0]; @@ -415,6 +415,7 @@ item.handledToLot = balancesItem.lot item.handledToWarehouseCode = balancesItem.warehouseCode item.handledToQty = balancesItem.qty + item.stdPackQty =balancesItem.stdPackQty item.handledFromContainerCode = balancesItem.containerCode item.handledFromPackingCode = balancesItem.packingCode @@ -439,7 +440,7 @@ item.handledToLot = balancesItem.lot item.handledToWarehouseCode = balancesItem.warehouseCode item.handledToQty = balancesItem.qty - + item.stdPackQty =balancesItem.stdPackQty item.handledFromContainerCode = balancesItem.containerCode item.handledFromPackingCode = balancesItem.packingCode item.handledFromSupplierBatch = balancesItem.supplierBatch @@ -567,7 +568,7 @@ mask: true }); let params = that.details[0]; - // console.log("提交",JSON.stringify(params)) + console.log("提交",JSON.stringify(params)) finshInjectionIssueJob(that.id, params.id, params) .then(res => { uni.hideLoading(); diff --git a/fe/PDA/pages/task/kittingIssueJobDetail.vue b/fe/PDA/pages/task/kittingIssueJobDetail.vue index 3071b54c5..5dc1530b8 100644 --- a/fe/PDA/pages/task/kittingIssueJobDetail.vue +++ b/fe/PDA/pages/task/kittingIssueJobDetail.vue @@ -389,18 +389,18 @@ "]不一致,是否继续发料?", res => { if (res) { - this.setData(result,data) + this.setData(result,data,fromData) } }) - }) + },100) } } else { - this.setData(result,data) + this.setData(result,data,fromData) } }, - setData(result,data) { + setData(result,data,fromData) { this.getBalance(result, res => { if (res.totalCount > 0) { var balancesItem = res.items[0]; @@ -415,7 +415,8 @@ item.handledToLot = balancesItem.lot item.handledToWarehouseCode = balancesItem.warehouseCode item.handledToQty = balancesItem.qty - + item.stdPackQty =balancesItem.stdPackQty + item.handledFromContainerCode = balancesItem.containerCode item.handledFromPackingCode = balancesItem.packingCode item.handledFromSupplierBatch = balancesItem.supplierBatch @@ -439,7 +440,8 @@ item.handledToLot = balancesItem.lot item.handledToWarehouseCode = balancesItem.warehouseCode item.handledToQty = balancesItem.qty - + item.stdPackQty =balancesItem.stdPackQty + item.handledFromContainerCode = balancesItem.containerCode item.handledFromPackingCode = balancesItem.packingCode item.handledFromSupplierBatch = balancesItem.supplierBatch diff --git a/fe/PDA/pages/task/sparePartIssueJobDetail.vue b/fe/PDA/pages/task/sparePartIssueJobDetail.vue index d9b3acbea..59f10eaff 100644 --- a/fe/PDA/pages/task/sparePartIssueJobDetail.vue +++ b/fe/PDA/pages/task/sparePartIssueJobDetail.vue @@ -389,18 +389,18 @@ "]不一致,是否继续发料?", res => { if (res) { - this.setData(result,data) + this.setData(result,data,fromData) } }) }) } } else { - this.setData(result,data) + this.setData(result,data,fromData) } }, - setData(result,data) { + setData(result,data,fromData) { this.getBalance(result, res => { if (res.totalCount > 0) { var balancesItem = res.items[0]; @@ -415,7 +415,8 @@ item.handledToLot = balancesItem.lot item.handledToWarehouseCode = balancesItem.warehouseCode item.handledToQty = balancesItem.qty - + item.stdPackQty =balancesItem.stdPackQty + item.handledFromContainerCode = balancesItem.containerCode item.handledFromPackingCode = balancesItem.packingCode item.handledFromSupplierBatch = balancesItem.supplierBatch @@ -439,7 +440,8 @@ item.handledToLot = balancesItem.lot item.handledToWarehouseCode = balancesItem.warehouseCode item.handledToQty = balancesItem.qty - + item.stdPackQty =balancesItem.stdPackQty + item.handledFromContainerCode = balancesItem.containerCode item.handledFromPackingCode = balancesItem.packingCode item.handledFromSupplierBatch = balancesItem.supplierBatch