From 8f8b6a47ce277cad0b640c328ab3962419e1c024 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 06 二月 2026 13:00:47 +0800
Subject: [PATCH] RCS完整流程
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 89 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 7429bb9..b8a3d84 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
@@ -15,8 +15,10 @@
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
import com.vincent.rsf.openApi.entity.constant.RcsConstant;
import com.vincent.rsf.openApi.entity.dto.SyncLocsDto;
+import com.vincent.rsf.openApi.entity.dto.LocationAllocateResponse;
import com.vincent.rsf.openApi.entity.params.ExMsgCallbackParams;
import com.vincent.rsf.openApi.entity.params.LocSiteParams;
+import com.vincent.rsf.openApi.entity.params.LocationAllocateParams;
import com.vincent.rsf.openApi.entity.params.RcsPubTaskParams;
import com.vincent.rsf.openApi.entity.params.SyncRcsLocsParam;
import com.vincent.rsf.openApi.entity.params.TaskReportParams;
@@ -362,21 +364,22 @@
// 灏嗕换鍔′笂鎶ュ洖璋冭浆鍙戝埌WMS绯荤粺
String callUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + WmsConstant.callBack;
- log.info("RCS鍥炶皟锛岃姹傚湴鍧�锛� {}锛� 杞崲鍚庡弬鏁帮細 {}", callUrl, exMsgParams.toJSONString());
+ log.info("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-锛岃姹傚湴鍧�锛� {}锛� 杞崲鍚庡弬鏁帮細 {}", callUrl, exMsgParams.toJSONString());
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
headers.add("api-version", "v2.0");
HttpEntity httpEntity = new HttpEntity(exMsgParams, headers);
ResponseEntity<String> exchange = restTemplate.exchange(callUrl, HttpMethod.POST, httpEntity, String.class);
- log.info("RCS鍥炶皟锛屽搷搴旂粨鏋滐細 {}", exchange);
+ log.info("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-锛屽搷搴旂粨鏋滐細 {}", exchange);
if (Objects.isNull(exchange.getBody())) {
- // 濡傛灉鍥炶皟澶辫触锛岃繑鍥炴垚鍔熷搷搴旓紙閬垮厤RCS閲嶅鍥炶皟锛�
- CommonResponse response = new CommonResponse();
- response.setCode(200);
- response.setMsg("鎺ユ敹鎴愬姛");
- log.warn("RCS鍥炶皟澶辫触锛屼絾杩斿洖鎴愬姛鍝嶅簲锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}", params.getTaskNo(), params.getBatchNo());
- return response;
+ // 鍥炶皟澶辫触锛屾姏鍑哄紓甯�
+ log.error("========== RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-澶辫触 ==========");
+ log.error("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-鍝嶅簲浣撲负绌猴紝鏃犳硶瑙ｆ瀽鍝嶅簲缁撴灉");
+ log.error("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-璇锋眰鍦板潃锛歿}", callUrl);
+ log.error("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-璇锋眰鍙傛暟锛歿}", exMsgParams.toJSONString());
+ log.error("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-澶辫触鐨勪换鍔＄紪鍙凤細{}锛屾壒娆★細{}", params.getTaskNo(), params.getBatchNo());
+ throw new CoolException("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-澶辫触锛學MS鍝嶅簲浣撲负绌猴紒浠诲姟缂栧彿锛�" + params.getTaskNo() + "锛屾壒娆★細" + params.getBatchNo());
} else {
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.coercionConfigDefaults()
@@ -384,14 +387,14 @@
try {
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
- log.info("RCS鍥炶皟涓婃姤鎴愬姛锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}", params.getTaskNo(), params.getBatchNo());
+ log.info("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-鎴愬姛锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}", params.getTaskNo(), params.getBatchNo());
return result;
} else {
- log.warn("RCS鍥炶皟涓婃姤鍥炶皟杩斿洖闈�200鐘舵�侊紝浠诲姟缂栧彿锛歿}锛屾壒娆★細{}锛屽搷搴旓細{}", params.getTaskNo(), params.getBatchNo(), exchange.getBody());
+ log.warn("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-杩斿洖闈�200鐘舵�侊紝浠诲姟缂栧彿锛歿}锛屾壒娆★細{}锛屽搷搴旓細{}", params.getTaskNo(), params.getBatchNo(), exchange.getBody());
return result;
}
} catch (JsonProcessingException e) {
- log.error("RCS鍥炶皟涓婃姤鍥炶皟鍝嶅簲瑙ｆ瀽澶辫触锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}锛岄敊璇細{}", params.getTaskNo(), params.getBatchNo(), e.getMessage());
+ log.error("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-鍝嶅簲瑙ｆ瀽澶辫触锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}锛岄敊璇細{}", params.getTaskNo(), params.getBatchNo(), e.getMessage());
// 瑙ｆ瀽澶辫触鏃惰繑鍥炴垚鍔熷搷搴旓紝閬垮厤RCS閲嶅鍥炶皟
CommonResponse response = new CommonResponse();
response.setCode(200);
@@ -400,4 +403,79 @@
}
}
}
+
+ /**
+ * @author Ryan
+ * @date 2026/2/6
+ * @description: 鐢宠鍏ュ簱浠诲姟锛屽垎閰嶅簱浣�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R allocateLocation(LocationAllocateParams params) {
+ log.info("========== 寮�濮嬬敵璇峰叆搴撲换鍔★紝鍒嗛厤搴撲綅 ==========");
+ log.info("鏂欑鐮侊細{}锛屽叆搴撶珯鐐癸細{}锛屽叆搴撶被鍨嬶細{}", params.getBarcode(), params.getStaNo(), params.getType());
+
+ // 璋冪敤WMS server鍐呴儴鎺ュ彛杩涜搴撲綅鍒嗛厤
+ String wmsUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + "/rsf-server/wcs/allocate/location";
+ log.info("WMS璇锋眰鍦板潃锛歿}", wmsUrl);
+
+ // 鏋勫缓璇锋眰鍙傛暟
+ JSONObject requestParams = new JSONObject();
+ requestParams.put("barcode", params.getBarcode());
+ requestParams.put("staNo", params.getStaNo());
+ requestParams.put("type", params.getType());
+ log.info("璇锋眰鍙傛暟锛歿}", requestParams.toJSONString());
+
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ HttpEntity httpEntity = new HttpEntity(requestParams, headers);
+
+ long startTime = System.currentTimeMillis();
+ ResponseEntity<String> exchange = restTemplate.exchange(wmsUrl, HttpMethod.POST, httpEntity, String.class);
+ long endTime = System.currentTimeMillis();
+ log.info("WMS鍝嶅簲鑰楁椂锛歿}ms", (endTime - startTime));
+ log.info("WMS鍝嶅簲鐘舵�佺爜锛歿}", exchange.getStatusCode());
+ log.info("WMS鍝嶅簲浣擄細{}", exchange.getBody());
+
+ if (Objects.isNull(exchange.getBody())) {
+ log.error("========== 鐢宠鍏ュ簱浠诲姟澶辫触 ==========");
+ log.error("WMS鍝嶅簲浣撲负绌猴紝鏃犳硶瑙ｆ瀽鍝嶅簲缁撴灉");
+ return R.error("鐢宠鍏ュ簱浠诲姟澶辫触锛學MS鍝嶅簲浣撲负绌猴紒锛�");
+ } else {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults()
+ .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ try {
+ JSONObject responseJson = JSONObject.parseObject(exchange.getBody());
+ Integer code = responseJson.getInteger("code");
+ String msg = responseJson.getString("msg");
+
+ if (code != null && code == 200) {
+ JSONObject data = responseJson.getJSONObject("data");
+ if (data != null) {
+ String locNo = data.getString("locNo");
+ log.info("========== 鐢宠鍏ュ簱浠诲姟鎴愬姛 ==========");
+ log.info("鍒嗛厤搴撲綅鍙凤細{}", locNo);
+
+ LocationAllocateResponse response = new LocationAllocateResponse();
+ response.setLocNo(locNo);
+ return R.ok(response);
+ } else {
+ log.error("========== 鐢宠鍏ュ簱浠诲姟澶辫触 ==========");
+ log.error("鍝嶅簲鏁版嵁涓虹┖");
+ return R.error("鐢宠鍏ュ簱浠诲姟澶辫触锛屽搷搴旀暟鎹负绌猴紒锛�");
+ }
+ } else {
+ log.error("========== 鐢宠鍏ュ簱浠诲姟澶辫触 ==========");
+ log.error("WMS杩斿洖閿欒 - code锛歿}锛宮sg锛歿}", code, msg);
+ return R.error(msg != null ? msg : "鐢宠鍏ュ簱浠诲姟澶辫触锛侊紒");
+ }
+ } catch (Exception e) {
+ log.error("========== 鐢宠鍏ュ簱浠诲姟寮傚父 ==========");
+ log.error("瑙ｆ瀽WMS鍝嶅簲澶辫触锛屽搷搴斾綋锛歿}", exchange.getBody(), e);
+ return R.error("瑙ｆ瀽WMS鍝嶅簲澶辫触锛�" + e.getMessage());
+ }
+ }
+ }
}
--
Gitblit v1.9.1