diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java index b2f4096..754637b 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java @@ -457,24 +457,23 @@ public class MagicAgvServiceImpl implements MagicAgvService { lnshStationDeviceDriver.setFlag(3); is_feedback = true; } - } - } - if (addressdevice.getDeviceDriver() instanceof SpecialOrdinarySiteDeviceDriver) { - specialOrdinarySiteDeviceDriver = (SpecialOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver(); - //请求取货 - if ("Load".equals(action)) { - if (addressdevice.getHas_goods() > 0) { - inst.setExecute_status("1"); - is_feedback = true; - } - //请求放货 - } else if ("Unload".equals(action)) { - if (addressdevice.getHas_goods() == 0) { - inst.setExecute_status("3"); - is_feedback = true; + } else if ("NOP".equals(action)) { + //调用LMS接口 + if(StrUtil.isNotEmpty(lnshStationDeviceDriver.getBarcode())){ + JSONObject json = new JSONObject(); + json.put("device_code",address); + json.put("type","5"); + json.put("vehicle_code",lnshStationDeviceDriver.getBarcode()); + HttpResponse result = acsToWmsService.inKiln(json); + if (ObjectUtil.isNotEmpty(result)) { + JSONObject jsonObject = JSONObject.parseObject(result.body()); + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.get("status").toString(),"200")) { + inst.setExecute_status("3"); + is_feedback = true; + } + } } } - } if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver();