From be481eeb96c5ae1933510fa0543a7239f808c8ba Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期六, 08 三月 2025 17:06:45 +0800
Subject: [PATCH] ctu入库完成
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 105 +++++++++++++++++++---------------
zy-asrs-wms/src/main/resources/application.yml | 4 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/request/TaskParam.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/SystemProperties.java | 7 ++
6 files changed, 70 insertions(+), 52 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/SystemProperties.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/SystemProperties.java
index 0ead602..cb6225d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/SystemProperties.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/SystemProperties.java
@@ -2,19 +2,24 @@
import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@Data
-@ConfigurationProperties(prefix = "rcs")
+//@ConfigurationProperties(prefix = "rcs")
@Component
public class SystemProperties {
/***RCS鍩虹API HOST*/
+ @Value("${rcs.baseHost}")
private String baseHost;
/***RRCS涓婃姤浠诲姟鐘舵��*/
private String issueTaskOfEvent;
/**RCS閫氱煡浼犺緭绾挎祦鍔�*/
private String conveyorStart;
+
+ /**ESS鎺ユ敹浠诲姟涓嬪彂鎺ュ彛*/
+ private String essReceiveTask;
private static String HOST = "http://localhost:8080";
//
// public static String ISSUE_TASK_OF_EVENT = HOST + "/task/create";
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/request/TaskParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/request/TaskParam.java
index 26ee736..5a3d8ad 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/request/TaskParam.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/request/TaskParam.java
@@ -23,5 +23,5 @@
鍙栧�艰秴杩噄nt绫诲瀷鏈�澶у�肩郴缁熶細鎶ラ敊锛屼换鍔′笅鍙戝け璐ャ��*/
private Integer taskPriority;
/**浠诲姟鎻忚堪锛屾弿杩颁换鍔℃墍闇�瑕佺殑鍙傛暟 , 蹇呬紶椤�*/
- private List<TaskDescribe> taskDescribe;
+ private TaskDescribe taskDescribe;
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
index 7ea4d15..665c558 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
@@ -4,8 +4,13 @@
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.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.cfg.CoercionAction;
+import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.domain.SystemProperties;
+import com.zy.asrs.wms.apis.wcs.entity.request.ConveyorStarParam;
import com.zy.asrs.wms.apis.wcs.entity.request.PublishTasksParam;
import com.zy.asrs.wms.apis.wcs.entity.request.TaskDescribe;
import com.zy.asrs.wms.apis.wcs.entity.request.TaskParam;
@@ -55,38 +60,39 @@
.eq(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id).eq(Task::getStatus, 1));
tasks.forEach(task -> {
try {
-// ConveyorStarParam conveyorStarParam = new ConveyorStarParam();
-// conveyorStarParam.setSlotCode(task.getOriginLoc())
-// .setContainerCode(task.getBarcode());
-// //璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦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) {
+ ConveyorStarParam conveyorStarParam = new ConveyorStarParam();
+ conveyorStarParam.setSlotCode(task.getOriginLoc())
+ .setContainerCode(task.getBarcode())
+ .setDirection("100");
+ // 鍘熷鎶ユ枃
+ log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", "http://192.168.2.200:9046/conveyor/moveContainer", JSONObject.toJSONString(conveyorStarParam));
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ HttpEntity httpEntity = new HttpEntity<>(conveyorStarParam, headers);
+ // 璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
+ 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 {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults()
+ .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ CommonReponse commonReponse = objectMapper.readValue(exchange.getBody(), CommonReponse.class);
+ if (commonReponse.getCode() == 0) {
taskService.update(new LambdaUpdateWrapper<Task>()
.eq(Task::getId, task.getId())
.set(Task::getTaskSts, TaskStsType.WCS_CONVEYOR_START.id));
-// log.info(task.getTaskNo() + "涓嬪彂娴佸姩閫氱煡" + commonReponse.getMsg());
-// } else {
-// throw new CoolException("涓嬪彂娴佸姩閫氱煡澶辫触锛侊紒");
-// }
-// }
+ 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).eq(Task::getId, task.getId()));
+ taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getStatus, 0).eq(Task::getId, task.getId()));
}
});
@@ -100,7 +106,7 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
- public void waitPakinSchedule() {
+ public void waitPakinSchedule() throws JsonProcessingException {
//鑾峰彇褰撳墠浠诲姟妗ｄ腑锛屾墍鏈変负寰呭叆搴撶姸鎬佺殑浠诲姟妗ｏ紝鎸夋椂闂村崌搴忔帓鍒�
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
// .eq(Task::getTaskType, 1)
@@ -117,16 +123,24 @@
tasks.forEach(task -> {
List<TaskParam> params = new ArrayList<>();
TaskParam param = new TaskParam();
- //璁剧疆瀹瑰櫒缂栫爜
param.setTaskCode(task.getTaskNo());
- List<TaskDescribe> taskDescribes = new ArrayList<>();
+
+ // 澶勭悊搴撲綅鏄犲皠
+ String[] parts = task.getTargetLoc().split("-");
+ String formatLocNo = String.format("A-%03d-%03d-%02d",
+ Integer.parseInt(parts[0]),
+ Integer.parseInt(parts[1]),
+ Integer.parseInt(parts[2]));
TaskDescribe describe = new TaskDescribe();
//璁剧疆鐩爣搴撲綅锛岀珯鐐�
describe.setContainerCode(task.getBarcode())
- .setToLocationCode(task.getTargetLoc())
+ .setToLocationCode(formatLocNo)
.setToStationCode(task.getTargetSite());
- taskDescribes.add(describe);
- param.setTaskDescribe(taskDescribes);
+// .setFromLocationCode("")
+// .setContainerFace("")
+// .setContainerType("").setStorageTag("");
+
+ param.setTaskDescribe(describe);
params.add(param);
tasksParam.setTasks(params);
});
@@ -134,20 +148,22 @@
tasksParam.setTaskType("putaway");
// TODO 澶氫换鍔″璁㈠崟锛岀粺涓�璋冨害锛屾槸鍚︿細鍑虹幇閮ㄥ垎鎴愬姛锛岄儴鍒嗗け璐ョ殑鎯呭喌
//璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+// MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
// 璁剧疆璇锋眰鍙傛暟
- params.add("params", JSONObject.toJSONString(tasksParam));
+// params.add("params", tasksParam);
log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", "http://192.168.2.200:9046/task/create", JSONObject.toJSONString(tasksParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
- HttpEntity httpEntity = new HttpEntity<>(params, headers);
+ HttpEntity httpEntity = new HttpEntity<>(tasksParam, headers);
// 璇锋眰
ResponseEntity<String> exchange = restTemplate.exchange("http://192.168.2.200:9046/task/create", HttpMethod.POST, httpEntity, String.class);
log.info("涓嬪彂浠诲姟 杩斿洖缁撴灉锛歿}", exchange);
if (exchange.getBody() == null) {
throw new CoolException("涓嬪彂浠诲姟澶辫触锛侊紒");
} else {
- CommonReponse reponse = (CommonReponse) JSON.parse(exchange.getBody());
+ ObjectMapper objectMapper = new ObjectMapper();
+ CommonReponse reponse = objectMapper.readValue(exchange.getBody(), CommonReponse.class);
+// CommonReponse reponse = (CommonReponse) JSON.parse(exchange.getBody());
if (reponse.getCode() == 0) {
// 璇锋眰鎴愬姛鍚庯紝缁熶竴淇敼鎵�鏈変换鍔℃。鐘舵�佷负鍏ュ簱鎵ц涓��
tasks.forEach(task -> {
@@ -231,7 +247,7 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
- public void waveToTask() {
+ public void waveToTask() throws JsonProcessingException {
//鑾峰彇褰撳墠浠诲姟妗ｄ腑锛屾墍鏈変负寰呭嚭搴撶姸鎬佺殑浠诲姟妗ｏ紝鎸夋椂闂村崌搴忔帓鍒�
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.ge(Task::getTaskType, 101) //TODO 濡備綍纭鏄�101锛岃繕鏄�103
@@ -250,36 +266,31 @@
TaskParam param = new TaskParam();
//璁剧疆瀹瑰櫒缂栫爜
param.setTaskCode(task.getTaskNo());
- List<TaskDescribe> taskDescribes = new ArrayList<>();
TaskDescribe describe = new TaskDescribe();
//璁剧疆鐩爣搴撲綅锛岀珯鐐�
describe.setContainerCode(task.getBarcode())
.setToLocationCode(task.getTargetLoc())
.setToStationCode(task.getTargetSite());
- taskDescribes.add(describe);
- param.setTaskDescribe(taskDescribes);
+ param.setTaskDescribe(describe);
params.add(param);
tasksParam.setTasks(params);
});
tasksParam.setTaskType("carry");
// TODO 澶氫换鍔″璁㈠崟锛岀粺涓�璋冨害锛屾槸鍚︿細鍑虹幇閮ㄥ垎鎴愬姛锛岄儴鍒嗗け璐ョ殑鎯呭喌
- //璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
SystemProperties properties = new SystemProperties();
- // 璁剧疆璇锋眰鍙傛暟
- params.add("params", JSONObject.toJSONString(tasksParam));
- log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", properties.getBaseHost() + properties.getIssueTaskOfEvent(), JSONObject.toJSONString(tasksParam));
+ log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", properties.getBaseHost() + properties.getEssReceiveTask(), JSONObject.toJSONString(tasksParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
- HttpEntity httpEntity = new HttpEntity<>(params, headers);
+ HttpEntity httpEntity = new HttpEntity<>(tasksParam, headers);
// 璇锋眰
- ResponseEntity<String> exchange = restTemplate.exchange(properties.getBaseHost() + properties.getIssueTaskOfEvent(), HttpMethod.POST, httpEntity, String.class);
+ ResponseEntity<String> exchange = restTemplate.exchange(properties.getBaseHost() + properties.getEssReceiveTask(), HttpMethod.POST, httpEntity, String.class);
log.info("涓嬪彂浠诲姟 杩斿洖缁撴灉锛歿}", exchange);
if (exchange.getBody() == null) {
throw new CoolException("涓嬪彂浠诲姟澶辫触锛侊紒");
} else {
- CommonReponse reponse = (CommonReponse) JSON.parse(exchange.getBody());
+ ObjectMapper objectMapper = new ObjectMapper();
+ CommonReponse reponse = objectMapper.readValue(exchange.getBody(), CommonReponse.class);
if (reponse.getCode() == 0) {
//璇锋眰鎴愬姛鍚庯紝缁熶竴淇敼鎵�鏈変换鍔℃。鐘舵�佷负鍏ュ簱鎵ц涓��
tasks.forEach(task -> {
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 715f479..675f090 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
@@ -88,7 +88,7 @@
taskService.update(new LambdaUpdateWrapper<Task>()
.set(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id)
//杈撻�佺嚎鑺傜偣缂栫爜锛屼笉鏄簮搴撲綅
-// .set(Task::getOriginLoc, arrivedParam.getSlotCode())
+ .set(Task::getOriginLoc, arrivedParam.getSlotCode())
.eq(Task::getBarcode, arrivedParam.getContainerCode()));
} else {
//瀹瑰櫒鍒拌揪鏃舵洿鏂颁换鍔＄姸鎬佷负锛氬叆搴撳畬鎴愶紝瀹氭椂浠诲姟鏍规嵁鐘舵�佺爜鏇存柊搴撳瓨
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index b1d6fe3..1b36038 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -1101,7 +1101,7 @@
task.setTaskType(taskType);
task.setIoPri(workService.generateIoPri(taskType));
task.setOriginLoc(loc.getLocNo());
- task.setTargetSite(operationPort.getFlag());
+ task.setTargetSite(operationPort.getMemo());
task.setBarcode(loc.getBarcode());
boolean res = taskService.save(task);
if (!res) {
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index 175f367..5df9770 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -75,7 +75,9 @@
rcs:
#RCS鍩虹API HOST
- baseHost: http://localhost:8080
+ baseHost: http://192.168.2.200:9046
+ #ESS鎺ユ敹浠诲姟涓嬪彂鎺ュ彛
+ essReceiveTask: /task/create
#RCS涓婃姤浠诲姟鐘舵��
issueTaskOfEvent: /task/create
#RCS閫氱煡浼犺緭绾挎祦鍔�
--
Gitblit v1.9.1