first-add

吴健

4 天以前 105d6b807d69eb95b3426f5cf6e87a8ff7b0611c

 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);
    }

    /**