diff --git a/.env.development b/.env.development index 9acfffb3..2788279c 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -VITE_BASE_URL=http://192.168.0.128:12080/admin-api +VITE_BASE_URL=http://192.168.0.108:12080/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.14:81/admin-api # 租户配置 diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index 90d29eb0..e7e11ff3 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -163,6 +163,7 @@ //查询推荐的目标库位 this.getRecommendLocation(balance, res => { itemp.toLocationCode = res.code; + itemp.expectinNumber = res.expectinNumber; }) let newDetail = createDetailInfo(balance, pack); // newDetail.fromInventoryStatus = balance.inventoryStatus; @@ -200,7 +201,7 @@ }) let param = { - expectinNumber: balance.id, + expectinNumber: balance.packingNumber + "-" + Date.now(), itemCode: balance.itemCode, inventoryStatus: balance.inventoryStatus, }; @@ -222,7 +223,7 @@ recommendLocationRemoveExpectin(param).then(res => { }).catch(err => { - this.showErrorMessage('【'++'】移除预占用失败,请在PC端的预占用中移除') + this.showErrorMessage('【' + lst.join(',') + '】移除预占用失败,请在PC端的预占用中移除') }) }, @@ -245,7 +246,7 @@ this.calcHandleQty(); }, removeItem(index, item) { - this.removeRecommendLocation([item.id]); + this.removeRecommendLocation([item.expectinNumber]); this.detailSource.splice(index, 1) }, removePack() { @@ -320,8 +321,9 @@ this.showCommitSuccessMessage("提交成功
生成制品上架记录
" + res.data) let removeId = []; this.detailSource.forEach(r => { - removeId.push(r.id); + removeId.push(r.expectinNumber); }) + this.removeRecommendLocation(removeId); } else { this.showErrorMessage("提交失败[" + res.msg + "]") @@ -393,7 +395,7 @@ submitItem.toBatch = info.batch; submitItem.fromLocationCode = detail.locationCode; - submitItem.toLocationCode = detail.toLocationCode; + submitItem.toLocationCode = item.toLocationCode; submitItem.qty = detail.handleQty; submitItem.package = "";