From 64546c8c6fc373f18d35a0103be04626db5def0b Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Wed, 4 Feb 2026 20:47:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E9=97=B4=E6=8E=A5=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6bug=E4=BF=AE=E5=A4=8D=EF=BC=9B=202.?=
 =?UTF-8?q?=20=E6=8B=A3=E9=80=89=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=B9=E9=9D=9E=E8=A3=85=E8=BD=BD=E6=9C=BA?=
 =?UTF-8?q?=E4=B8=94=E9=9D=9E=E5=B9=B3=E5=9C=B0=E6=9C=BA=E7=9A=84=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BD=9C=E4=BA=86=E5=8C=BA=E5=88=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/wms/controller/TaskController.java   |  7 ++++++-
 .../com/wms/utils/excel/vo/PickTaskRecordExcelVo.java  | 10 ++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

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 {