diff --git a/src/api/wms/scrapRequestDetail/index.ts b/src/api/wms/scrapRequestDetail/index.ts index 99a15ec2a..2c752eafd 100644 --- a/src/api/wms/scrapRequestDetail/index.ts +++ b/src/api/wms/scrapRequestDetail/index.ts @@ -17,12 +17,15 @@ export interface ScrapRequestDetailVO { itemDesc1: string itemDesc2: string projectCode: string + inventoryQty: number qty: number uom: string updateTime: Date updater: string } +const message = useMessage() // 消息弹窗 + // 查询报废出库申请子列表 export const getScrapRequestDetailPage = async (params) => { if (params.isSearch) { @@ -46,6 +49,10 @@ export const createScrapRequestDetail = async (data: ScrapRequestDetailVO) => { // 修改报废出库申请子 export const updateScrapRequestDetail = async (data: ScrapRequestDetailVO) => { + if(parseFloat(data.inventoryQty) < parseFloat(data.qty)){ + message.warning("数量不能大于库存数量") + return + } return await request.put({ url: `/wms/scrap-request-detail/update`, data }) } @@ -62,4 +69,4 @@ export const exportScrapRequestDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/scrap-request-detail/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index a72f3a5cd..01f7a54c2 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -222,6 +222,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => newRow['uom'] = item['uom'] newRow['singlePrice'] = itemCode ? itemCode['price'] : '' newRow['amount'] = newRow['qty'] * newRow['singlePrice'] + newRow['inventoryQty'] = item['qty'] tableData.value.push(newRow) }) // row['singlePrice'] = res.price @@ -725,6 +726,13 @@ const submitForm = async (formType, submitData) => { item.amount = Number(item.amount).toFixed(2) }) try { + const cmdExists = data.subList.some(filter => + parseFloat(filter.inventoryQty) < parseFloat(filter.qty) + ); + if(cmdExists){ + message.warning("数量不能大于库存数量") + return + } if (formType === 'create') { console.log('【报废出库子列表】', data.subList) if (data.subList.length == 0) { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 01acdc417..df71709a2 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -1144,6 +1144,21 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ // disabled: true // } // }, + { + label: '库存数量 ', + field: 'inventoryQty', + sort: 'custom', + isSearch: false, + isTable: false, + tableForm: { + disabled: true + }, + form:{ + componentProps:{ + disabled:true + } + } + }, { label: '数量', field: 'qty',