From fde989eba34025960ec95ed07f81497e5d5dc4c5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 十一月 2025 18:48:46 +0800
Subject: [PATCH] 出库完成修改站点状态
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocSiteParams.java | 26 +++++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsRcsService.java | 3
rsf-open-api/src/main/java/com/vincent/rsf/openApi/enums/LocStasEnum.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 86 ++++++++++++++--
rsf-open-api/src/main/java/com/vincent/rsf/openApi/enums/LocStsType.java | 60 ++++++++++++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java | 41 +++++++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsRcsController.java | 16 +++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/RcsConstant.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/LocSiteParams.java | 26 +++++
10 files changed, 249 insertions(+), 18 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 afa3d5b..e6099eb 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
@@ -4,6 +4,7 @@
import com.vincent.rsf.framework.exception.CoolException;
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.RcsPubTaskParams;
import com.vincent.rsf.openApi.entity.params.SyncRcsLocsParam;
import com.vincent.rsf.openApi.service.WmsRcsService;
@@ -81,5 +82,20 @@
return R.ok().add(wmsRcsService.syncLocs(params));
}
+ /**
+ * @author Ryan
+ * @date 2025/11/10
+ * @description: WMS 鍑哄簱鎴愬姛鍚庯紝淇敼搴撲綅銆佺珯鐐圭姸鎬�
+ * @version 1.0
+ */
+ @ApiOperation("RCS淇敼搴撲綅鎴栫珯鐐圭姸鎬�")
+ @PostMapping("/modify/status")
+ public R modifyLocOrSite(@RequestBody LocSiteParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return wmsRcsService.modifyLocOrSite(params);
+ }
+
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/RcsConstant.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/RcsConstant.java
index 0245eb6..5baa51e 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/RcsConstant.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/constant/RcsConstant.java
@@ -6,4 +6,6 @@
public static String syncLocs = "/api/open/loc/sync";
+ public static String modifystatus = "/api/open/modify/status";
+
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/LocSiteParams.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/LocSiteParams.java
new file mode 100644
index 0000000..f8175fb
--- /dev/null
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/LocSiteParams.java
@@ -0,0 +1,26 @@
+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 = "LocSiteParams", description = "搴撲綅鎴栫姸鎬佸弬鏁�")
+public class LocSiteParams implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("绫诲瀷锛歭oc: 搴撲綅锛� site: 绔欑偣")
+ private String type = "loc";
+
+ @ApiModelProperty("绔欑偣鎴栧簱浣�")
+ private String code;
+
+ @ApiModelProperty("搴撲綅鎴栫珯鐐圭姸鎬�")
+ private String status;
+
+}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/enums/LocStasEnum.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/enums/LocStasEnum.java
index 42a39a4..acc7dfe 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/enums/LocStasEnum.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/enums/LocStasEnum.java
@@ -21,6 +21,6 @@
this.desc = desc;
}
- private String code;
- private String desc;
+ public String code;
+ public String desc;
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/enums/LocStsType.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/enums/LocStsType.java
new file mode 100644
index 0000000..dbf7f47
--- /dev/null
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/enums/LocStsType.java
@@ -0,0 +1,60 @@
+package com.vincent.rsf.openApi.enums;
+
+public enum LocStsType {
+
+ //绌烘澘
+ LOC_STS_TYPE_D("D", "绌烘澘"),
+ //鍦ㄥ簱
+ LOC_STS_TYPE_F("F", "鍦ㄥ簱"),
+ //绌哄簱
+ LOC_STS_TYPE_O("O", "绌哄簱"),
+ //绂佺敤
+ LOC_STS_TYPE_X("X", "绂佺敤"),
+ //鍏ュ簱棰勭害
+ LOC_STS_TYPE_S("S", "鍏ュ簱棰勭害"),
+ //鍑哄簱棰勭害
+ LOC_STS_TYPE_R("R", "鍑哄簱棰勭害"),
+ ;
+
+ public String type;
+
+ public String desc;
+
+ LocStsType(String type, String desc) {
+ this.type = type;
+ this.desc = desc;
+ }
+
+
+ public static LocStsType get(String el) {
+ for (LocStsType value : LocStsType.values()) {
+ if (el.equals(value.toString())) {
+ return value;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/8/28
+ * @description: RCS搴撲綅鐘舵�佽浆鎹�
+ * @version 1.0
+ */
+ public static String getLocSts(String val) {
+ if (val.equals(LocStasEnum.LOC_STAS_ENUM_IDLE.code)) {
+ return LocStsType.LOC_STS_TYPE_O.type;
+ } else if (val.equals(LocStasEnum.LOC_STAS_ENUM_STOCK.code)) {
+ return LocStsType.LOC_STS_TYPE_F.type;
+ } else if (val.equals(LocStasEnum.LOC_STAS_ENUM_PAKIN.code)) {
+ return LocStsType.LOC_STS_TYPE_S.type;
+ } else if (val.equals(LocStasEnum.LOC_STAS_ENUM_PAKOUT.code)) {
+ return LocStsType.LOC_STS_TYPE_R.type;
+ } else if (val.equals(LocStasEnum.LOC_STAS_ENUM_DISABLED.code)) {
+ return LocStsType.LOC_STS_TYPE_X.type;
+ }
+ return null;
+ }
+
+
+}
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 d18de2c..134688b 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
@@ -7,6 +7,7 @@
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
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;
@@ -22,4 +23,6 @@
CommonResponse callBackEvent(ExMsgCallbackParams params);
List<SyncLocsDto> syncLocs(SyncRcsLocsParam params);
+
+ R modifyLocOrSite(LocSiteParams 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 d5d2cf5..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;
+
/**
@@ -145,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
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
index 0a4afb4..0d527e0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
@@ -13,4 +13,7 @@
//鐩樼偣搴撳瓨淇敼
public static String CHECK_LOCITEM_UPDATE = "/rsf-open-api/erp/check/locitem/update";
+
+ //涓婃姤绔欑偣鐘舵��
+ public static String REPORT_SITE_STATUS = "/rsf-open-api/rcs/modify/status";
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocSiteParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocSiteParams.java
new file mode 100644
index 0000000..a049544
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocSiteParams.java
@@ -0,0 +1,26 @@
+package com.vincent.rsf.server.manager.controller.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 = "LocSiteParams", description = "搴撲綅鎴栫姸鎬佸弬鏁�")
+public class LocSiteParams implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("绫诲瀷锛歭oc: 搴撲綅锛� site: 绔欑偣")
+ private String type = "loc";
+
+ @ApiModelProperty("绔欑偣鎴栧簱浣�")
+ private String code;
+
+ @ApiModelProperty("搴撲綅鎴栫珯鐐圭姸鎬�")
+ private String status;
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 11e7884..169758d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -1,6 +1,5 @@
package com.vincent.rsf.server.manager.schedules;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -18,6 +17,7 @@
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.common.constant.Constants;
+import com.vincent.rsf.server.manager.controller.params.LocSiteParams;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.entity.*;
@@ -257,7 +257,7 @@
if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName,
- task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id) ? task.getOrgSite() : task.getTargSite()));
+ task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id) ? task.getOrgSite() : task.getTargSite()));
if (station.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
continue;
}
@@ -522,7 +522,6 @@
}
-
/**
* @param
* @return
@@ -559,16 +558,17 @@
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
- for (TaskItem taskItem : taskItems) {
- if (Objects.isNull(taskItem.getOrderId())) {
- continue;
- }
- WkOrder order = asnOrderService.getById(taskItem.getOrderId());
- if (Objects.isNull(order)) {
- continue;
- }
- //鍏ュ簱鍗曚换鍔℃槑缁嗕笂鎶�
- if (order.getType().equals(OrderType.ORDER_IN.type)) {
+ //鍏ュ簱鍗曟嵁鏄庣粏涓婃姤
+ if (task.getTaskType() <= TaskType.TASK_TYPE_CHECK_IN.type) {
+ for (TaskItem taskItem : taskItems) {
+ if (Objects.isNull(taskItem.getOrderId())) {
+ continue;
+ }
+ WkOrder order = asnOrderService.getById(taskItem.getOrderId());
+ if (Objects.isNull(order)) {
+ continue;
+ }
+ //鍏ュ簱鍗曚换鍔℃槑缁嗕笂鎶�
WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, order.getId())
.eq(WkOrderItem::getFieldsIndex, taskItem.getFieldsIndex()));
@@ -577,6 +577,13 @@
}
/**鍏ュ簱鍗曟槑缁嗕笂鎶�*/
reportMsgService.reportOrderItem(wkOrderItem);
+ }
+ } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {
+ //鍑哄簱鍗曚笂鎶CS淇敼搴撲綅鐘舵��
+ try {
+ reportStationStatus(task);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
}
@@ -599,11 +606,62 @@
if (!taskItemLogService.saveBatch(itemLogs)) {
throw new CoolException("浠诲姟鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
}
-
if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()))) {
throw new CoolException("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
});
}
+
+
+ /**
+ * @author Ryan
+ * @date 2025/11/10
+ * @description: 涓婃姤绔欑偣鐘舵��
+ * @version 1.0
+ */
+ public CommonResponse reportStationStatus(Task task) {
+ if (Objects.isNull(task.getTargSite())) {
+ throw new CoolException("鐩爣绔欑偣涓嶈兘涓虹┖锛侊紒");
+ }
+ BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getTargSite()));
+ if (Objects.isNull(station)) {
+ throw new CoolException("鏁版嵁閿欒锛岀洰鏍囩珯鐐逛笉瀛樺湪锛侊紒");
+ }
+ station.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
+
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ LocSiteParams locSiteParams = new LocSiteParams();
+ locSiteParams.setStatus(LocStsType.getLocSts(LocStsType.LOC_STS_TYPE_O.type))
+ .setType("site")
+ .setCode(station.getStationName());
+
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.REPORT_SITE_STATUS;
+ log.info("涓婃姤宸插畬鎴愯鍗曪細{}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(locSiteParams));
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+
+ HttpEntity httpEntity = new HttpEntity(locSiteParams, 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);
+ return result;
+ } catch (JsonProcessingException e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+
+ }
+
}
--
Gitblit v1.9.1