zhouz/huachuang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ACS、PC对任务状态的变化

Browse Source
This commit is contained in:
liyongde
2026-07-16 14:11:30 +08:00
parent f24e01c7dd
commit be46cf49c5
37 changed files with 2349 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/TaskCommonApi.java → nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/api/TaskCommonApi.java
View File

@@ -1,5 +1,6 @@
package cn.code.nl.framework.execute.biz;
package cn.code.nl.framework.execute.biz.api;
import cn.code.nl.framework.execute.biz.dto.TaskStatusCallApiReqDTO;
import org.springframework.web.bind.annotation.PostMapping;
/**
@@ -10,5 +11,5 @@ import org.springframework.web.bind.annotation.PostMapping;
public interface TaskCommonApi {
@PostMapping("/do-handle-picked")
void doHandlePicked();
void doHandlePicked(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO);
}

4
nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/lms/LmsTaskCommonApi.java → nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/api/lms/LmsTaskCommonApi.java
View File

@@ -1,7 +1,7 @@
package cn.code.nl.framework.execute.biz.lms;
package cn.code.nl.framework.execute.biz.api.lms;
import cn.code.nl.framework.common.enums.RpcConstants;
import cn.code.nl.framework.execute.biz.TaskCommonApi;
import cn.code.nl.framework.execute.biz.api.TaskCommonApi;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;

4
nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/wms/WmsTaskCommonApi.java → nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/api/wms/WmsTaskCommonApi.java
View File

@@ -1,7 +1,7 @@
package cn.code.nl.framework.execute.biz.wms;
package cn.code.nl.framework.execute.biz.api.wms;
import cn.code.nl.framework.common.enums.RpcConstants;
import cn.code.nl.framework.execute.biz.TaskCommonApi;
import cn.code.nl.framework.execute.biz.api.TaskCommonApi;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;

38
nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/dto/TaskStatusCallApiReqDTO.java Normal file
View File

@@ -0,0 +1,38 @@
package cn.code.nl.framework.execute.biz.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Map;
/**
* 任务状态返回DTO
* @Author: liyongde
* @Date: 2026/7/16 14:01
*/
@Data
public class TaskStatusCallApiReqDTO implements Serializable {
/** 任务ID */
private Long taskId;
/** 任务编码 */
private String taskCode;
/** 回调状态：当前为 PICKED(65) */
private String status;
/** 业务归属服务 */
private String ownerService;
/** 业务类型 */
private String bizType;
/** 业务侧标识 */
private String bizId;
/** 业务回调处理器编码（LMS/WMS 内部路由） */
private String handleCode;
/** 扩展数据 */
private Map<String, Object> payload;
}

4
nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/config/NlExecuteRpcAutoConfiguration.java
View File

@@ -1,7 +1,7 @@
package cn.code.nl.framework.execute.config;
import cn.code.nl.framework.execute.biz.lms.LmsTaskCommonApi;
import cn.code.nl.framework.execute.biz.wms.WmsTaskCommonApi;
import cn.code.nl.framework.execute.biz.api.lms.LmsTaskCommonApi;
import cn.code.nl.framework.execute.biz.api.wms.WmsTaskCommonApi;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.cloud.openfeign.EnableFeignClients;

6
nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/core/TaskCommonApiFactory.java
View File

@@ -2,9 +2,9 @@ package cn.code.nl.framework.execute.core;
import cn.code.nl.framework.common.enums.RpcConstants;
import cn.code.nl.framework.common.exception.ServiceException;
import cn.code.nl.framework.execute.biz.TaskCommonApi;
import cn.code.nl.framework.execute.biz.lms.LmsTaskCommonApi;
import cn.code.nl.framework.execute.biz.wms.WmsTaskCommonApi;
import cn.code.nl.framework.execute.biz.api.TaskCommonApi;
import cn.code.nl.framework.execute.biz.api.lms.LmsTaskCommonApi;
import cn.code.nl.framework.execute.biz.api.wms.WmsTaskCommonApi;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;