From 43450d7859c291ac190c8cbab5728705fdeb18f7 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期日, 22 六月 2025 17:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ycds-wms-dev' into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 29a0d0c..5325151 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
@@ -115,7 +115,7 @@
for (CacheSite cacheSite:cacheSites) {
// 鑾峰彇浠诲姟鏄庣粏鏁伴噺
List<TaskDetl> taskDetlByTaskId = taskDetlService.getTaskDetlByTaskId(task.getId());
- double sum = taskDetlByTaskId.stream().mapToDouble(TaskDetl::getAnfme).sum();
+ int sum = (int)taskDetlByTaskId.stream().mapToDouble(TaskDetl::getAnfme).sum();
SlapLightControlParam slapLightControlParam = new SlapLightControlParam();
slapLightControlParam
.setControllerCode(cacheSite.getMemo())
@@ -347,7 +347,7 @@
public R slapLightLogic(Map<String, Object> request) {
String taskNo = request.get("taskNo").toString();
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));
if (Objects.isNull(performs.stream().findFirst().get().getPlatformId())) {
throw new CoolException("璇锋墦鍗版槑缁嗭紝骞剁粦瀹氱洰鏍囬泦璐у尯");
@@ -376,21 +376,21 @@
// }).collect(Collectors.toList());
//鍒ゆ柇鏁伴噺鏄惁涓庤鍗曟槑缁嗙殑闇�姹傞噺鐩稿悓锛岀浉鍚屽垯璁㈠崟瀹屾垚
- if (one.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_DONE.val) {
- //鎾瀹屾垚锛岄噴鏀剧粦瀹氱珯鐐�
- List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().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("鎾绔欑偣鏇存柊澶辫触");
}
}
}
--
Gitblit v1.9.1