From 105d6b807d69eb95b3426f5cf6e87a8ff7b0611c Mon Sep 17 00:00:00 2001 From: 吴健 <14790700720@163.com> Date: 星期三, 14 五月 2025 10:34:45 +0800 Subject: [PATCH] first-add --- billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java b/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java index ab8d6cf..9994dd0 100644 --- a/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java +++ b/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.billion.main.om.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.billion.common.core.domain.entity.SysUser; @@ -84,20 +85,20 @@ @Override public int updateOmProductionOrderInfo(OmProductionOrderInfo omProductionOrderInfo) { - Collection<Long> omProductionOrderInfoIds = Collections.emptyList(); - List<OmProductionOrderInfo> checkList = this.list(new LambdaQueryWrapper<OmProductionOrderInfo>() - .eq(OmProductionOrderInfo::getWorkOrderNo, omProductionOrderInfo.getWorkOrderNo()) - .notIn(OmProductionOrderInfo::getId, omProductionOrderInfoIds)); -// .stream().filter(x -> !x.getId().equals(omProductionOrderInfo.getId())) -// .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(checkList)){ - throw new ServiceException("宸插瓨鍦ㄥ伐鍗曠紪鍙蜂负"+omProductionOrderInfo.getWorkOrderNo()+"鐨勬暟鎹�"); - } - LoginUser loginUser = SecurityUtils.getLoginUser(); - SysUser user = loginUser.getUser(); - omProductionOrderInfo.setUpdateTime(new Date()); - omProductionOrderInfo.setUpdateBy(user.getUserName()); - return OmProductionOrderInfoMapper.updateOmProductionOrderInfo(omProductionOrderInfo); +// Collection<Long> omProductionOrderInfoIds = Collections.emptyList(); +// List<OmProductionOrderInfo> checkList = this.list(new LambdaQueryWrapper<OmProductionOrderInfo>() +// .eq(OmProductionOrderInfo::getWorkOrderNo, omProductionOrderInfo.getWorkOrderNo()) +// .notIn(OmProductionOrderInfo::getId, omProductionOrderInfoIds)); +//// .stream().filter(x -> !x.getId().equals(omProductionOrderInfo.getId())) +//// .collect(Collectors.toList()); +// if (CollUtil.isNotEmpty(checkList)){ +// throw new ServiceException("宸插瓨鍦ㄥ伐鍗曠紪鍙蜂负"+omProductionOrderInfo.getWorkOrderNo()+"鐨勬暟鎹�"); +// } +// LoginUser loginUser = SecurityUtils.getLoginUser(); +// SysUser user = loginUser.getUser(); +// omProductionOrderInfo.setUpdateTime(new Date()); +// omProductionOrderInfo.setUpdateBy(user.getUserName()); + return OmProductionOrderInfoMapper.updateById(omProductionOrderInfo); } /** -- Gitblit v1.9.3