root/beiterui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NDC接口调整

Browse Source
This commit is contained in:
psh
2023-10-24 14:13:08 +08:00
parent 1427a3689d
commit c173e19565
17 changed files with 216 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
View File

@@ -187,18 +187,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override
public BaseResponse feedbackState(JSONObject param) {
String requestNo = param.getString("requestNo");
String requestMethodCode = param.getString("request_medthod_code"); // 获取请求方法名
String requestMethodName = param.getString("request_medthod_name");
String taskId = param.getString("taskId");
BaseResponse result = BaseResponse.build(requestNo);
String device_code = param.getString("device_code");
param.put("config_code",requestMethodCode);
try {
if(ObjectUtil.isEmpty(requestMethodCode)){
throw new BadRequestException("任务类型不正确!requestMethodCode："+requestMethodName+",device_code："+device_code);
SchBaseTask schBaseTask=taskService.getById(taskId);
if(ObjectUtil.isEmpty(schBaseTask)){
throw new BadRequestException("任务不存在!taskId："+taskId);
}
AbstractTask task = taskFactory.getTask(requestMethodCode);
AbstractTask task = taskFactory.getTask(schBaseTask.getConfig_code());
// 执行创建任务
task.apply(param);
String resultCode=task.feedbackState(param);
result.getParameters().put("result",resultCode);
} catch (Exception e) {
String message = ObjectUtil.isEmpty(e.getMessage())
? ((InvocationTargetException) e).getTargetException().getMessage()

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
View File

@@ -141,4 +141,10 @@ public class SchBasePoint implements Serializable {
@TableField(exist = false)
private String group_id;
@ApiModelProperty(value = "取货等待点")
private String start_wait_point;
@ApiModelProperty(value = "放货等待点")
private String next_wait_point;
}

14
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
View File

@@ -23,7 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author ldjun
@@ -227,4 +229,16 @@ public abstract class AbstractTask {
this.updateStatus(task_code, status);
}
/**
* 任务阶段反馈最新点位
*
* @param param
* @throws BadRequestException
*/
public String feedbackState(JSONObject param) throws BadRequestException {
return this.feedbackTaskState(param);
}
protected abstract String feedbackTaskState(JSONObject param);
}

17
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/BPSLTask.java
View File

@@ -214,4 +214,21 @@ public class BPSLTask extends AbstractTask {
public void cancel(String task_code) {
this.updateStatus(task_code, TaskStatus.CANCELED);
}
@Override
protected String feedbackTaskState(JSONObject param) {
int phase=param.getInteger("phase");
String result="0";
switch (phase){
case 3:
break;
case 4:
break;
case 6:
break;
case 7:
break;
}
return result;
}
}

17
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
View File

@@ -175,4 +175,21 @@ public class KGHJRKTask extends AbstractTask {
public void cancel(String task_code) {
this.updateStatus(task_code, TaskStatus.CANCELED);
}
@Override
protected String feedbackTaskState(JSONObject param) {
int phase=param.getInteger("phase");
String result="0";
switch (phase){
case 3:
break;
case 4:
break;
case 6:
break;
case 7:
break;
}
return result;
}
}

18
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java
View File

@@ -30,6 +30,7 @@ import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
* @Author: psh
@@ -241,4 +242,21 @@ public class MJXLTask extends AbstractTask {
public void cancel(String task_code) {
this.updateStatus(task_code, TaskStatus.CANCELED);
}
@Override
protected String feedbackTaskState(JSONObject param) {
int phase=param.getInteger("phase");
String result="0";
switch (phase){
case 3:
break;
case 4:
break;
case 6:
break;
case 7:
break;
}
return result;
}
}

17
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java
View File

@@ -181,4 +181,21 @@ public class TBXBKJTask extends AbstractTask {
public void cancel(String task_code) {
this.updateStatus(task_code, TaskStatus.CANCELED);
}
@Override
protected String feedbackTaskState(JSONObject param) {
int phase=param.getInteger("phase");
String result="0";
switch (phase){
case 3:
break;
case 4:
break;
case 6:
break;
case 7:
break;
}
return result;
}
}

17
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/XSCKTask.java
View File

@@ -226,4 +226,21 @@ public class XSCKTask extends AbstractTask {
public void cancel(String task_code) {
this.updateStatus(task_code, TaskStatus.CANCELED);
}
@Override
protected String feedbackTaskState(JSONObject param) {
int phase=param.getInteger("phase");
String result="0";
switch (phase){
case 3:
break;
case 4:
break;
case 6:
break;
case 7:
break;
}
return result;
}
}

17
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ZJBZKDDTask.java
View File

@@ -88,4 +88,21 @@ public class ZJBZKDDTask extends AbstractTask {
public void cancel(String task_code) {
this.updateStatus(task_code, TaskStatus.CANCELED);
}
@Override
protected String feedbackTaskState(JSONObject param) {
int phase=param.getInteger("phase");
String result="0";
switch (phase){
case 3:
break;
case 4:
break;
case 6:
break;
case 7:
break;
}
return result;
}
}

17
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSFMTask.java
View File

@@ -279,4 +279,21 @@ public class GHSFMTask extends AbstractTask {
public void cancel(String task_code) {
this.updateStatus(task_code, TaskStatus.CANCELED);
}
@Override
protected String feedbackTaskState(JSONObject param) {
int phase=param.getInteger("phase");
String result="0";
switch (phase){
case 3:
break;
case 4:
break;
case 6:
break;
case 7:
break;
}
return result;
}
}

17
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ghs/GHSQHTask.java
View File

@@ -292,4 +292,21 @@ public class GHSQHTask extends AbstractTask {
public void cancel(String task_code) {
this.updateStatus(task_code, TaskStatus.CANCELED);
}
@Override
protected String feedbackTaskState(JSONObject param) {
int phase=param.getInteger("phase");
String result="0";
switch (phase){
case 3:
break;
case 4:
break;
case 6:
break;
case 7:
break;
}
return result;
}
}