From 69a3c374ca3afb770e3b9ffcbdda07ce362cbf58 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 09 一月 2026 19:59:29 +0800
Subject: [PATCH] #
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java
index 1663c91..e048b9e 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java
@@ -67,7 +67,7 @@
try {
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
- return R.ok().add(result.getData());
+ return R.ok(result.getMsg()).add(result.getData());
} else {
return R.error(result.getMsg());
// throw new CoolException("浠诲姟鎵ц鐘舵�佷笂鎶ュけ璐ワ紒锛�");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index b33e26f..30b10da 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -938,6 +938,14 @@
if (waitPakins.isEmpty()) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦� 锛侊紒");
}
+ Task one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
+ if (!Cools.isEmpty(one)) {
+ InTaskWcsReportParam inTaskWcsReportParam = new InTaskWcsReportParam();
+ inTaskWcsReportParam.setTaskNo(one.getTaskCode());
+ inTaskWcsReportParam.setLocNo(one.getTargLoc());
+ inTaskWcsReportParam.setTaskPri(one.getSort());
+ return R.ok("浠诲姟宸插瓨鍦ㄧ洿鎺ヤ笅鍙戯紒").add(inTaskWcsReportParam);
+ }
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getSite,params.getSourceStaNo()).orderByDesc(DeviceSite::getId),false);
if (Objects.isNull(deviceSite)) {
@@ -948,7 +956,7 @@
.setSiteId(deviceSite.getId());
R r = taskService.generateTasks(taskParams, 111L);
if (r.get("msg").equals("浠诲姟鐢熸垚瀹屾瘯锛�")) {
- Task one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
+ one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
InTaskWcsReportParam inTaskWcsReportParam = new InTaskWcsReportParam();
inTaskWcsReportParam.setTaskNo(one.getTaskCode());
inTaskWcsReportParam.setLocNo(one.getTargLoc());
--
Gitblit v1.9.1