From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 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..697f643 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/PlansExtListVO.java
@@ -71,7 +71,7 @@
private Integer lessDistributNum;
@ApiModelProperty(value = "璁″垝绫诲瀷 0姝ｅ父1寮傚父2杩斿伐", example = "1")
- @ExcelColumn(name="璁″垝绫诲瀷",valueMapping = "0=姝ｅ父;1=寮傚父;2=杩斿伐;",index = 11,width =15)
+ @ExcelColumn(name="璁″垝绫诲瀷",valueMapping = "0=姝ｅ父;1=寮傚父;2=杩斿伐;",index = 12,width =15)
private Integer type;
@ApiModelProperty(value = "鐢熶骇宸ュ簭缂栫爜锛堝叧鑱攑rocedures琛級", example = "1")
@@ -84,15 +84,15 @@
private Integer unitId;
@ApiModelProperty(value = "璁″垝鏁伴噺", example = "1")
- @ExcelColumn(name="璁″垝鏁伴噺",index = 6,width =15)
+ @ExcelColumn(name="璁″垝鏁伴噺",index = 7,width =15)
private Integer num;
@ApiModelProperty(value = "鎵规鍙�")
- @ExcelColumn(name="鐢熶骇鎵规鍙�",index = 8,width =15)
+ @ExcelColumn(name="鐢熶骇鎵规鍙�",index = 9,width =15)
private String batch;
@ApiModelProperty(value = "浼樺厛绾э紙鎺掑簭鐮侊級瀛楁", example = "1")
- @ExcelColumn(name="浼樺厛绾�",index = 9,width =15)
+ @ExcelColumn(name="浼樺厛绾�",index = 10,width =15)
private Integer urgent;
@ApiModelProperty(value = "瀵煎叆鎵瑰彿锛堝叧鑱攑lan_import琛�)", example = "1")
@@ -102,14 +102,14 @@
private Integer userId;
@ApiModelProperty(value = "鐘舵�� 0宸茬敓鎴愩��1宸插彂甯冦��2宸叉挙鍥炪��3宸插彇娑堛��4宸插垎閰嶃��5宸叉殏鍋溿��6宸插畬宸ャ��7宸插叆搴撱��8宸插叧闂�", example = "1")
- @ExcelColumn(name="璁″垝鐘舵��",valueMapping = "0=宸茬敓鎴�;1=宸插彂甯�;2=宸叉挙鍥�;3=宸插彇娑�;4=宸插垎閰�;5=宸叉殏鍋�;6=宸插畬宸�;7=宸插叆搴�;8=宸插叧闂�;",index = 10,width =15)
+ @ExcelColumn(name="璁″垝鐘舵��",valueMapping = "0=宸茬敓鎴�;1=宸插彂甯�;2=宸叉挙鍥�;3=宸插彇娑�;4=宸插垎閰�;5=宸叉殏鍋�;6=宸插畬宸�;7=宸插叆搴�;8=宸插叧闂�;",index = 11,width =15)
private Integer status;
@ApiModelProperty(value = "杩斾慨鐢宠鍗曞彿锛堝叧鑱攂ackorder琛級", example = "1")
private Integer backorderId;
@ApiModelProperty(value = "璁″垝鍙戝竷鏃堕棿")
- @ExcelColumn(name="鍙戝竷鏃ユ湡",index = 15,width =15)
+ @ExcelColumn(name="鍙戝竷鏃ユ湡",index = 16,width =15)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date publishDate;
@@ -133,20 +133,29 @@
@ApiModelProperty(value = "宸插畬宸ユ暟閲�", example = "0")
private Integer doneNum;
@ApiModelProperty(value = "鍚堟牸鏁伴噺", example = "0")
- @ExcelColumn(name="鍚堟牸鏁伴噺",index = 13,width =15)
+ @ExcelColumn(name="鍚堟牸鏁伴噺",index = 14,width =15)
private Integer qulifiedNum;
@ApiModelProperty(value = "涓嶈壇鏁伴噺", example = "0")
- @ExcelColumn(name="涓嶈壇鏁伴噺",index = 14,width =15)
+ @ExcelColumn(name="涓嶈壇鏁伴噺",index = 15,width =15)
private Integer unqulifiedNum;
@ApiModelProperty(value = "宸插垎閰嶇敓浜ф暟閲�", example = "1",hidden = true)
private Integer distributNum;
@ApiModelProperty(value = "宸ュ崟宸插垎閰嶇敓浜ф暟閲�", example = "1",hidden = true)
private Integer workorderDistributNum;
@ApiModelProperty(value = "宸插垎閰嶆湭瀹屽伐鐢熶骇鏁伴噺", example = "1",hidden = true)
- @ExcelColumn(name="宸插垎閰嶆湭瀹屽伐鐢熶骇鏁伴噺",index = 12,width =15)
+ @ExcelColumn(name="宸插垎閰嶆湭瀹屽伐鐢熶骇鏁伴噺",index = 13,width =15)
private Integer distributNoDoneNum;
@ApiModelProperty(value = "搴撳瓨鏄惁婊¤冻 0涓嶆弧瓒� 1婊¤冻", example = "0")
private Integer isStock;
+ @ApiModelProperty(value = "鏄惁寤舵湡")
+ private Boolean hasExpire;
+ @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫棩鏈�")
+ @ExcelColumn(name="璁″垝鏃ユ湡",index = 4,width =15)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date workPlanPlanDate;
+ @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date workPlanStartDate;
@ExcelColumn(name="鐗╂枡鍚嶇О",index = 1,width =15)
@@ -155,16 +164,16 @@
@ExcelColumn(name="鐗╂枡缂栫爜",index = 2,width =15)
private String materialCode;
- @ExcelColumn(name="宸ュ巶",index = 4,width =15)
+ @ExcelColumn(name="宸ュ巶",index = 5,width =15)
private String factoryName;
- @ExcelColumn(name="宸ュ簭",index = 5,width =15)
+ @ExcelColumn(name="宸ュ簭",index = 6,width =15)
private String produceName;
- @ExcelColumn(name="璁″垝鍛�",index = 16,width =15)
+ @ExcelColumn(name="璁″垝鍛�",index = 17,width =15)
private String planUserName;
- @ExcelColumn(name="鍗曚綅鍚嶇О",index = 7,width =15)
+ @ExcelColumn(name="鍗曚綅鍚嶇О",index = 8,width =15)
private String unitName;
@ExcelColumn(name="鎴愬搧璁″垝缂栫爜")
@@ -173,14 +182,16 @@
@ExcelColumn(name="閿�鍞鍗�")
private String salesOrder;
- @ApiModelProperty(value = "鎴愬搧璁″垝寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date workPlanStartDate;
-
@ApiModelProperty(value = "鎴愬搧璁″垝缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date workPlanEndDate;
@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