diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/timing/TimingSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/timing/TimingSendMaterialTask.java
index 1c6959a..f958794 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/timing/TimingSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/timing/TimingSendMaterialTask.java
@@ -94,13 +94,13 @@ public class TimingSendMaterialTask extends AbstractAcsTask {
         //更新任务状态为完成
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
             //判断状态,
-            if (StrUtil.equals("2", jsonTask.getString("task_status"))) {
-                // 更改任务状态为完成
-                jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
-                jsonTask.put("update_time", DateUtil.now());
-                taskTab.update(jsonTask);
-                return;
-            }
+//            if (StrUtil.equals("2", jsonTask.getString("task_status"))) {
+//                // 更改任务状态为完成
+//                jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
+//                jsonTask.put("update_time", DateUtil.now());
+//                taskTab.update(jsonTask);
+//                return;
+//            }
 
             //更改任务状态为完成
             jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode());
@@ -111,7 +111,7 @@ public class TimingSendMaterialTask extends AbstractAcsTask {
 
             MaterialbaseServiceImpl materialbaseService = SpringContextHolder.getBean(MaterialbaseServiceImpl.class);
             KlzhcwUtil klzhcwUtil = SpringContextHolder.getBean(KlzhcwUtil.class);
-            MaterialbaseDto materialbaseDto = materialbaseService.findById(Long.parseLong(jsonTask.getString("material_id")));
+            MaterialbaseDto materialbaseDto = materialbaseService.findById(jsonTask.getLong("material_id"));
             LinkedList<JSONObject> ll = MyLinkedListService.getLinkedList();
             JSONObject param = new JSONObject();
             param.put("vehicle_type", jsonTask.getString("vehicle_type"));
@@ -182,7 +182,7 @@ public class TimingSendMaterialTask extends AbstractAcsTask {
                 .task_code(CodeUtil.getNewCode("TASK_CODE"))
                 .task_name("定时任务生成空料盅区有料到困料区的任务")
                 .task_type("timing")
-                .task_status(TaskStatusEnum.SURE_END.getCode())
+                .task_status(TaskStatusEnum.START_AND_POINT.getCode())
                 .point_code1(point_code1)
                 .point_code2(point_code2)
                 .priority("1")
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
index 26a7f0c..da7d260 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ