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 | 343 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 186 insertions(+), 157 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 c3eb626..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,5 +1,6 @@
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;
@@ -10,6 +11,7 @@
import com.zy.asrs.wms.apis.wcs.entity.request.*;
import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse;
import com.zy.asrs.wms.apis.wcs.services.WcsApiService;
+import com.zy.asrs.wms.apis.wcs.utils.HttpEssUtils;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.CacheSiteStatusType;
import com.zy.asrs.wms.asrs.entity.enums.OrderPickStatus;
@@ -28,11 +30,8 @@
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import javax.annotation.Resource;
+import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@@ -62,6 +61,9 @@
@Autowired
private PlatformService platformService;
+ @Resource
+ private SystemProperties systemProperties;
+
/**
* 瀹瑰櫒鍒拌揪鎺ユ敹
@@ -77,35 +79,79 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R containerArrivedNotify(ContainerArrivedParam arrivedParam, String taskType, Long hostId) {
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, arrivedParam.getContainerCode()));
- if (Collections.isEmpty(tasks)) {
+ public R containerArrivedNotify(ContainerArrivedParam arrivedParam, String taskType, Long hostId){
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, arrivedParam.getContainerCode()));
+ if (task == null) {
return R.error("浠诲姟涓嶅瓨鍦紒锛�");
}
+ log.info("瀹瑰櫒鍒拌揪鎺ユ敹锛屼换鍔″彿锛歿}锛屽綋鍓嶇姸鎬侊細{}锛屼笂鎶ョ姸鎬侊細{}",task.getTaskNo(),task.getTaskSts$(),TaskStsType.WCS_CONTAINER_RECEIVE.desc);
+
+ taskType = task.getTaskType() > 100 ? "outStock":"inStock";
if (taskType.equals("inStock")) {
- //DONE 鏍规嵁ESS杩斿洖鐨勫鍣ㄧ紪鐮佷慨鏀逛换鍔℃。涓殑杈撻�佺嚎璧峰浣嶇疆鑺傜偣锛屽強浠诲姟妗ｅ鍣ㄥ埌杈剧姸鎬�
- taskService.update(new LambdaUpdateWrapper<Task>()
- .set(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id)
- //杈撻�佺嚎鑺傜偣缂栫爜锛屼笉鏄簮搴撲綅
-// .set(Task::getOriginLoc, arrivedParam.getSlotCode())
- .eq(Task::getBarcode, arrivedParam.getContainerCode()));
- } else {
- //瀹瑰櫒鍒拌揪鏃舵洿鏂颁换鍔＄姸鎬佷负锛氬叆搴撳畬鎴愶紝瀹氭椂浠诲姟鏍规嵁鐘舵�佺爜鏇存柊搴撳瓨
- //褰撶姸鎬佷负鍏ュ簱瀹屾垚鏃讹紝鏇存柊搴撳瓨淇℃伅
-// boolean update = taskService.update(new LambdaUpdateWrapper<Task>()
-// .set(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id)
-// .set(Task::getOriginLoc, arrivedParam.getSlotCode())
-// .eq(Task::getBarcode, arrivedParam.getContainerCode()));
- //fixme 瀹瑰櫒鍒拌揪鐘舵�佹洿鏀逛负鎾涓�...
- boolean update = taskService.update(new LambdaUpdateWrapper<Task>()
- .set(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
- .set(Task::getOriginLoc, arrivedParam.getSlotCode())
- .eq(Task::getBarcode, arrivedParam.getContainerCode()));
- if (!update) {
- throw new CoolException("瀹瑰櫒鍒拌揪浠诲姟鏇存柊澶辫触锛侊紒");
+ if (task.getTaskSts() == 198) {
+ return R.error("鎾涓紒锛�");
}
+ if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_IN.id ) {
+ //DONE 鏍规嵁ESS杩斿洖鐨勫鍣ㄧ紪鐮佷慨鏀逛换鍔℃。涓殑杈撻�佺嚎璧峰浣嶇疆鑺傜偣锛屽強浠诲姟妗ｅ鍣ㄥ埌杈剧姸鎬�
+ taskService.update(new LambdaUpdateWrapper<Task>()
+ .set(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id)
+ //杈撻�佺嚎鑺傜偣缂栫爜锛屼笉鏄簮搴撲綅
+ .set(Task::getOriginSite, arrivedParam.getSlotCode())
+ .eq(Task::getBarcode, arrivedParam.getContainerCode()));
+ } else {
+ log.warn("{}娌℃湁涓嬪彂浠诲姟",task.getTaskNo());
+ R.error(task.getTaskNo()+"娌℃湁涓嬪彂浠诲姟");
+ }
+ } else {
+ if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id
+ || task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id ) {
+ // 鍒拌揪鎷ｉ�変綅锛屾帶鍒舵挱绉嶅浜伅
+ List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getBarcode, task.getBarcode()));
+ if(cacheSites.size() == 0) {
+ log.error("鏉＄爜锛歿}锛屾湭鎵惧埌鎾澧欎寒鐏�",task.getBarcode());
+ 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")
+ .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());
+ } else {
+ log.info("浠诲姟{}鍒拌揪鎷ｉ�変綅锛屾挱绉嶅{}浜伅澶辫触",task.getTaskNo(),cacheSite.getSiteNo());
+ }
+ }
+ boolean update = taskService.update(new LambdaUpdateWrapper<Task>()
+ .set(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
+ .set(Task::getOriginSite, arrivedParam.getSlotCode())
+ .eq(Task::getBarcode, arrivedParam.getContainerCode()));
+ if (!update) {
+ throw new CoolException("瀹瑰櫒鍒拌揪浠诲姟鏇存柊澶辫触锛侊紒");
+ }
+ } else if(task.getTaskSts().equals(TaskStsType.UPDATED_OUT.id)) {
+ ConveyorStarParam conveyorStarParam = new ConveyorStarParam();
+ conveyorStarParam.setSlotCode(task.getOriginSite())
+ .setContainerCode(task.getBarcode())
+ .setDirection("200");
+ // 鍑哄簱瀹屾垚锛屾竻闄よ緭閫佺嚎鏉＄爜锛屽彇涓嬬瀛�
+ CommonReponse response = HttpEssUtils.post("娓呴櫎杈撻�佺嚎鏉＄爜", HttpEssUtils.CONVEYOR_START, conveyorStarParam);
+ if (response.getCode().equals(200)) {
+ log.info("{}鍑哄簱瀹屾垚锛屾竻闄}杈撻�佺嚎鏉＄爜{}鎴愬姛",task.getTaskNo(),task.getOriginSite(),task.getBarcode());
+ }
+ }
}
return R.success("success");
@@ -126,37 +172,43 @@
.eq(Task::getTaskNo, callbackParam.getTaskCode()));
if (!Collections.isEmpty(list)) {
list.forEach(task -> {
+ log.info("瀹瑰櫒鎵ц鐘舵�佷笂鎶ワ紝浠诲姟鍙凤細{}锛屽綋鍓嶇姸鎬侊細{}锛屼笂鎶ョ姸鎬侊細{}",task.getTaskNo(),task.getTaskSts$(),callbackParam.getEventType());
+ if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_ALLOCATED.event)) {
+ return;
+ }
+ // ESS鍙兘閰嶇疆涓�涓姸鎬佷笂鎶ユ帴鍙ｏ紝鏍规嵁浠诲姟鍙峰垽鏂槸鍏ュ簱浠诲姟鎴栧嚭搴撲换鍔�
+ String taskType = task.getTaskType() > 100 ? "outStock":"inStock";
TaskStsType taskStsType = null;
- if (stockType.equals("inStock")) { //鍏ュ簱浠诲姟
+ if (taskType.equals("inStock")) { //鍏ュ簱浠诲姟
if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //涓婃姤鍙栫鐘舵��
- if (task.getTaskSts() == TaskStsType.WCS_CONVEYOR_START.id) {
+// if (task.getTaskSts() == TaskStsType.WCS_CONVEYOR_START.id) {
taskStsType = TaskStsType.WCS_TOTE_LOAD;
- } else {
- String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_TOTE_LOAD.desc + "浠诲姟";
- log.error(errMsg);
- throw new CoolException(errMsg);
- }
+// } else {
+// String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_TOTE_LOAD.desc + "浠诲姟";
+// log.error(errMsg);
+// throw new CoolException(errMsg);
+// }
} else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //涓婃姤鏀剧鐘舵��
- if (task.getTaskSts() == TaskStsType.WCS_TOTE_LOAD.id) {
+// if (task.getTaskSts() == TaskStsType.WCS_TOTE_LOAD.id) {
taskStsType = TaskStsType.WCS_TOTE_UNLOAD;
- } else {
- String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_TOTE_UNLOAD.desc + "浠诲姟";
- log.error(errMsg);
- throw new CoolException(errMsg);
- }
+// } else {
+// String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_TOTE_UNLOAD.desc + "浠诲姟";
+// log.error(errMsg);
+// throw new CoolException(errMsg);
+// }
} else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //TODO 闇�纭涓婃姤浠诲姟涓紝浠诲姟瀹屾垚鏄摢涓簨浠讹紝鐩墠鏆傚畾task浜嬩欢
- if (task.getTaskSts() == TaskStsType.WCS_TOTE_UNLOAD.id) {
+// if (task.getTaskSts() == TaskStsType.WCS_TOTE_UNLOAD.id) {
taskStsType = TaskStsType.WCS_PUTAWAY_SUCESS;
- } else {
- String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_PUTAWAY_SUCESS.desc + "浠诲姟";
- log.error(errMsg);
- throw new CoolException(errMsg);
- }
+// } else {
+// String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_PUTAWAY_SUCESS.desc + "浠诲姟";
+// log.error(errMsg);
+// throw new CoolException(errMsg);
+// }
}
boolean result = taskService.update(new LambdaUpdateWrapper<Task>()
.set(Task::getRobotCode, callbackParam.getRobotCode())
- .set(Task::getSysTaskCode, callbackParam.getSysTaskCode())
- .set(Task::getTaskSts, taskStsType.id)
+// .set(Task::getSysTaskCode, callbackParam.getSysTaskCode())
+ .set(Task::getTaskSts, taskStsType != null ? taskStsType.id : task.getTaskType())
.set(Task::getExcudeStatus, callbackParam.getStatus())
.set(Task::getTaskDesc, callbackParam.getMessage())
.eq(Task::getBarcode, callbackParam.getContainerCode())
@@ -169,37 +221,36 @@
}
} else { //鍑哄簱浠诲姟
if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //涓婃姤鍙栫鐘舵��
- if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT.id ) {
+// if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT.id ) {
taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD;
- } else {
- String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.desc + "浠诲姟";
- log.error(errMsg);
- throw new CoolException(errMsg);
- }
+// } else {
+// String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.desc + "浠诲姟";
+// log.error(errMsg);
+// throw new CoolException(errMsg);
+// }
} else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //涓婃姤鏀剧鐘舵��
- if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id) {
+// if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id) {
taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD;
- } else {
- String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.desc + "浠诲姟";
- log.error(errMsg);
- throw new CoolException(errMsg);
- }
+// } else {
+// String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.desc + "浠诲姟";
+// log.error(errMsg);
+// throw new CoolException(errMsg);
+// }
} else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //涓婃姤瀹屾垚鐘舵��
- if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.id || task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id) {
+// if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.id || task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id) {
//鍑哄簱浠诲姟瀹屾垚锛屼慨鏀圭姸鎬佷负瀹瑰櫒鍒拌揪锛屽畾鏃朵换鍔＄敓鎴愭挱绉嶆尝娆�
taskStsType = TaskStsType.WCS_EXECUTE_OUT_TASK_DONE;
- } else {
- String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.desc + "浠诲姟";
- log.error(errMsg);
- throw new CoolException(errMsg);
- }
+// } else {
+// String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.desc + "浠诲姟";
+// log.error(errMsg);
+// throw new CoolException(errMsg);
+// }
}
-
//鏇存柊鍑哄簱鐘舵�佸強鐩稿叧瀛楁
boolean update = taskService.update(new LambdaUpdateWrapper<Task>()
.set(Task::getRobotCode, callbackParam.getRobotCode())
.set(Task::getSysTaskCode, callbackParam.getSysTaskCode())
- .set(Task::getTaskSts, taskStsType.id)
+ .set(Task::getTaskSts, taskStsType != null ? taskStsType.id : task.getTaskType())
.set(Task::getExcudeStatus, callbackParam.getStatus())
.set(Task::getTaskDesc, callbackParam.getMessage())
.eq(Task::getBarcode, callbackParam.getContainerCode())
@@ -224,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();
}
@@ -301,29 +340,33 @@
* 鎷嶇伅鎷ｆ枡閫昏緫锛岃缁嗚鏄庤鎺ュ彛璋冪敤璇存槑
*
* @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();
+
+ List<CacheSite> performs = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo));
+ if (Objects.isNull(performs.stream().findFirst().get().getPlatformId())) {
+ throw new CoolException("璇锋墦鍗版槑缁嗭紝骞剁粦瀹氱洰鏍囬泦璐у尯");
+ }
//* 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("褰撳墠璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -351,36 +394,22 @@
}
}
}
- converyor = true;
params.add("params", JSONObject.toJSONString(slapParam));
- log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", SystemProperties.SLAP_LIGHT, 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