From 4e8b7012320bd30c1acfb36d20d7564c22890aa9 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 10 三月 2025 12:57:58 +0800
Subject: [PATCH] 出库修改
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 5 +++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 4 +++-
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 | 11 +++++++++--
4 files changed, 16 insertions(+), 6 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 cb6225d..636da74 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
@@ -6,20 +6,27 @@
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
-@Data
//@ConfigurationProperties(prefix = "rcs")
@Component
+@Data
public class SystemProperties {
+
/***RCS鍩虹API HOST*/
@Value("${rcs.baseHost}")
private String baseHost;
- /***RRCS涓婃姤浠诲姟鐘舵��*/
+
+ /***RCS涓婃姤浠诲姟鐘舵��*/
+ @Value("${rcs.issueTaskOfEvent}")
private String issueTaskOfEvent;
+
/**RCS閫氱煡浼犺緭绾挎祦鍔�*/
+ @Value("${rcs.conveyorStart}")
private String conveyorStart;
/**ESS鎺ユ敹浠诲姟涓嬪彂鎺ュ彛*/
+ @Value("${rcs.essReceiveTask}")
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/schedule/ScheduleJobs.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
index 665c558..66de319 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
@@ -33,6 +33,7 @@
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
+import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -49,6 +50,8 @@
@Autowired
private WorkService workService;
+ @Resource
+ private SystemProperties properties;
/***
* 鍏ュ簱浠诲姟---閫氱煡ESS杈撻�佺嚎娴佸姩
@@ -277,8 +280,6 @@
});
tasksParam.setTaskType("carry");
- // TODO 澶氫换鍔″璁㈠崟锛岀粺涓�璋冨害锛屾槸鍚︿細鍑虹幇閮ㄥ垎鎴愬姛锛岄儴鍒嗗け璐ョ殑鎯呭喌
- SystemProperties properties = new SystemProperties();
log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", properties.getBaseHost() + properties.getEssReceiveTask(), JSONObject.toJSONString(tasksParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
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 675f090..250c15d 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
@@ -126,8 +126,10 @@
.eq(Task::getTaskNo, callbackParam.getTaskCode()));
if (!Collections.isEmpty(list)) {
list.forEach(task -> {
+ // 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) {
taskStsType = TaskStsType.WCS_TOTE_LOAD;
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 1b36038..b1d6fe3 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.getMemo());
+ task.setTargetSite(operationPort.getFlag());
task.setBarcode(loc.getBarcode());
boolean res = taskService.save(task);
if (!res) {
--
Gitblit v1.9.1