From 50e8fdb9fb7e5988687616198490d38bf7dc58e0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 05 十一月 2025 12:47:09 +0800
Subject: [PATCH] 出库单上报票号为空问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index 3d83a26..f1424e8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -71,8 +71,10 @@
* @author Ryan
* @description 涓婃姤璐ㄦ鍒楄〃
* @params [items 鍒楄〃]
+ *
* @return boolean
* @time 2025/3/7 09:12
+ * 11
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -207,7 +209,8 @@
if (result.getCode() == 200) {
return R.ok().add(result.getData());
} else {
- throw new CoolException("淇敼澶辫触锛侊紒");
+ return R.ok(result.getMsg()).add(result.getData());
+// throw new CoolException("淇敼澶辫触锛侊紒");
}
} catch (JsonProcessingException e) {
throw new CoolException(e.getMessage());
@@ -216,13 +219,43 @@
}
/**
- * 搴撳瓨鏁版嵁淇敼
+ * 鐩樼偣搴撳瓨鏁版嵁淇敼
* @param params
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R uploadCheckOrder(ReportParams params) {
- return null;
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.CHECK_LOCITEM_UPDATE;
+ log.info("鐩樼偣搴撳瓨淇敼锛歿}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(params));
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+
+ params.setAction("Update").setOrderType("PD_stock");
+
+ HttpEntity httpEntity = new HttpEntity(params, headers);
+ ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
+ log.info("鐩樼偣搴撳瓨淇敼锛岃繑鍥炵粨鏋滐細 {}", exchange);
+ 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 R.ok().add(result.getData());
+ } else {
+ throw new CoolException("淇敼澶辫触锛侊紒");
+ }
+ } catch (JsonProcessingException e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
}
}
--
Gitblit v1.9.1