From 15973f20325554ccc8b6bd266ae614cff2887fcf Mon Sep 17 00:00:00 2001 From: pjb <123456> Date: 星期五, 11 七月 2025 15:48:46 +0800 Subject: [PATCH] `1` --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java index 575b71f..8b364d7 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java @@ -331,21 +331,22 @@ //* 1. 鍒ゆ柇褰撳墠瀹瑰櫒鏄惁杩樻湁鐗╂枡鏈嫞锛屾湭鎷e畬闂伅锛屾嫞瀹岄�氱煡瀹瑰櫒娴佸姩锛屽苟鐏伅 SlapLightControlParam slapParam = new SlapLightControlParam(); MultiValueMap<String, Object> params = new LinkedMultiValueMap<>(); - + Order one = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, orderNo)); + if (Objects.isNull(one)) { + throw new CoolException("褰撳墠璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�"); + } //鍒ゆ柇褰撳墠浠诲姟鏄惁杩樻湁鐗╂枡鏈嫞 if (!checked(orderNo, taskNo)) { log.info("鏈畬鎴愰棯鐏姹傚湴鍧�锛歿}锛岃姹傚弬鏁帮細{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam)); //璋冪敤涓夋柟鎺ュ彛,闂伅涓嶅仛鎿嶄綔 // 璁剧疆璇锋眰鍙傛暟 + mobileService.sowLightMange(siteNo, one, "LIGHT"); // throw new CoolException("褰撳墠浠诲姟鏈畬鎴愶紝涓嶈兘鎵ц姝ゆ搷浣滐紒锛�"); // params.add("params", JSONObject.toJSONString(slapParam)); } else { //璋冪敤涓夋柟鎺ュ彛,鐏伅閫氱煡瀹瑰櫒娴佸姩锛� 浼犵伃鐏弬鏁� //todo 鍒ゆ柇褰撳墠璁㈠崟鏄惁瀹屾垚锛屽畬鎴愮伃鐏紝鏈畬鎴愪繚鎸佹嫞璐х姸鎬佷寒鐏� - Order one = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, orderNo)); - if (Objects.isNull(one)) { - throw new CoolException("褰撳墠璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�"); - } + // //鑾峰彇鎾宸插畬鎴愮殑璁㈠崟鏄庣粏 // List<OrderDetl> detlList = orderDetls.stream().filter(detl -> { // return detl.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_DONE.val; -- Gitblit v1.9.1