From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java | 259 +++++++++++++++++++++++++++++++--------------------
1 files changed, 157 insertions(+), 102 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java
index 9019a9a..b5f4655 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePart.java
@@ -1,162 +1,217 @@
package org.jeecg.modules.spare.entity;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecg.modules.spare.vo.AuxiliaryUnitVo;
-import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
/**
* @Description: mom_eam_spare_part
* @Author: jeecg-boot
- * @Date: 2023-06-20
+ * @Date: 2023-06-20
* @Version: V1.0
*/
@Data
@TableName("mom_eam_spare_part")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mom_eam_spare_part瀵硅薄", description="mom_eam_spare_part")
+@ApiModel(value = "mom_eam_spare_part瀵硅薄", description = "mom_eam_spare_part")
public class SparePart extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**澶囦欢鍒嗙被id*/
- @Excel(name = "澶囦欢鍒嗙被id", width = 15)
+ /**
+ * 澶囦欢鍒嗙被id
+ */
@ApiModelProperty(value = "澶囦欢鍒嗙被id")
- private String sparePartCategoryId;
- /**澶囦欢缂栫爜*/
- @Excel(name = "澶囦欢缂栫爜", width = 15)
+ private java.lang.String sparePartCategoryId;
+ /**
+ * 澶囦欢缂栫爜
+ */
+ @Excel(name = "澶囦欢缂栫爜", width = 15)
@ApiModelProperty(value = "澶囦欢缂栫爜")
- private String num;
- /**澶囦欢鍚嶇О*/
- @Excel(name = "澶囦欢鍚嶇О", width = 15)
+ private java.lang.String num;
+ /**
+ * 澶囦欢鍚嶇О
+ */
+ @Excel(name = "澶囦欢鍚嶇О", width = 15)
@ApiModelProperty(value = "澶囦欢鍚嶇О")
- private String name;
- /**鐘舵�� 0 绂佺敤 1 鍚敤*/
- @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
+ private java.lang.String name;
+ /**
+ * 鐘舵�� 0 绂佺敤 1 鍚敤
+ */
+ @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
@ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
- private String status = CommonConstant.STATUS_1;
- /**鍨嬪彿*/
- @Excel(name = "鍨嬪彿", width = 15)
+ private java.lang.String status = CommonConstant.STATUS_1;
+ /**
+ * 鍨嬪彿
+ */
+ @Excel(name = "鍨嬪彿", width = 15)
@ApiModelProperty(value = "鍨嬪彿")
- private String model;
- /**瑙勫垯*/
- @Excel(name = "瑙勫垯", width = 15)
+ private java.lang.String model;
+ /**
+ * 瑙勫垯
+ */
+ @Excel(name = "瑙勫垯", width = 15)
@ApiModelProperty(value = "瑙勫垯")
- private String specification;
- /**鍒堕�犲晢*/
- @Excel(name = "鍒堕�犲晢", width = 15)
+ private java.lang.String specification;
+ /**
+ * 鍒堕�犲晢
+ */
+
+ @Excel(name = "鍒堕�犲晢", width = 25, dictTable = "mom_base_constructor", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "鍒堕�犲晢")
- @Dict(dicCode = "id",dictTable="mom_base_constructor",dicText="name")
- private String constructorId;
- /**涓诲崟浣峣d*/
- @Excel(name = "涓诲崟浣峣d", width = 15)
+ @Dict(dicCode = "id", dictTable = "mom_base_constructor", dicText = "name")
+ private java.lang.String constructorId;
+
+ /**
+ * 涓诲崟浣峣d
+ */
+ @Excel(name = "涓诲崟浣�", width = 15, dicCode = "id", dictTable = "mom_base_unit", dicText = "name")
@ApiModelProperty(value = "涓诲崟浣峣d")
- @Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
- private String mainUnitId;
- /**杈呭崟浣峣d*/
- @Excel(name = "杈呭崟浣峣d", width = 15)
+ @Dict(dicCode = "id", dictTable = "mom_base_unit", dicText = "name")
+ private java.lang.String mainUnitId;
+ /**
+ * 杈呭崟浣峣d
+ */
+
@ApiModelProperty(value = "杈呭崟浣峣d")
- @Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
- private String auxiliaryUnitId;
+ @Dict(dicCode = "id", dictTable = "mom_base_unit", dicText = "name")
+ private java.lang.String auxiliaryUnitId;
- /**鎹㈢畻姣斾緥*/
- @Excel(name = "鎹㈢畻姣斾緥", width = 15)
+ /**
+ * 鎹㈢畻姣斾緥
+ */
@ApiModelProperty(value = "鎹㈢畻姣斾緥")
- private String conversionRatio;
+ private java.lang.String conversionRatio;
- /**鎵规绠＄悊鏍囪瘑*/
- @Excel(name = "鎵规绠＄悊鏍囪瘑", width = 15)
+ /**
+ * 鎵规绠＄悊鏍囪瘑
+ */
+ @Excel(name = "鎵规绠＄悊鏍囪瘑", width = 15)
@ApiModelProperty(value = "鎵规绠＄悊鏍囪瘑")
- private Integer batchManagedFlag;
- /**鏈夋晥鏈熺鐞嗘爣璇�*/
- @Excel(name = "鏈夋晥鏈熺鐞嗘爣璇�", width = 15)
+ private java.lang.Integer batchManagedFlag;
+ /**
+ * 鏈夋晥鏈熺鐞嗘爣璇�
+ */
+ @Excel(name = "鏈夋晥鏈熺鐞嗘爣璇�", width = 15)
@ApiModelProperty(value = "鏈夋晥鏈熺鐞嗘爣璇�")
- private Integer validityManagedFlag;
- /**鏈夋晥鏈�*/
- @Excel(name = "鏈夋晥鏈�", width = 15)
+ private java.lang.Integer validityManagedFlag;
+ /**
+ * 鏈夋晥鏈�
+ */
+ @Excel(name = "鏈夋晥鏈�", width = 15)
@ApiModelProperty(value = "鏈夋晥鏈�")
- private Integer validityPeriod;
- /**鏈夋晥鏈熷崟浣�*/
- @Excel(name = "鏈夋晥鏈熷崟浣�", width = 15)
+ private java.lang.Integer validityPeriod;
+ /**
+ * 鏈夋晥鏈熷崟浣�
+ */
+ @Excel(name = "鏈夋晥鏈熷崟浣�", width = 15, dictTable = "mom_base_unit", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "鏈夋晥鏈熷崟浣�")
- @Dict(dicCode = "id",dictTable="mom_base_unit",dicText="name")
- private String validityPeriodUnitId;
- /**搴撳瓨涓婇檺鍒�*/
- @Excel(name = "搴撳瓨涓婇檺鍒�", width = 15)
+ @Dict(dicCode = "id", dictTable = "mom_base_unit", dicText = "name")
+ private java.lang.String validityPeriodUnitId;
+ /**
+ * 搴撳瓨涓婇檺鍒�
+ */
+ @Excel(name = "搴撳瓨涓婇檺鍒�", width = 15)
@ApiModelProperty(value = "搴撳瓨涓婇檺鍒�")
- private Integer inventoryUpperLimit;
- /**搴撳瓨涓嬮檺鍒�*/
- @Excel(name = "搴撳瓨涓嬮檺鍒�", width = 15)
+ private java.lang.Integer inventoryUpperLimit;
+ /**
+ * 搴撳瓨涓嬮檺鍒�
+ */
+ @Excel(name = "搴撳瓨涓嬮檺鍒�", width = 15)
@ApiModelProperty(value = "搴撳瓨涓嬮檺鍒�")
- private Integer inventoryLowerLimit;
- /**搴撳瓨棰勮涓嬮檺*/
- @Excel(name = "搴撳瓨棰勮涓嬮檺", width = 15)
+ private java.lang.Integer inventoryLowerLimit;
+ /**
+ * 搴撳瓨棰勮涓嬮檺
+ */
+ @Excel(name = "搴撳瓨棰勮涓嬮檺", width = 15)
@ApiModelProperty(value = "搴撳瓨棰勮涓嬮檺")
- private Integer inventoryWarnLimit;
- /**缁忔祹璁㈣揣閲�*/
- @Excel(name = "缁忔祹璁㈣揣閲�", width = 15)
+ private java.lang.Integer inventoryWarnLimit;
+ /**
+ * 缁忔祹璁㈣揣閲�
+ */
+ @Excel(name = "缁忔祹璁㈣揣閲�", width = 15)
@ApiModelProperty(value = "缁忔祹璁㈣揣閲�")
- private Integer economicOrderQuantity;
+ private java.lang.Integer economicOrderQuantity;
- /**閲囪喘鎻愬墠鏈�*/
- @Excel(name = "閲囪喘鎻愬墠鏈�", width = 15)
+ /**
+ * 閲囪喘鎻愬墠鏈�
+ */
+ @Excel(name = "閲囪喘鎻愬墠鏈�", width = 15)
@ApiModelProperty(value = "閲囪喘鎻愬墠鏈�")
- private Integer purchaseLeadTime;
- /**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
+ private java.lang.Integer purchaseLeadTime;
+
+ /**
+ * 绉熸埛id
+ */
@ApiModelProperty(value = "绉熸埛id")
- private String tenantId;
- /**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
+ private java.lang.String tenantId;
+ /**
+ * 鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)
+ */
+
+
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
@TableLogic
private Integer delFlag = CommonConstant.DEL_FLAG_0;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
+ /**
+ * 澶囨敞
+ */
+
@ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
+ private java.lang.String remark;
+ /**
+ * 澶囩敤瀛楁1
+ */
+
@ApiModelProperty(value = "澶囩敤瀛楁1")
- private String uda1;
- /**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
+ private java.lang.String uda1;
+ /**
+ * 澶囩敤瀛楁2
+ */
+
@ApiModelProperty(value = "澶囩敤瀛楁2")
- private String uda2;
- /**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
+ private java.lang.String uda2;
+ /**
+ * 澶囩敤瀛楁3
+ */
+
@ApiModelProperty(value = "澶囩敤瀛楁3")
- private String uda3;
- /**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
+ private java.lang.String uda3;
+ /**
+ * 澶囩敤瀛楁4
+ */
+
@ApiModelProperty(value = "澶囩敤瀛楁4")
- private String uda4;
- /**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
+ private java.lang.String uda4;
+ /**
+ * 澶囩敤瀛楁5
+ */
+
@ApiModelProperty(value = "澶囩敤瀛楁5")
- private String uda5;
+ private java.lang.String uda5;
@TableField(exist = false)
private List<AuxiliaryUnitVo> auxiliaryUnits;
@TableField(exist = false)
- private Double totalMainQuantity;
+ private BigDecimal totalMainQuantity;
@TableField(exist = false)
- private Double totalAuxiliaryQuantity;
+ private BigDecimal totalAuxiliaryQuantity;
+
+
}
--
Gitblit v1.9.3