From 84e27ab892455bf80e1e5f2bb2fc73b203bd56de Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 10 二月 2026 14:57:19 +0800
Subject: [PATCH] 入库
---
rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java | 7 ++++++-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 7 ++++---
2 files changed, 10 insertions(+), 4 deletions(-)
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 5f450cc..937a3bb 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
@@ -1376,7 +1376,8 @@
// 鎯呭喌1锛氬鏋滄槸鎷ｆ枡/鐩樼偣鍏ュ簱浠诲姟锛岀姸鎬�199宸茬粡鍦╟reateInTask涓洿鏂颁负2浜�
// 鎯呭喌2锛氬鏋滄槸鏂板垱寤虹殑浠诲姟锛堟棤璁㈠崟鍙风粍鎵橈級锛岀姸鎬佹槸1锛岄渶瑕佹洿鏂颁负2
// 鎯呭喌3锛氬鏋滅姸鎬佸凡缁忔槸2锛屼笉闇�瑕佹洿鏂�
- if (task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id)) {
+ Integer taskStatus = task.getTaskStatus();
+ if (taskStatus != null && taskStatus.equals(TaskStsType.GENERATE_IN.id)) {
log.info("鏂板垱寤虹殑鍏ュ簱浠诲姟锛堟棤璁㈠崟鍙风粍鎵橈級锛孯CS鐢宠鍏ュ簱鏃舵洿鏂颁负鐘舵��2 - 浠诲姟缂栫爜锛歿}", task.getTaskCode());
Long loginUserId = SystemAuthUtils.getLoginUserId();
if (loginUserId == null) {
@@ -1397,11 +1398,11 @@
log.warn("鏂板垱寤虹殑鍏ュ簱浠诲姟鐘舵�佹洿鏂颁负2澶辫触锛屽彲鑳界姸鎬佸凡鍙樻洿 - 浠诲姟缂栫爜锛歿}锛屽綋鍓嶇姸鎬侊細{}",
task.getTaskCode(), task.getTaskStatus());
}
- } else if (task.getTaskStatus().equals(TaskStsType.WCS_EXECUTE_IN.id)) {
+ } else if (taskStatus != null && taskStatus.equals(TaskStsType.WCS_EXECUTE_IN.id)) {
log.info("鍏ュ簱浠诲姟鐘舵�佸凡缁忔槸2锛圧CS浠诲姟宸蹭笅鍙戯級锛屾棤闇�鏇存柊 - 浠诲姟缂栫爜锛歿}", task.getTaskCode());
} else {
log.info("鍏ュ簱浠诲姟褰撳墠鐘舵�侊細{}锛孯CS鐢宠鍏ュ簱鏃朵繚鎸佸綋鍓嶇姸鎬� - 浠诲姟缂栫爜锛歿}",
- task.getTaskStatus(), task.getTaskCode());
+ taskStatus, task.getTaskCode());
}
log.info("========== RCS-鐢宠鍏ュ簱浠诲姟鎴愬姛 ==========");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java
index 1c1bbc5..eeb1464 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/exception/GlobalExceptionHandler.java
@@ -60,7 +60,12 @@
public R exceptionHandler(Throwable e, HttpServletResponse response) {
logger.error(e.getMessage(), e);
CommonUtil.addCrossHeaders(response);
- return R.error(Constants.RESULT_ERROR_MSG);
+ // 杩斿洖寮傚父淇℃伅渚夸簬鎺掓煡锛岄伩鍏嶄粎杩斿洖 "Internal server error!"
+ String msg = e.getMessage() != null && !e.getMessage().isEmpty() ? e.getMessage() : e.getClass().getSimpleName();
+ if (e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
+ msg = msg + "; cause: " + e.getCause().getMessage();
+ }
+ return R.error(msg);
}
}
--
Gitblit v1.9.1