From 2166b1661ca1e94fae6e4631799a9997418bff43 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期四, 26 六月 2025 11:40:37 +0800
Subject: [PATCH] 基础数据,产线,班次,班组

---
 src/main/java/org/jeecg/modules/base/entity/Supplier.java |  229 +++++++++++++++++++++++++--------------------------------
 1 files changed, 100 insertions(+), 129 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/base/entity/Supplier.java b/src/main/java/org/jeecg/modules/base/entity/Supplier.java
index 0bb7323..fa928e8 100644
--- a/src/main/java/org/jeecg/modules/base/entity/Supplier.java
+++ b/src/main/java/org/jeecg/modules/base/entity/Supplier.java
@@ -1,150 +1,121 @@
 package org.jeecg.modules.base.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.constant.CommonConstant;
+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.Data;
 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.jeecgframework.poi.excel.annotation.Excel;
-
-import java.io.Serializable;
 
 /**
- * @Description: mom_eam_inspection_project
+ * @Description: 渚涘簲鍟嗙鐞�
  * @Author: jeecg-boot
- * @Date: 2023-03-10
+ * @Date:   2025-06-24
  * @Version: V1.0
  */
 @Data
-@TableName("mom_base_supplier")
+@TableName("base_supplier")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "mom_base_supplier瀵硅薄", description = "mom_base_supplier")
-public class Supplier extends JeecgEntity implements Serializable {
+@ApiModel(value="base_supplier瀵硅薄", description="渚涘簲鍟嗙鐞�")
+public class Supplier implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 缂栫爜
-     */
-    @Excel(name = "缂栫爜", width = 15)
-    @ApiModelProperty(value = "缂栫爜")
-    private String num;
-    /**
-     * 鍚嶇О
-     */
-    @Excel(name = "鍚嶇О", width = 15)
-    @ApiModelProperty(value = "鍚嶇О")
-    private String name;
-
-    /**
-     * 绠�绉�
-     */
-    @Excel(name = "绠�绉�", width = 15)
-    @ApiModelProperty(value = "绠�绉�")
-    private String abbreviation;
-
-    /**
-     * 渚涘簲鍟嗙被鍨�
-     */
-    @Excel(name = "渚涘簲鍟嗙被鍨�", width = 15,dicCode = "supplier_type")
-    @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
-    @Dict(dicCode = "supplier_type")
-    private String supplierType;
-
-    /**
-     * 鎵�灞炶涓�
-     */
-    @Excel(name = "鎵�灞炶涓�", width = 15)
-    @ApiModelProperty(value = "鎵�灞炶涓�")
-    private String affiliationIndustry;
-
-
-    /**
-     * 鍦板潃
-     */
-
-    @Excel(name = "鍦板潃",width = 30)
-    @ApiModelProperty(value = "鍦板潃")
-    private  String address;
-
-
-
-
-    /**
-     * 绉熸埛id
-     */
-    @Excel(name = "绉熸埛id", width = 15)
-    @ApiModelProperty(value = "绉熸埛id")
-    private String tenantId;
-
-
-    /**
-     * 鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)
-     */
-    @Excel(name = "鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)", width = 15)
-    @ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝e父,1-宸插垹闄�)")
+	/**涓婚敭*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "涓婚敭")
+    private String id;
+	/**鍒涘缓浜�*/
+    @ApiModelProperty(value = "鍒涘缓浜�")
+    private String createBy;
+	/**鍒涘缓鏃堕棿*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    private Date createTime;
+	/**鏇存柊浜�*/
+    @ApiModelProperty(value = "鏇存柊浜�")
+    private String updateBy;
+	/**鏇存柊鏃堕棿*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
+    private Date updateTime;
+	/**鍒犻櫎鏍囪*/
+	@Excel(name = "鍒犻櫎鏍囪", width = 15)
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
+    @TableLogic
     private Integer delFlag = CommonConstant.DEL_FLAG_0;
-    /**
-     * 澶囨敞
-     */
-    @Excel(name = "澶囨敞", width = 15)
+	/**渚涘簲鍟嗙紪鐮�*/
+	@Excel(name = "渚涘簲鍟嗙紪鐮�", width = 15)
+    @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+    private String supplierCode;
+	/**渚涘簲鍟嗗悕绉�*/
+	@Excel(name = "渚涘簲鍟嗗悕绉�", width = 15)
+    @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+    private String supplierName;
+	/**渚涘簲鍟嗗悕绉�*/
+	@Excel(name = "渚涘簲鍟嗗悕绉�", width = 15)
+    @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+    private String supplierStatus;
+	/**鍥藉*/
+	@Excel(name = "鍥藉", width = 15)
+    @ApiModelProperty(value = "鍥藉")
+    private String country;
+	/**鐪佷唤*/
+	@Excel(name = "鐪佷唤", width = 15)
+    @ApiModelProperty(value = "鐪佷唤")
+    private String province;
+	/**鍩庡競*/
+	@Excel(name = "鍩庡競", width = 15)
+    @ApiModelProperty(value = "鍩庡競")
+    private String city;
+	/**璇︾粏鍦板潃*/
+	@Excel(name = "璇︾粏鍦板潃", width = 15)
+    @ApiModelProperty(value = "璇︾粏鍦板潃")
+    private String address;
+	/**閭紪*/
+	@Excel(name = "閭紪", width = 15)
+    @ApiModelProperty(value = "閭紪")
+    private String postcode;
+	/**鑱旂郴浜�*/
+	@Excel(name = "鑱旂郴浜�", width = 15)
+    @ApiModelProperty(value = "鑱旂郴浜�")
+    private String contact;
+	/**浼犵湡*/
+	@Excel(name = "浼犵湡", width = 15)
+    @ApiModelProperty(value = "浼犵湡")
+    private String fax;
+	/**閭*/
+	@Excel(name = "閭", width = 15)
+    @ApiModelProperty(value = "閭")
+    private String email;
+	/**鐢佃瘽*/
+	@Excel(name = "鐢佃瘽", width = 15)
+    @ApiModelProperty(value = "鐢佃瘽")
+    private String phone;
+	/**鍏徃鐢佃瘽*/
+	@Excel(name = "鍏徃鐢佃瘽", width = 15)
+    @ApiModelProperty(value = "鍏徃鐢佃瘽")
+    private String companyTelephone;
+	/**瀹樻柟缃戠珯*/
+	@Excel(name = "瀹樻柟缃戠珯", width = 15)
+    @ApiModelProperty(value = "瀹樻柟缃戠珯")
+    private String officialWebsite;
+	/**澶囨敞*/
+	@Excel(name = "澶囨敞", width = 15)
     @ApiModelProperty(value = "澶囨敞")
     private String remark;
-    /**
-     * 澶囩敤瀛楁1
-     */
-    @Excel(name = "澶囩敤瀛楁1", width = 15)
-    @ApiModelProperty(value = "澶囩敤瀛楁1")
-    private String supplierUda1;
-    /**
-     * 澶囩敤瀛楁2
-     */
-    @Excel(name = "澶囩敤瀛楁2", width = 15)
-    @ApiModelProperty(value = "澶囩敤瀛楁2")
-    private String supplierUda2;
-    /**
-     * 澶囩敤瀛楁3
-     */
-    @Excel(name = "澶囩敤瀛楁3", width = 15)
-    @ApiModelProperty(value = "澶囩敤瀛楁3")
-    private String supplierUda3;
-    /**
-     * 澶囩敤瀛楁4
-     */
-    @Excel(name = "澶囩敤瀛楁4", width = 15)
-    @ApiModelProperty(value = "澶囩敤瀛楁4")
-    private String supplierUda4;
-    /**
-     * 澶囩敤瀛楁5
-     */
-    @Excel(name = "澶囩敤瀛楁5", width = 15)
-    @ApiModelProperty(value = "澶囩敤瀛楁5")
-    private String supplierUda5;
-    /**
-     * 鐘舵�� 0 绂佺敤 1 鍚敤
-     */
-    @Excel(name = "鐘舵�� 0 绂佺敤 1 鍚敤", width = 15)
-    @ApiModelProperty(value = "鐘舵�� 0 绂佺敤 1 鍚敤")
-    private String status = CommonConstant.STATUS_1;
-
-    /**
-     * 渚涘簲鍟嗙被鍨婭d
-     */
-    @Excel(name = "supplier_category_id", width = 15)
-    @ApiModelProperty(value = "supplier_category_id")
-    private String supplierCategoryId;
-
-
-
-
-
-
-    @ApiModelProperty(value = "渚涘簲鍟嗛」鐩垎绫荤紪鐮�/鍚嶇О")
-    @TableField(exist = false)
-    private String supplierCategoryNumName;
 }

--
Gitblit v1.9.3