补充自编号订单货物列表卸柜/到仓时间返回值

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/dal/mysql/BoxPreloadGoodsMapper.java

@@ -84,6 +84,7 @@ public interface BoxPreloadGoodsMapper extends AbstractMapper<BoxPreloadGoodsDO>
             "eo.audit_type, ",
             "eo.audit_result, ",
             "eo.guan_lian_order_status, ",
+            "eo.unload_time, ",
             "eo.container_number, ",
             "eo.exception_reason, ",
             "eo.package_type as advance_type, ",

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxPreloadGoods/BoxLoadOrderVO.java

@@ -12,17 +12,22 @@ import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionBackVO;
 import cn.iocoder.yudao.module.order.vo.orderLocation.OrderLocationBackVO;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @Data
 @ApiModel("管理后台 - 装柜订单货物 Response VO")
 public class BoxLoadOrderVO {
@@ -39,6 +44,11 @@ public class BoxLoadOrderVO {
     @ApiModelProperty("报关方式类型")
     private Integer customsType;
 
+    @ApiModelProperty("卸柜/到仓时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date unloadTime;
+
     @ApiModelProperty(value = "始发仓名称")
     private String startWarehouseName;
 

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxPreloadGoods/BoxPreloadGoodsBackVO.java

@@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.order.vo.order.WarehouseInInfoVO;
 import cn.iocoder.yudao.module.order.vo.orderLocation.OrderLocationBackVO;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -58,6 +59,11 @@ public class BoxPreloadGoodsBackVO {
     @ApiModelProperty("订单编号")
     private String orderNo;
 
+    @ApiModelProperty("卸柜/到仓时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date unloadTime;
+
     @ApiModelProperty("运输方式ID")
     private Integer transportId;