From 204bb9eb1ff8a9aca875381f6b8cfd689cbf4990 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 28 九月 2023 16:33:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/models/MQuality.java | 182 +++++++++++++++++++++++++++------------------
1 files changed, 109 insertions(+), 73 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/MQuality.java b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
index 4bca1df..6ee6f21 100644
--- a/igds-core/src/main/java/com/ld/igds/models/MQuality.java
+++ b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
@@ -1,115 +1,151 @@
package com.ld.igds.models;
+import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.ld.igds.check.dto.CheckItemData;
import lombok.Data;
+
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
- * 璐ㄩ噺宸℃--绮鍦ㄤ粨妫�娴�
- *
- * @author chen
+ * 璐ㄩ噺绠＄悊锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲璋冩暣
*
+ * @author chen
*/
@Data
@Entity
@Table(name = "D_M_QUALITY")
public class MQuality implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- @Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "涓婚敭ID", description = "ZJ+妫�楠岀被鍒�+骞存湀鏃ユ椂鍒嗙")
- private String id;
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "涓婚敭ID", description = "ZJ+妫�楠岀被鍒�+骞存湀鏃ユ椂鍒嗙")
+ private String id;
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
- @Column(name = "DEPT_ID_", length = 40)
- @PropertyDef(label = "搴撳尯缂栫爜")
- private String deptId;
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "搴撳尯缂栫爜")
+ private String deptId;
- @Column(name = "DEPOT_ID_", length = 50)
- @PropertyDef(label = "浠撳簱缂栫爜")
- private String depotId;
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱缂栫爜")
+ private String depotId;
- @Column(name = "FOOD_VARIETY_", length = 10)
- @PropertyDef(label = "绮鍝佺")
- private String foodVariety;
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
- @Column(name = "FOOD_LEVEL_", length = 10)
- @PropertyDef(label = "绮绛夌骇")
- private String foodLevel;
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
- @Column(name = "FOOD_TYPE_", length = 10)
- @PropertyDef(label = "绮鎬ц川")
- private String foodType;
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+ @Column(name = "STORE_DATE_")
+ private Date storeDate;
- @Column(name = "FOOD_LOCATION_", length = 30)
- @PropertyDef(label = "绮浜у湴")
- private String foodLocation;
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "妫�楠岀被鍒�", description = "01锛氬叆浠撻獙鏀� 02锛氬嚭浠撴楠� 03锛�3 鏈堟湯鏅04锛�9 鏈堟湯鏅 05锛氬叆浠撳垵妫� 06锛氭湀搴︽鏌� 07锛�3 鏈堟湯搴撳唴鏅煡 08锛�9 鏈堟湯搴撳唴鏅煡")
+ private String type;
- @Column(name = "TYPE_", length = 10)
- @PropertyDef(label = "妫�楠岀被鍒�", description = "濡傚叆搴撻獙鏀躲�佸偍钘忔楠屻�佹棩甯稿贰妫�绛�")
- private String type;
+ @Column(name = "TIME_")
+ @PropertyDef(label = "妫�楠屾椂闂�")
+ private Date time;
- @Column(name = "STANDARD_", length = 10)
- @PropertyDef(label = "妫�楠屼緷鎹�", description = "01-鍥芥爣锛�02-鍏朵粬")
- private String standard;
+ @Column(name = "USER_", length = 50)
+ @PropertyDef(label = "妫�楠屼汉", description = "妫�楠屼汉鍛樺鍚嶏紝鑻ユ湁澶氫釜淇濈鍛�")
+ private String user;
- @Column(name = "USER_", length = 50)
- @PropertyDef(label = "妫�楠屽崟浣嶆垨妫�楠屼汉")
- private String user;
+ @Column(name = "UNIT_", length = 50)
+ @PropertyDef(label = "妫�楠屽崟浣�")
+ private String unit;
- @Column(name = "TIME_")
- @PropertyDef(label = "妫�楠屾椂闂�")
- private Date time;
+ @Column(name = "STANDARD_", length = 4)
+ @PropertyDef(label = "妫�楠屼緷鎹�", description = "1-鍥芥爣锛�0-鍏朵粬")
+ private String standard;
- @Column(name = "RESULT_", length = 50)
- @PropertyDef(label = "妫�楠岀粨璁�")
- private String result;
- @Column(name = "CHECK_AREA__", length = 50)
- @PropertyDef(label = "鎵︽牱鍖哄煙")
- private String checkArea;
+ @PropertyDef(label = "鎸囨爣绫诲埆", description = "1: 璐ㄩ噺鎸囨爣妫�楠�2锛氬偍瀛樺搧璐ㄦ楠�3锛氶鍝佸畨鍏ㄦ楠� 濡傛灉鍚屾椂妫�楠屼簡澶氫釜锛岀敤#闅斿紑锛屼緥濡傦細1#2#3")
+ @Column(name = "zblb", length = 8)
+ private String zblb;
- @Column(name = "CHECK_USER_", length = 50)
- @PropertyDef(label = "鎵︽牱浜�")
- private String checkUser;
+ @Column(name = "RESULT_", length = 40)
+ @PropertyDef(label = "妫�楠岀粨璁�", description = "1銆佽川閲忔寚鏍囧～鍐�/杈炬爣/涓嶈揪鏍� 2銆佸偍瀛樺搧璐ㄦ寚鏍囧～鍐欌�滃疁瀛樷�濄�佽交搴︿笉瀹滃瓨鈥濄�佲�滈噸搴︿笉瀹滃瓨鈥�3銆侀鍝佸畨鍏ㄦ寚鏍囧～鍐欌�滃悎鏍尖�濄�佷笉鍚堟牸鈥� 澶氶」鎸囨爣鏃朵互#鍒嗛殧锛屼緥濡傦細杈炬爣|缁煎悎鍒ゅ畾#瀹滃瓨#鍚堟牸 ")
+ private String result;
- @Column(name = "CHECK_TIME_")
- @PropertyDef(label = "鎵︽牱鏃堕棿")
- private Date checkTime;
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绛惧彂鏃ユ湡")
+ @Column(name = "qfrq")
+ private Date qfrq;
- @Column(name = "CHECK_NUM_")
- @PropertyDef(label = "鏍峰搧鏁伴噺")
- private Double checkNum;
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎶ュ憡鍑哄叿鏃堕棿")
+ @Column(name = "bgcjsj")
+ private Date bgcjsj;
- @Column(name = "CHECK_REPRESENT_", length = 50)
- @PropertyDef(label = "鏍峰搧浠ｈ〃")
- private String checkRepresent;
+ @PropertyDef(label = "瀹℃牳浜哄鍚�")
+ @Column(name = "shrxm", length = 64)
+ private String shrxm;
- @Column(name = "CHECK_LEVEL_", length = 20)
- @PropertyDef(label = "鏍峰搧绛夌骇")
- private String checkLevel;
+ @PropertyDef(label = "鎵︽牱鍗曠紪鍙�")
+ @Column(name = "qydbh", length = 64)
+ private String qydbh;
- @Column(name = "NORMAL_YEAR_", length = 10)
- @PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺")
- private String normalYear;
+ @Column(name = "CHECK_TIME_")
+ @PropertyDef(label = "鎵︽牱鏃堕棿", required = true)
+ private Date checkTime;
- @Column(name = "REMARK_", length = 500)
- @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
- private String remark;
+ @Column(name = "CHECK_AREA_", length = 50)
+ @PropertyDef(label = "鎵︽牱鍖哄煙")
+ private String checkArea;
- /**
- * 鍖栭獙椤逛俊鎭�
- */
- @Transient
- private List<CheckItemData> checkItems;
+ @Column(name = "CHECK_USER_", length = 50)
+ @PropertyDef(label = "鎵︽牱浜�", required = true)
+ private String checkUser;
+
+ @PropertyDef(label = "鐩戠潱浜哄鍚�")
+ @Column(name = "jdrxm", length = 64)
+ private String jdrxm;
+
+ @PropertyDef(label = "鏍峰搧缂栧彿")
+ @Column(name = "ypbh", length = 64)
+ private String ypbh;
+
+ @PropertyDef(label = "鏍峰搧鏁伴噺", required = true)
+ @Column(name = "ypsl", precision = 20, scale = 6)
+ private Double ypsl;
+
+ @PropertyDef(label = "浠ｈ〃鏁伴噺")
+ @Column(name = "dbsl", precision = 20, scale = 6)
+ private Double dbsl;
+
+ @PropertyDef(label = "鏍峰搧绛夌骇")
+ @Column(name = "ypdj", length = 2)
+ private String ypdj;
+
+ @Column(name = "NORMAL_YEAR_", length = 10)
+ @PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺")
+ private String normalYear;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ /**
+ * 鍖栭獙椤圭洰鏄庣粏
+ */
+ @Transient
+ private List<CheckItemData> checkItems;
}
--
Gitblit v1.9.3