diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java index fb0b838..68a4ae8 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryZDAgvTaskStatus.java @@ -77,10 +77,12 @@ public class QueryZDAgvTaskStatus { TaskDto entity = taskService.findByCode(inst.getTask_code()); String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); String Type1=entity.getTask_type(); - if(StrUtil.equals(Type1,"定点任务")){ + + if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { + JSONObject jo = new JSONObject(); jo.put("taskCode",entity.getTask_code()); - jo.put("carId",""); + jo.put("carId",vehicle); jo.put("taskType ",entity.getTask_type()); jo.put("feedbackStatus","taking"); log.info("请求参数:{}",jo); @@ -95,25 +97,26 @@ public class QueryZDAgvTaskStatus { // if(responseCode == 0) { // log.info("请求ZDwcs成功,申请取货 请求结果{}",responseCode); // } - } - if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - JSONObject jo = new JSONObject(); - jo.put("taskCode",entity.getTask_code()); - jo.put("carId",""); - jo.put("taskType ",entity.getTask_type()); - jo.put("feedbackStatus","taking"); - log.info("请求参数:{}",jo); - try{ - HttpResponse result= acsToWmsZDService.taskFeedback(jo); - log.info("请求ZDwcs成功,反馈取货中 请求结果{}",result.body()); - } catch (Exception e) { - e.printStackTrace(); - } + } else { + if(StrUtil.equals(Type1,"定点任务")){ + JSONObject jo = new JSONObject(); + jo.put("taskCode",entity.getTask_code()); + jo.put("carId",vehicle); + jo.put("taskType ",entity.getTask_type()); + jo.put("feedbackStatus","taking"); + log.info("请求参数:{}",jo); + try{ + HttpResponse result= acsToWmsZDService.taskFeedback(jo); + log.info("请求ZDwcs成功,反馈取货中 请求结果{}",result.body()); + } catch (Exception e) { + e.printStackTrace(); + } // JSONObject response=JSONObject.parseObject(result.body()); // int responseCode= response.getInteger("responseCode"); // if(responseCode == 0) { // log.info("请求ZDwcs成功,申请取货 请求结果{}",responseCode); // } + } }