汪菘 2 years ago
parent
commit
758423c75a
  1. 0
      acs/nladmin-system/.gitignore
  2. 0
      acs/nladmin-system/README.en.md
  3. 0
      acs/nladmin-system/README.md
  4. 0
      acs/nladmin-system/jrebel-classpath-12132.jar
  5. 4
      acs/nladmin-system/pom.xml
  6. 0
      acs/nladmin-system/src/main/java/org/nl/AppRun.java
  7. 0
      acs/nladmin-system/src/main/java/org/nl/acs/AcsConfig.java
  8. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/AgvUtil.java
  9. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java
  10. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/NDCAgvController.java
  11. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java
  12. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/ZheDaAgvController.java
  13. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvService.java
  14. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/MagicAgvService.java
  15. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/NDCAgvService.java
  16. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java
  17. 2
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java
  18. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/dto/AgvDto.java
  19. 0
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
  20. 1
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java
  21. 15
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
  22. 10
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
  23. 161
      acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java
  24. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/AcsInit.java
  25. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/AutoRunController.java
  26. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java
  27. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java
  28. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java
  29. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java
  30. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java
  31. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunService.java
  32. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java
  33. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/run/DevelopConfig.java
  34. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
  35. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/run/SystemConfig.java
  36. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/run/ThreadDto.java
  37. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java
  38. 0
      acs/nladmin-system/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java
  39. 0
      acs/nladmin-system/src/main/java/org/nl/acs/autotask/CleanLog.java
  40. 0
      acs/nladmin-system/src/main/java/org/nl/acs/common/AbstractDriverService.java
  41. 0
      acs/nladmin-system/src/main/java/org/nl/acs/common/IDriverService.java
  42. 0
      acs/nladmin-system/src/main/java/org/nl/acs/common/StandardCoveyorControlWithPlcScannerDevice.java
  43. 0
      acs/nladmin-system/src/main/java/org/nl/acs/common/StandardCoveyorControlWithScannerDevice.java
  44. 0
      acs/nladmin-system/src/main/java/org/nl/acs/common/StandardInspectSiteDevice.java
  45. 0
      acs/nladmin-system/src/main/java/org/nl/acs/common/StandardOrdinarySiteDevice.java
  46. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device.xls
  47. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java
  48. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/AddressService.java
  49. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/dto/AddressDto.java
  50. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/impl/AddressServiceImpl.java
  51. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/address/wql/sys_config.xls
  52. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java
  53. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigDto.java
  54. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigService.java
  55. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigServiceImpl.java
  56. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
  57. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/BaseDeviceDriver.java
  58. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDto.java
  59. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java
  60. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/OpcPlcDto.java
  61. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ReadUtil.java
  62. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/rest/AcsDeviceErpmappingController.java
  63. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java
  64. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java
  65. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java
  66. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java
  67. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcController.java
  68. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcPlcController.java
  69. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/rest/StorageCellController.java
  70. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/AcsDeviceErpmappingService.java
  71. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java
  72. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java
  73. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java
  74. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceExtraService.java
  75. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceService.java
  76. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/OpcPlcService.java
  77. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/OpcService.java
  78. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/StorageCellService.java
  79. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java
  80. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java
  81. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java
  82. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceDriverDto.java
  83. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java
  84. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java
  85. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java
  86. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/OpcDto.java
  87. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/OpcPlcDto.java
  88. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/StorageCellDto.java
  89. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/AcsDeviceErpmappingServiceImpl.java
  90. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java
  91. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java
  92. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java
  93. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
  94. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/ExportCSVUtil.java
  95. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/OpcPlcServiceImpl.java
  96. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/OpcServiceImpl.java
  97. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
  98. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/wql/QStage_01.wql
  99. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql
  100. 0
      acs/nladmin-system/src/main/java/org/nl/acs/device/wql/route.xls

0
nladmin-system/.gitignore → acs/nladmin-system/.gitignore

0
nladmin-system/README.en.md → acs/nladmin-system/README.en.md

0
nladmin-system/README.md → acs/nladmin-system/README.md

0
nladmin-system/jrebel-classpath-12132.jar → acs/nladmin-system/jrebel-classpath-12132.jar

4
nladmin-system/pom.xml → acs/nladmin-system/pom.xml

@ -489,8 +489,10 @@
<includes>
<include>**/*.*</include>
</includes>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<includes>

0
nladmin-system/src/main/java/org/nl/AppRun.java → acs/nladmin-system/src/main/java/org/nl/AppRun.java

0
nladmin-system/src/main/java/org/nl/acs/AcsConfig.java → acs/nladmin-system/src/main/java/org/nl/acs/AcsConfig.java

0
nladmin-system/src/main/java/org/nl/acs/agv/AgvUtil.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/AgvUtil.java

0
nladmin-system/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/MagicAgvController.java

0
nladmin-system/src/main/java/org/nl/acs/agv/rest/NDCAgvController.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/NDCAgvController.java

0
nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java

0
nladmin-system/src/main/java/org/nl/acs/agv/rest/ZheDaAgvController.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/rest/ZheDaAgvController.java

0
nladmin-system/src/main/java/org/nl/acs/agv/server/AgvService.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvService.java

0
nladmin-system/src/main/java/org/nl/acs/agv/server/MagicAgvService.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/MagicAgvService.java

0
nladmin-system/src/main/java/org/nl/acs/agv/server/NDCAgvService.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/NDCAgvService.java

0
nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java

2
nladmin-system/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java

@ -29,7 +29,7 @@ public interface ZheDaAgvService {
HttpResponse queryZDAgvDeviceStatus();
String process(String jobno, String type, String address, String action, String processingVehicle,String feedbackStatus);
String process(String jobno, String type, String address, String action, String processingVehicle);
public HttpResponse markComplete(String code);

0
nladmin-system/src/main/java/org/nl/acs/agv/server/dto/AgvDto.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/dto/AgvDto.java

0
nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java

1
nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java

@ -27,6 +27,7 @@ import org.nl.acs.opc.DeviceType;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.service.ParamService;
import org.nl.modules.wql.util.SpringContextHolder;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import java.util.Arrays;

15
nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java

@ -19,6 +19,7 @@ import org.nl.acs.opc.DeviceAppServiceImpl;
import org.nl.modules.system.service.ParamService;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.util.SpringContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
@ -28,12 +29,14 @@ import java.util.Map;
@Service
@RequiredArgsConstructor
public class NDCAgvServiceImpl implements NDCAgvService {
private final DeviceAppService deviceAppService;
private final ParamService paramService;
private final AcsToWmsService acsToWmsService;
private final DeviceExecuteLogService logServer;
@Autowired
private DeviceAppService deviceAppService;
@Autowired
private ParamService paramService;
@Autowired
private AcsToWmsService acsToWmsService;
@Autowired
private DeviceExecuteLogService logServer;
Map<String, AgvDto> AGVDeviceStatus = new HashMap();

10
nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java

@ -21,6 +21,7 @@ import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.opc.DeviceType;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
@ -32,9 +33,12 @@ import java.util.Map;
@Service
@RequiredArgsConstructor
public class XianGongAgvServiceImpl implements XianGongAgvService {
private final DeviceAppService deviceAppService;
private final ParamService paramService;
private final AcsToWmsService acsToWmsService;
@Autowired
private DeviceAppService deviceAppService;
@Autowired
private ParamService paramService;
@Autowired
private AcsToWmsService acsToWmsService;
Map<String, AgvDto> AGVDeviceStatus = new HashMap();
@LokiLog(type = LokiLogType.AGV)

161
nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java

@ -1,5 +1,6 @@
package org.nl.acs.agv.server.impl;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
@ -18,6 +19,7 @@ import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDev
import org.nl.acs.device_driver.basedriver.lubei_conveyor.LubeiConveyorDeviceDriver;
import org.nl.acs.device_driver.basedriver.paint_conveyor.PaintConveyorDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.ext.wms.service.AcsToWmsZDService;
import org.nl.acs.instruction.service.InstructionService;
@ -49,6 +51,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
private final ParamService paramService;
@LokiLog(type = LokiLogType.AGV)
@Override
@SaIgnore
public HttpResponse sendAgvInstToAgv(Instruction inst) throws Exception {
JSONObject jo = new JSONObject();
String start_point_code = inst.getStart_point_code();
@ -68,15 +71,18 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
jo.put("task_code", inst.getInstruction_code());
//根据任务,下发指令类型
JSONArray destinations = new JSONArray();
if (task_type.equals("3")) {
destinations.add(destination(start_point_code, "Wait", "5", "1"));
} else if (task_type.equals("4")) {
destinations.add(destination(start_point_code, "Load", "1", "1"));
destinations.add(destination(next_point_code, "Wait", "5", "1"));
} else {
destinations.add(destination(start_point_code, "Load", "1", "1"));
destinations.add(destination(next_point_code, "Unload", "1", "1"));
}
// if (task_type.equals("3")) {
// destinations.add(destination(start_point_code, "Wait", "5", "1"));
// } else if (task_type.equals("4")) {
// destinations.add(destination(start_point_code, "Load", "1", "1"));
// destinations.add(destination(next_point_code, "Wait", "5", "1"));
// } else {
// destinations.add(destination(start_point_code, "Load", "1", "1"));
// destinations.add(destination(next_point_code, "Unload", "1", "1"));
// }
destinations.add(destination(start_point_code, "Load", "1", "1"));
destinations.add(destination(next_point_code, "Unload", "1", "1"));
jo.put("destinations", destinations);
@ -86,13 +92,14 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue();
String agvport2 = paramService.findByCode(AcsConfig.AGVPORT2).getValue();
agvurl = agvurl + ":" + agvport + "/v1/transportOrders/" + inst.getInstruction_code();
agvurl = agvurl + ":" + agvport + "/rmds/v1/transportOrders/" + inst.getInstruction_code();
log.info("下发agv任务请求:{}", agvurl);
HttpResponse result = HttpRequest.post(agvurl)
.body(String.valueOf(jo))//表单内容
.timeout(20000)//超时,毫秒
.execute();
log.info("下发agv任务请求内容:{}", jo);
log.info("下发agv任务请求反馈:{}", result);
return result;
} else {
@ -107,11 +114,13 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) {
String agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue();
String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue();
agvurl = agvurl + ":" + agvport + "/v1/vehicles";
HttpResponse result = HttpRequest.get(agvurl)
agvurl = agvurl + ":" + agvport + "/rmds/v1/transportOrders/query";
HttpResponse result = HttpRequest.post(agvurl)
.body("{}")
.timeout(20000)//超时,毫秒
.execute();
System.out.println("查询agv指令数据:" + result.body());
log.info("查询agv指令数据:{}", result.body());
return result;
} else {
@ -138,10 +147,10 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
@LokiLog(type = LokiLogType.AGV)
@Override
public synchronized String process(String jobno, String type, String address, String action, String processingVehicle,String feedbackStatus)
public synchronized String process(String jobno, String type, String address, String action, String processingVehicle)
{
{
log.info("查询到AGV请求参数,jobno:{},address:{}", jobno + ",address:" + address + ",type:" + type + ",action:" + action+",feedbackStatus:"+feedbackStatus);
log.info("查询到AGV请求参数,jobno:{},address:{}", jobno + ",address:" + address + ",type:" + type + ",action:" + action);
//释放AGV资源,继续后续动作
boolean is_feedback = false;
String str = "";
@ -177,7 +186,8 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus",feedbackStatus);
jo.put("feedbackStatus","applyTake");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
@ -188,13 +198,14 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
} else {
log.info("设备{} 请求取货,光电信号:{}",addressdevice,lubeiConveyorDeviceDriver.getMove());
}
}
}
if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
JSONObject jo = new JSONObject();
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus",feedbackStatus);
jo.put("feedbackStatus","applyTake");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
@ -203,6 +214,22 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
log.info("请求ZDwcs成功,申请取货 请求结果{}",responseCode);
}
}
if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) {
JSONObject jo = new JSONObject();
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus","applyTake");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
if(responseCode == 0) {
is_feedback = true;
log.info("请求ZDwcs成功,申请取货 请求结果{}",responseCode);
}
}
}
if ("PauseOnStation".equals(type)) {
if (addressdevice.getDeviceDriver() instanceof LubeiConveyorDeviceDriver) {
@ -212,14 +239,21 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus",feedbackStatus);
jo.put("feedbackStatus","takeFinish");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
if(responseCode == 0) {
is_feedback = true;
log.info("请求ZDwcs成功,取货完成 请求结果{}",responseCode);
}
lubeiConveyorDeviceDriver.writing(2);
if(lubeiConveyorDeviceDriver.getTo_command() == 2){
is_feedback = true;
} else {
lubeiConveyorDeviceDriver.writing(2);
}
} else {
log.info("设备{} 请求离开,光电信号:{}",addressdevice,lubeiConveyorDeviceDriver.getMove());
}
@ -229,7 +263,8 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus",feedbackStatus);
jo.put("feedbackStatus","takeFinish");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
@ -238,6 +273,21 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
log.info("请求ZDwcs成功,取货完成 请求结果{}",responseCode);
}
}
if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) {
JSONObject jo = new JSONObject();
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus","takeFinish");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
if(responseCode == 0) {
is_feedback = true;
log.info("请求ZDwcs成功,申请取货 请求结果{}",responseCode);
}
}
}
}
@ -251,7 +301,8 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus",feedbackStatus);
jo.put("feedbackStatus","applyPut");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
@ -268,7 +319,8 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus",feedbackStatus);
jo.put("feedbackStatus","applyPut");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
@ -277,6 +329,21 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
log.info("请求ZDwcs成功,开始放货 请求结果{}",responseCode);
}
}
if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) {
JSONObject jo = new JSONObject();
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus","applyPut");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
if(responseCode == 0) {
is_feedback = true;
log.info("请求ZDwcs成功,申请取货 请求结果{}",responseCode);
}
}
}
if ("PauseOnStation".equals(type)) {
if (addressdevice.getDeviceDriver() instanceof LubeiConveyorDeviceDriver) {
@ -286,14 +353,20 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus",feedbackStatus);
jo.put("feedbackStatus","putFinish");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
if(responseCode == 0) {
is_feedback = true;
log.info("请求ZDwcs成功,放货完成 请求结果{}",responseCode);
}
lubeiConveyorDeviceDriver.writing(3);
if(lubeiConveyorDeviceDriver.getTo_command() == 3){
is_feedback = true;
} else {
lubeiConveyorDeviceDriver.writing(3);
}
} else {
log.info("设备{} 请求离开,光电信号:{}",addressdevice,lubeiConveyorDeviceDriver.getMove());
}
@ -303,7 +376,8 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus",feedbackStatus);
jo.put("feedbackStatus","putFinish");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
@ -312,6 +386,21 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
log.info("请求ZDwcs成功,放货完成 请求结果{}",responseCode);
}
}
if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) {
JSONObject jo = new JSONObject();
jo.put("taskCode",task.getTask_code());
jo.put("carId",processingVehicle);
jo.put("taskType ",type);
jo.put("feedbackStatus","putFinish");
log.info("请求参数:{}",jo);
HttpResponse result= acsToWmsZDService.taskFeedback(jo);
JSONObject response=JSONObject.parseObject(result.body());
int responseCode= response.getInteger("responseCode");
if(responseCode == 0) {
is_feedback = true;
log.info("请求ZDwcs成功,申请取货 请求结果{}",responseCode);
}
}
}
}
com.alibaba.fastjson.JSONObject requestjo = new com.alibaba.fastjson.JSONObject();
@ -330,7 +419,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
String agvurl = acsConfigService.findConfigFromCache().get(AcsConfig.AGVURL);
String agvport = acsConfigService.findConfigFromCache().get(AcsConfig.AGVPORT);
agvurl = agvurl + ":" + agvport + "/api/route/transportOrders/" + jobno + "/interact";
agvurl = agvurl + ":" + agvport + "/rmds/v1/transportOrders/" + jobno + "/interact";
HttpResponse result = HttpRequest.post(agvurl)
@ -394,11 +483,11 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
JSONArray properties = new JSONArray();
JSONObject pro1 = new JSONObject();
pro1.put("key", "EntryRequired");
pro1.put("value", "True");
pro1.put("value", "true");
properties.add(pro1);
JSONObject pro2 = new JSONObject();
pro2.put("key", "PauseOnStation");
pro2.put("value", "True");
pro2.put("value", "true");
properties.add(pro2);
destinationOrder.put("properties", properties);
//进入等待 离开不等待
@ -406,11 +495,11 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
JSONArray properties = new JSONArray();
JSONObject pro1 = new JSONObject();
pro1.put("key", "EntryRequired");
pro1.put("value", "True");
pro1.put("value", "true");
properties.add(pro1);
JSONObject pro2 = new JSONObject();
pro2.put("key", "PauseOnStation");
pro2.put("value", "False");
pro2.put("value", "false");
properties.add(pro2);
destinationOrder.put("properties", properties);
//进入不等待 离开等待
@ -418,11 +507,11 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
JSONArray properties = new JSONArray();
JSONObject pro1 = new JSONObject();
pro1.put("key", "EntryRequired");
pro1.put("value", "False");
pro1.put("value", "false");
properties.add(pro1);
JSONObject pro2 = new JSONObject();
pro2.put("key", "PauseOnStation");
pro2.put("value", "True");
pro2.put("value", "true");
properties.add(pro2);
destinationOrder.put("properties", properties);
//不等待
@ -430,11 +519,11 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
JSONArray properties = new JSONArray();
JSONObject pro1 = new JSONObject();
pro1.put("key", "EntryRequired");
pro1.put("value", "False");
pro1.put("value", "false");
properties.add(pro1);
JSONObject pro2 = new JSONObject();
pro2.put("key", "PauseOnStation");
pro2.put("value", "False");
pro2.put("value", "false");
properties.add(pro2);
destinationOrder.put("properties", properties);
}
@ -472,7 +561,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
JSONArray properties = new JSONArray();
JSONObject pro1 = new JSONObject();
pro1.put("key", "Wait");
pro1.put("value", "True");
pro1.put("value", "true");
properties.add(pro1);
destinationOrder.put("properties", properties);
}

0
nladmin-system/src/main/java/org/nl/acs/auto/AcsInit.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/AcsInit.java

0
nladmin-system/src/main/java/org/nl/acs/auto/AutoRunController.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/AutoRunController.java

0
nladmin-system/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java

0
nladmin-system/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java

0
nladmin-system/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java

0
nladmin-system/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java

0
nladmin-system/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java

0
nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunService.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunService.java

0
nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java

0
nladmin-system/src/main/java/org/nl/acs/auto/run/DevelopConfig.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/run/DevelopConfig.java

0
nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java

0
nladmin-system/src/main/java/org/nl/acs/auto/run/SystemConfig.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/run/SystemConfig.java

0
nladmin-system/src/main/java/org/nl/acs/auto/run/ThreadDto.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/run/ThreadDto.java

0
nladmin-system/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java

0
nladmin-system/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java → acs/nladmin-system/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java

0
nladmin-system/src/main/java/org/nl/acs/autotask/CleanLog.java → acs/nladmin-system/src/main/java/org/nl/acs/autotask/CleanLog.java

0
nladmin-system/src/main/java/org/nl/acs/common/AbstractDriverService.java → acs/nladmin-system/src/main/java/org/nl/acs/common/AbstractDriverService.java

0
nladmin-system/src/main/java/org/nl/acs/common/IDriverService.java → acs/nladmin-system/src/main/java/org/nl/acs/common/IDriverService.java

0
nladmin-system/src/main/java/org/nl/acs/common/StandardCoveyorControlWithPlcScannerDevice.java → acs/nladmin-system/src/main/java/org/nl/acs/common/StandardCoveyorControlWithPlcScannerDevice.java

0
nladmin-system/src/main/java/org/nl/acs/common/StandardCoveyorControlWithScannerDevice.java → acs/nladmin-system/src/main/java/org/nl/acs/common/StandardCoveyorControlWithScannerDevice.java

0
nladmin-system/src/main/java/org/nl/acs/common/StandardInspectSiteDevice.java → acs/nladmin-system/src/main/java/org/nl/acs/common/StandardInspectSiteDevice.java

0
nladmin-system/src/main/java/org/nl/acs/common/StandardOrdinarySiteDevice.java → acs/nladmin-system/src/main/java/org/nl/acs/common/StandardOrdinarySiteDevice.java

0
nladmin-system/src/main/java/org/nl/acs/device.xls → acs/nladmin-system/src/main/java/org/nl/acs/device.xls

0
nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java → acs/nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/address/service/AddressService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/AddressService.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/address/service/dto/AddressDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/dto/AddressDto.java

0
nladmin-system/src/main/java/org/nl/acs/device/address/service/impl/AddressServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/impl/AddressServiceImpl.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/address/wql/sys_config.xls → acs/nladmin-system/src/main/java/org/nl/acs/device/address/wql/sys_config.xls

0
nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java → acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigDto.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigService.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigServiceImpl.java

0
nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java → acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/BaseDeviceDriver.java → acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/BaseDeviceDriver.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDto.java

0
nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java → acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemProtocol.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/OpcPlcDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/OpcPlcDto.java

0
nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ReadUtil.java → acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ReadUtil.java

0
nladmin-system/src/main/java/org/nl/acs/device/rest/AcsDeviceErpmappingController.java → acs/nladmin-system/src/main/java/org/nl/acs/device/rest/AcsDeviceErpmappingController.java

0
nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java → acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java

0
nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java → acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java

0
nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java → acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java

0
nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java → acs/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java

0
nladmin-system/src/main/java/org/nl/acs/device/rest/OpcController.java → acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcController.java

0
nladmin-system/src/main/java/org/nl/acs/device/rest/OpcPlcController.java → acs/nladmin-system/src/main/java/org/nl/acs/device/rest/OpcPlcController.java

0
nladmin-system/src/main/java/org/nl/acs/device/rest/StorageCellController.java → acs/nladmin-system/src/main/java/org/nl/acs/device/rest/StorageCellController.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/AcsDeviceErpmappingService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/AcsDeviceErpmappingService.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/DeviceExtraService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceExtraService.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/DeviceService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/DeviceService.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/OpcPlcService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/OpcPlcService.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/OpcService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/OpcService.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/StorageCellService.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/StorageCellService.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceDriverDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceDriverDto.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/dto/OpcDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/OpcDto.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/dto/OpcPlcDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/OpcPlcDto.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/dto/StorageCellDto.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/dto/StorageCellDto.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/impl/AcsDeviceErpmappingServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/AcsDeviceErpmappingServiceImpl.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

0
hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/ExportCSVUtil.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/ExportCSVUtil.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/impl/OpcPlcServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/OpcPlcServiceImpl.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/impl/OpcServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/OpcServiceImpl.java

0
nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java → acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java

0
nladmin-system/src/main/java/org/nl/acs/device/wql/QStage_01.wql → acs/nladmin-system/src/main/java/org/nl/acs/device/wql/QStage_01.wql

0
nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql → acs/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql

0
nladmin-system/src/main/java/org/nl/acs/device/wql/route.xls → acs/nladmin-system/src/main/java/org/nl/acs/device/wql/route.xls

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save