修改

hdy

2025-02-26 a2cd0f560c226d7830c79fa3c0a6cb3db72927b4

 billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java

@@ -7,15 +7,14 @@
import com.billion.common.core.domain.model.LoginUser;
import com.billion.common.exception.ServiceException;
import com.billion.common.utils.SecurityUtils;
import com.billion.main.common.BaseEntity;
import com.billion.main.om.domain.OmProductionOrderInfo;
import com.billion.main.om.mapper.OmProductionOrderInfoMapper;
import com.billion.main.om.service.IOmProductionOrderInfoService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.*;

/**
 * 生产工单Service业务层处理
 * 
@@ -27,6 +26,36 @@
{
    @Resource
    private OmProductionOrderInfoMapper OmProductionOrderInfoMapper;


    @Override
    public OmProductionOrderInfo getEarliestOrder()
    {
        return OmProductionOrderInfoMapper.selectEarliestOrder();
    }
    @Override
    public OmProductionOrderInfo getEarliestOrder2() {return OmProductionOrderInfoMapper.selectEarliestOrder2();}
    @Override
    public OmProductionOrderInfo getSerialNumber()
    {
        return OmProductionOrderInfoMapper.getSerialNumber();
    }
    @Override
    public OmProductionOrderInfo updateSerialNumber() {return OmProductionOrderInfoMapper.updateSerialNumber();}
    @Override
    public OmProductionOrderInfo updateYear() {return OmProductionOrderInfoMapper.updateYear();}
    @Override
    public OmProductionOrderInfo updateOrderStatus5()
    {
        return OmProductionOrderInfoMapper.updateOrderStatus5();
    }
    @Override
    public OmProductionOrderInfo updateOrderStatus2()
    {
        return OmProductionOrderInfoMapper.updateOrderStatus2();
    }



    /**
     * 查询生产工单
@@ -85,9 +114,10 @@
    @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(BaseEntity::getId,omProductionOrderInfo.getId()));
                        .notIn(OmProductionOrderInfo::getId, omProductionOrderInfoIds));
//                .stream().filter(x -> !x.getId().equals(omProductionOrderInfo.getId()))
//                .collect(Collectors.toList());
        if (CollUtil.isNotEmpty(checkList)){