From 5edbc95f689813cee37ee573af48e59175ddff92 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期二, 21 一月 2025 13:37:28 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/AgvMobileController.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index 4db9799..cdbcfae 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -77,7 +77,7 @@ @RequestMapping("/pick/again/auth") @ManagerAuth(memo = "鍐嶆鎷f枡") public R pickAgain(@RequestBody PickParam pickParams) { - if (pickParams == null ) { + if (pickParams == null) { return R.error("缂哄皯鍙傛暟"); } agvMobileService.pickAgain(pickParams, 1l); @@ -177,6 +177,9 @@ return R.error("缂哄皯鍙傛暟"); } for (AgvMobileStartParam.Pda pda : params.getPad()) { + if (pda == null || Cools.isEmpty(pda.getContainerCode())) { + return R.error("缂哄皯瀹瑰櫒鍙傛暟"); + } pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2))); workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false); } @@ -416,7 +419,7 @@ AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode)); AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo)); - if (agvLocMastByLocNo==null){ + if (agvLocMastByLocNo == null) { return R.error("搴撲綅涓嶅瓨鍦�"); } String barcode1 = agvLocMastByLocNo.getBarcode(); @@ -525,6 +528,7 @@ @Transactional @ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�") @Synchronized + @Deprecated //涓嶇敤浜� public R agvLocMove(@RequestBody HashMap<String, Object> params) { String fl = String.valueOf(params.get("floor")); short floor = (short) Integer.parseInt(fl.substring(0, 1)); -- Gitblit v1.9.1