diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
index bf1e0d4..6fe8045 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java
@@ -497,7 +497,7 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De
             json.put("type", "3");
             JSONObject resp = acsToWmsService.apply(json);
             if (StrUtil.equals(resp.getString("status"), "200")) {
-                this.writing(8);
+                this.writing(6);
                 this.setCallMaterialRequireSucess(true);
                 logServer.deviceInfo("acs申请任务", this.getDevice_code(), "压机叫料任务申请成功!");
             }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 23b1df7..1dc07ff 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -321,9 +321,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         //如果是的话说明困料区来的 先去库存表查询对应的条码的物料信息 并将对应的物料信息保存在redis中
         if (StrUtil.equals(is_first, "true")) {
             JSONObject ivtJson = wo_ivt.query("vehicle_code = '" + barcode + "'").uniqueResult(0);
-            redisUtils.set(barcode, ivtJson.getString("material_id"));
-            redisUtils.set(barcode + "-ivt_qty", ivtJson.getString("ivt_qty"));
-            materialbaseDto = materialbaseService.findById(ivtJson.getLong("material_id"));
+            if (ObjectUtil.isNotEmpty(ivtJson)) {
+                redisUtils.set(barcode, ivtJson.getString("material_id"));
+                redisUtils.set(barcode + "-ivt_qty", ivtJson.getString("ivt_qty"));
+                materialbaseDto = materialbaseService.findById(ivtJson.getLong("material_id"));
+            }
         }
         Object redis_material_id = redisUtils.get(barcode);
         String material_id = ObjectUtil.isEmpty(redis_material_id) ? null : String.valueOf(redis_material_id);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java
index edc099e..27966c3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java
@@ -70,14 +70,14 @@ public class YljCallMaterialTask extends AbstractAcsTask {
             pointTab.update(jsonStart);
         }
 
-        if (StrUtil.equals(status, "1")) {
+        if (StrUtil.equals(status, TaskStatusEnum.EXECUTING.getCode())) {
             // 更新任务状态为执行中
             taskObj.put("task_status", TaskStatusEnum.EXECUTING.getCode());
             taskObj.put("update_time", DateUtil.now());
             taskTab.update(taskObj);
         }
 
-        if (StrUtil.equals(status, "2")) {
+        if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
 
             //判断状态,
             if (StrUtil.equals("2", taskObj.getString("task_status"))) {