diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToMesServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToMesServiceImpl.java
index 4b2165d..80ebf17 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToMesServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToMesServiceImpl.java
@@ -44,7 +44,7 @@ public class AcsToMesServiceImpl implements AcsToMesService {
     @Override
     public HttpResponse taskFeedback(JSONObject whereJson) {
         //TODO:改成中鼎
-        String wmsUrl = "10.10.188.151:8098";
+        String wmsUrl = paramService.findByCode("mes_url").getValue();
         AddressDto addressDto = addressService.findByCode("feedMesAgvTaskStatus");
         String methods_url = addressDto.getMethods_url();
         String url = wmsUrl + methods_url;
@@ -66,7 +66,7 @@ public class AcsToMesServiceImpl implements AcsToMesService {
 
     @Override
     public HttpResponse taskDeprecate(JSONObject whereJson) {
-        String wmsUrl = "10.10.188.151:8098";
+        String wmsUrl = paramService.findByCode("mes_url").getValue();
         AddressDto addressDto = addressService.findByCode("acsCancelBack");
         String methods_url = addressDto.getMethods_url();
         String url = wmsUrl + methods_url;
@@ -88,7 +88,7 @@ public class AcsToMesServiceImpl implements AcsToMesService {
 
     @Override
     public HttpResponse deviceStatusUpdate(JSONObject whereJson) {
-        String wmsUrl = "10.10.188.151:8098";
+        String wmsUrl = paramService.findByCode("mes_url").getValue();
         AddressDto addressDto = addressService.findByCode("deviceStatusUpdate");
         String methods_url = addressDto.getMethods_url();
         String url = wmsUrl + methods_url;
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToZDWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToZDWmsServiceImpl.java
index c7dd484..b1a48a2 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToZDWmsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToZDWmsServiceImpl.java
@@ -45,7 +45,8 @@ public class AcsToZDWmsServiceImpl implements AcsToZDWmsService {
     @Override
     public HttpResponse taskFeedback(JSONObject whereJson) {
         //TODO:改成中鼎
-        String wmsUrl = "172.30.15.32:30010";
+        //String wmsUrl = "172.30.15.32:30010";
+        String wmsUrl = paramService.findByCode("wms_url").getValue();
         AddressDto addressDto = addressService.findByCode("feedZdAgvTaskStatus");
         String methods_url = addressDto.getMethods_url();
         String url = wmsUrl + methods_url;
@@ -67,7 +68,7 @@ public class AcsToZDWmsServiceImpl implements AcsToZDWmsService {
 
     @Override
     public HttpResponse taskDeprecate(JSONObject whereJson) {
-        String wmsUrl = "172.30.15.32:30010";
+        String wmsUrl = paramService.findByCode("wms_url").getValue();
         AddressDto addressDto = addressService.findByCode("acsCancelBack");
         String methods_url = addressDto.getMethods_url();
         String url = wmsUrl + methods_url;
@@ -89,7 +90,7 @@ public class AcsToZDWmsServiceImpl implements AcsToZDWmsService {
 
     @Override
     public HttpResponse deviceStatusUpdate(JSONObject whereJson) {
-        String wmsUrl = "172.30.15.32:30010";
+        String wmsUrl = paramService.findByCode("wms_url").getValue();
         AddressDto addressDto = addressService.findByCode("deviceStatusUpdate");
         String methods_url = addressDto.getMethods_url();
         String url = wmsUrl + methods_url;
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 7f15611..26a5e82 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -92,6 +92,8 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
     InstructionService instructionService;
     @Autowired
     StorageCellService storageCellService;
+    @Autowired
+    private TaskService taskService;
 
     @Override
     public void autoInitial() throws Exception {
@@ -1334,6 +1336,10 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
         } catch (Exception e) {
             acsTask.setRemark(e.getMessage());
         }
+        if (acsTask.getTask_status().equals("0")){
+            acsTask.setTask_status("1");
+            taskService.update(acsTask);
+        }
     }
 
     @Override
diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
index 4f0e6b3..33df3d9 100644
--- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
@@ -81,7 +81,7 @@ public class AutoCreateInst {
             }
             String start_point = acsTask.getStart_device_code();
             Device device = appService.findDeviceByCode(start_point);
-            if (StrUtil.equals(acsTask.getTask_type(), "1") && device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
+            if (StrUtil.equals(acsTask.getTask_type(), "1") && device != null &&device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
                 List<String> deviceCodes = ((StandardInspectSiteDeviceDriver) device.getDeviceDriver()).getExtraDeviceCodes("link_device_code");
                 if (ObjectUtil.isNotEmpty(deviceCodes)) {
                     String linkDeviceCode = deviceCodes.get(0);