From 383c6139926563f02fba4432effbfc27f87d88c5 Mon Sep 17 00:00:00 2001 From: bfwms <1> Date: 星期三, 30 七月 2025 14:36:57 +0800 Subject: [PATCH] ERP对接 --- src/main/java/com/zy/asrs/entity/WrkDetl.java | 96 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 88 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java index 938969b..064e589 100644 --- a/src/main/java/com/zy/asrs/entity/WrkDetl.java +++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java @@ -2,8 +2,11 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.SpringUtils; +import com.zy.asrs.service.*; +import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; @@ -15,7 +18,7 @@ @Data @TableName("asr_wrk_detl") -public class WrkDetl implements Serializable { +public class WrkDetl implements Serializable, Cloneable { private static final long serialVersionUID = 1L; @@ -58,9 +61,9 @@ private String maktx; /** - * 鎵瑰彿 + * 搴忓垪鐮� */ - @ApiModelProperty(value= "鎵瑰彿") + @ApiModelProperty(value= "搴忓垪鐮�") private String batch; /** @@ -226,7 +229,7 @@ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚� */ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ") - private Integer check; + private Integer inspect; /** * 鍗遍櫓鍝� 1: 鏄� 0: 鍚� @@ -267,6 +270,21 @@ */ @ApiModelProperty(value= "澶囨敞") private String memo; + /** + * 鏄惁鍐荤粨 + */ + @ApiModelProperty(value= "鏄惁鍐荤粨") + private Integer frozen; + + /** + * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘 + */ + @ApiModelProperty(value= "涓婃灦鍖哄煙") + @TableField("mat_type") + private Integer matType; + + @ApiModelProperty(value= "瀹㈡埛淇℃伅ID") + private Long owner; public String getIoTime$(){ if (Cools.isEmpty(this.ioTime)){ @@ -287,6 +305,16 @@ } } + public String getOwner$(){ + LocOwnerService service = SpringUtils.getBean(LocOwnerService.class); + LocOwner locOwner = service.selectById(this.owner); + if (!Cools.isEmpty(locOwner)){ + return String.valueOf(locOwner.getOwner()); + } + return null; + } + + public String getSource$(){ if (null == this.source){ return null; } switch (this.source){ @@ -301,15 +329,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); } } @@ -357,4 +385,56 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } + public String getWrkSts$(){ + WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class); + if (!Cools.isEmpty(this.wrkNo)){ + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", this.wrkNo)); + if (!Cools.isEmpty(wrkMast)){ + return wrkMast.getWrkSts$(); + } + } + return null; + } + public String getIoType$(){ + WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class); + if (!Cools.isEmpty(this.wrkNo)){ + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", this.wrkNo)); + if (!Cools.isEmpty(wrkMast)){ + return wrkMast.getIoType$(); + } + } + return null; + } + + public void sync(Object source) { + Synchro.Copy(source, this); + } + + public String getMatType$() { + if (this.matType == null) { + return ""; + } + switch (this.matType) { + case 1: + return "鍗曞搧鍖�"; + case 2: + return "楂橀娣锋斁鍖�"; + case 3: + return "浣庨娣锋斁鍖�"; + default: + return ""; + } + } + + + @Override + public WrkDetl clone() { + try { + return (WrkDetl) super.clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + return null; + } + } -- Gitblit v1.9.1