zy-asrs.git - Gitblit

			@@ -5,6 +5,7 @@
			import com.baomidou.mybatisplus.annotations.TableName;
			import com.baomidou.mybatisplus.enums.IdType;
			import com.zy.asrs.service.*;
			import com.zy.asrs.utils.LocAliasUtils;
			import com.zy.system.entity.User;
			import com.zy.system.service.UserService;
			import com.core.common.Cools;
			@@ -70,6 +71,13 @@
			@ApiModelProperty(value= "堆垛机号")
			@TableField("crn_no")
			private Integer crnNo;

			/**
			* 库区：1=A区，2=B区，3=C区
			*/
			@ApiModelProperty(value= "库区")
			@TableField("area_id")
			private Integer areaId;

			@ApiModelProperty(value= "")
			@TableField("sheet_no")
			@@ -216,6 +224,10 @@
			@ApiModelProperty(value= "")
			@TableField("exp_time")
			private Double expTime;

			@ApiModelProperty(value= "耗时(分钟)")
			@TableField("cost_time")
			private Integer costTime;

			@ApiModelProperty(value= "")
			@TableField("ref_wrkno")
			@@ -401,6 +413,10 @@
			return null;
			}

			public String getAreaId$(){
			return LocAliasUtils.areaName(this.areaId);
			}

			public String getWrkDate$(){
			if (Cools.isEmpty(this.wrkDate)){
			return "";
			@@ -412,9 +428,9 @@
			LocMastService service = SpringUtils.getBean(LocMastService.class);
			LocMast locMast = service.selectById(this.locNo);
			if (!Cools.isEmpty(locMast)){
			return String.valueOf(locMast.getLocNo());
			return LocAliasUtils.displayLocNo(locMast);
			}
			return null;
			return this.locNo;
			}

			public String getStaNo$(){
			@@ -439,9 +455,9 @@
			LocMastService service = SpringUtils.getBean(LocMastService.class);
			LocMast locMast = service.selectById(this.sourceLocNo);
			if (!Cools.isEmpty(locMast)){
			return String.valueOf(locMast.getLocNo());
			return LocAliasUtils.displayLocNo(locMast);
			}
			return null;
			return this.sourceLocNo;
			}

			public String getIoTime$(){