From 90e8096a24e55fa40fbd5dbf7b9d94a6d88940d7 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期日, 20 七月 2025 16:20:59 +0800 Subject: [PATCH] 成品库出入库分配堆垛机顺序321 --- src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java index c3b84b3..7679d6e 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java @@ -2,16 +2,72 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.core.common.Cools; import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.entity.result.FindLocNoAttributeVo; import com.zy.asrs.mapper.WrkMastMapper; import com.zy.asrs.service.WrkMastService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; + +@Slf4j @Service("wrkMastService") public class WrkMastServiceImpl extends ServiceImpl<WrkMastMapper, WrkMast> implements WrkMastService { @Override - public int getWorkingMast(String devpNo) { + public int getWorkingMast(Integer devpNo) { return selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", devpNo).in("wrk_sts", 1, 6)); } + + @Override + public List<WrkMast> selectToBeCompleteData() { + return this.baseMapper.selectToBeCompleteData(); + } + + @Override + public List<WrkMast> selectToBeHistoryData() { + return this.baseMapper.selectToBeHistoryData(); + } + + @Override + public WrkMast selectByBarcode(String barcode) { + List<WrkMast> wrkMasts = this.selectList(new EntityWrapper<WrkMast>().eq("barcode", barcode)); + if (Cools.isEmpty(wrkMasts)) { + return null; + } + return wrkMasts.get(0); + } + + @Override + @Transactional(propagation = Propagation.REQUIRES_NEW) + public void updateCtnType(WrkMast wrkMast) { + if (wrkMast.getCtnType() == 0) { + wrkMast.setCtnType(1); + this.updateById(wrkMast); + log.info("鑷姩琛ュ熬妗朵俊鍙锋垚鍔�,浠诲姟鍙凤細{}",wrkMast.getWrkNo()); + } + } + + @Override + public int getStoreCount(Integer crnNo) { + return selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo) + .last(" and (wrk_sts in (1,2) or (wrk_sts=3 and wrk_no in (select wrk_no from asr_bas_devp)))")); + } + + @Override + public int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo) { + return this.baseMapper.selectWrkMastBareBoardStaNo(ioType,staNo); + } + + @Override + public List<WrkMast> selectWrkMastWrkDetl(Integer ioType, FindLocNoAttributeVo findLocNoAttributeVo, Integer crnNo) { + return this.baseMapper.selectWrkMastWrkDetl(ioType,findLocNoAttributeVo.getMatnr(),findLocNoAttributeVo.getBatch(),findLocNoAttributeVo.getBrand() + ,findLocNoAttributeVo.getStandby1(),findLocNoAttributeVo.getStandby2(),findLocNoAttributeVo.getStandby3() + ,findLocNoAttributeVo.getBoxType1(),findLocNoAttributeVo.getBoxType2(),findLocNoAttributeVo.getBoxType3() + ,crnNo); + } } -- Gitblit v1.9.1