From ebe2da6e4eefd59b366ebab3a651b32763b580ed Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 22 六月 2025 14:23:56 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 163 ++++++++++++++++++++++++------------------------------
1 files changed, 72 insertions(+), 91 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 0a18483..26cfdd1 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
@@ -1,9 +1,9 @@
package com.zy.asrs.wms.apis.wcs.services.Impl;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.domain.SystemProperties;
@@ -31,7 +31,6 @@
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
-import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -114,10 +113,19 @@
throw new CoolException("鏈壘鍒版挱绉嶅");
}
for (CacheSite cacheSite:cacheSites) {
+ // 鑾峰彇浠诲姟鏄庣粏鏁伴噺
+ List<TaskDetl> taskDetlByTaskId = taskDetlService.getTaskDetlByTaskId(task.getId());
+ int sum = (int)taskDetlByTaskId.stream().mapToDouble(TaskDetl::getAnfme).sum();
SlapLightControlParam slapLightControlParam = new SlapLightControlParam();
- slapLightControlParam.setControllerCode(cacheSite.getMemo()).setTagCode(cacheSite.getSiteNo())
- .setColor("GREEN").setMode("LIGHT");
+ slapLightControlParam
+ .setControllerCode(cacheSite.getMemo())
+ .setTagCode(cacheSite.getSiteNo())
+ .setColor("GREEN")
+ .setIndex(cacheSite.getIndex())
+ .setMode("LIGHT")
+ .setDisplay(sum + "");
// 鍙戣捣浜伅璇锋眰
+ log.info("浠诲姟{}鍒拌揪鎷ｉ�変綅锛屾挱绉嶅浜伅涓嬪彂",task.getTaskNo(), JSONObject.toJSONString(slapLightControlParam));
CommonReponse response = HttpEssUtils.post("鍒拌揪鎷ｉ�変綅锛屾挱绉嶅浜伅", HttpEssUtils.PLT_SEND_COMMAND, slapLightControlParam);
if (response.getCode().equals(0)) {
log.info("浠诲姟{}鍒拌揪鎷ｉ�変綅锛屾挱绉嶅{}浜伅鎴愬姛",task.getTaskNo(),cacheSite.getSiteNo());
@@ -267,65 +275,53 @@
* @return
*/
@Override
- public synchronized R containerConveryor(String code) {
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, code));
- if (tasks.isEmpty()) {
- return R.error("瀹瑰櫒鐮佷换鍔′笉瀛樺湪锛侊紒");
- } else if (tasks.size() > 1) {
- return R.error("瀹瑰櫒鐮佷换鍔￠敊璇紒锛�");
- }
- tasks.forEach(task -> {
- // try {
-// ConveyorStarParam conveyorStarParam = new ConveyorStarParam();
-// conveyorStarParam.setSlotCode(task.getOriginLoc())
-// .setContainerCode(task.getBarcode());
-// if (task.getTaskType() == 101) { //浠诲姟绫诲瀷涓�101鍏ㄧ洏鍑哄簱锛岀洿鎺ュ彇涓嬪鍣紝浼�200
-// conveyorStarParam.setDirection("200");
-// } else if (task.getTaskType() == 103) { //濡傛灉涓轰换鍔＄被鍨嬩负103锛岄渶璧板洖搴撴搷浣滐紝浼�100
-// conveyorStarParam.setDirection("100");
-// }
-// //璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
-// MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
-// // 璁剧疆璇锋眰鍙傛暟
-// params.add("params", JSONObject.toJSONString(conveyorStarParam));
-// log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", Constant.CONVEYOR_START, JSONObject.toJSONString(conveyorStarParam));
-// HttpHeaders headers = new HttpHeaders();
-// headers.add("Content-Type", "application/json");
-// HttpEntity httpEntity = new HttpEntity<>(params, headers);
-// // 璇锋眰
-// ResponseEntity<String> exchange = restTemplate.exchange(Constant.CONVEYOR_START, HttpMethod.POST, httpEntity, String.class);
-// log.info("涓嬪彂娴佸姩閫氱煡 杩斿洖缁撴灉锛歿}", exchange);
-// if (exchange.getBody() == null) {
-// throw new CoolException("涓嬪彂娴佸姩閫氱煡澶辫触锛侊紒");
-// } else {
-// CommonReponse commonReponse = JSON.toJavaObject(JSON.parseObject(exchange.getBody()), CommonReponse.class);
-// if (commonReponse.getCode() == 0) {
- //娴佸姩閫氱煡涓嬪彂瀹屾垚鍚庯紝淇敼浠诲姟鐘舵�佷负杈撻�佺嚎娴佸姩涓�傘��
- //TODO 鍒ゆ柇浠诲姟鏄惁涓�103鎷ｆ枡鍑哄簱锛�103鎷ｆ枡娴佸姩鍚庝慨鏀逛负4锛圧CS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙戯級
- if (task.getTaskType() == 103) {
- //TODO 闇�鎵炬捣鏌旂‘璁ゆ槸鍚﹂渶瑕侀噸鏂拌皟鐢ㄥ叆搴撴帴鍙�
- //鏇存柊搴撳瓨淇℃伅,淇敼浠诲姟鐘舵�佷负4 锛圧CS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙戯級
- workService.pickTask(task.getId());
-// taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskSts, TaskStsType.WCS_CONVEYOR_START))
- } else {
- taskService.update(new LambdaUpdateWrapper<Task>()
- .eq(Task::getId, task.getId())
- .set(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id));
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized R containerConveryor(String code) throws Exception{
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, code));
+ if (Objects.isNull(task)) {
+ throw new CoolException("瀹瑰櫒鐮佷换鍔′笉瀛樺湪锛侊紒");
+ }
+ try {
+ ConveyorStarParam conveyorStarParam = new ConveyorStarParam();
+ conveyorStarParam.setSlotCode(task.getOriginSite())
+ .setContainerCode(task.getBarcode());
+ if (task.getTaskType() == 101) { //浠诲姟绫诲瀷涓�101鍏ㄧ洏鍑哄簱锛岀洿鎺ュ彇涓嬪鍣紝浼�200
+ conveyorStarParam.setDirection("200");
+ } else if (task.getTaskType() == 103 || task.getTaskType() == 107) { //濡傛灉涓轰换鍔＄被鍨嬩负103锛岄渶璧板洖搴撴搷浣滐紝浼�100
+ conveyorStarParam.setDirection("100");
}
-// log.info(task.getTaskNo() + "涓嬪彂娴佸姩閫氱煡" + commonReponse.getMsg());
-// } else {
-// throw new CoolException("涓嬪彂娴佸姩閫氱煡澶辫触锛侊紒");
-// }
-// }
-// } catch (Exception ex) {
-// log.error(ex.getMessage());
-// } finally {
-// //濡傛灉寮傚父淇敼绂佺敤鐘舵��
-// taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getStatus, 0)
-// .set(Task::getUpdateTime, new Date())
-// .eq(Task::getId, task.getId()));
-// }
- });
+ //璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+ // 璁剧疆璇锋眰鍙傛暟
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+ HttpEntity httpEntity = new HttpEntity<>(conveyorStarParam, headers);
+ log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", HttpEssUtils.CONVEYOR_START, JSONObject.toJSONString(conveyorStarParam));
+ ResponseEntity<String> exchange = restTemplate.exchange("http://192.168.2.200:9046/conveyor/moveContainer", HttpMethod.POST, httpEntity, String.class);
+ log.info("涓嬪彂娴佸姩閫氱煡 杩斿洖缁撴灉锛歿}", exchange);
+ if (exchange.getBody() == null) {
+ throw new CoolException("涓嬪彂娴佸姩閫氱煡澶辫触锛侊紒");
+ } else {
+ CommonReponse commonReponse = JSON.toJavaObject(JSON.parseObject(exchange.getBody()), CommonReponse.class);
+ if (commonReponse.getCode() == 0) {
+ //娴佸姩閫氱煡涓嬪彂瀹屾垚鍚庯紝淇敼浠诲姟鐘舵�佷负杈撻�佺嚎娴佸姩涓�傘��
+ if (task.getTaskType() == 103 || task.getTaskType() == 107) {
+ //鏇存柊搴撳瓨淇℃伅,淇敼浠诲姟鐘舵�佷负4 锛圧CS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙戯級
+ workService.pickTask(task.getId());
+ } else {
+ taskService.update(new LambdaUpdateWrapper<Task>()
+ .eq(Task::getId, task.getId())
+ .set(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id));
+ }
+ log.info(task.getTaskNo() + "涓嬪彂娴佸姩閫氱煡" + commonReponse.getMsg());
+ } else {
+ throw new CoolException("涓嬪彂娴佸姩閫氱煡澶辫触锛侊紒");
+ }
+ }
+ } catch (Exception ex) {
+ log.error("UNK", ex);
+ }
return R.ok();
}
@@ -344,10 +340,11 @@
* 鎷嶇伅鎷ｆ枡閫昏緫锛岃缁嗚鏄庤鎺ュ彛璋冪敤璇存槑
*
* @param request
+ * @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void slapLightLogic(Map<String, Object> request) {
+ public R slapLightLogic(Map<String, Object> request) {
String taskNo = request.get("taskNo").toString();
String orderNo = request.get("orderNo").toString();
@@ -359,19 +356,17 @@
//* 1. 鍒ゆ柇褰撳墠瀹瑰櫒鏄惁杩樻湁鐗╂枡鏈嫞锛屾湭鎷ｅ畬闂伅锛屾嫞瀹岄�氱煡瀹瑰櫒娴佸姩锛屽苟鐏伅
SlapLightControlParam slapParam = new SlapLightControlParam();
MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- //榛樿娴佸姩
- boolean converyor = false;
//鍒ゆ柇褰撳墠浠诲姟鏄惁杩樻湁鐗╂枡鏈嫞
if (!checked(orderNo, taskNo)) {
+ log.info("鏈畬鎴愰棯鐏姹傚湴鍧�锛歿}锛岃姹傚弬鏁帮細{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));
//璋冪敤涓夋柟鎺ュ彛,闂伅涓嶅仛鎿嶄綔
// 璁剧疆璇锋眰鍙傛暟
- params.add("params", JSONObject.toJSONString(slapParam));
- 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("褰撳墠璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -399,36 +394,22 @@
}
}
}
- converyor = true;
params.add("params", JSONObject.toJSONString(slapParam));
log.info("瀹屾垚鐏伅璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));
}
- if (converyor) {
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskNo, request.get("taskNo")));
- if (Objects.isNull(task)) {
- throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
- }
+ 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());
}
-// HttpHeaders headers = new HttpHeaders();
-// headers.add("Content-Type", "application/json");
-// HttpEntity httpEntity = new HttpEntity<>(params, headers);
-// // 璇锋眰
-// ResponseEntity<CommonReponse> exchange = restTemplate.exchange(SystemProperties.CONVEYOR_START, HttpMethod.POST, httpEntity, CommonReponse.class);
-// log.info("涓嬪彂娴佸姩閫氱煡 杩斿洖缁撴灉锛歿}", exchange);
-// if (exchange.getBody() == null) {
-// throw new CoolException("涓嬪彂娴佸姩閫氱煡澶辫触锛侊紒");
-// } else {
-// CommonReponse response = exchange.getBody();
-// if (response.getCode() == 0) {
-// if (!converyor) {
-// //* 2. 瀹瑰櫒娴佸姩鍒ゆ柇锛屽鏋滄枡绠辨病鏈夌墿鏂� code浼�200锛� 鏈夌墿鏂欎紶100 鎵ц鍥炲簱浠诲姟,淇敼浠诲姟鐘舵�佷负 璋冪敤containerConveryor锛坱askNo锛夋柟娉�
-// containerConveryor(request.get("taskNo").toString());
-// }
-// }
-// }
+ return R.ok();
}
/**
--
Gitblit v1.9.1