diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index 6394525..f433d88 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -178,10 +178,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { if (!ObjectUtil.isEmpty(inst)) { instructionService.finish(inst.getInstruction_id()); } else { - log.warn("指令号:{},未反馈wms任务完成,因为agv上报指令号查询指令为空!", inst.getInstruction_code()); + log.warn("指令号:{},未反馈wms任务完成,因为agv上报指令号查询指令为空!", ikey); } data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - log.info("指令号:{},已反馈agv任务完成!", inst.getInstruction_code()); + log.info("指令号:{},已反馈agv任务完成!", ikey); } //进入交通灯区域 else if (phase == 0x50) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index a9dbb5f..2c3ea2f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -571,7 +571,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { result = HttpRequest.post(url) .header("Content-Type", "application/json;charset=UTF-8") .header("Authorization", String.valueOf(redisUtils.get("wms_token"))) - .body(JSON.toJSONString(from)) + .body(JSON.toJSONString(map)) .timeout(3000) .execute(); log.info("反馈WMS AGV取放货状态成功,请求路径:{},请求结果:{}", url, result.body());