From a2cd0f560c226d7830c79fa3c0a6cb3db72927b4 Mon Sep 17 00:00:00 2001 From: hdy <1105738590@qq.com> Date: 星期三, 26 二月 2025 08:25:31 +0800 Subject: [PATCH] 修改 --- billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 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 c9a60a2..36a4102 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 @@ -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)){ -- Gitblit v1.9.3