From 339515558253d776769dc2e2560bbb4a0450c989 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 29 十一月 2024 09:44:44 +0800
Subject: [PATCH] 将码云版本提交至gitlab -- 20241129
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java | 74 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
old mode 100644
new mode 100755
index 7fc3ded..29ac2c8
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -17,16 +18,17 @@
import lombok.experimental.Accessors;
/**
- * @Description: 骞茬嚗鎵规
+ * @Description: 骞茬嚗宸ュ崟
* @Author: jeecg-boot
* @Date: 2023-03-08
* @Version: V1.0
*/
@Data
+@ToString
@TableName("dry_order")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="dry_order瀵硅薄", description="骞茬嚗鎵规")
+@ApiModel(value="dry_order瀵硅薄", description="骞茬嚗宸ュ崟")
public class DryOrder implements Serializable {
private static final long serialVersionUID = 1L;
@@ -34,21 +36,24 @@
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
- /**鎵规鏃堕棿*/
- @Excel(name = "鎵规鏃堕棿", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鎵规鏃堕棿")
+ /**宸ュ崟鏃堕棿*/
+ @Excel(name = "宸ュ崟鏃堕棿", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "宸ュ崟鏃堕棿")
private Date orderTime;
- /**鎵规鍙�*/
- @Excel(name = "鎵规鍙�", width = 15)
- @ApiModelProperty(value = "鎵规鍙�")
+ /**宸ュ崟鍙�*/
+ @Excel(name = "宸ュ崟鍙�", width = 15)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
private String code;
/**鑽潗*/
@Excel(name = "鑽潗", width = 15, dictTable = "dry_herb", dicText = "name", dicCode = "id")
- @Dict(dictTable = "dry_herb", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "dry_herb_formula", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "鑽潗")
private String herbId;
+ /**鑽潗*/
+ @ApiModelProperty(value = "鑽潗鍚嶇О")
+ private String herbName;
/**鍒濆鍚按鐜�*/
@Excel(name = "鍒濆鍚按鐜�", width = 15)
@ApiModelProperty(value = "鍒濆鍚按鐜�")
@@ -60,7 +65,11 @@
/**鎶曟枡閲�*/
@Excel(name = "鎶曟枡閲�", width = 15)
@ApiModelProperty(value = "鎶曟枡閲�")
- private Double feed;
+ private Integer feed;
+ /**鍒濆閲嶉噺*/
+ @Excel(name = "鍒濆閲嶉噺", width = 15)
+ @ApiModelProperty(value = "鍒濆閲嶉噺")
+ private Double originWeight;
/**棰勮骞茬嚗鏃堕棿*/
@Excel(name = "棰勮骞茬嚗鏃堕棿", width = 15)
@ApiModelProperty(value = "棰勮骞茬嚗鏃堕棿")
@@ -72,7 +81,27 @@
/**骞茬嚗鏃堕棿*/
@Excel(name = "骞茬嚗鏃堕棿", width = 15)
@ApiModelProperty(value = "骞茬嚗鏃堕棿")
- private Integer drying;
+ private Integer dryTime;
+ /**鐑娓╁害*/
+ @Excel(name = "鐑娓╁害", width = 15)
+ @ApiModelProperty(value = "鐑娓╁害")
+ private Double windTemp;
+ /**鐜娓╁害*/
+ @Excel(name = "鐜娓╁害", width = 15)
+ @ApiModelProperty(value = "鐜娓╁害")
+ private Double envTemp;
+ /**鐜婀垮害*/
+ @Excel(name = "鐜婀垮害", width = 15)
+ @ApiModelProperty(value = "鐜婀垮害")
+ private Double envHum;
+ /**鑽℃枡寤舵椂ms*/
+ @Excel(name = "鑽℃枡寤舵椂ms", width = 15)
+ @ApiModelProperty(value = "鑽℃枡寤舵椂ms")
+ private Integer delay;
+ /**缈绘枡娆℃暟*/
+ @Excel(name = "缈绘枡娆℃暟", width = 15)
+ @ApiModelProperty(value = "缈绘枡娆℃暟")
+ private Integer turn;
/**棰勮鍓╀綑鏃堕棿*/
@Excel(name = "棰勮鍓╀綑鏃堕棿", width = 15)
@ApiModelProperty(value = "棰勮鍓╀綑鏃堕棿")
@@ -107,13 +136,26 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
- /**鎵规鐘舵��*/
- @Excel(name = "鎵规鐘舵��", width = 15)
- @ApiModelProperty(value = "鎵规鐘舵��")
+ /**宸ュ崟鐘舵��*/
+ @Excel(name = "宸ュ崟鐘舵��", width = 15)
+ @Dict(dicCode = "dry_order_status")
+ @ApiModelProperty(value = "宸ュ崟鐘舵��")
private Integer orderStatus;
/**鎿嶄綔浜�*/
@Excel(name = "鎿嶄綔浜�", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
@ApiModelProperty(value = "鎿嶄綔浜�")
private String operator;
+
+ /**娓╁害瓒嬪娍*/
+ @ApiModelProperty(value = "娓╁害瓒嬪娍")
+ private String temps;
+
+ /**钂告苯娑堣��*/
+ @ApiModelProperty(value = "钂告苯娑堣��")
+ private Double steam;
+
+ /**鐢佃兘娑堣��*/
+ @ApiModelProperty(value = "鐢佃兘娑堣��")
+ private Double watt;
}
--
Gitblit v1.9.3