From 17080b28dc3fb0df12a5a4da76e10dd9203e5725 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期三, 08 十月 2025 11:07:48 +0800 Subject: [PATCH] 订单功能完善 --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 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 bb8bf20..efc19ee 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -93,6 +93,9 @@ List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList()); // List<String> batchs = param.getList().stream().map(FullStoreParam.MatCodeStore::getBatch).distinct().collect(Collectors.toList()); StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), matnrs.get(0), null, null,locTypeDto); + if (Cools.isEmpty(dto)){ + throw new CoolException("鏌ヨ搴撲綅澶辫触锛侊紒==銆媠tartupFullPutStore ==銆� commonService.getLocNo"); + } // 鐢熸垚宸ヤ綔鍙� int workNo = dto.getWorkNo(); // 鐢熸垚宸ヤ綔妗� @@ -446,6 +449,9 @@ .eq("stn_no", param.getOutSite()) .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); + if (staDesc == null) { + throw new CoolException("璺緞涓嶅瓨鍦�"); + } Integer sourceStaNo = staDesc.getCrnStn(); if (Cools.isEmpty(sourceStaNo)) { throw new CoolException("妫�绱㈡簮绔欏け璐�"); @@ -1019,15 +1025,15 @@ } } - @Override - public StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId) { - if (Cools.isEmpty(list)) { - throw new CoolException("鍏ュ簱閫氱煡妗d笉鑳戒负绌�"); - } - LocTypeDto locTypeDto = new LocTypeDto(); - locTypeDto.setLocType1((short) 1); - return wcsController.startupFullPutStore(301, list.get(0).getZpallet(), locTypeDto, list); - } +// @Override +// public StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId) { +// if (Cools.isEmpty(list)) { +// throw new CoolException("鍏ュ簱閫氱煡妗d笉鑳戒负绌�"); +// } +// LocTypeDto locTypeDto = new LocTypeDto(); +// locTypeDto.setLocType1((short) 1); +// return wcsController.startupFullPutStore(301, list.get(0).getZpallet(), locTypeDto, list); +// } @Override @Transactional -- Gitblit v1.9.1