From 5fc35be9138e965b2cf3e1211257bdf12009a358 Mon Sep 17 00:00:00 2001 From: Administrator <335182714> Date: 星期三, 17 九月 2025 08:23:01 +0800 Subject: [PATCH] 订单出库显示明细是否完成修复 --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index b3654de..1692651 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -1227,7 +1227,7 @@ @Override @Transactional - public R gwmsGenerateInventory(GwmsGenerateInventoryDto param) { + public synchronized R gwmsGenerateInventory(GwmsGenerateInventoryDto param) { if (Cools.isEmpty(param)) { throw new CoolException("璇锋眰鍙傛暟鏈夎锛�" + param); @@ -1246,6 +1246,10 @@ HashMap<String, Object> xx = new HashMap<>(); List<GwmsGenerateInventoryDto.MatList> matList = param.getMatList(); for (GwmsGenerateInventoryDto.MatList obj : matList) { + int barcodeCount2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("brand", obj.getPackageGroupNo())); + if (barcodeCount2 > 0) { + throw new CoolException("鍖呰缁勫彿宸插瓨鍦ㄥ伐浣滄。锛堣緭閫佺嚎锛夛細" + obj.getPackageGroupNo()); + } int zpalletCount2 = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("brand", obj.getPackageGroupNo())); if (zpalletCount2 > 0) { throw new CoolException("鍖呰缁勫彿宸插瓨鍦細" + obj.getPackageGroupNo()); @@ -2399,7 +2403,7 @@ @Override @Transactional - public R unqualifiedOrder(ReturnOrderConfirmParam param) { + public R unQualifiedOrder(ReturnOrderConfirmParam param) { if (Cools.isEmpty(param.getOrderNumber())) { param.setOrderNumber("UQCK" + DateUtils.convert(new Date(), DateUtils.yyyyMMdd)); } -- Gitblit v1.9.1