From f1f08a7174e53f375b341c9bd4be50f637db2c2e Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 02 三月 2026 16:48:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java | 137 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 129 insertions(+), 8 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java
index e048b9e..3b307d9 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java
@@ -9,12 +9,13 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.openApi.config.PlatformProperties;
import com.vincent.rsf.openApi.entity.Loc;
+import com.vincent.rsf.openApi.entity.constant.WcsConstant;
import com.vincent.rsf.openApi.entity.constant.WmsConstant;
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
-import com.vincent.rsf.openApi.entity.params.WcsChangeLocParam;
-import com.vincent.rsf.openApi.entity.params.WcsCreateInTaskParam;
-import com.vincent.rsf.openApi.entity.params.WcsReassignLocParam;
-import com.vincent.rsf.openApi.entity.params.WcsTaskReportParam;
+import com.vincent.rsf.openApi.entity.params.*;
+import com.vincent.rsf.openApi.enums.MissionActionTypeEnum;
+import com.vincent.rsf.openApi.enums.MissionStepTypeEnum;
+import com.vincent.rsf.openApi.enums.TaskTypeEnum;
import com.vincent.rsf.openApi.mapper.LocMapper;
import com.vincent.rsf.openApi.service.WmsWcsService;
import lombok.extern.slf4j.Slf4j;
@@ -38,12 +39,132 @@
private PlatformProperties.WmsApi wmsApi;
@Autowired
+ private PlatformProperties.WcsApi wcsApi;
+
+ @Autowired
private RestTemplate restTemplate;
/**
* @author Munch D. Luffy
* @date 2026/01/09
- * @description: 浠诲姟涓嬪彂
+ * @description: 浠诲姟涓嬪彂锛堟寚浠や笅鍙戯級
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R issueTaskWcs(MissionTaskIssueParam param) {
+ if (param.getActionType().equals(MissionActionTypeEnum.MISSION_ACTION_TYPE_ENUM_HTTP_CALL.type)){
+ return issueTaskWcsHttp(param);
+ }
+ return R.error();
+ }
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: 浠诲姟涓嬪彂锛堟寚浠や笅鍙�,HTTP鏂瑰紡锛�
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public R issueTaskWcsHttp(MissionTaskIssueParam param) {
+ if (param.getStepType().equals(MissionStepTypeEnum.MISSION_STEP_TYPE_REQUEST.type)){
+ return issueTaskWcsHttpREQUEST(param);
+ } else if (param.getStepType().equals(MissionStepTypeEnum.MISSION_STEP_TYPE_UNBIND.type)){
+ return issueTaskWcsHttpREQUEST(param);//寰呭畬鍠�
+ } else if (param.getStepType().equals(MissionStepTypeEnum.MISSION_STEP_TYPE_BIND.type)){
+ return issueTaskWcsHttpREQUEST(param);//寰呭畬鍠�
+ } else if (param.getStepType().equals(MissionStepTypeEnum.MISSION_STEP_TYPE_OBTAIN.type)){
+ return issueTaskWcsHttpREQUEST(param);//寰呭畬鍠�
+ } else if (param.getStepType().equals(MissionStepTypeEnum.MISSION_STEP_TYPE_NO_EXECUTE.type)){
+// return issueTaskWcsHttpREQUEST(param);//寰呭畬鍠�
+ return R.ok();
+ }
+ return R.error();
+ }
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: 浠诲姟涓嬪彂锛堟寚浠や笅鍙�,HTTP鏂瑰紡锛�
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public R issueTaskWcsHttpREQUEST(MissionTaskIssueParam param) {
+ try{
+ String wcsUrl = wcsApi.getHost() + ":" + wcsApi.getPort();
+ MissionWcsTaskIssueParam missionWcsTaskIssueParam = new MissionWcsTaskIssueParam();
+ if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_IN.code)){
+ wcsUrl = wcsUrl + WcsConstant.createInTask;
+ missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
+ String[] split = param.getLocNo().split("-");
+ String endLoc = split[2]+"-"+split[3]+"-"+split[4];
+ missionWcsTaskIssueParam.setLocNo(endLoc);
+ missionWcsTaskIssueParam.setBarcode(param.getBarcode());
+ missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
+
+ } else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_OUT.code)){
+ wcsUrl = wcsUrl + WcsConstant.createOutTask;
+ missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
+ String[] split = param.getSourcelocNo().split("-");
+ String souLoc = split[2]+"-"+split[3]+"-"+split[4];
+ missionWcsTaskIssueParam.setLocNo(souLoc);
+ missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
+ missionWcsTaskIssueParam.setStaNo(Integer.parseInt(param.getStaNo()));//鐩爣绔�
+ missionWcsTaskIssueParam.setOutArea("");//鐩爣鍖哄煙
+ missionWcsTaskIssueParam.setBatch("");//鍑哄簱鎵规鍙�
+ missionWcsTaskIssueParam.setBatchSeq(1);//鍑哄簱椤哄簭鍙�
+ } else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_TRANSFER.code)){
+ wcsUrl = wcsUrl + WcsConstant.createLocMoveTask;
+ missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
+ String[] split1 = param.getSourcelocNo().split("-");
+ String souLoc = split1[2]+"-"+split1[3]+"-"+split1[4];
+ missionWcsTaskIssueParam.setSourceLocNo(souLoc);
+ String[] split2 = param.getLocNo().split("-");
+ String endLoc = split2[2]+"-"+split2[3]+"-"+split2[4];
+ missionWcsTaskIssueParam.setLocNo(endLoc);
+ missionWcsTaskIssueParam.setTaskPri(param.getTaskPri());
+ } else if (param.getType().equals(TaskTypeEnum.TASK_TYPE_ENUM_STA.code)){
+ wcsUrl = wcsUrl + WcsConstant.STA_TO_STA;
+ missionWcsTaskIssueParam.setTaskNo(param.getTaskNo());
+ missionWcsTaskIssueParam.setStaNo(Integer.parseInt(param.getStaNo()));//鐩爣绔�
+ missionWcsTaskIssueParam.setSourceStaNo(Integer.parseInt(param.getSourcestaNo()));//鐩爣绔�
+ }
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ log.info("鍏ュ簱浠诲姟鐢宠锛岃姹傚湴鍧�锛� {}锛� 璇锋眰鍙傛暟锛� {}", wcsUrl , JSONObject.toJSONString(missionWcsTaskIssueParam));
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+ HttpEntity httpEntity = new HttpEntity(missionWcsTaskIssueParam, headers);
+ ResponseEntity<String> exchange = restTemplate.exchange(wcsUrl, HttpMethod.POST, httpEntity, String.class);
+ log.info("WCS浠诲姟鐢宠锛屽搷搴旂粨鏋滐細 {}", exchange);
+ if (Objects.isNull(exchange.getBody())) {
+ return R.error().add("涓嬪彂Wcs杩斿洖鍙傛暟涓虹┖锛侊紒锛�");
+ } 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(result.getMsg()).add(result.getData());
+ } else {
+ return R.error(result.getMsg());
+// throw new CoolException("浠诲姟鎵ц鐘舵�佷笂鎶ュけ璐ワ紒锛�");
+ }
+ } catch (JsonProcessingException e) {
+// throw new CoolException(e.getMessage());
+ }
+ }
+ } catch (Exception e){
+ log.error(e.getMessage(),e);
+ }
+ return R.error();
+ }
+
+ /**
+ * @author Munch D. Luffy
+ * @date 2026/01/09
+ * @description: 浠诲姟涓嬪彂锛堣鍔ㄦ帴鏀讹級
* @version 1.0
*/
@Override
@@ -106,7 +227,7 @@
try {
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
- return R.ok().add(result.getData());
+ return R.ok(result.getMsg()).add(result.getData());
} else {
return R.error(result.getMsg());
// throw new CoolException("浠诲姟鎵ц鐘舵�佷笂鎶ュけ璐ワ紒锛�");
@@ -145,7 +266,7 @@
try {
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
- return R.ok().add(result.getData());
+ return R.ok(result.getMsg()).add(result.getData());
} else {
return R.error(result.getMsg());
// throw new CoolException("浠诲姟鎵ц鐘舵�佷笂鎶ュけ璐ワ紒锛�");
@@ -184,7 +305,7 @@
try {
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
- return R.ok().add(result.getData());
+ return R.ok(result.getMsg()).add(result.getData());
} else {
return R.error(result.getMsg());
// throw new CoolException("浠诲姟鎵ц鐘舵�佷笂鎶ュけ璐ワ紒锛�");
--
Gitblit v1.9.1