From 5cc40452e260550c709928d0679f6e713448ffe7 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期三, 01 十一月 2023 16:50:54 +0800 Subject: [PATCH] 库存编码规则 拣料更改料箱拣料 --- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index b5e36a0..5de7f20 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -7,10 +7,7 @@ import com.core.common.*; import com.core.exception.CoolException; import com.zy.asrs.entity.*; -import com.zy.asrs.entity.param.CombParam; -import com.zy.asrs.entity.param.MobileAdjustParam; -import com.zy.asrs.entity.param.NodePakoutParam; -import com.zy.asrs.entity.param.OpenOrderPakinParam; +import com.zy.asrs.entity.param.*; import com.zy.asrs.service.*; import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.task.handler.WorkLogHandler; @@ -74,6 +71,8 @@ private NodeService nodeService; @Autowired private ManPakOutService manPakOutService; + @Autowired + private LocDetlService locDetlService; @Override @Transactional @@ -474,6 +473,10 @@ SaasUtils.insertLog(0,locNo,waitPakin.getMatnr(), waitPakin.getAnfme(),user.getUsername()); }); + Node node = nodeService.selectByUuid(locNo); + node.setStatus(0); + nodeService.updateById(node); + //鐢熸垚鍏ュ簱閫氱煡鍘嗗彶妗� waitPakinLogService.save(zpallet); //鍒犻櫎鍏ュ簱閫氱煡妗� @@ -538,6 +541,7 @@ //淇敼搴撳瓨 manLocDetl.setAnfme(manLocDetl.getAnfme()-manPakOut.getCount()); if (manLocDetl.getAnfme() == 0 ){ + checkNodeStatus(manLocDetl.getLocNo()); manLocDetlService.delete(manLocDetlWrapper); }else{ manLocDetl.setStatus(1); @@ -550,8 +554,28 @@ //妫�娴嬭鍗曟槸鍚﹀畬鎴� orderService.checkComplete(param.getOrderNo()); + } + @Transactional + public void modifyWrkDetl(List<WrkDetl> wrkDetls, List<ModifyPakoutParam.CA> params, Long userId) { + wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkDetls.get(0).getWrkNo())); + + params.forEach(param ->{ + WrkDetl wrkDetl = new WrkDetl(); + LocDetl locDetl = locDetlService.selectByContainerCode(param.getContainerCode()); + BeanUtils.copyProperties(locDetl,wrkDetl); + wrkDetl.setWrkNo(wrkDetls.get(0).getWrkNo()); + if(wrkDetl.getAnfme() < param.getAnfme()){ + throw new CoolException("鏂欑"+param.getContainerCode()+"鐨勭墿鏂欐暟閲忓皬浜庢嫞鏂欐暟閲忥紝璇烽噸鏂版牳瀵�"); + } + wrkDetl.setAnfme(param.getAnfme()); + wrkDetl.setModiTime(new Date()); + wrkDetl.setAppeTime(new Date()); + wrkDetl.setModiUser(userId); + wrkDetlService.insert(wrkDetl); + + }); } private void saveManlocDetl(WaitPakin waitPakin, Date now, String locNo){ @@ -588,21 +612,17 @@ return status; - - } - public static void main(String[] args) { - ManPakOut m = new ManPakOut(); - m.setAnfme(1.0); - NodePakoutParam n = new NodePakoutParam(); - n.setAnfme(1.0); - - double a = 1.0; - double b = 1.0; - System.out.println(m.getAnfme() == n.getAnfme()); - System.out.println(a == b); - System.out.println(Double.doubleToLongBits(m.getAnfme()) == Double.doubleToLongBits(n.getAnfme())); + private void checkNodeStatus(String locNo){ + ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo)); + //濡傛灉搴撳瓨淇℃伅涓病鏈夋敼搴撲綅锛屽垯淇敼搴撲綅鐘舵�佷负1 + if(Cools.isEmpty(manLocDetl)){ + Node node = nodeService.selectByUuid(locNo); + node.setStatus(1); + nodeService.updateById(node); + } } + } -- Gitblit v1.9.1