diff --git a/mes/qd/src/assets/js/lodop/install_lodop32.exe b/mes/qd/src/assets/js/lodop/install_lodop32.exe index 6f04ce86..6cadfa2c 100644 Binary files a/mes/qd/src/assets/js/lodop/install_lodop32.exe and b/mes/qd/src/assets/js/lodop/install_lodop32.exe differ diff --git a/mes/qd/src/assets/js/lodop/install_lodop64.exe b/mes/qd/src/assets/js/lodop/install_lodop64.exe index b0a2e4e7..6c5193db 100644 Binary files a/mes/qd/src/assets/js/lodop/install_lodop64.exe and b/mes/qd/src/assets/js/lodop/install_lodop64.exe differ diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/b/Test.java b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/b/Test.java new file mode 100644 index 00000000..04108c20 --- /dev/null +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/b/Test.java @@ -0,0 +1,113 @@ +package org.nl.acs.ext.wms.liKuData.b; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.nl.acs.ext.wms.RespUtil; +import org.nl.acs.ext.wms.liKuData.Resp; +import org.nl.acs.ext.wms.liKuData.a.Datas; +import org.nl.acs.ext.wms.liKuData.a.RobotQueryResponse; +import org.nl.acs.ext.wms.liKuData.a.Robots; +import org.nl.acs.instruction.service.dto.Instruction; +import org.nl.acs.task.service.dto.TaskDto; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +public class Test { + + public static void main(String[] args) { +// TaskDto taskDto= new TaskDto(); +// Instruction dto = new Instruction(); +// +// CreateRequest createRequest = new CreateRequest(); +// List list = new ArrayList(); +// //list Describe 出库 +// OutTaskDescribe outTaskDescribe = new OutTaskDescribe(); +// outTaskDescribe.setContainerCode(dto.getVehicle_code()); +// outTaskDescribe.setFromLocationCode(dto.getStart_point_code()); +// outTaskDescribe.setToStationCode(new ArrayList(Collections.singleton(dto.getNext_device_code()))); +// +// AGVTask agvTask = new AGVTask(); +// agvTask.setTaskDescribe(outTaskDescribe); +// agvTask.setTaskCode(dto.getTask_id()); +// agvTask.setTaskPriority(dto.getPriority()); +// +// list.add(agvTask); +// createRequest.setTasks(list); +// //list Describe 入库 +// InTaskDescribe inTaskDescribe=new InTaskDescribe(); +// inTaskDescribe.setContainerCode(dto.getVehicle_code()); +// inTaskDescribe.setFromLocationCode(dto.getStart_point_code()); +// inTaskDescribe.setLocationCode(dto.getNext_point_code()); +// inTaskDescribe.setContainerType(dto.getVehicle_type()); +// +// AGVTask agvTask1 = new AGVTask(); +// agvTask1.setTaskDescribe(inTaskDescribe); +// agvTask1.setTaskCode(dto.getTask_id()); +// agvTask1.setTaskPriority(dto.getPriority()); +// +// list.add(agvTask1); +// createRequest.setTasks(list); +// //list Describe 移库 +// RelocationTaskDescribe relocationTaskDescribe = new RelocationTaskDescribe(); +// relocationTaskDescribe.setContainerCode(dto.getVehicle_code()); +// relocationTaskDescribe.setFromLocationCode(dto.getStart_point_code()); +// relocationTaskDescribe.setToLocationCode(dto.getNext_point_code()); +// +// AGVTask agvTask2 = new AGVTask(); +// agvTask2.setTaskDescribe(relocationTaskDescribe); +// agvTask2.setTaskCode(dto.getTask_id()); +// agvTask2.setTaskPriority(dto.getPriority()); +// +// list.add(agvTask2); +// createRequest.setTasks(list); +// +// //list Describe 盘库 +// CheckTaskDescribe checkTaskDescribe=new CheckTaskDescribe(); +// checkTaskDescribe.setContainerCode(dto.getVehicle_code()); +// checkTaskDescribe.setLocationCode(dto.getNext_point_code()); +// checkTaskDescribe.setCheckType("scan"); +// +// AGVTask agvTask3 = new AGVTask(); +// agvTask3.setTaskDescribe(inTaskDescribe); +// agvTask3.setTaskCode(dto.getTask_id()); +// agvTask3.setTaskPriority(dto.getPriority()); +// +// list.add(agvTask3); +// createRequest.setTasks(list); +// //list Describe 搬运 +// CarryTaskDescribe carryTaskDescribe=new CarryTaskDescribe(); +// carryTaskDescribe.setContainerCode(dto.getVehicle_code()); +// carryTaskDescribe.setFromLocationCode(dto.getStart_point_code()); +// carryTaskDescribe.setToLocationCode(dto.getNext_point_code()); +// carryTaskDescribe.setContainerType(dto.getVehicle_type()); +// +// AGVTask agvTask4 = new AGVTask(); +// agvTask4.setTaskDescribe(inTaskDescribe); +// agvTask4.setTaskCode(dto.getTask_id()); +// agvTask4.setTaskPriority(dto.getPriority()); +// +// list.add(agvTask4); +// createRequest.setTasks(list); + + String result="{\"code\":0,\"msg\":\"success\",\"data\":{\"robots\":[{\"robotCode\":\"kubot-1\",\"robotTypeCode\":\"RT_KUBOT\",\"pointCode\":\"POINT:1280:5070\",\"positionX\":1283,\"positionY\":5057,\"theta\":269,\"forkHeight\":679,\"forkLength\":4,\"forkTheta\":1,\"stationCode\":\"1\",\"locationCode\":\"LT_CONVEYOR_OUTPUT:POINT:1280:5070\",\"state\":\"IDLE\",\"hardwareState\":\" ROBOT_IDLE \",\"trays\":[{\"trayLevel\":0,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#0\"},{\"trayLevel\":1,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#1\"},{\"trayLevel\":2,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#2\"},{\"trayLevel\":3,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#3\"},{\"trayLevel\":4,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#4\"},{\"trayLevel\":64,\"containerCode\":null,\"taskCodes\":[],\"positionCode\":\"kubot-1#64\"}]}]}}"; +// RobotQueryResponse robotQueryResponse = JSONObject.parseObject(result, RobotQueryResponse.class); +// List robotsLIst=robotQueryResponse.getDatas().getRobots(); + + + Resp robotResp = RespUtil.getResp(result, new RobotQueryResponse());; +// RobotQueryResponse robotQueryResponse = JSONObject.parseObject(String.valueOf(robotResp.getData().getRobots()),RobotQueryResponse.class); +// List robotsList=robotQueryResponse.getDatas().getRobots(); + + JSONArray jsonArray =robotResp.getData().getJSONArray("robots"); + List robotsList=jsonArray.toJavaList(Robots.class); + System.out.println(robotsList); +// for(int i=0;i + + + + + + + \ No newline at end of file diff --git a/wcs/nladmin-system/src/main/resources/log/.idea/modules.xml b/wcs/nladmin-system/src/main/resources/log/.idea/modules.xml new file mode 100644 index 00000000..0882239c --- /dev/null +++ b/wcs/nladmin-system/src/main/resources/log/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/wcs/nladmin-system/src/main/resources/log/.idea/vcs.xml b/wcs/nladmin-system/src/main/resources/log/.idea/vcs.xml new file mode 100644 index 00000000..821e530d --- /dev/null +++ b/wcs/nladmin-system/src/main/resources/log/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/wcs/nladmin-ui/src/assets/js/lodop/install_lodop32.exe b/wcs/nladmin-ui/src/assets/js/lodop/install_lodop32.exe index a6da35e2..6cadfa2c 100644 Binary files a/wcs/nladmin-ui/src/assets/js/lodop/install_lodop32.exe and b/wcs/nladmin-ui/src/assets/js/lodop/install_lodop32.exe differ diff --git a/wcs/nladmin-ui/src/assets/js/lodop/install_lodop64.exe b/wcs/nladmin-ui/src/assets/js/lodop/install_lodop64.exe index 19985e43..6c5193db 100644 Binary files a/wcs/nladmin-ui/src/assets/js/lodop/install_lodop64.exe and b/wcs/nladmin-ui/src/assets/js/lodop/install_lodop64.exe differ diff --git a/wcs/qd/src/assets/js/lodop/install_lodop32.exe b/wcs/qd/src/assets/js/lodop/install_lodop32.exe index 37ef3597..6cadfa2c 100644 Binary files a/wcs/qd/src/assets/js/lodop/install_lodop32.exe and b/wcs/qd/src/assets/js/lodop/install_lodop32.exe differ diff --git a/wcs/qd/src/assets/js/lodop/install_lodop64.exe b/wcs/qd/src/assets/js/lodop/install_lodop64.exe index 5cdce433..6c5193db 100644 Binary files a/wcs/qd/src/assets/js/lodop/install_lodop64.exe and b/wcs/qd/src/assets/js/lodop/install_lodop64.exe differ