From 25579b7079f5fab8fc660358644deb5aea633ed2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 七月 2025 12:46:13 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 90 +++++++++++++++++++++++----------------------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 15 +++++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java | 2
3 files changed, 58 insertions(+), 49 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
index 1ce5d11..7d7c5e2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -26,8 +26,10 @@
import javax.annotation.Resource;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
@Slf4j
@RestController
@@ -115,18 +117,23 @@
throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦紒锛�");
}
- WaveSeed waveSeed = waveSeedService.getOne(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getSiteNo, request.get("tagCode").toString()));
+ List<WaveSeed> waveSeed = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getSiteNo, request.get("tagCode").toString()));
if (Objects.isNull(waveSeed)) {
throw new CoolException("鎾澧欏湴鏍囨湭缁戝畾锛侊紒");
}
+
+ List<Long> taskIds = waveSeed.stream().map(WaveSeed::getTaskId).collect(Collectors.toList());
+
// 鏍规嵁鎾绔欑偣淇℃伅鏉＄爜锛屾煡浠诲姟
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, waveSeed.getTaskId()));
- if (Objects.isNull(task)) {
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds));
+ if (tasks.isEmpty()) {
throw new CoolException("褰撳墠绔欑偣浠诲姟涓嶅瓨鍦紒锛�");
}
+ List<String> taskNos = tasks.stream().map(Task::getTaskNo).collect(Collectors.toList());
+
Map<String, Object> param = new HashMap<>();
- param.put("taskNo", task.getTaskNo());
+ param.put("taskNo", taskNos);
param.put("siteNo", cacheSite.getSiteNo());
param.put("orderNo",cacheSite.getOrderNo());
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 654aad2..42c74aa 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
@@ -348,7 +348,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R slapLightLogic(Map<String, Object> request) {
- String taskNo = request.get("taskNo").toString();
+ List<String> taskNos = (List<String>)request.get("taskNo");
String orderNo = request.get("orderNo").toString();
String siteNo = Objects.isNull(request.get("siteNo")) ? null : request.get("siteNo").toString();
List<CacheSite> performs = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo));
@@ -359,59 +359,61 @@
//* 1. 鍒ゆ柇褰撳墠瀹瑰櫒鏄惁杩樻湁鐗╂枡鏈嫞锛屾湭鎷ｅ畬闂伅锛屾嫞瀹岄�氱煡瀹瑰櫒娴佸姩锛屽苟鐏伅
SlapLightControlParam slapParam = new SlapLightControlParam();
MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- //鍒ゆ柇褰撳墠浠诲姟鏄惁杩樻湁鐗╂枡鏈嫞
- if (!checked(orderNo, taskNo)) {
- log.info("鏈畬鎴愰棯鐏姹傚湴鍧�锛歿}锛岃姹傚弬鏁帮細{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));
- //璋冪敤涓夋柟鎺ュ彛,闂伅涓嶅仛鎿嶄綔
- // 璁剧疆璇锋眰鍙傛暟
- throw new CoolException("褰撳墠浠诲姟鏈畬鎴愶紝涓嶈兘鎵ц姝ゆ搷浣滐紒锛�");
+
+ taskNos.forEach(taskNo -> {
+ //鍒ゆ柇褰撳墠浠诲姟鏄惁杩樻湁鐗╂枡鏈嫞
+ if (!checked(orderNo, taskNo)) {
+ log.info("鏈畬鎴愰棯鐏姹傚湴鍧�锛歿}锛岃姹傚弬鏁帮細{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));
+ //璋冪敤涓夋柟鎺ュ彛,闂伅涓嶅仛鎿嶄綔
+ // 璁剧疆璇锋眰鍙傛暟
+ 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("褰撳墠璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�");
- }
+ } 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;
// }).collect(Collectors.toList());
- //鍒ゆ柇鏁伴噺鏄惁涓庤鍗曟槑缁嗙殑闇�姹傞噺鐩稿悓锛岀浉鍚屽垯璁㈠崟瀹屾垚
- //鎾瀹屾垚锛岄噴鏀剧粦瀹氱珯鐐�
- List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
- .eq(!Objects.isNull(siteNo), CacheSite::getSiteNo, siteNo)
- .eq(CacheSite::getOrderNo, orderNo));
- for (CacheSite cacheSite : cacheSites) {
- if (!cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) {
- cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
- cacheSite.setOrderId(null);
- cacheSite.setBarcode(null);
- cacheSite.setOrderNo(null);
- cacheSite.setPlatformId(null);
- cacheSite.setPlatformNo(null);
- cacheSite.setUpdateTime(new Date());
- if (!cacheSiteService.updateById(cacheSite)) {
- throw new CoolException("鎾绔欑偣鏇存柊澶辫触");
+ //鍒ゆ柇鏁伴噺鏄惁涓庤鍗曟槑缁嗙殑闇�姹傞噺鐩稿悓锛岀浉鍚屽垯璁㈠崟瀹屾垚
+ //鎾瀹屾垚锛岄噴鏀剧粦瀹氱珯鐐�
+ List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()
+ .eq(!Objects.isNull(siteNo), CacheSite::getSiteNo, siteNo)
+ .eq(CacheSite::getOrderNo, orderNo));
+ for (CacheSite cacheSite : cacheSites) {
+ if (!cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) {
+ cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
+ cacheSite.setOrderId(null);
+ cacheSite.setBarcode(null);
+ cacheSite.setOrderNo(null);
+ cacheSite.setPlatformId(null);
+ cacheSite.setPlatformNo(null);
+ cacheSite.setUpdateTime(new Date());
+ if (!cacheSiteService.updateById(cacheSite)) {
+ throw new CoolException("鎾绔欑偣鏇存柊澶辫触");
+ }
}
}
+ params.add("params", JSONObject.toJSONString(slapParam));
+ log.info("瀹屾垚鐏伅璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));
}
- params.add("params", JSONObject.toJSONString(slapParam));
- log.info("瀹屾垚鐏伅璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));
- }
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskNo, request.get("taskNo")));
- if (Objects.isNull(task)) {
- throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
- }
- try {
- containerConveryor(task.getBarcode());
- } catch (Exception e) {
- log.error("鎵ц寮傚父:UNK", e);
- throw new CoolException(e.getMessage());
- }
-
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskNo, request.get("taskNo")));
+ if (Objects.isNull(task)) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
+ }
+ try {
+ containerConveryor(task.getBarcode());
+ } catch (Exception e) {
+ log.error("鎵ц寮傚父:UNK", e);
+ throw new CoolException(e.getMessage());
+ }
+ });
return R.ok();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java
index 6af39ee..a36a678 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java
@@ -155,7 +155,7 @@
this.siteStatus = siteStatus;
this.orderId = orderId;
this.orderNo = orderNo;
-// this.barcode = barcode;
+ this.barcode = barcode;
this.hostId = hostId;
this.status = status;
this.deleted = deleted;
--
Gitblit v1.9.1