wms-master.git - Gitblit

			@@ -5,7 +5,11 @@
			import java.text.SimpleDateFormat;
			import java.util.Date;

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.vincent.rsf.server.system.constant.DictTypeCode;
			import com.vincent.rsf.server.system.entity.DictData;
			import com.vincent.rsf.server.system.service.DictDataService;
			import lombok.experimental.Accessors;
			import org.springframework.format.annotation.DateTimeFormat;

			@@ -17,6 +21,7 @@
			import com.vincent.rsf.server.system.entity.User;
			import java.io.Serializable;
			import java.util.Map;
			import java.util.Objects;

			@Data
			@Accessors(chain = true)
			@@ -102,6 +107,12 @@
			@ApiModelProperty(value= "物料名称")
			private String maktx;

			@ApiModelProperty("规格")
			private String spec;

			@ApiModelProperty("型号")
			private String model;

			/**
			* 送货数量
			*/
			@@ -183,13 +194,34 @@
			private Integer ntyStatus;

			/**
			* 状态 1: 正常 0: 冻结
			* 质检结果
			*/
			@ApiModelProperty("质检结果")
			private Short isptResult;

			/**
			* 质检状态
			*/
			@ApiModelProperty("质检状态")
			private Short isptStatus;


			@ApiModelProperty("合格数量")
			@TableField(exist = false)
			private Double safeQty;

			@ApiModelProperty("不合格数量")
			@TableField(exist = false)
			private Double disQty;

			/**
			* 状态 1: 正常 0: 冻结
			*/
			@ApiModelProperty(value= "状态 1: 正常 0: 冻结 ")
			private Integer status;

			/**
			* 是否删除 1: 是 0: 否
			* 是否删除 1: 是 0: 否
			*/
			@ApiModelProperty(value= "是否删除 1: 是 0: 否 ")
			private Integer deleted;
			@@ -350,4 +382,18 @@
			}
			}

			public String getIsptResult$(){
			if (Cools.isEmpty(this.isptResult)){
			return null;
			}
			DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
			DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
			.eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
			.eq(DictData::getValue, this.isptResult));
			if (Objects.isNull(dictData)) {
			return null;
			}
			return dictData.getLabel();
			}

			}