From 79e603ec5550093b6401c781c3f0cde45b12396c Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期四, 28 十二月 2023 08:43:52 +0800 Subject: [PATCH] # --- zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java index bc060c1..f302516 100644 --- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java @@ -3,6 +3,7 @@ import java.text.SimpleDateFormat; import java.util.Date; +import com.zy.asrs.common.utils.Synchro; import com.zy.asrs.common.wms.service.LocMastService; import org.springframework.format.annotation.DateTimeFormat; import java.text.SimpleDateFormat; @@ -30,6 +31,10 @@ public class LocDetl implements Serializable { private static final long serialVersionUID = 1L; + + @ApiModelProperty(value= "") + @TableId(value = "id", type = IdType.AUTO) + private Long id; /** * 搴撲綅鍙� @@ -186,9 +191,15 @@ @ApiModelProperty(value= "澶囨敞") private String memo; + /** + * 鎺堟潈鍟嗘埛 + */ + @ApiModelProperty(value= "鎺堟潈鍟嗘埛") + private Long hostId; + public LocDetl() {} - public LocDetl(String locNo,String zpallet,Double anfme,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo) { + public LocDetl(String locNo,String zpallet,Double anfme,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) { this.locNo = locNo; this.zpallet = zpallet; this.anfme = anfme; @@ -227,6 +238,7 @@ this.appeUser = appeUser; this.appeTime = appeTime; this.memo = memo; + this.hostId = hostId; } // LocDetl locDetl = new LocDetl( @@ -267,7 +279,8 @@ // null, // 淇敼鏃堕棿 // null, // 鍒涘缓鑰� // null, // 娣诲姞鏃堕棿 -// null // 澶囨敞 +// null, // 澶囨敞 +// null // 鎺堟潈鍟嗘埛 // ); public String getLocNo$(){ @@ -311,5 +324,17 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } + public String getHostId$(){ + HostService service = SpringUtils.getBean(HostService.class); + Host host = service.getById(this.hostId); + if (!Cools.isEmpty(host)){ + return String.valueOf(host.getName()); + } + return null; + } + + public void sync(Object source) { + Synchro.Copy(source, this); + } } -- Gitblit v1.9.1