From f744b13a0905777a405becaf7232cfe3e72f1fe2 Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 19 Jul 2024 15:49:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/balance/index.ts | 11 ++++ .../productionitemcodeSpareitemcode/index.ts | 11 ++++ .../productionitemcodeSpareitemcode.data.ts | 60 +++++++++++++++++++ .../relegate/relegateRequest/index.vue | 23 ++++--- .../relegateRequestMain.data.ts | 34 ++++++----- .../callmaterials/callmaterials.data.ts | 4 +- 6 files changed, 114 insertions(+), 29 deletions(-) diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 0aa246832..3d408963f 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -190,6 +190,17 @@ export const getBalanceByBusinessTypeByItemType = async (params) => { return await request.get({ url: `/wms/balance/pageBusinessTypeToBalance`, params }) } } + +// 查询库存余额列表根据业务类型 根据库存状态及库区类型再根据物料的种类筛选 +export const getBalanceByBusinessCategoryByItemType = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance/pageBusinessCategoryToBalanceSenior', data }) + } else { + return await request.get({ url: `/wms/balance/pageBusinessCategoryToBalance`, params }) + } +} // 根据code获取数据列表 export const getBalanceItemListByCodes = async (data) => {   return await request.get({ url: `/wms/balance/listByCodes`,data }) diff --git a/src/api/wms/productionitemcodeSpareitemcode/index.ts b/src/api/wms/productionitemcodeSpareitemcode/index.ts index 1bd325194..b201b9e1e 100644 --- a/src/api/wms/productionitemcodeSpareitemcode/index.ts +++ b/src/api/wms/productionitemcodeSpareitemcode/index.ts @@ -19,6 +19,17 @@ export const getProductionitemcodeSpareitemcodePage = async (params) => { } } +// 查询量产件备件关系列表 +export const getProductionitemcodeSpareitemcodeRelation = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productionitemcode-spareitemcode/getRelationSeniorS', data }) + } else { + return await request.get({ url: `/wms/productionitemcode-spareitemcode/getRelation`, params }) + } +} + // 查询量产件备件关系详情 export const getProductionitemcodeSpareitemcode = async (id: number) => { return await request.get({ url: `/wms/productionitemcode-spareitemcode/get?id=` + id }) diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts index 2ebe01c0d..cf6f44bf7 100644 --- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts +++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts @@ -1,5 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '../itembasic/itembasic.data' // 表单校验 export const ProductionitemcodeSpareitemcodeRules = reactive({ @@ -13,12 +15,70 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive }) } else if (formField == 'downItemCode') { - row['downItemCode'] = val[0]['code'] + row['downItemCode'] = val[0]['spareItemCode'] + console.log(row['itemCode']); + // ItembasicApi.getItemListByCodes(row['itemCode']) + + // if(){ + // row['downItemCode'] = val[0]['productionItemCode'] + // }else if(){ + // row['downItemCode'] = val[0]['spareItemCode'] + // } } else if (formField == 'toLocationCode') { row['toLocationCode'] = val[0]['code'] } else { @@ -139,17 +148,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { RelegateRequestDetail.allSchemas.tableFormColumns.map(item => { if (item.field == 'itemCode') { item.tableForm.searchCondition = [ - { - key: 'businessType', - value: businessType, - isMainValue: false - } - // ,{ - // key: 'available', - // value: 'TRUE', - // isMainValue: false - // } - ,{ + { message: '请选择从仓库代码！', key: 'warehouseCode', value: 'fromWarehouseCode', diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index 6df677b5e..41bd576fb 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -17,6 +17,8 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l import * as ItempackageApi from '@/api/wms/itempackage' import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' +import * as ProductionitemcodeSpareitemcodeApi from '@/api/wms/productionitemcodeSpareitemcode' +import { ProductionitemcodeSpareitemcode } from '@/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data' import * as confgiApi from '@/api/infra/config' // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { @@ -322,7 +324,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ searchField: 'itemCode', searchTitle: '库存余额信息', searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.getBalanceByBusinessTypeByItemType, + searchPage: BalanceApi.getBalanceByBusinessCategoryByItemType, searchCondition: [] } }, @@ -334,7 +336,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalanceByBusinessTypeByItemType, // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalanceByBusinessCategoryByItemType, // 查询弹窗所需分页方法 searchCondition:[ // { // key: 'available', @@ -361,19 +363,20 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择降级物料代码', - searchField: 'code', + searchField: 'productionItemCode', searchTitle: '物料基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage, + searchAllSchemas: ProductionitemcodeSpareitemcode.allSchemas, + searchPage: ProductionitemcodeSpareitemcodeApi.getProductionitemcodeSpareitemcodeRelation, searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false },{ - key: 'type', - value: confgiData.itemType, - isMainValue: false - }], + key: 'itemCode', + value: 'itemCode', + isTableRowValue: true, + isMainValue:false + }], verificationParams: [{ key: 'code', action: '==', @@ -387,19 +390,20 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ tableForm:{ isInpuFocusShow: true, searchListPlaceholder: '请选择降级物料代码', // 输入框占位文本 - searchField: 'itemCode', // 查询弹窗赋值字段 + searchField: 'productionItemCode', // 查询弹窗赋值字段 searchTitle: '物料基础信息', // 查询弹窗标题 - searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 - searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchAllSchemas: ProductionitemcodeSpareitemcode.allSchemas, // 查询弹窗所需类 + searchPage: ProductionitemcodeSpareitemcodeApi.getProductionitemcodeSpareitemcodeRelation, // 查询弹窗所需分页方法 searchCondition:[ { key: 'available', value: 'TRUE', isMainValue: false },{ - key: 'type', - value: confgiData.itemType, - isMainValue: false + key: 'itemCode', + value: 'itemCode', + isTableRowValue: true, + isMainValue:false }] }, table: { diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index 1f380e974..1aa4338dd 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -38,7 +38,7 @@ export const CallmaterialsRules = reactive({ workStationCode: [required], uom: [required], callmaterialQty: [required], - project: [{ max: 50, message: '最多50字符', trigger: 'blur'}] + project: [{ max: 64, message: '最多50字符', trigger: 'blur'}] }) export const Callmaterials = useCrudSchemas(reactive([ @@ -361,7 +361,7 @@ export const Callmaterials = useCrudSchemas(reactive([ } , form: { componentProps:{ - maxlength: 50, + maxlength: 64, type:'textarea', showWordLimit:true }