From ca73a173f008c8d7a9d700bad897ca24fe2d2203 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 十月 2023 09:29:57 +0800
Subject: [PATCH] 111
---
server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
index 8f3c4bc..7d4db6c 100644
--- a/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
+++ b/server/src/main/java/doumeemes/dao/business/vo/WorkPlansVO.java
@@ -57,7 +57,7 @@
private Integer factoryId;
@ApiModelProperty(value = "宸ュ巶鍚嶇О", example = "1")
- @ExcelColumn(name="宸ュ巶鍚嶇О",index = 4,width =15)
+ @ExcelColumn(name="宸ュ巶鍚嶇О",index = 5,width =15)
private String factoryName;
@ApiModelProperty(value = "鏉ユ簮 0浜哄伐鍒涘缓銆�1Excel瀵煎叆", example = "1")
@@ -67,11 +67,16 @@
@ExcelColumn(name="璁″垝缂栫爜",index = 0,width =15)
private String planCode;
- @ApiModelProperty(value = "璁″垝鏃ユ湡")
- @ExcelColumn(name="璁″垝鏃ユ湡",index = 3,width =15)
+ @ApiModelProperty(value = "璁″垝瀹屾垚鏃ユ湡")
+ @ExcelColumn(name="璁″垝瀹屾垚鏃ユ湡",index = 4,width =15)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planDate;
-
+ @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
+ @ExcelColumn(name="璁″垝寮�濮嬫棩鏈�",index = 3,width =15)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
+ @ApiModelProperty(value = "閿�鍞崟鍙�" )
+ private String salesorder;
@ApiModelProperty(value = "鐗╂枡缂栫爜锛堝叧鑱攎aterial_distribute琛級", example = "1")
private Integer materialId;
@@ -89,26 +94,26 @@
private Integer unitId;
@ApiModelProperty(value = "鍗曚綅缂栫爜鍚嶇О", example = "1")
- @ExcelColumn(name="鍗曚綅鍚嶇О",index = 6,width =15)
+ @ExcelColumn(name="鍗曚綅鍚嶇О",index = 7,width =15)
private String unitName;
@ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
- @ExcelColumn(name="璁″垝鏁伴噺",index = 5,width =15)
+ @ExcelColumn(name="璁″垝鏁伴噺",index = 6,width =15)
private Integer num;
@ApiModelProperty(value = "鎵规鍙�")
- @ExcelColumn(name="鎵规鍙�",index = 7,width =15)
+ @ExcelColumn(name="鎵规鍙�",index = 8,width =15)
private String batch;
@ApiModelProperty(value = "鐘舵�� 1=宸茬敓鎴�;2=宸插彂甯冦��3宸插彇娑堛��4宸插垎閰嶃��5宸叉殏鍋溿��6宸插畬宸ャ��7宸插叆搴撱��8宸插叧闂�", example = "1")
- @ExcelColumn(name="璁″垝鐘舵��",valueMapping = "0=宸茬敓鎴�;1=鎵ц涓�;3=宸插彇娑�;4=宸插垎閰�;5=宸叉殏鍋�;6=宸插畬宸�;7=宸插叆搴�;8=宸插叧闂�;",index = 8,width =15)
+ @ExcelColumn(name="璁″垝鐘舵��",valueMapping = "0=宸茬敓鎴�;1=鎵ц涓�;3=宸插彇娑�;4=宸插垎閰�;5=宸叉殏鍋�;6=宸插畬宸�;7=宸插叆搴�;8=宸插叧闂�;",index = 9,width =15)
private Integer status;
@ApiModelProperty(value = "瀵煎叆鎵瑰彿锛堝叧鑱攑lan_import琛�)", example = "1")
private Integer importId;
@ApiModelProperty(value = "鏄惁鏆傚仠 0鏈殏鍋� 1宸叉殏鍋�", example = "1")
- @ExcelColumn(name="鏄惁鏆傚仠",valueMapping = "0=鍚�;1=鏄�",index = 9,width =15)
+ @ExcelColumn(name="鏄惁鏆傚仠",valueMapping = "0=鍚�;1=鏄�",index = 10,width =15)
private Integer paused;
@ApiModelProperty(value = "璁″垝鍛樼紪鐮侊紙涓巗ystem_user琛ㄥ叧鑱旓級", example = "1")
@@ -118,33 +123,36 @@
private Integer urgent;
@ApiModelProperty(value = "璁″垝鍛樺鍚�", example = "1")
- @ExcelColumn(name="璁″垝鍛樺鍚�",index = 14,width =15)
+ @ExcelColumn(name="璁″垝鍛樺鍚�",index = 15,width =15)
private String userName;
@ApiModelProperty(value = "璁″垝鍛樻墜鏈哄彿", example = "1")
- @ExcelColumn(name="璁″垝鍛樻墜鏈哄彿",index = 15,width =15)
+ @ExcelColumn(name="璁″垝鍛樻墜鏈哄彿",index = 16,width =15)
private String userMobile;
@ApiModelProperty(value = "璁″垝鍙戝竷鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
- @ExcelColumn(name="璁″垝鍙戝竷鏃堕棿",index = 13,width =15)
+ @ExcelColumn(name="璁″垝鍙戝竷鏃堕棿",index = 14,width =15)
private Date publishDate;
@ApiModelProperty(value = "鐢ㄦ埛閮ㄩ棬鍚嶇О", example = "1")
private String userDepartName;
@ApiModelProperty(value = "瀹屽伐鏁伴噺", example = "1")
- @ExcelColumn(name="瀹屽伐鏁伴噺" ,index = 10,width =15)
+ @ExcelColumn(name="瀹屽伐鏁伴噺" ,index = 11,width =15)
private Integer finishNum;
@ApiModelProperty(value = "瀹屽伐鍚堟牸鏁伴噺", example = "1")
- @ExcelColumn(name="瀹屽伐鍚堟牸鏁伴噺",index = 11,width =15)
+ @ExcelColumn(name="瀹屽伐鍚堟牸鏁伴噺",index = 12,width =15)
private Integer finishQualifiedNum;
@ApiModelProperty(value = "瀹屽伐涓嶈壇鏁伴噺", example = "1")
- @ExcelColumn(name="瀹屽伐涓嶈壇鏁伴噺",index = 12,width =15)
+ @ExcelColumn(name="瀹屽伐涓嶈壇鏁伴噺",index = 13,width =15)
private Integer finishUnQualifiedNum;
@ApiModelProperty(value = "瀛愯鍒掓槑缁嗕俊鎭�", example = "1")
private List<PlansExtListVO> plansExtListVOList;
+
+ @ApiModelProperty(value = "鏄惁杩囨湡")
+ private Boolean hasExpire;
}
--
Gitblit v1.9.3