From b18f06787ca85aad6bb16a4f4a452a018f3fbf2b Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期四, 14 四月 2022 16:40:27 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java index 3dcdf3d..61b9883 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java @@ -3,12 +3,12 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.common.Cools; import com.core.exception.CoolException; -import com.zy.asrs.entity.MatCode; +import com.zy.asrs.entity.Mat; import com.zy.asrs.entity.WrkDetl; -import com.zy.asrs.entity.MatCodeCountDto; import com.zy.asrs.mapper.WrkDetlMapper; -import com.zy.asrs.service.MatCodeService; +import com.zy.asrs.service.MatService; import com.zy.asrs.service.WrkDetlService; +import com.zy.common.model.DetlDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -20,32 +20,40 @@ public class WrkDetlServiceImpl extends ServiceImpl<WrkDetlMapper, WrkDetl> implements WrkDetlService { @Autowired - private MatCodeService matCodeService; + private MatService matService; @Override @Transactional - public void createWorkDetail(Integer workNo, List<MatCodeCountDto> matCodeCountDtos, Long userId) { - if (matCodeCountDtos.isEmpty()){ + public void createWorkDetail(Integer workNo, List<DetlDto> detlDtos, String barcode, Long userId) { + if (detlDtos.isEmpty()){ return; } - for (MatCodeCountDto dto : matCodeCountDtos) { - MatCode matCode = matCodeService.selectById(dto.getMatNo()); - if (Cools.isEmpty(matCode)){ - throw new CoolException("鐗╂枡鏉$爜鏁版嵁涓虹┖"); + Date now = new Date(); + for (DetlDto dto : detlDtos) { + Mat mat = matService.selectByMatnr(dto.getMatnr()); + if (Cools.isEmpty(mat)){ + throw new CoolException(dto.getMatnr() + "鍟嗗搧缁存姢澶辫触"); } // 淇濇寔宸ヤ綔妗f槑缁� WrkDetl wrkDetl = new WrkDetl(); + wrkDetl.sync(mat); wrkDetl.setWrkNo(workNo); - wrkDetl.setIoTime(new Date()); - wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿 - wrkDetl.setAnfme((double) dto.getCount()); // 鏁伴噺 + wrkDetl.setIoTime(now); + wrkDetl.setBatch(dto.getBatch()); + wrkDetl.setAnfme(dto.getAnfme()); // 鏁伴噺 + wrkDetl.setZpallet(barcode); // 鎵樼洏鏉$爜 wrkDetl.setAppeUser(userId); - wrkDetl.setAppeTime(new Date()); + wrkDetl.setAppeTime(now); wrkDetl.setModiUser(userId); - wrkDetl.setModiTime(new Date()); + wrkDetl.setModiTime(now); if (!this.insert(wrkDetl)) { throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触"); } } } + + @Override + public List<WrkDetl> selectByWrkNo(Integer wrkNo) { + return this.baseMapper.selectByWrkNo(wrkNo); + } } -- Gitblit v1.9.1