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-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 191 ++++++++++++---------
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsRcsService.java | 3
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/LocationAllocateParams.java | 25 ++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/dto/LocationAllocateResponse.java | 19 ++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java | 102 ++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java | 26 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java | 31 +++
rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java | 55 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 43 ++++
10 files changed, 402 insertions(+), 95 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java
index 4a4dcb8..46913ef 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java
@@ -5,6 +5,7 @@
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
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;
@@ -116,4 +117,29 @@
return wmsRcsService.reportTask(params);
}
+ /**
+ * @author Ryan
+ * @date 2026/2/6
+ * @description: 鐢宠鍏ュ簱浠诲姟
+ * @version 1.0
+ */
+ @ApiOperation("鐢宠鍏ュ簱浠诲姟")
+ @PostMapping("/api/open/location/allocate")
+ public R allocateLocation(@RequestBody LocationAllocateParams params) {
+ log.info("鐢宠鍏ュ簱浠诲姟锛岃姹傚弬鏁帮細{}", params);
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getBarcode()) || params.getBarcode().isEmpty()) {
+ return R.error("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(params.getStaNo()) || params.getStaNo().isEmpty()) {
+ return R.error("鍏ュ簱绔欑偣涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getType())) {
+ params.setType(18);
+ }
+ return wmsRcsService.allocateLocation(params);
+ }
+
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/dto/LocationAllocateResponse.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/dto/LocationAllocateResponse.java
new file mode 100644
index 0000000..5f91fff
--- /dev/null
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/dto/LocationAllocateResponse.java
@@ -0,0 +1,19 @@
+package com.vincent.rsf.openApi.entity.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "LocationAllocateResponse", description = "鐢宠鍏ュ簱浠诲姟杩斿洖缁撴灉")
+public class LocationAllocateResponse implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("搴撲綅鍙�")
+ private String locNo;
+}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/LocationAllocateParams.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/LocationAllocateParams.java
new file mode 100644
index 0000000..1e7dd08
--- /dev/null
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/LocationAllocateParams.java
@@ -0,0 +1,25 @@
+package com.vincent.rsf.openApi.entity.params;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "LocationAllocateParams", description = "鐢宠鍏ュ簱浠诲姟鍙傛暟")
+public class LocationAllocateParams implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鏂欑鐮�", required = true)
+ private String barcode;
+
+ @ApiModelProperty(value = "鍏ュ簱绔欑偣", required = true)
+ private String staNo;
+
+ @ApiModelProperty(value = "鍏ュ簱绫诲瀷", required = true)
+ private Integer type;
+}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsRcsService.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsRcsService.java
index 8b8928b..87323fa 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsRcsService.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsRcsService.java
@@ -8,6 +8,7 @@
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.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;
@@ -28,4 +29,6 @@
R modifyLocOrSite(LocSiteParams params);
CommonResponse reportTask(TaskReportParams params);
+
+ R allocateLocation(LocationAllocateParams params);
}
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 4cc19fe..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;
@@ -335,7 +337,7 @@
*/
@Override
public CommonResponse reportTask(TaskReportParams params) {
- log.info("浠诲姟鎵ц閫氱煡涓婃姤锛岃姹傚弬鏁帮細 {}", JSONObject.toJSONString(params));
+ log.info("RCS鍥炶皟锛岃姹傚弬鏁帮細 {}", JSONObject.toJSONString(params));
// 鍙傛暟鏍￠獙
if (Objects.isNull(params)) {
@@ -362,21 +364,22 @@
// 灏嗕换鍔′笂鎶ュ洖璋冭浆鍙戝埌WMS绯荤粺
String callUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + WmsConstant.callBack;
- log.info("浠诲姟鎵ц閫氱煡涓婃姤锛岃姹傚湴鍧�锛� {}锛� 杞崲鍚庡弬鏁帮細 {}", 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("浠诲姟鎵ц閫氱煡涓婃姤锛屽搷搴旂粨鏋滐細 {}", exchange);
+ log.info("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-锛屽搷搴旂粨鏋滐細 {}", exchange);
if (Objects.isNull(exchange.getBody())) {
- // 濡傛灉鍥炶皟澶辫触锛岃繑鍥炴垚鍔熷搷搴旓紙閬垮厤RCS閲嶅鍥炶皟锛�
- CommonResponse response = new CommonResponse();
- response.setCode(200);
- response.setMsg("鎺ユ敹鎴愬姛");
- log.warn("浠诲姟鎵ц閫氱煡涓婃姤鍥炶皟澶辫触锛屼絾杩斿洖鎴愬姛鍝嶅簲锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}", 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("浠诲姟鎵ц閫氱煡涓婃姤鎴愬姛锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}", params.getTaskNo(), params.getBatchNo());
+ log.info("RCS鍥炶皟-WMS-SERVER浠诲姟涓婃姤-鎴愬姛锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}", params.getTaskNo(), params.getBatchNo());
return result;
} else {
- log.warn("浠诲姟鎵ц閫氱煡涓婃姤鍥炶皟杩斿洖闈�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("浠诲姟鎵ц閫氱煡涓婃姤鍥炶皟鍝嶅簲瑙ｆ瀽澶辫触锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}锛岄敊璇細{}", 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());
+ }
+ }
+ }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
index b4e79a9..13a9301 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java
@@ -18,6 +18,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
+
@RestController
@RequestMapping("/wcs")
@Api(tags = "wcs鎺ュ彛瀵规帴")
@@ -121,5 +123,34 @@
return wcsService.receiveExMsg(params);
}
+ /**
+ * @author Ryan
+ * @date 2026/2/6
+ * @description: 鐢宠鍏ュ簱浠诲姟锛屽垎閰嶅簱浣嶏紙鍐呴儴鎺ュ彛锛�
+ * @version 1.0
+ */
+ @ApiOperation("鐢宠鍏ュ簱浠诲姟锛屽垎閰嶅簱浣�")
+ @PostMapping("/allocate/location")
+ public R allocateLocation(@RequestBody Map<String, Object> params) {
+ if (Cools.isEmpty(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ String barcode = (String) params.get("barcode");
+ String staNo = (String) params.get("staNo");
+ Integer type = params.get("type") != null ? Integer.valueOf(params.get("type").toString()) : null;
+
+ if (Cools.isEmpty(barcode)) {
+ return R.error("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Cools.isEmpty(staNo)) {
+ return R.error("鍏ュ簱绔欑偣涓嶈兘涓虹┖锛侊紒");
+ }
+ if (type == null) {
+ return R.error("鍏ュ簱绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+
+ return wcsService.allocateLocation(barcode, staNo, type);
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java
index 049a1c7..74f0d72 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/WcsService.java
@@ -18,4 +18,6 @@
R receiveExMsg(ExMsgParams params);
R pubWcsTask(WcsTaskParams params);
+
+ R allocateLocation(String barcode, String staNo, Integer type);
}
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 a014e06..2500a3a 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
@@ -914,6 +914,7 @@
int deviceNo = 0;
Loc loc = new Loc();
InTaskMsgDto inTaskMsgDto = new InTaskMsgDto();
+ locTypeDto.setLocType1(18);
List<Loc> loc1 = locService.list(new LambdaQueryWrapper<Loc>()
.eq(Loc::getAreaId, area)
.eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
@@ -969,4 +970,46 @@
inTaskMsgDto.setLocNo(locNo);
return inTaskMsgDto;
}
+
+ /**
+ * @author Ryan
+ * @date 2026/2/6
+ * @description: 鐢宠鍏ュ簱浠诲姟锛屽垎閰嶅簱浣�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R allocateLocation(String barcode, String staNo, Integer type) {
+ log.info("========== 寮�濮嬬敵璇峰叆搴撲换鍔★紝鍒嗛厤搴撲綅 ==========");
+ log.info("鏂欑鐮侊細{}锛屽叆搴撶珯鐐癸細{}锛屽叆搴撶被鍨嬶細{}", barcode, staNo, type);
+
+ // 鏋勫缓 TaskInParam 鍙傛暟锛屼笌 /wcs/create/in/task 鎺ュ彛鍙傛暟涓�鑷�
+ TaskInParam param = new TaskInParam();
+ param.setBarcode(barcode);
+ param.setSourceStaNo(staNo);
+ param.setIoType(TaskType.TASK_TYPE_IN.type); // 鍏ュ簱绫诲瀷
+ param.setLocType1(type); // 搴撲綅绫诲瀷锛堥珮浣庢娴嬩俊鍙凤級
+ param.setUser(1L); // 榛樿鐢ㄦ埛ID锛屽彲浠ユ牴鎹疄闄呴渶姹傝皟鏁�
+
+ // 璋冪敤 createInTask 鏂规硶锛屽垱寤哄畬鏁寸殑鍏ュ簱浠诲姟
+ // 璇ユ柟娉曚細鎵ц浠ヤ笅娴佺▼锛�
+ // 1. 楠岃瘉璁惧绔欑偣
+ // 2. 楠岃瘉缁勬嫋鐘舵��
+ // 3. 鐢熸垚浠诲姟缂栫爜
+ // 4. 鑾峰彇搴撲綅鍙�
+ // 5. 鍒涘缓骞朵繚瀛樹换鍔�
+ // 6. 鏇存柊搴撲綅鐘舵��
+ // 7. 鑾峰彇骞堕獙璇佺粍鎷栨槑缁�
+ // 8. 鍒涘缓骞朵繚瀛樹换鍔℃槑缁�
+ // 9. 鏇存柊缁勬墭鐘舵��
+ InTaskMsgDto msgDto = createInTask(param);
+
+ log.info("========== 鐢宠鍏ュ簱浠诲姟鎴愬姛 ==========");
+ log.info("浠诲姟缂栫爜锛歿}锛屽簱浣嶅彿锛歿}", msgDto.getWorkNo(), msgDto.getLocNo());
+
+ // 杩斿洖缁撴灉锛屽彧杩斿洖搴撲綅鍙凤紙鏍规嵁鎺ュ彛鏂囨。瑕佹眰锛�
+ JSONObject result = new JSONObject();
+ result.put("locNo", msgDto.getLocNo());
+ return R.ok(result);
+ }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
index 7d2360c..c3eb876 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/domain/PageParam.java
@@ -320,8 +320,10 @@
// column, temp[0], cls != null ? cls.getSimpleName() : "null", requestInfo);
continue;
}
+ // 妫�鏌ュ疄浣撶被瀛楁鐨� @TableField 娉ㄨВ锛屽鏋滃瓧娈垫槸淇濈暀鍏抽敭瀛楋紝浣跨敤娉ㄨВ涓寚瀹氱殑鍒楀悕锛堝甫鍙嶅紩鍙凤級
+ String dbColumn = getDbColumnName(column);
boolean asc = temp.length == 1 || !temp[temp.length - 1].toLowerCase().equals(ORDER_DESC_VALUE);
- orders.add(new OrderItem(column, asc));
+ orders.add(new OrderItem(dbColumn, asc));
}
}
}
@@ -329,6 +331,57 @@
}
/**
+ * 鑾峰彇鏁版嵁搴撳垪鍚嶏紝濡傛灉鏄繚鐣欏叧閿瓧鍒欐坊鍔犲弽寮曞彿
+ * @param fieldName 瀛楁鍚嶏紙涓嬪垝绾挎牸寮忥級
+ * @return 鏁版嵁搴撳垪鍚�
+ */
+ private String getDbColumnName(String fieldName) {
+ if (cls == null) {
+ // 濡傛灉娌℃湁瀹炰綋绫伙紝妫�鏌ユ槸鍚︽槸甯歌鐨勪繚鐣欏叧閿瓧
+ return wrapReservedKeyword(fieldName);
+ }
+
+ // 鏌ユ壘瀹炰綋绫讳腑瀵瑰簲鐨勫瓧娈�
+ for (Field field : Cools.getAllFields(cls)) {
+ String column = Utils.toSymbolCase(field.getName(), '_');
+ if (column.equals(fieldName)) {
+ // 妫�鏌ユ槸鍚︽湁 @TableField 娉ㄨВ
+ if (field.isAnnotationPresent(TableField.class)) {
+ TableField annotation = field.getAnnotation(TableField.class);
+ String value = annotation.value();
+ // 濡傛灉娉ㄨВ鍊间笉涓虹┖锛屼娇鐢ㄦ敞瑙ｅ�硷紙鍙兘宸茬粡鍖呭惈鍙嶅紩鍙凤級
+ if (!Cools.isEmpty(value) && !value.equals(fieldName)) {
+ return value;
+ }
+ }
+ // 濡傛灉娌℃湁娉ㄨВ鎴栨敞瑙ｅ�间负绌猴紝妫�鏌ユ槸鍚︽槸淇濈暀鍏抽敭瀛�
+ return wrapReservedKeyword(fieldName);
+ }
+ }
+
+ // 濡傛灉鎵句笉鍒板瓧娈碉紝妫�鏌ユ槸鍚︽槸淇濈暀鍏抽敭瀛�
+ return wrapReservedKeyword(fieldName);
+ }
+
+ /**
+ * 濡傛灉鏄� MySQL 淇濈暀鍏抽敭瀛楋紝鍒欐坊鍔犲弽寮曞彿
+ * @param column 鍒楀悕
+ * @return 澶勭悊鍚庣殑鍒楀悕
+ */
+ private String wrapReservedKeyword(String column) {
+ // MySQL 甯歌淇濈暀鍏抽敭瀛楀垪琛�
+ Set<String> reservedKeywords = new HashSet<>(Arrays.asList(
+ "row", "type", "length", "channel", "status", "order", "group", "key", "index",
+ "table", "database", "user", "select", "insert", "update", "delete", "from", "where"
+ ));
+
+ if (reservedKeywords.contains(column.toLowerCase())) {
+ return "`" + column + "`";
+ }
+ return column;
+ }
+
+ /**
* 鑾峰彇褰撳墠璇锋眰淇℃伅锛堣矾寰勫拰鏂规硶锛�
* @return 璇锋眰淇℃伅瀛楃涓诧紝鏍煎紡锛欻TTP鏂规硶 璇锋眰璺緞
*/
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 d653a6a..610b525 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
@@ -1516,26 +1516,23 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void pubTaskToWcs(List<Task> tasks) {
- WcsTaskParams taskParams = new WcsTaskParams();
- List<TaskItemParam> items = new ArrayList<>();
+ /**浠诲姟涓嬪彂鎺ュ彛*/
+ String pubTakUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.pubTask;
- // 璁剧疆鎵规缂栧彿锛堜娇鐢ㄧ涓�涓换鍔＄殑barcode锛屽鏋滀负null鍒欎娇鐢ㄤ换鍔＄紪鐮侊級
- String batchNo = null;
- if (!tasks.isEmpty()) {
- Task firstTask = tasks.get(0);
- batchNo = StringUtils.isNotBlank(firstTask.getBarcode())
- ? firstTask.getBarcode()
- : firstTask.getTaskCode();
- }
- if (StringUtils.isBlank(batchNo)) {
- // 濡傛灉鎵规缂栧彿浠嶄负绌猴紝鐢熸垚涓�涓粯璁ゅ��
- batchNo = "BATCH_" + System.currentTimeMillis();
- }
-
- taskParams.setBatchNo(batchNo);
- log.info("璁剧疆鎵规缂栧彿锛歿}", batchNo);
-
- tasks.forEach(task -> {
+ for (Task task : tasks) {
+ WcsTaskParams taskParams = new WcsTaskParams();
+ List<TaskItemParam> items = new ArrayList<>();
+
+ // 璁剧疆鎵规缂栧彿锛堜娇鐢ㄥ綋鍓嶄换鍔＄殑浠诲姟缂栫爜锛�
+ String batchNo = task.getTaskCode();
+ if (StringUtils.isBlank(batchNo)) {
+ // 濡傛灉浠诲姟缂栧彿涓虹┖锛岀敓鎴愪竴涓粯璁ゅ��
+ batchNo = "BATCH_" + System.currentTimeMillis();
+ }
+ taskParams.setBatchNo(batchNo);
+ log.info("浠诲姟鎵规缂栧彿锛歿}", batchNo);
+
+ // 鏋勫缓褰撳墠浠诲姟鐨勫弬鏁�
TaskItemParam itemParam = new TaskItemParam();
//浠诲姟缂栫爜锛堝搴攕eqNum锛�
itemParam.setTaskNo(task.getTaskCode());
@@ -1597,58 +1594,91 @@
throw new CoolException("褰撳墠绔欑偣涓嶆槸F.鍦ㄥ簱鐘舵�侊紒锛�");
}
}
- if (station.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
- if (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ // 绔欑偣闂寸Щ搴撻渶瑕佽幏鍙栫洰鏍囩珯鐐�
+ BasStation targetStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
+ if (Objects.isNull(targetStation)) {
+ throw new CoolException("鐩爣绔欑偣涓嶅瓨鍦紒锛�");
+ }
+ if (targetStation.getType().equals(StationTypeEnum.STATION_TYPE_NORMAL.type)) {
+ if (!targetStation.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
throw new CoolException("鐩爣绔欑偣涓嶆槸O.绌洪棽鐘舵�侊紒锛�");
}
}
}
items.add(itemParam);
- });
- taskParams.setTasks(items);
- /**浠诲姟涓嬪彂鎺ュ彛*/
- String pubTakUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.pubTask;
- /**RCS鍩虹閰嶇疆閾炬帴*/
- log.info("========== 寮�濮嬩笅鍙戜换鍔″埌RCS ==========");
- log.info("RCS璇锋眰鍦板潃锛歿}", pubTakUrl);
- log.info("鎵规缂栧彿锛歿}", batchNo);
- log.info("浠诲姟鏁伴噺锛歿}", tasks.size());
- log.info("浠诲姟鍒楄〃璇︽儏锛�");
- tasks.forEach(task -> {
- log.info(" - 浠诲姟缂栫爜锛歿}锛屼换鍔＄被鍨嬶細{}锛屾簮搴撲綅锛歿}锛岀洰鏍囧簱浣嶏細{}锛屾簮绔欑偣锛歿}锛岀洰鏍囩珯鐐癸細{}",
+ taskParams.setTasks(items);
+
+ // 璁板綍褰撳墠浠诲姟淇℃伅
+ log.info(" RCS- 浠诲姟缂栫爜锛歿}锛屼换鍔＄被鍨嬶細{}锛屾簮搴撲綅锛歿}锛岀洰鏍囧簱浣嶏細{}锛屾簮绔欑偣锛歿}锛岀洰鏍囩珯鐐癸細{}",
task.getTaskCode(), task.getTaskType(), task.getOrgLoc(),
task.getTargLoc(), task.getOrgSite(), task.getTargSite());
- });
- log.info("璇锋眰鍙傛暟锛歿}", JSONObject.toJSONString(taskParams));
- HttpHeaders headers = new HttpHeaders();
- headers.add("Content-Type", "application/json");
- headers.add("api-version", "v2.0");
- HttpEntity httpEntity = new HttpEntity(taskParams, headers);
- long startTime = System.currentTimeMillis();
- ResponseEntity<String> exchange = restTemplate.exchange(pubTakUrl, HttpMethod.POST, httpEntity, String.class);
- long endTime = System.currentTimeMillis();
- log.info("RCS鍝嶅簲鑰楁椂锛歿}ms", (endTime - startTime));
- log.info("RCS鍝嶅簲鐘舵�佺爜锛歿}", exchange.getStatusCode());
- log.info("RCS鍝嶅簲澶达細{}", exchange.getHeaders());
- log.info("RCS鍝嶅簲浣擄細{}", exchange.getBody());
- if (Objects.isNull(exchange.getBody())) {
- log.error("========== RCS浠诲姟涓嬪彂澶辫触 ==========");
- log.error("RCS鍝嶅簲浣撲负绌猴紝鏃犳硶瑙ｆ瀽鍝嶅簲缁撴灉");
- log.error("璇锋眰鍦板潃锛歿}", pubTakUrl);
- log.error("璇锋眰鍙傛暟锛歿}", JSONObject.toJSONString(taskParams));
- throw new CoolException("浠诲姟涓嬪彂澶辫触锛孯CS鍝嶅簲浣撲负绌猴紒锛�");
- } else {
+ log.info("RCS-璇锋眰鍙傛暟锛歿}", JSONObject.toJSONString(taskParams));
+
+ // 鍙戦�佸綋鍓嶄换鍔�
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+ HttpEntity httpEntity = new HttpEntity(taskParams, headers);
+
+ /**RCS鍩虹閰嶇疆閾炬帴*/
+ log.info("========== 寮�濮嬩笅鍙戜换鍔″埌RCS ==========");
+ log.info("璇锋眰RCS-鍦板潃锛歿}", pubTakUrl);
+ log.info("璇锋眰RCS-鍙傛暟锛歿}", JSONObject.toJSONString(taskParams));
+ long startTime = System.currentTimeMillis();
+ ResponseEntity<String> exchange = null;
try {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.coercionConfigDefaults()
- .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
- CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
- log.info("RCS鍝嶅簲瑙ｆ瀽缁撴灉 - code锛歿}锛宮sg锛歿}锛宒ata锛歿}",
- result.getCode(), result.getMsg(), result.getData());
- if (result.getCode() == 200) {
- log.info("RCS浠诲姟涓嬪彂鎴愬姛锛屽紑濮嬫洿鏂颁换鍔＄姸鎬�");
- tasks.forEach(task -> {
- log.info("鏇存柊浠诲姟鐘舵�� - 浠诲姟缂栫爜锛歿}锛屼换鍔＄被鍨嬶細{}", task.getTaskCode(), task.getTaskType());
+ exchange = restTemplate.exchange(pubTakUrl, HttpMethod.POST, httpEntity, String.class);
+ long endTime = System.currentTimeMillis();
+ log.info("RCS鍝嶅簲鑰楁椂锛歿}ms", (endTime - startTime));
+ log.info("RCS鍝嶅簲鐘舵�佺爜锛歿}", exchange.getStatusCode());
+ log.info("RCS鍝嶅簲澶达細{}", exchange.getHeaders());
+ log.info("RCS鍝嶅簲浣擄細{}", exchange.getBody());
+ } catch (org.springframework.web.client.ResourceAccessException e) {
+ long endTime = System.currentTimeMillis();
+ log.error("========== RCS浠诲姟涓嬪彂璧勬簮璁块棶寮傚父 ==========");
+ log.error("璇锋眰RCS-璧勬簮璁块棶寮傚父锛堝彲鑳藉寘鍚繛鎺ヨ秴鏃讹級锛岃�楁椂锛歿}ms锛屼换鍔＄紪鐮侊細{}", (endTime - startTime), task.getTaskCode(), e);
+ log.error("璇锋眰RCS-璇锋眰鍦板潃锛歿}", pubTakUrl);
+ log.error("璇锋眰RCS-璇锋眰鍙傛暟锛歿}", JSONObject.toJSONString(taskParams));
+ // 妫�鏌ユ槸鍚︽槸杩炴帴瓒呮椂寮傚父
+ Throwable cause = e.getCause();
+ String errorMsg = e.getMessage();
+ if (cause instanceof java.net.SocketTimeoutException ||
+ (cause instanceof java.net.ConnectException && cause.getMessage() != null && cause.getMessage().contains("timed out")) ||
+ (errorMsg != null && (errorMsg.contains("Connection timed out") || errorMsg.contains("timed out") || errorMsg.contains("timeout")))) {
+ throw new CoolException("RCS杩炴帴瓒呮椂锛屼换鍔′笅鍙戝け璐ワ紒浠诲姟缂栫爜锛�" + task.getTaskCode() + "锛岄敊璇俊鎭細" + errorMsg);
+ }
+ throw new CoolException("RCS璧勬簮璁块棶寮傚父锛屼换鍔′笅鍙戝け璐ワ紒浠诲姟缂栫爜锛�" + task.getTaskCode() + "锛岄敊璇俊鎭細" + errorMsg);
+ } catch (Exception e) {
+ long endTime = System.currentTimeMillis();
+ log.error("========== RCS浠诲姟涓嬪彂寮傚父 ==========");
+ log.error("璇锋眰RCS-寮傚父锛岃�楁椂锛歿}ms锛屼换鍔＄紪鐮侊細{}", (endTime - startTime), task.getTaskCode(), e);
+ log.error("璇锋眰RCS-鍦板潃锛歿}", pubTakUrl);
+ log.error("璇锋眰RCS-鍙傛暟锛歿}", JSONObject.toJSONString(taskParams));
+ String errorMsg = e.getMessage();
+ // 妫�鏌ユ槸鍚︽槸杩炴帴瓒呮椂鐩稿叧鐨勫紓甯�
+ if (errorMsg != null && (errorMsg.contains("Connection timed out") || errorMsg.contains("timed out") || errorMsg.contains("timeout"))) {
+ throw new CoolException("RCS杩炴帴瓒呮椂锛屼换鍔′笅鍙戝け璐ワ紒浠诲姟缂栫爜锛�" + task.getTaskCode() + "锛岄敊璇俊鎭細" + errorMsg);
+ }
+ throw new CoolException("RCS浠诲姟涓嬪彂寮傚父锛佷换鍔＄紪鐮侊細" + task.getTaskCode() + "锛岄敊璇俊鎭細" + errorMsg);
+ }
+
+ if (Objects.isNull(exchange) || Objects.isNull(exchange.getBody())) {
+ log.error("========== RCS浠诲姟涓嬪彂澶辫触 ==========");
+ log.error("璇锋眰RCS-RCS鍝嶅簲浣撲负绌猴紝鏃犳硶瑙ｆ瀽鍝嶅簲缁撴灉");
+ log.error("璇锋眰RCS-鍦板潃锛歿}", pubTakUrl);
+ log.error("璇锋眰RCS-鍙傛暟锛歿}", JSONObject.toJSONString(taskParams));
+ log.error("璇锋眰RCS-澶辫触鐨勪换鍔＄紪鐮侊細{}", task.getTaskCode());
+ throw new CoolException("浠诲姟涓嬪彂澶辫触锛孯CS鍝嶅簲浣撲负绌猴紒锛佷换鍔＄紪鐮侊細" + task.getTaskCode());
+ } else {
+ try {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults()
+ .setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
+ log.info("RCS鍝嶅簲瑙ｆ瀽缁撴灉 - code锛歿}锛宮sg锛歿}锛宒ata锛歿}",
+ result.getCode(), result.getMsg(), result.getData());
+ if (result.getCode() == 200) {
+ log.info("RCS浠诲姟涓嬪彂鎴愬姛锛屽紑濮嬫洿鏂颁换鍔＄姸鎬� - 浠诲姟缂栫爜锛歿}", task.getTaskCode());
if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
@@ -1701,28 +1731,25 @@
}
}
}
- });
- log.info("========== RCS浠诲姟涓嬪彂瀹屾垚锛屽叡{}涓换鍔＄姸鎬佸凡鏇存柊 ==========", tasks.size());
- } else {
- log.error("========== RCS浠诲姟涓嬪彂澶辫触 ==========");
- log.error("RCS杩斿洖閿欒 - code锛歿}锛宮sg锛歿}锛宒ata锛歿}",
- result.getCode(), result.getMsg(), result.getData());
- log.error("澶辫触鐨勪换鍔″垪琛細");
- tasks.forEach(task -> {
- log.error(" - 浠诲姟缂栫爜锛歿}锛屼换鍔＄被鍨嬶細{}", task.getTaskCode(), task.getTaskType());
- });
-// throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒");
+ } else {
+ log.error("========== RCS浠诲姟涓嬪彂澶辫触 ==========");
+ log.error("RCS杩斿洖閿欒 - code锛歿}锛宮sg锛歿}锛宒ata锛歿}",
+ result.getCode(), result.getMsg(), result.getData());
+ log.error("澶辫触鐨勪换鍔＄紪鐮侊細{}锛屼换鍔＄被鍨嬶細{}", task.getTaskCode(), task.getTaskType());
+ throw new CoolException("浠诲姟涓嬪彂澶辫触锛侊紒浠诲姟缂栫爜锛�" + task.getTaskCode());
+ }
+ } catch (JsonProcessingException e) {
+ log.error("========== RCS浠诲姟涓嬪彂寮傚父 ==========");
+ log.error("瑙ｆ瀽RCS鍝嶅簲澶辫触锛屽搷搴斾綋锛歿}锛屼换鍔＄紪鐮侊細{}", exchange.getBody(), task.getTaskCode(), e);
+ throw new CoolException("瑙ｆ瀽RCS鍝嶅簲澶辫触锛�" + e.getMessage() + "锛屼换鍔＄紪鐮侊細" + task.getTaskCode());
+ } catch (Exception e) {
+ log.error("========== RCS浠诲姟涓嬪彂寮傚父 ==========");
+ log.error("浠诲姟涓嬪彂杩囩▼涓彂鐢熷紓甯革紝浠诲姟缂栫爜锛歿}", task.getTaskCode(), e);
+ throw e;
}
- } catch (JsonProcessingException e) {
- log.error("========== RCS浠诲姟涓嬪彂寮傚父 ==========");
- log.error("瑙ｆ瀽RCS鍝嶅簲澶辫触锛屽搷搴斾綋锛歿}", exchange.getBody(), e);
- throw new CoolException("瑙ｆ瀽RCS鍝嶅簲澶辫触锛�" + e.getMessage());
- } catch (Exception e) {
- log.error("========== RCS浠诲姟涓嬪彂寮傚父 ==========");
- log.error("浠诲姟涓嬪彂杩囩▼涓彂鐢熷紓甯�", e);
- throw e;
}
}
+ log.info("========== RCS浠诲姟涓嬪彂瀹屾垚锛屽叡{}涓换鍔″凡澶勭悊 ==========", tasks.size());
}/**
--
Gitblit v1.9.1