From 110277e0d23e15b497a967596216cc62a33c8457 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 10 Dec 2024 14:03:51 +0800 Subject: [PATCH] =?UTF-8?q?FWHL-61=E5=A4=87=E4=BB=B6=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/spareitemLocation/index.ts | 8 +++++++- .../sparepartReturnRequestMain/index.vue | 12 ++++++++++++ .../sparepartReturnRequestMain.data.ts | 2 +- .../sparereceiptRequestMain/index.vue | 16 +++++++++++++--- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/api/wms/spareitemLocation/index.ts b/src/api/wms/spareitemLocation/index.ts index 5f5a2e81b..053b7b10f 100644 --- a/src/api/wms/spareitemLocation/index.ts +++ b/src/api/wms/spareitemLocation/index.ts @@ -50,4 +50,10 @@ export const exportSpareitemLocation = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/spareitem-location/get-import-template' }) -} \ No newline at end of file +} + + +// 自动推荐库位 +export const queryItemLocation = async (data) => { + return await request.post({ url: `/wms/spareitem-location/queryItemLocation`, data }) +} diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue index 7dd585274..beeda28e4 100644 --- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue @@ -108,6 +108,7 @@ import { } from './sparepartReturnRequestMain.data' import * as UnplannedreceiptRequestMainApi from '@/api/wms/unplannedreceiptRequestMain' import * as UnplannedreceiptRequestDetailApi from '@/api/wms/unplannedreceiptRequestDetail' +import * as SpareitemLocationApi from '@/api/wms/spareitemLocation' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItembasicApi from "@/api/wms/itembasic"; import { formatTime } from '@/utils/index' @@ -170,6 +171,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => message.warning('不能同时选择可制造和可采购的物料') } newVal = newVal.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['code'])) + + + let locationList = await SpareitemLocationApi.queryItemLocation({ + "itemCodeList":newVal.map(item=>(item['code'])) + }) + console.log('locationList',locationList) + newVal.forEach(item=>{ let tfk = JSON.parse(JSON.stringify(tableFormKeys)) tfk.batch = formatTime(new Date(), 'yyyyMMdd') @@ -179,6 +187,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => tfk['itemCode'] = item['code'] tfk['uom'] = item['uom'] tfk['validityDays'] = item['validityDays'] + let locationItem = locationList.find(location=>location['itemCode'] == item['code']) + if(locationItem){ + tfk['toLocationCode'] = locationItem['locationCode'] + } tableData.value.push(tfk) }) } else if(formField === 'costcentreCode'){ diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts index 9638264f6..956c6b76d 100644 --- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts @@ -639,7 +639,7 @@ export const UnplannedreceiptRequestMainRules = reactive({ { required: false, message: '请输入项目代码', trigger: 'blur' } ], toWarehouseCode: [ - { required: true, message: '请输入到库位代码', trigger: 'blur' } + { required: true, message: '请输入到仓库代码', trigger: 'blur' } ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index b6bdf9697..0c99e0a8f 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -126,6 +126,7 @@ import { } from './sparereceiptRequestMain.data' import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain' import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail' +import * as SpareitemLocationApi from '@/api/wms/spareitemLocation' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { formatDate } from '@/utils/formatTime' import * as SupplieritemApi from '@/api/wms/supplieritem' @@ -223,7 +224,7 @@ const onEnter = async (field,value)=>{ formRef.value.setDefaultBlurValue(field,value) // getSearchTableData(value,true) } -const updateTableData = (tableList)=>{ +const updateTableData = async (tableList)=>{ console.log('tableList',tableList) let itemCodes = tableList.filter(item=>tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode'])) console.log('itemCodes',itemCodes) @@ -234,6 +235,10 @@ const updateTableData = (tableList)=>{ } tableList = tableList.filter(item=>!tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode'])) if(tableList.length==0) return + let locationList = await SpareitemLocationApi.queryItemLocation({ + "itemCodeList":tableList.map(item=>(item.itemCode)) + }) + console.log('locationList',locationList) tableList.forEach(row=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row})) newRow['poLine'] = row['lineNumber'] @@ -249,7 +254,10 @@ const updateTableData = (tableList)=>{ newRow['arriveDate'] = dayjs().valueOf() //批次 newRow['batch'] = formatDate(newRow['produceDate'],'YYYYMMDD'); - newRow['defaultToLocationCode'] =row['defaultLocation'] + let locationItem = locationList.find(location=>location['itemCode'] == row['itemCode']) + if(locationItem){ + newRow['defaultToLocationCode'] = locationItem['locationCode'] + } if(!tableData.value.find((item:object)=>item.poNumber == newRow.poNumber&&item.itemCode == newRow.itemCode&&item.poLine == newRow.poLine&&item.batch == newRow.batch)){ tableData.value.push(newRow) } @@ -288,7 +296,9 @@ const getSearchTableData = async (number,isEnter=false)=>{ }).then((res)=>{ res.list.forEach((item,index)=>{ const findItem = tableData.value.find(item1=>item1['itemCode']==item['code']) - findItem['expireTime'] = item['expireTime'] + if(findItem){ + findItem['expireTime'] = item['expireTime'] + } }) }) }