From 5f6dbe95bb56f30ccd7acb98282d486e5ed2afd8 Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期四, 26 六月 2025 17:33:39 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/LocDetl.java | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java index bd7eab3..e5f1fb3 100644 --- a/src/main/java/com/zy/asrs/entity/LocDetl.java +++ b/src/main/java/com/zy/asrs/entity/LocDetl.java @@ -7,6 +7,7 @@ import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.asrs.service.LocMastService; +import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; @@ -52,6 +53,7 @@ private String orderNo; @ApiModelProperty(value= "瑙勬牸") + @ExcelProperty("瑙勬牸") private String specs; @ApiModelProperty(value= "鍨嬪彿") @@ -60,7 +62,8 @@ @ApiModelProperty(value= "棰滆壊") private String color; - @ApiModelProperty(value= "鍝佺墝") + @ApiModelProperty(value= "绫诲瀷") +// @ApiModelProperty(value= "鍝佺墝") private String brand; @ApiModelProperty(value= "鍗曚綅") @@ -132,7 +135,7 @@ private Integer source; @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ") - private Integer check; + private Integer inspect; @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ") private Integer danger; @@ -155,6 +158,10 @@ @ApiModelProperty(value= "澶囨敞") private String memo; + + @ApiModelProperty(value= "bom鍙�") + @TableField("bom_code") + private String bomCode; public String getLocNo$(){ LocMastService service = SpringUtils.getBean(LocMastService.class); @@ -191,15 +198,15 @@ } } - public String getCheck$(){ - if (null == this.check){ return null; } - switch (this.check){ + public String getInspect$(){ + if (null == this.inspect){ return null; } + switch (this.inspect){ case 1: return "鏄�"; case 0: return "鍚�"; default: - return String.valueOf(this.check); + return String.valueOf(this.inspect); } } @@ -231,7 +238,6 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime); } - public String getAppeUser$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.appeUser); @@ -248,4 +254,8 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } + public void sync(Object source) { + Synchro.Copy(source, this); + } + } -- Gitblit v1.9.1