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

ACS请求LMS获取点位高度接口重新调整

Browse Source
This commit is contained in:
psh
2023-10-25 10:45:37 +08:00
parent ead57ef05c
commit 3c20058871
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -318,14 +318,14 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
String start_point; String start_point;
int next_height; int next_height;
int start_height; int start_height;
if(!"1".equals(task.getTask_type())&&!"2".equals(task.getTask_type())) { if(!"2".equals(task.getTask_type())) {
BaseRequest request = new BaseRequest(); BaseRequest request = new BaseRequest();
request.setRequestNo(IdUtil.simpleUUID()); request.setRequestNo(IdUtil.simpleUUID());
request.setTaskId(task.getExt_task_id()); request.setTaskId(task.getExt_task_id());
JSONObject resp = JSONObject.parseObject(acsToWmsService.feedbackState(request)); JSONObject resp = JSONObject.parseObject(acsToWmsService.feedbackState(request));
if("200".equals(resp.getString("code"))){ if("200".equals(resp.getString("code"))){
start_height=(resp.getJSONObject("parameters").getInteger("start_height")-1)*1000; start_height=resp.getJSONObject("parameters").getInteger("start_height");
next_height=(resp.getJSONObject("parameters").getInteger("next_height")-1)*1000; next_height=resp.getJSONObject("parameters").getInteger("next_height");
start_point=resp.getJSONObject("parameters").getString("start_point"); start_point=resp.getJSONObject("parameters").getString("start_point");
next_point=resp.getJSONObject("parameters").getString("next_point"); next_point=resp.getJSONObject("parameters").getString("next_point");
task.setStart_height(String.valueOf(start_height)); task.setStart_height(String.valueOf(start_height));

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

@@ -11,6 +11,7 @@ import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException; import org.nl.common.exception.BadRequestException;
import org.nl.system.service.notice.ISysNoticeService; import org.nl.system.service.notice.ISysNoticeService;
import org.nl.system.service.param.ISysParamService;
import org.nl.wms.database.material.service.IMdBaseMaterialService; import org.nl.wms.database.material.service.IMdBaseMaterialService;
import org.nl.wms.database.material.service.dao.MdBaseMaterial; import org.nl.wms.database.material.service.dao.MdBaseMaterial;
import org.nl.wms.ext.service.AcsToWmsService; import org.nl.wms.ext.service.AcsToWmsService;
@@ -201,9 +202,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
Map<String, String> map=new HashMap<>(); Map<String, String> map=new HashMap<>();
map.put("start_point",schBaseTask.getPoint_code1()); map.put("start_point",schBaseTask.getPoint_code1());
map.put("next_point",schBaseTask.getPoint_code2()); map.put("next_point",schBaseTask.getPoint_code2());
//todo map.put("start_height",schBaseTask.getPoint_code1_height());
map.put("start_height","0"); map.put("next_height",schBaseTask.getPoint_code2_height());
map.put("next_height","0");
result.setParameters(map); result.setParameters(map);
} catch (Exception e) { } catch (Exception e) {
String message = ObjectUtil.isEmpty(e.getMessage()) String message = ObjectUtil.isEmpty(e.getMessage())

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

@@ -120,4 +120,10 @@ public class SchBaseTask implements Serializable {
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
private String update_time; private String update_time;
@ApiModelProperty(value = "点位1高度")
private String point_code1_height="0";
@ApiModelProperty(value = "点位2高度")
private String point_code2_height="0";
} }

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

@@ -246,6 +246,6 @@ public class MJXLTask extends AbstractTask {
@Override @Override
protected void feedbackTaskState(JSONObject param,SchBaseTask schBaseTask, BaseResponse result) { protected void feedbackTaskState(JSONObject param,SchBaseTask schBaseTask, BaseResponse result) {
//todo 重算最优点 //无需重算，返回当前点位即可
} }
} }