From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 16 十月 2025 09:55:35 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 32 +++----------------------------- 1 files changed, 3 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 5503e51..c5bcbfd 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -80,8 +80,6 @@ private SlaveProperties slaveProperties; @Autowired private WaitPakinService waitPakinService; - @Autowired - private InventoryCheckOrderDetlService inventoryCheckOrderDetlService; @Override @Transactional @@ -386,19 +384,7 @@ // 鐢熸垚宸ヤ綔妗f槑缁� for (LocDetlDto detlDto : dto.getLocDetlDtos()) { - InventoryCheckOrderDetl inventoryCheckOrderDetl = new InventoryCheckOrderDetl(); - inventoryCheckOrderDetl.setOrderNo(param.getOrderNo()); - inventoryCheckOrderDetl.setMatnr(detlDto.getLocDetl().getMatnr()); - inventoryCheckOrderDetl.setMaktx(detlDto.getLocDetl().getMaktx()); - inventoryCheckOrderDetl.setBatch(detlDto.getLocDetl().getBatch()); - inventoryCheckOrderDetl.setLocNo(detlDto.getLocDetl().getLocNo()); - inventoryCheckOrderDetl.setArea(detlDto.getLocDetl().getOrigin()); - inventoryCheckOrderDetl.setAnfme(detlDto.getLocDetl().getAnfme()); - inventoryCheckOrderDetl.setIoTime(now); - inventoryCheckOrderDetl.setStatus("1"); - if (!inventoryCheckOrderDetlService.insert(inventoryCheckOrderDetl)) { - throw new CoolException("淇濆瓨鐩樼偣鏄庣粏澶辫触"); - } + if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) { continue; @@ -1058,19 +1044,7 @@ // 鐢熸垚宸ヤ綔妗f槑缁� for (LocDetlDto detlDto : dto.getLocDetlDtos()) { - InventoryCheckOrderDetl inventoryCheckOrderDetl = new InventoryCheckOrderDetl(); - inventoryCheckOrderDetl.setOrderNo(param.getOrderNo()); - inventoryCheckOrderDetl.setMatnr(detlDto.getLocDetl().getMatnr()); - inventoryCheckOrderDetl.setMaktx(detlDto.getLocDetl().getMaktx()); - inventoryCheckOrderDetl.setBatch(detlDto.getLocDetl().getBatch()); - inventoryCheckOrderDetl.setLocNo(detlDto.getLocDetl().getLocNo()); - inventoryCheckOrderDetl.setArea(detlDto.getLocDetl().getOrigin()); - inventoryCheckOrderDetl.setAnfme(detlDto.getLocDetl().getAnfme()); - inventoryCheckOrderDetl.setIoTime(now); - inventoryCheckOrderDetl.setStatus("1"); - if (!inventoryCheckOrderDetlService.insert(inventoryCheckOrderDetl)) { - throw new CoolException("淇濆瓨鐩樼偣鏄庣粏澶辫触"); - } + if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) { continue; @@ -1196,7 +1170,7 @@ if (Cools.isEmpty(wrkMast)) { throw new CoolException(workNo + "宸ヤ綔妗d笉瀛樺湪"); } - if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) { + if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 5||wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15) { throw new CoolException("褰撳墠宸ヤ綔妗e凡瀹屾垚"); } // 鍏ュ簱 + 搴撲綅杞Щ -- Gitblit v1.9.1