From cdfb6025516e43275982780291b4c5bd866bd9d7 Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期五, 25 七月 2025 09:24:16 +0800 Subject: [PATCH] #erp对接修改 --- src/main/java/com/zy/common/web/WcsController.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index e54971f..ba10177 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -75,6 +75,10 @@ if (Cools.isEmpty(param.getBarcode())) { return R.error("鏉$爜涓嶈兘涓虹┖"); } + int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode())); + if (countWrk > 0) { + return R.error("宸ヤ綔妗e凡瀛樺湪"); + } waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())); if (Cools.isEmpty(waitPakins)) { WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode()); @@ -86,10 +90,6 @@ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode())); if (countLoc > 0) { return R.error("搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�"); - } - int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode())); - if (countWrk > 0) { - return R.error("宸ヤ綔妗e凡瀛樺湪"); } } if (Cools.isEmpty(param.getLocType1())) { -- Gitblit v1.9.1