From 17eb62f9d9cb2706296ea35f241dd8aafbebd6f2 Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期日, 12 十一月 2023 05:17:08 +0800 Subject: [PATCH] Changes11 --- mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 98 insertions(+), 22 deletions(-) diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java index e0d9546..e1bc30e 100644 --- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java +++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Part.java @@ -17,6 +17,7 @@ package com.chinaztt.mes.basic.entity; +import cn.hutool.core.annotation.Alias; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; @@ -84,37 +85,49 @@ @Unique @ApiModelProperty(value = "闆朵欢鍙�") @NonNull + @Alias("闆朵欢鍙�") private String partNo; + /** * 鍚嶇О */ - @ApiModelProperty(value = "鍚嶇О") + @Alias("姝e湪浣跨敤涓殑闆朵欢鎻忚堪") private String partName; - /** - * 鍚嶇О - */ - @ApiModelProperty(value = "妫�娴嬭鍒檌d") - private Long testRuleId; - /** - * 闆朵欢绫诲瀷 - */ - @ApiModelProperty(value = "闆朵欢绫诲瀷") - private String materialType; - /** - * 鍗曚綅 - */ - @ApiModelProperty(value = "鍗曚綅") - private String unit; - /** - * 鍗曚綅2 - */ - @ApiModelProperty(value = "鍗曚綅2") - private String sunit; + /** * 鎻忚堪 */ - @ApiModelProperty(value = "鎻忚堪") + @Alias("闆朵欢鎻忚堪") private String description; + + /** + * 闆朵欢绫诲瀷 + */ + @Alias("闆朵欢绫诲瀷") + private String materialType; + /** + * 妫�娴嬭鍒檌d + */ + @ApiModelProperty(value = "妫�娴嬭鍒檌d") + private Long testRuleId; + + /** + * 鍗曚綅 + */ + @Alias("搴撳瓨璁¢噺鍗曚綅") + private String unit; + + + /** + * 鍗曚綅2 + */ + @Alias("閲嶉噺璁¢噺鍗曚綅") + private String sunit; + + + @Alias("鐜版湁鏁伴噺") + private String totalNum; + /** * 鍘熷厛鐨勫搧绫� 鐜板湪鏀逛负 涓�绾у垎绫� */ @@ -192,6 +205,7 @@ * P锛氳櫄鎷熼浂浠惰鍒掋�傛棤闇�闄勫姞瀛楁 */ @ApiModelProperty(value = "璁″垝鏂规硶") + @Alias("闆朵欢鐘舵��") private String planningMethod; /** * 鐗规��1 @@ -240,4 +254,66 @@ @ApiModelProperty(value = "鏄惁鍘熸潗鏂欐") private Integer testRuleType; + + @Alias("鍩�") + private String domainNo; + + @Alias("鍩熸弿杩�") + private String domainName; + + @Alias("鏄惁璁惧澶囦欢") + private String isEquipment; + + @Alias("璧勪骇绛夌骇") + private String assets; + + @Alias("璧勪骇绫诲埆") + private String assetsType; + + @Alias("鐗╄祫鐘舵��") + private String suppliesType; + + @Alias("ABC 绫�") + private String abcType; + + @Alias("棰戠巼绾у埆") + private String hz; + + @Alias("澹版槑鍛ㄦ湡") + private String cycle; + + @Alias("浣撶Н璁¢噺鍗曚綅") + private String volume; + + @Alias("鐜版湁鑾峰彇鏁伴噺") + private String getNum; + + @Alias("榛樿鐨勭墿鏂欑敵璇蜂緵搴�") + private String defaultMr; + + @Alias("DOP 杩炴帴") + private String dopR; + + @Alias("鍑�棰濅氦鏄�") + private String netto; + + @Alias("鏁伴噺璁$畻鍙栨暣") + private String numCount; + + @Alias("搴撳瓨浼颁环鏂规硶") + private String ivm; + + @Alias("搴撳瓨浠舵垚鏈眰") + private String icl; + + @Alias("渚涘簲鍟嗗彂绁ㄤ簨椤�") + private String sii; + + @Alias("闆舵垚鏈�") + private String zc; + + @Alias("澶栭儴鏈嶅姟鎴愭湰鐨勬柟娉�") + private String esca; + + } -- Gitblit v1.9.3