rev 反馈中鼎wcs

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,11 +97,11 @@ public class QueryZDAgvTaskStatus {
 //                            if(responseCode == 0) {
 //                                log.info("请求ZDwcs成功，申请取货 请求结果{}",responseCode);
 //                            }
-                        }
+                        } else {
-                        if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
+                            if(StrUtil.equals(Type1,"定点任务")){
                                 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);
@@ -115,6 +117,7 @@ public class QueryZDAgvTaskStatus {
 //                                log.info("请求ZDwcs成功，申请取货 请求结果{}",responseCode);
 //                            }
                             }
+                        }
 
 
                     }