From 941bf6ff9bb24315dce4b9e39fb370b9fa766842 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期二, 18 二月 2025 12:35:35 +0800 Subject: [PATCH] 兼容四期 --- src/main/java/com/zy/asrs/entity/WaitPakin.java | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java index c295716..ea7f6351 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakin.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.core.common.Cools; +import com.zy.common.utils.Synchro; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +17,7 @@ private static final long serialVersionUID = 1L; - @ApiModelProperty(value= "鎵樼洏鏉$爜") + @ApiModelProperty(value= "璐ф灦鏉$爜") private String zpallet; @ApiModelProperty(value= "鏁伴噺") @@ -26,13 +27,13 @@ @TableField("loc_no") private String locNo; - @ApiModelProperty(value= "鍟嗗搧缂栧彿") + @ApiModelProperty(value= "鐗╂枡鍙�") private String matnr; - @ApiModelProperty(value= "鍟嗗搧鍚嶇О") + @ApiModelProperty(value= "鐗╂枡鍙�") private String maktx; - @ApiModelProperty(value= "鎵瑰彿") + @ApiModelProperty(value= "搴忓垪鐮�") private String batch; @ApiModelProperty(value= "鍗曟嵁缂栧彿") @@ -42,7 +43,7 @@ @ApiModelProperty(value= "瑙勬牸") private String specs; - @ApiModelProperty(value= "鍨嬪彿") + @ApiModelProperty(value= "鎵规") private String model; @ApiModelProperty(value= "棰滆壊") @@ -60,19 +61,19 @@ @ApiModelProperty(value= "sku") private String sku; - @ApiModelProperty(value= "鍗曚綅閲�") + @ApiModelProperty(value= "鍖呮暟") private Double units; @ApiModelProperty(value= "鏉$爜") private String barcode; - @ApiModelProperty(value= "浜у湴") + @ApiModelProperty(value= "鐗╂枡鐘舵��") private String origin; @ApiModelProperty(value= "鍘傚") private String manu; - @ApiModelProperty(value= "鐢熶骇鏃ユ湡") + @ApiModelProperty(value= "鍗曟嵁鏃堕棿") @TableField("manu_date") private String manuDate; @@ -120,7 +121,7 @@ private Integer source; @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ") - private Integer check; + private Integer inspect; @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ") private Integer danger; @@ -177,15 +178,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); } } @@ -215,4 +216,7 @@ 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