From 05b8ccfc9eeadddd65e95ea82479c224d1516b4c Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 07 八月 2025 19:19:33 +0800 Subject: [PATCH] no message --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java index f48c31e..a0f6a43 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java @@ -534,6 +534,7 @@ /** * 娉㈡鍑哄簱棰勮 + * * @param param * @return */ @@ -587,7 +588,7 @@ locDto.setLocNo(detl.getLocNo()); locDto.setTypeId(LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id); locDto.setLocDetlId(detl.getId()); - locDto.setAnfme(detl.getAnfme()); + locDto.setAnfme(detl.getAnfme() - detl.getWorkQty()); locDto.setWorkQty(detl.getWorkQty()); locDtos.add(locDto); //搴撲綅瀹為檯鍙敤鏁伴噺 @@ -1109,6 +1110,11 @@ throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�"); } + wave.setSite(operationPort.getFlag()); + if (!waveService.updateById(wave)) { + throw new CoolException("娉㈡绔欏彛鐘舵�佹洿鏂板け璐ワ紒锛�"); + } + for (OrderOutMergeDto merge : list) { LocDetl locDetl = locDetlService.getById(merge.getLocDetlId()); if (locDetl == null) { @@ -1148,7 +1154,7 @@ .eq(WaveDetl::getStockIndex, matUniqueKey) .eq(WaveDetl::getWaveId, wave.getId())); if (waveDetl == null) { - throw new CoolException("waveId:" + wave.getId() + "鐗╂枡锛�" + taskDetl.getMatnr() + "娉㈡鏁版嵁涓嶅瓨鍦�"); + throw new CoolException("waveId:" + wave.getId() + "鐗╂枡锛�" + taskDetl.getMatnr() + "娉㈡鏁版嵁涓嶅瓨鍦�"); } waveDetl.setWorkQty(waveDetl.getWorkQty() + taskDetl.getAnfme()); waveDetl.setUpdateTime(new Date()); @@ -1161,6 +1167,8 @@ if (orders.isEmpty()) { throw new CoolException("褰撳墠娉㈡璁㈠崟涓嶅瓨鍦紒锛�"); } + + // List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>() // .eq(CacheSite::getSiteStatus, CacheSiteStatusType.O.id).eq(CacheSite::getChannel, task.getTargetSite())); @@ -1638,7 +1646,10 @@ for (LocDetl locDetl : param.getLocDetls()) { List<OrderOutMergeParam> orders = new ArrayList<>(); - LocDetl detl = locDetlService.getOne(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locDetl.getLocNo())); + LocDetl detl = locDetlService.getOne(new LambdaQueryWrapper<LocDetl>() + .eq(LocDetl::getMatId, locDetl.getMatId()) + .eq(LocDetl::getBatch, locDetl.getBatch()) + .eq(LocDetl::getLocNo, locDetl.getLocNo())); if (Objects.isNull(detl)) { continue; } -- Gitblit v1.9.1