diff --git a/src/main/java/com/wms/controller/TaskController.java b/src/main/java/com/wms/controller/TaskController.java
index e2c0f60..bcaed84 100644
--- a/src/main/java/com/wms/controller/TaskController.java
+++ b/src/main/java/com/wms/controller/TaskController.java
@@ -2052,6 +2052,7 @@ public class TaskController {
                     .eq(Vehicle::getVehicleStatus, VehicleStatus.ON.getCode())
                     .orderByAsc(Vehicle::getLastInTime)
                     .last("limit " + needNum);
+
             if (Objects.equals(callEmptyVehicleRequest.getVehicleType2(), "间接物料")) {
                 if (StringUtils.isEmpty(callEmptyVehicleRequest.getGoodsId())) {
                     logger.error("间接物料必须输入物料号");
@@ -2094,7 +2095,11 @@ public class TaskController {
                 emptyVehicleTask.setVehicleSize(1);
                 emptyVehicleTask.setCreateTime(LocalDateTime.now());
                 emptyVehicleTask.setUserName(callEmptyVehicleRequest.getUserName());
-                emptyVehicleTask.setIsPicking(0);
+                if (Objects.equals(callEmptyVehicleRequest.getVehicleType2(), "间接物料")) {
+                    emptyVehicleTask.setIsPicking(1);
+                } else {
+                    emptyVehicleTask.setIsPicking(0);
+                }
                 vehicleOutTasks.add(emptyVehicleTask);
                 // 出库料箱表
                 outVehicleIds.add(emptyVehicle.getVehicleId());
diff --git a/src/main/java/com/wms/utils/excel/vo/PickTaskRecordExcelVo.java b/src/main/java/com/wms/utils/excel/vo/PickTaskRecordExcelVo.java
index b9d9a84..ddf46a9 100644
--- a/src/main/java/com/wms/utils/excel/vo/PickTaskRecordExcelVo.java
+++ b/src/main/java/com/wms/utils/excel/vo/PickTaskRecordExcelVo.java
@@ -1,7 +1,5 @@
 package com.wms.utils.excel.vo;
 
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.wms.constants.enums.PickTaskStatusEnum;
@@ -85,8 +83,12 @@ public class PickTaskRecordExcelVo {
         pickTaskRecordExcelVo.setPickStatus(PickTaskStatusEnum.getValueByCode(pickTaskRecord.getPickStatus()));
         pickTaskRecordExcelVo.setLastUpdateTime(pickTaskRecord.getLastUpdateTime());
         pickTaskRecordExcelVo.setArriveTime(pickTaskRecord.getArriveTime());
-        pickTaskRecordExcelVo.setMachineType(Objects.equals(pickTaskRecord.getMachineType(), 1) ? "装载机" : "平地机");
-        pickTaskRecordExcelVo.setAreaType(Objects.equals(pickTaskRecord.getAreaType(), 1) ? "前" : "后");
+        if (pickTaskRecord.getMachineType() != null) {
+            pickTaskRecordExcelVo.setMachineType(Objects.equals(pickTaskRecord.getMachineType(), 1) ? "装载机" : "平地机");
+        }
+        if (pickTaskRecord.getAreaType() != null) {
+            pickTaskRecordExcelVo.setAreaType(Objects.equals(pickTaskRecord.getAreaType(), 1) ? "前" : "后");
+        }
         if (pickTaskRecord.getArriveTime() != null && pickTaskRecord.getLastUpdateTime() != null) {
             pickTaskRecordExcelVo.setUseTime(StringUtils.durationFormat(pickTaskRecord.getArriveTime().until(pickTaskRecord.getLastUpdateTime(), ChronoUnit.SECONDS)));
         } else {