zy-asrs.git - Gitblit

			@@ -1,13 +1,16 @@
			package com.zy.asrs.entity;

			import com.alibaba.excel.annotation.ExcelProperty;
			import com.baomidou.mybatisplus.annotations.TableField;
			import com.baomidou.mybatisplus.annotations.TableId;
			import com.baomidou.mybatisplus.annotations.TableName;
			import com.baomidou.mybatisplus.enums.IdType;
			import com.core.common.Cools;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			import org.springframework.format.annotation.DateTimeFormat;

			import java.text.SimpleDateFormat;
			import java.util.Date;

			@Data
			@@ -19,111 +22,175 @@

			//入库时间
			@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
			@TableField("pakin_time")
			private String pakinTime;
			private Date pakinTime;

			//批号
			@TableField("batch")
			private String batch;
			//主体
			@ExcelProperty(value = "主体")
			@TableField("owner")
			private String owner;

			//包装号
			@TableField("package_no")
			private String packageNo;
			//主体
			@ExcelProperty(value = "物资类别")
			@TableField("type")
			private String type;

			//牌号
			@TableField("brand")
			private String brand;

			//重量
			@TableField("weight")
			private Double weight;
			//生产订单编号
			@ExcelProperty(value = "生产订单编号")
			@TableField("pro_order_no")
			private String proOrderNo;

			//车间
			@ExcelProperty(value = "生产车间")
			@TableField("workshop")
			private String workshop;

			//生产线
			@ExcelProperty(value = "生产线")
			@TableField("line")
			private String line;

			//生产线
			@ExcelProperty(value = "存货编码")
			@TableField("matnr")
			private String matnr;

			//牌号
			@ExcelProperty(value = "牌号")
			@TableField("brand")
			private String brand;

			//批号
			@TableField("batch")
			@ExcelProperty(value = "批号")
			private String batch;

			//包装号
			@TableField("package_no")
			@ExcelProperty(value = "包装号")
			private String packageNo;

			//包装号
			@ExcelProperty(value = "生产日期")
			@TableField("pro_date")
			private String proDate;

			//重量
			@TableField("weight")
			@ExcelProperty(value = "重量")
			private Double weight;

			@ApiModelProperty(value= "单位")
			@ExcelProperty(value = "单位")
			@TableField("unit")
			private String unit;

			//包装类型
			@TableField("package_type")
			@ExcelProperty(value = "包装类型")
			private String packageType;

			//托盘类型
			@TableField("zpallet_type")
			@ExcelProperty(value = "托盘类型")
			private String zpalletType;

			//缠膜
			@TableField("film_wrap")
			@ExcelProperty(value = "缠膜")
			private String filmWrap;

			//熔指
			@TableField("finger_melting")
			@ExcelProperty(value = "熔指")
			private Double fingerMelting;

			//水分
			@TableField("water")
			@ExcelProperty(value = "水分")
			private Double water;

			//熔点
			@TableField("fusing_point")
			@ExcelProperty(value = "熔点")
			private Double fusingPoint;

			//挥发份1
			@TableField("vadf1")
			@ExcelProperty(value = "挥发份1")
			private Double vadf1;

			//挥发份2
			@TableField("vadf2")
			@ExcelProperty(value = "挥发份2")
			private Double vadf2;

			//黄度
			@TableField("yellowness")
			@ExcelProperty(value = "黄度")
			private Double yellowness;

			//不透明度
			@TableField("opacity")
			@ExcelProperty(value = "不透明度")
			private Double opacity;

			//水分
			@TableField("water")
			private Double water;

			//L值
			@TableField("l")
			@ExcelProperty(value = "l值")
			private Double l;

			//a值
			@TableField("a")
			@ExcelProperty(value = "a值")
			private Double a;

			//b值
			@TableField("b")
			@ExcelProperty(value = "b值")
			private Double b;

			//填充
			@TableField("fill_in")
			@ExcelProperty(value = "填充")
			private Double fillIn;

			//质量状态
			@TableField("mass_state")
			@ExcelProperty(value = "质量状体")
			private String massState;

			//质量问题
			@TableField("problem")
			@ExcelProperty(value = "备注")
			private String problem;

			//仓库
			@TableField("stash")
			private String stash;
			//应用方向
			@ExcelProperty(value = "应用方向")
			@TableField("direction")
			private String direction;

			//库位
			@TableField("loc_no")
			private String locNo;
			//存放位置
			@ExcelProperty(value = "存放位置")
			@TableField("position")
			private String position;

			//剩余重量
			@TableField("weight_anfme")
			@ExcelProperty(value = "入库量")
			private Double weightAnfme = 0.0;
			//待出库数量
			@TableField("qty_anfme")
			private Double qtyAnfme = 0.0;

			//仓库
			@TableField("stash")
			//@ExcelProperty(value = "仓库")
			private String stash;

			//库位
			@TableField("loc_no")
			//@ExcelProperty(value = "库位")
			private String locNo;

			//状态
			@TableField("status")
			@@ -168,4 +235,11 @@

			@TableField("memo")
			private String memo;

			public String getPakinTime$() {
			if (Cools.isEmpty(this.pakinTime)){
			return "";
			}
			return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pakinTime);
			}
			}