root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-08-22 10:18:20 +08:00
parent e395d856c7
commit 02b1236ce8
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java
View File

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