diff --git a/hd/README.en.md b/hd/README.en.md index 77b90dd..85bda5f 100644 --- a/hd/README.en.md +++ b/hd/README.en.md @@ -1,4 +1,4 @@ -# sh_wcs +# whxr_acs #### Description {**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} diff --git a/hd/README.md b/hd/README.md index 8c53447..9475211 100644 --- a/hd/README.md +++ b/hd/README.md @@ -1,2 +1,2 @@ -# sh_wcs +# whxr_acs diff --git a/hd/nladmin-system/pom.xml b/hd/nladmin-system/pom.xml index e13ce6e..52578e7 100644 --- a/hd/nladmin-system/pom.xml +++ b/hd/nladmin-system/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - sh_wcs + whxr_acs org.nl 1.0-SNAPSHOT diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/whxr/whxr_storage_conveyor/StorageConveyorDefination.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/whxr/whxr_storage_conveyor/StorageConveyorDefination.java index 3f75392..388440d 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/whxr/whxr_storage_conveyor/StorageConveyorDefination.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/whxr/whxr_storage_conveyor/StorageConveyorDefination.java @@ -43,7 +43,7 @@ public class StorageConveyorDefination implements DeviceDriverDefination { @Override public List getFitDeviceTypes() { List types = new LinkedList(); - types.add(DeviceType.storage); + types.add(DeviceType.conveyor); return types; } } diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/ext/xr_lk/service/impl/AcsToXRlkServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/ext/xr_lk/service/impl/AcsToXRlkServiceImpl.java index 5386d37..1f7bdcc 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/ext/xr_lk/service/impl/AcsToXRlkServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/ext/xr_lk/service/impl/AcsToXRlkServiceImpl.java @@ -4,12 +4,15 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import net.sf.json.JSON; +import net.sf.json.JSONObject; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; import org.nl.acs.device.address.service.AddressService; import org.nl.acs.device.address.service.dto.AddressDto; import org.nl.acs.device.service.DeviceService; import org.nl.acs.ext.xr_lk.service.AcsToXrlkService; +import org.nl.acs.log.service.LogServer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,21 +30,27 @@ public class AcsToXRlkServiceImpl implements AcsToXrlkService { @Autowired AddressService addressService; + private final LogServer logServer; + @Override public HttpResponse invokeDoor(String device_code) { String wcsurl = acsConfigService.findConfigFromCache().get(AcsConfig.ERPURL); AddressDto addressDto = addressService.findByCode("invokeDoor"); String url = wcsurl + addressDto.getMethods_url() + device_code; HttpResponse result = null; + log.info("invokeDoor-----请求url{}",url); + try { //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} result = HttpRequest.get(url) .execute(); + log.info("invokeDoor-----反馈{}", result); System.out.println(result); } catch (Exception e) { String msg = e.getMessage(); //网络不通 System.out.println(msg); + } return result; } @@ -52,10 +61,14 @@ public class AcsToXRlkServiceImpl implements AcsToXrlkService { AddressDto addressDto = addressService.findByCode("isPutPermission"); String url = wcsurl + addressDto.getMethods_url() + device_code; HttpResponse result = null; + log.info("isPutPermission-----请求url{}",url); + try { //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} + result = HttpRequest.get(url) .execute(); + log.info("isPutPermission-----反馈{}", result); System.out.println(result); } catch (Exception e) { String msg = e.getMessage(); @@ -71,11 +84,14 @@ public class AcsToXRlkServiceImpl implements AcsToXrlkService { AddressDto addressDto = addressService.findByCode("isTakePermission"); String url = wcsurl + addressDto.getMethods_url() + device_code; HttpResponse result = null; + log.info("isTakePermission-----请求url{}",url); + try { //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} result = HttpRequest.get(url) .execute(); System.out.println(result); + log.info("isTakePermission-----反馈{}", result); } catch (Exception e) { String msg = e.getMessage(); //网络不通 @@ -90,11 +106,18 @@ public class AcsToXRlkServiceImpl implements AcsToXrlkService { AddressDto addressDto = addressService.findByCode("AGVWorkStatus"); String url = wcsurl + addressDto.getMethods_url(); HttpResponse result = null; + JSONObject jo = new JSONObject(); + jo.put("station",device_code); + jo.put("type",type); + log.info("AGVWorkStatus-----请求参数{}", jo.toString()); + try { //{"status":400,"timestamp":"2021-10-22 16:32:22","message":"业务类型不正确!"} - result = HttpRequest.get(url) + result = HttpRequest.post(url).body(String.valueOf(jo)) .execute(); System.out.println(result); + log.info("AGVWorkStatus-----反馈{}", result); + } catch (Exception e) { String msg = e.getMessage(); //网络不通 diff --git a/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index abeb7f5..7511df9 100644 --- a/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -882,7 +882,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { HttpResponse response = acsToXrlkService.isTakePermission(device.getDevice_code()); if (response.getStatus() == 200) { JSONObject jo = JSONObject.fromObject(response.body()); - if (StrUtil.equals(jo.get("signal").toString(), "1")) { + if (StrUtil.equals(jo.get("result").toString(), "1")) { data = AgvService.sendAgvOneModeInst(phase, index, 0); } else { log.info("AGV请求取货设备{},立库WMS不允许取货", device_code); @@ -1103,7 +1103,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { HttpResponse response = acsToXrlkService.isPutPermission(device.getDevice_code()); if (response.getStatus() == 200) { JSONObject jo = JSONObject.fromObject(response.body()); - if (StrUtil.equals(jo.get("signal").toString(), "1")) { + if (StrUtil.equals(jo.get("result").toString(), "1")) { data = AgvService.sendAgvOneModeInst(phase, index, 0); } else { log.info("AGV请求放货设备{},立库WMS不允许放货", device_code); diff --git a/hd/nladmin-system/src/main/resources/log/AcsToLKWms.xml b/hd/nladmin-system/src/main/resources/log/AcsToLKWms.xml new file mode 100644 index 0000000..0900fcb --- /dev/null +++ b/hd/nladmin-system/src/main/resources/log/AcsToLKWms.xml @@ -0,0 +1,32 @@ + + + + + + + + + ${LOG_HOME}/ACS请求立库WMS/%d{yyyy-MM-dd}.%i.log + + 15 + + 200MB + + 2GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + + + + + + + + + + diff --git a/hd/nladmin-system/src/main/resources/logback-spring.xml b/hd/nladmin-system/src/main/resources/logback-spring.xml index c7560f2..7030f9f 100644 --- a/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -26,6 +26,7 @@ https://juejin.cn/post/6844903775631572999 + @@ -66,7 +67,7 @@ https://juejin.cn/post/6844903775631572999 - + diff --git a/hd/pom.xml b/hd/pom.xml index 7a6cbe2..14e5845 100644 --- a/hd/pom.xml +++ b/hd/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.nl - sh_wcs + whxr_acs pom 1.0-SNAPSHOT 开发平台 diff --git a/hd/test.txt b/hd/test.txt deleted file mode 100644 index e69de29..0000000