From fde989eba34025960ec95ed07f81497e5d5dc4c5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 十一月 2025 18:48:46 +0800
Subject: [PATCH] 出库完成修改站点状态
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java
index b630ed3..35b4602 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java
@@ -16,6 +16,7 @@
import com.vincent.rsf.openApi.entity.constant.RcsConstant;
import com.vincent.rsf.openApi.entity.dto.SyncLocsDto;
import com.vincent.rsf.openApi.entity.params.ExMsgCallbackParams;
+import com.vincent.rsf.openApi.entity.params.LocSiteParams;
import com.vincent.rsf.openApi.entity.params.RcsPubTaskParams;
import com.vincent.rsf.openApi.entity.params.SyncRcsLocsParam;
import com.vincent.rsf.openApi.mapper.LocMapper;
@@ -41,12 +42,11 @@
@Autowired
private PlatformProperties rcsApi;
-
@Autowired
private PlatformProperties.WmsApi wmsApi;
-
@Autowired
private RestTemplate restTemplate;
+
/**
@@ -57,7 +57,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R pubTasks(RcsPubTaskParams params) {
+ public CommonResponse pubTasks(RcsPubTaskParams params) {
/**RCS鍩虹閰嶇疆閾炬帴*/
String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.pubTask;
log.info("浠诲姟涓嬪彂锛岃姹傚湴鍧�锛� {}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl , JSONObject.toJSONString(params));
@@ -76,9 +76,9 @@
try {
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
- return R.ok();
+ return result;
} else {
- throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
+ return result;
}
} catch (JsonProcessingException e) {
throw new CoolException(e.getMessage());
@@ -93,8 +93,8 @@
* @version 1.0
*/
@Override
- public R cancelTasks(Map<String, Object> params) {
- return R.ok();
+ public CommonResponse cancelTasks(Map<String, Object> params) {
+ return new CommonResponse();
}
/**
@@ -104,7 +104,7 @@
* @version 1.0
*/
@Override
- public R callBackEvent(ExMsgCallbackParams params) {
+ public CommonResponse callBackEvent(ExMsgCallbackParams params) {
String callUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + WmsConstant.callBack;
/**WMS鍩虹閰嶇疆閾炬帴*/
log.info("浠诲姟鎵ц鐘舵�佷笂鎶ワ紝璇锋眰鍦板潃锛� {}锛� 璇锋眰鍙傛暟锛� {}", callUrl , JSONObject.toJSONString(params));
@@ -115,7 +115,7 @@
ResponseEntity<String> exchange = restTemplate.exchange(callUrl, HttpMethod.POST, httpEntity, String.class);
log.info("浠诲姟鎵ц鐘舵�佷笂鎶ワ紝鍝嶅簲缁撴灉锛� {}", exchange);
if (Objects.isNull(exchange.getBody())) {
- throw new CoolException("浠诲姟鎵ц鐘舵�佷笂鎶ュけ璐ワ紒锛�");
+ return new CommonResponse();
} else {
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.coercionConfigDefaults()
@@ -123,9 +123,10 @@
try {
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
- return R.ok();
+ return result;
} else {
- throw new CoolException("浠诲姟鎵ц鐘舵�佷笂鎶ュけ璐ワ紒锛�");
+ return result;
+// throw new CoolException("浠诲姟鎵ц鐘舵�佷笂鎶ュけ璐ワ紒锛�");
}
} catch (JsonProcessingException e) {
throw new CoolException(e.getMessage());
@@ -144,6 +145,43 @@
return syncRcsLocs(params);
}
+
+ /**
+ * @author Ryan
+ * @date 2025/11/10
+ * @description: 淇敼搴撲綅鎴栫珯鐐圭姸鎬�
+ * @version 1.0
+ */
+ @Override
+ public R modifyLocOrSite(LocSiteParams params) {
+ /**RCS鍩虹閰嶇疆閾炬帴*/
+ String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.modifystatus;
+ log.info("搴撲綅鎴栫珯鐐圭姸鎬佷慨鏀癸紝璇锋眰鍦板潃锛� {}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl , JSONObject.toJSONString(params));
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+ 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();
+ } else {
+ throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } catch (JsonProcessingException e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+ }
+
/**
* @author Ryan
* @date 2025/8/28
--
Gitblit v1.9.1