From da70e7d9e017fda5a48eb8df412dbd7c33769ab6 Mon Sep 17 00:00:00 2001
From: yy <yy123>
Date: 星期三, 10 十二月 2025 19:40:24 +0800
Subject: [PATCH] 盘点功能优化
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 20 ++++++++------------
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 2 +-
3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
index 9b8db2f..19bd532 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
@@ -273,21 +273,17 @@
HttpEntity httpEntity = new HttpEntity(params, headers);
ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
- log.info("淇敼缁撴灉锛� {}", exchange);
+ log.info("淇敼缁撴灉锛� {}", exchange.getBody());
if (Objects.isNull(exchange.getBody())) {
throw new CoolException("淇敼澶辫触锛侊紒");
} else {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
- try {
- CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
- if (result.getCode() == 200) {
- return result;
- } else {
- throw new CoolException("淇敼澶辫触锛侊紒");
- }
- } catch (JsonProcessingException e) {
- throw new CoolException(e.getMessage());
+ CommonResponse commonResponse = new CommonResponse();
+ ErpCommonResponse result = JSONObject.parseObject(exchange.getBody(), ErpCommonResponse.class);
+ if (!result.getIsError()) {
+ commonResponse.setCode(200).setMsg(result.getMessage()).setData(result.getData());
+ return commonResponse;
+ } else {
+ throw new CoolException("淇敼澶辫触锛侊紒");
}
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
index 76616f0..5c87e42 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -275,7 +275,7 @@
if (null == task) {
throw new CoolException("鏈壘鍒板鍣ㄥ彿瀵瑰簲浠诲姟");
}
- if (!task.getTaskStatus().equals(TaskStsType.AWAIT.id)) {
+ if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
return R.error("浠诲姟鐘舵�佷笉鏄瓑寰呯‘璁�");
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index dc0e983..5c868cc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -1224,7 +1224,7 @@
throw new CoolException(e.getMessage());
}
}
- if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)) {
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
/**淇敼涓哄簱浣嶇姸鎬佷负S.棰勭害鍏ュ簱锛屼繚鐣欏師鏈夊簱浣�*/
if (!locService.update(new LambdaUpdateWrapper<Loc>()
.set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type)
--
Gitblit v1.9.1