From e504763f69029b594f7d9440f3f606e8562027fa Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期二, 01 四月 2025 12:30:12 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/AgvMobileController.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index 9f3579a..4d03ca6 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -157,6 +157,20 @@ } log.info("鍚姩鍏ュ簱,{}", JSON.toJSONString(params)); // 缁勬墭 + if (params.getBarcode().startsWith("31")) { + //绠卞3鍏ュ簱锛岃揣鏋朵笂鍙兘瑁呬竴绉� + if (!Cools.isEmpty(params.getCombParams())) { + if (params.getCombParams().size() > 1) { + return R.error("鍗婃垚鍝佺澹冲叆搴擄紝璐ф灦涓婂彧鑳借涓�绉嶇墿鏂�"); + } else { + List<CombParam.CombMat> combMats = params.getCombParams().get(0).getCombMats(); + if (!Cools.isEmpty(combMats) && combMats.size() > 1) { + return R.error("鍗婃垚鍝佺澹冲叆搴擄紝璐ф灦涓婂彧鑳借涓�绉嶇墿鏂�"); + } + } + + } + } params.getCombParams().forEach(combParam -> { agvMobileService.comb(combParam, getUserId()); }); -- Gitblit v1.9.1