From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 14 十月 2025 16:34:22 +0800 Subject: [PATCH] 改bug --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java index f3b22db..e4ebc9b 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.dao.business.vo.WmsJobContractVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -9,6 +10,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -48,6 +51,9 @@ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") private Integer isdeleted; +// @ApiModelProperty(value = "浣滀笟鏉ユ簮锛�0鑷缓 1wms鎺ㄩ��", example = "1") +// @ExcelColumn(name="浣滀笟鏉ユ簮锛�0鑷缓 1wms鎺ㄩ��") +// private Integer origin; @ApiModelProperty(value = "澶囨敞") @ExcelColumn(name="澶囨敞") @@ -72,7 +78,9 @@ @ApiModelProperty(value = "鍙告満濮撳悕") @ExcelColumn(name="鍙告満濮撳悕") private String driverName; - + @ApiModelProperty(value = "鏀惰揣鍦�") + @ExcelColumn(name="鏀惰揣鍦�") + private String repertotyAddress; @ApiModelProperty(value = "鎵胯繍鍟�") @ExcelColumn(name="鎵胯繍鍟�") private String carrierName; @@ -102,18 +110,24 @@ @ExcelColumn(name="杞︾墝鍙�") private String plateNumber; - @ApiModelProperty(value = "鏀惰揣鍦�") - @ExcelColumn(name="鏀惰揣鍦�") - private String repertotyAddress; - @ApiModelProperty(value = "鍚堝悓鍙穈") @ExcelColumn(name="鍚堝悓鍙穈") private String contractNum; + @ApiModelProperty(value = "鏄惁鏂版暟鎹甡") @TableField(exist = false) private int isNew; + @ApiModelProperty(value = "鎬绘暟閲�") + @TableField(exist = false) + private BigDecimal ioQty; + + @ApiModelProperty(value = "鏈堝彴_WMS浣滀笟閫氱煡鍗曟槑缁�") @TableField(exist = false) private List<PlatformWmsDetail> platformWmsDetailList; + + @ApiModelProperty(value = "鍚堝悓鍒楄〃") + @TableField(exist = false) + private List<WmsJobContractVO> wmsJobContractVOList; } -- Gitblit v1.9.3