From a2746876e81443d52bc4cb6f35bf8554741a6b4c Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 18 十月 2024 14:28:33 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 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 5b9a619..d85176d 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,7 +10,10 @@ 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; /** * 鏈堝彴_WMS浣滀笟閫氱煡鍗曡鏁版嵁 @@ -108,8 +112,21 @@ @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