From 0994009a6d6184839359505d99fdf7be68ee1b19 Mon Sep 17 00:00:00 2001 From: hdy <1105738590@qq.com> Date: 星期五, 14 三月 2025 12:51:12 +0800 Subject: [PATCH] 工单界面新增按钮 --- billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java | 80 +++++++++++++++++++++++++++++++--------- 1 files changed, 62 insertions(+), 18 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 0a24522..0b4288e 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 @@ -3,19 +3,16 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.billion.common.core.domain.entity.SysUser; -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.common.utils.DateUtils; 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; + /** * 鐢熶骇宸ュ崟Service涓氬姟灞傚鐞� * @@ -27,6 +24,51 @@ { @Resource private OmProductionOrderInfoMapper OmProductionOrderInfoMapper; + + + @Override + public OmProductionOrderInfo getBodyOrder() + { + return OmProductionOrderInfoMapper.getBodyOrder(); + } + + @Override + public OmProductionOrderInfo updateBodyStatus2() {return OmProductionOrderInfoMapper.updateBodyStatus2();} + @Override + public OmProductionOrderInfo updateBodyStatus1() + { + return OmProductionOrderInfoMapper.updateBodyStatus1(); + } + @Override + public OmProductionOrderInfo getHeadOrder() + { + return OmProductionOrderInfoMapper.getHeadOrder(); + } + + @Override + public OmProductionOrderInfo updateHeadStatus2() {return OmProductionOrderInfoMapper.updateHeadStatus2();} + @Override + public OmProductionOrderInfo updateHeadStatus1() + { + return OmProductionOrderInfoMapper.updateHeadStatus1(); + } + @Override + public OmProductionOrderInfo getPreOrder() + { + return OmProductionOrderInfoMapper.getPreOrder(); + } + + @Override + public OmProductionOrderInfo updatePreStatus2() {return OmProductionOrderInfoMapper.updatePreStatus2();} + @Override + public OmProductionOrderInfo updatePreStatus1() + { + return OmProductionOrderInfoMapper.updatePreStatus1(); + } + + + + /** * 鏌ヨ鐢熶骇宸ュ崟 @@ -85,19 +127,16 @@ @Override public int updateOmProductionOrderInfo(OmProductionOrderInfo omProductionOrderInfo) { - List<OmProductionOrderInfo> checkList = this.list(new LambdaQueryWrapper<OmProductionOrderInfo>() - .eq(OmProductionOrderInfo::getWorkOrderNo, omProductionOrderInfo.getWorkOrderNo()) - .notIn(BaseEntity::getId,omProductionOrderInfo.getId())); -// .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)); +// if (CollUtil.isNotEmpty(checkList)){ +// throw new ServiceException("宸插瓨鍦ㄥ伐鍗曠紪鍙蜂负"+omProductionOrderInfo.getWorkOrderNo()+"鐨勬暟鎹�"); +// } +// return OmProductionOrderInfoMapper.updateOmProductionOrderInfo(omProductionOrderInfo); + omProductionOrderInfo.setUpdateTime(DateUtils.getNowDate()); + return OmProductionOrderInfoMapper.updateOmProductionOrderInfo(omProductionOrderInfo); } /** @@ -123,4 +162,9 @@ { return OmProductionOrderInfoMapper.deleteOmProductionOrderInfoById(id); } + + @Override + public void insertBatch(List<OmProductionOrderInfo> confList) { + + } } -- Gitblit v1.9.3