From f2830fa9a99dd5bb0bca1f540c5124004cd4516d Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期二, 20 二月 2024 15:15:05 +0800 Subject: [PATCH] bug修复 四项库作业数量重复 --- src/main/java/com/zy/asrs/entity/WrkDetl.java | 49 ++++++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 19 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..826af34 100644 --- a/src/main/java/com/zy/asrs/entity/WrkDetl.java +++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotations.TableName; import com.core.common.Cools; import com.core.common.SpringUtils; +import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; @@ -34,10 +35,16 @@ private Date ioTime; /** - * 鏁伴噺 + * 浣滀笟鏁伴噺 */ - @ApiModelProperty(value= "鏁伴噺") + @ApiModelProperty(value= "浣滀笟鏁伴噺") private Double anfme; + + /** + * 鎬诲簱瀛� + */ + @ApiModelProperty(value= "鎬诲簱瀛�") + private Double stock; /** * 鎵樼洏鏉$爜 @@ -48,19 +55,19 @@ /** * 鐗╂枡 */ - @ApiModelProperty(value= "鍟嗗搧缂栧彿") + @ApiModelProperty(value= "鐗╂枡鍙�") private String matnr; /** * 鐗╂枡鎻忚堪 */ - @ApiModelProperty(value= "鍟嗗搧鍚嶇О") + @ApiModelProperty(value= "鐗╂枡鍙�") private String maktx; /** - * 鎵瑰彿 + * 搴忓垪鐮� */ - @ApiModelProperty(value= "鎵瑰彿") + @ApiModelProperty(value= "搴忓垪鐮�") private String batch; /** @@ -77,9 +84,9 @@ private String specs; /** - * 鍨嬪彿 + * 鎵规 */ - @ApiModelProperty(value= "鍨嬪彿") + @ApiModelProperty(value= "鎵规") private String model; /** @@ -113,9 +120,9 @@ private String sku; /** - * 鍗曚綅閲� + * 鍖呮暟 */ - @ApiModelProperty(value= "鍗曚綅閲�") + @ApiModelProperty(value= "鍖呮暟") private Double units; /** @@ -125,9 +132,9 @@ private String barcode; /** - * 浜у湴 + * 鐗╂枡鐘舵�� */ - @ApiModelProperty(value= "浜у湴") + @ApiModelProperty(value= "鐗╂枡鐘舵��") private String origin; /** @@ -137,9 +144,9 @@ private String manu; /** - * 鐢熶骇鏃ユ湡 + * 鍗曟嵁鏃堕棿 */ - @ApiModelProperty(value= "鐢熶骇鏃ユ湡") + @ApiModelProperty(value= "鍗曟嵁鏃堕棿") @TableField("manu_date") private String manuDate; @@ -226,7 +233,7 @@ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚� */ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ") - private Integer check; + private Integer inspect; /** * 鍗遍櫓鍝� 1: 鏄� 0: 鍚� @@ -301,15 +308,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 +364,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