From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/dao/business/model/WorkPlans.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java b/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
index 883ece0..f5ef864 100644
--- a/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
+++ b/server/src/main/java/doumeemes/dao/business/model/WorkPlans.java
@@ -61,19 +61,26 @@
@ApiModelProperty(value = "璁″垝缂栫爜")
private String planCode;
- @ApiModelProperty(value = "璁″垝鏃ユ湡")
- @Excel(name="璁″垝鏃ユ湡",orderNum ="1",format = "yyyy-MM-dd")
+ @ApiModelProperty(value = "璁″垝缁撴潫鏃ユ湡")
+ @Excel(name="璁″垝缁撴潫鏃ユ湡",orderNum ="2",format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
+ @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
+ @Excel(name="璁″垝寮�濮嬫棩鏈�",orderNum ="1",format = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+ @ApiModelProperty(value = "閿�鍞崟鍙�" )
+ @Excel(name="閿�鍞崟鍙�",orderNum ="8")
+ private String salesorder;
@ApiModelProperty(value = "浜у搧鍚嶇О" )
@TableField(exist = false)
- @Excel(name="浜у搧鍚嶇О",orderNum ="2")
+ @Excel(name="浜у搧鍚嶇О",orderNum ="3")
private String materialName;
@ApiModelProperty(value = "浜у搧缂栫爜" )
@TableField(exist = false)
- @Excel(name="浜у搧缂栫爜",orderNum ="3")
+ @Excel(name="浜у搧缂栫爜",orderNum ="4")
private String materialCode;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
@@ -83,11 +90,11 @@
private Integer unitId;
@ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
- @Excel(name="璁″垝鐢熶骇鏁伴噺",orderNum ="4")
+ @Excel(name="璁″垝鐢熶骇鏁伴噺",orderNum ="5")
private Integer num;
@ApiModelProperty(value = "鎵规鍙�")
- @Excel(name="浜у搧鎵规鍙�",orderNum = "6")
+ @Excel(name="浜у搧鎵规鍙�",orderNum = "7")
private String batch;
@ApiModelProperty(value = "鐘舵�� 0宸茬敓鎴愩��1宸插彂甯冦��2宸叉挙鍥炪��3宸插彇娑堛��4宸插垎閰嶃��5宸叉殏鍋溿��6宸插畬宸ャ��7宸插叆搴撱��8宸插叧闂�", example = "1")
@@ -107,11 +114,11 @@
private Date publishDate;
@ApiModelProperty(value = "鐢熶骇宸ュ巶鏈虹骇缁勭粐鍚嶇О" )
- @Excel(name="鐢熶骇宸ュ巶",orderNum ="5")
+ @Excel(name="鐢熶骇宸ュ巶",orderNum ="6")
@TableField(exist = false)
private String factoryName;
@ApiModelProperty(value = "浼樺厛绾э紙鎺掑簭鐮侊級瀛楁", example = "1")
- @Excel(name="浼樺厛绾�" ,orderNum = "8")
+ @Excel(name="浼樺厛绾�" ,orderNum = "9")
private Integer urgent;
}
--
Gitblit v1.9.3