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

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

@@ -318,14 +318,14 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
         String start_point;
         int next_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();
             request.setRequestNo(IdUtil.simpleUUID());
             request.setTaskId(task.getExt_task_id());
             JSONObject resp = JSONObject.parseObject(acsToWmsService.feedbackState(request));
             if("200".equals(resp.getString("code"))){
-                start_height=(resp.getJSONObject("parameters").getInteger("start_height")-1)*1000;
-                next_height=(resp.getJSONObject("parameters").getInteger("next_height")-1)*1000;
+                start_height=resp.getJSONObject("parameters").getInteger("start_height");
+                next_height=resp.getJSONObject("parameters").getInteger("next_height");
                 start_point=resp.getJSONObject("parameters").getString("start_point");
                 next_point=resp.getJSONObject("parameters").getString("next_point");
                 task.setStart_height(String.valueOf(start_height));

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

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

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

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

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

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