diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index eb280d862..c222d6d06 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -745,13 +745,30 @@ const submitForm = async (formType, submitData) => { return } data.subList = tableData.value // 拼接子表数据参数 - const cmdExists = data.subList.some(filter => - parseFloat(filter.inventoryQty) < parseFloat(filter.qty) - ); - if(cmdExists){ - message.warning("数量不能大于库存数量") - return - } + const cmdExists = data.subList.some(filter => + parseFloat(filter.inventoryQty) > 0 && parseFloat(filter.inventoryQty) < parseFloat(filter.qty) +); +if(cmdExists){ + message.warning("库存数量为正式,则数量不能大于库存数量") + return +} +// 1. 筛选出 inventoryQty <= 0 的记录,并提取它们的 itemCode +const zeroInventoryItems = data.subList.filter(item => parseFloat(item.inventoryQty) <= 0 && (item.itemType == 'SUB' || item.itemType == 'FG')) + .map(item => item.itemCode); +var isRemark = ""; + // 2. 如果有库存不足的商品,拼接提示信息 +if (zeroInventoryItems.length > 0) { + const str = zeroInventoryItems.join(", "); // 用逗号分隔 itemCode + // 删除的二次确认 + isRemark = str+"是半成品/产成品,请先做生产申请后再进行隔离。" + await message.delConfirm(str+"是半成品/产成品,请先做生产申请后再进行隔离。") +} +// // 检查库存数量是否小于等于0 +// const zeroInventory = data.subList.some(filter => parseFloat(filter.inventoryQty) <= 0 && (filter.itemType == 'SUB' || filter.itemType == 'FG') ); +// if(zeroInventory){ +// // 删除的二次确认 +// await message.delConfirm("[品番]是半成品/产成品,请先做生产申请后再进行隔离。") +// } // let isExist = false // tableData.value.forEach(item => { // item['toLocationCode'] = toLocationCode @@ -765,6 +782,7 @@ const submitForm = async (formType, submitData) => { // return message.warning('物料号重复') // } flag.value = false + data.remark = isRemark data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){