From 6b656dae5760b0151757f5f82ef756c48f53124c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 八月 2023 11:19:08 +0800
Subject: [PATCH] 111

---
 server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
index 43c59ef..bd47d2a 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
@@ -147,6 +147,12 @@
     private Integer distributNoDoneNum;
     @ApiModelProperty(value = "搴撳瓨鏄惁婊¤冻 0涓嶆弧瓒� 1婊¤冻", example = "0")
     private Integer  isStock;
+    @ApiModelProperty(value = "鏄惁寤舵湡")
+    private Boolean hasExpire;
+    @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫棩鏈�")
+    private  Date workPlanPlanDate;
+    @ApiModelProperty(value = "鎴愬搧璁″垝缁撴潫鏃ユ湡")
+    private  Date workPlanStartDate;
 
 
     @ExcelColumn(name="鐗╂枡鍚嶇О",index = 1,width =15)
@@ -173,9 +179,9 @@
     @ExcelColumn(name="閿�鍞鍗�")
     private String salesOrder;
 
-    @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫椂闂�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date workPlanStartDate;
+//    @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫椂闂�")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    private Date workPlanStartDate;
 
     @ApiModelProperty(value = "鎴愬搧璁″垝缁撴潫鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -183,4 +189,10 @@
 
     @ApiModelProperty(value = "宸茬敓浜ф暟閲�")
     private Integer produceNum;
+
+    @ApiModelProperty(value = "鏄惁鏈塨om閰嶇疆 0鏃� 1鏈�", example = "1")
+    private Integer hasBom;
+    @ApiModelProperty(value = "bom鎶曟枡鏂瑰紡 0鎺ㄥ紡 1鎷夊紡", example = "1")
+    private Integer bomType;
+
 }

--
Gitblit v1.9.3