From 9e3ac50b27cbbfc6d82da8177a1a8fcf1c009247 Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期一, 08 九月 2025 09:32:21 +0800 Subject: [PATCH] #根据1,2楼rgv任务数,分配生成4楼盘点衔接任务 --- src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java index 1b995a3..f898eff 100644 --- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java @@ -7,14 +7,18 @@ import com.core.exception.CoolException; import com.zy.asrs.entity.StaDesc; import com.zy.asrs.mapper.StaDescMapper; +import com.zy.asrs.mapper.WrkMastStaMapper; +import com.zy.asrs.service.MatService; import com.zy.asrs.service.StaDescService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service("staDescService") public class StaDescServiceImpl extends ServiceImpl<StaDescMapper, StaDesc> implements StaDescService { - + @Autowired + private WrkMastStaMapper wrkMastStaMapper; @Override public List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo) { return this.baseMapper.queryOutStaNosByLocNo(locNo, typeNo); @@ -34,6 +38,33 @@ } @Override + public StaDesc queryCrnStnCheck(Integer typeNo, Integer crnNo, Integer stnNo) { + Integer wrkRgv1 = wrkMastStaMapper.wrkCount1(); + Integer wrkRgv2 = wrkMastStaMapper.wrkCount2(); + + Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>(); + + // 鉁� 濡傛灉 wrkRgv1 < wrkRgv2锛屽垯澶氬姞涓�涓潯浠� + if (wrkRgv1 < wrkRgv2) { + wrapper.eq("type_no", typeNo) + .eq("stn_no", stnNo) + .eq("crn_no", crnNo) + .lt("crn_stn", 2000); + }else{ + wrapper.eq("type_no", typeNo) + .eq("stn_no", stnNo) + .eq("crn_no", crnNo) + .gt("crn_stn", 2000); + } + StaDesc staDesc = this.selectOne(wrapper); + if (staDesc == null) { + throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�"); + } + return staDesc; + } + + + @Override public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo) { Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>() .eq("type_no", typeNo) -- Gitblit v1.9.1