From c5d4cd7dad4b5abce0de6760449ea4cd055b9bd0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 30 Apr 2020 10:10:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E7=BC=96?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ExcelDataParamModel.java | 181 +++++++++++++++++++++ .../pojo/mes/model/ProdPlanBatchCompileModel.java | 51 +++++- 2 files changed, 229 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java new file mode 100644 index 0000000..f9eeea2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java @@ -0,0 +1,181 @@ +//package cn.estsh.i3plus.pojo.mes.model; +// +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiParam; +//import lombok.AllArgsConstructor; +//import lombok.Data; +//import lombok.NoArgsConstructor; +//import org.apache.poi.ss.usermodel.CellStyle; +//import org.springframework.util.StringUtils; +// +//import java.io.Serializable; +//import java.math.BigDecimal; +// +///** +// * @Author: wangjie +// * @CreateDate: 2019/8/21 9:19 AM +// * @Description: +// **/ +//@Data +//@NoArgsConstructor +//@AllArgsConstructor +//@Api("EXCEL参数model") +//public class ExcelDataParamModel implements Serializable { +// +// public ExcelDataParamModel(Class clazz){ +// this.clazz = clazz; +// } +// +// @ApiParam("获取相对应的类，用来映射数据,如果不设置此值，那么整个数据将会用String[]作为数据，不再通过映射拿取数据") +// private Class clazz; +// +// @ApiParam("对应类的映射字段名，String类型") +// private String[] strField; +// +// @ApiParam("对应类的标题，需要一一对应") +// private String[] titleStr; +// +// @ApiParam("大标题") +// private String title; +// +// @ApiParam("文件名，如果传入的ExcelDataParamModel是一个List的时候，以sheetNo = 1为文件名，如果sheetNo为空，则默认随机") +// private String fileName; +// +// @ApiParam("后缀") +// private String sufix; +// +// @ApiParam("大标题样式") +// private CellStyle bigTitleCellStyle; +// +// @ApiParam("标题样式") +// private CellStyle titleCellStyle; +// +// @ApiParam("数据样式") +// private CellStyle cellStyle; +// +// @ApiParam("sheet名") +// private String sheetName; +// +// @ApiParam("每个格子的宽度") +// private BigDecimal[] cellWidth; +// +// @ApiParam("如果传入的ExcelDataParamModel是List的时候，默认以sheetNo排序") +// private Integer sheetNo; +// +// @ApiParam("导出数据转换器") +// private QueryDataInterface queryDataInterface; +// +// public Class getClazz() { +// return clazz; +// } +// +// public String[] getStrField() { +// return strField; +// } +// +// public String[] getTitleStr() { +// return titleStr; +// } +// +// public String getTitle() { +// if(StringUtils.isEmpty(this.title)){ +// return "无效的标题"; +// }else{ +// return title; +// } +// } +// +// public String getFileName() { +// if(StringUtils.isEmpty(this.fileName)){ +// return "未命名"; +// }else{ +// return this.fileName; +// } +// } +// +// public CellStyle getBigTitleCellStyle() { +// return bigTitleCellStyle; +// } +// +// public CellStyle getTitleCellStyle() { +// return titleCellStyle; +// } +// +// public CellStyle getCellStyle() { +// return cellStyle; +// } +// +// public String getSheetName() { +// return sheetName; +// } +// +// public Integer getSheetNo() { +// return sheetNo; +// } +// +// public BigDecimal[] getCellWidth() { +// return cellWidth; +// } +// +// public String getSufix() { +// return sufix; +// } +// +// public QueryDataInterface getQueryDataInterface() { +// return queryDataInterface; +// } +// +// public void setClazz(Class clazz) { +// this.clazz = clazz; +// } +// +// public void setStrField(String[] strField) { +// this.strField = strField; +// } +// +// public void setTitleStr(String[] titleStr) { +// this.titleStr = titleStr; +// } +// +// public void setTitle(String title) { +// this.title = title; +// } +// +// public void setFileName(String fileName) { +// this.fileName = fileName; +// } +// +// public void setSufix(String sufix) { +// this.sufix = sufix; +// } +// +// public void setBigTitleCellStyle(CellStyle bigTitleCellStyle) { +// this.bigTitleCellStyle = bigTitleCellStyle; +// } +// +// public void setTitleCellStyle(CellStyle titleCellStyle) { +// this.titleCellStyle = titleCellStyle; +// } +// +// public void setCellStyle(CellStyle cellStyle) { +// this.cellStyle = cellStyle; +// } +// +// public void setSheetName(String sheetName) { +// this.sheetName = sheetName; +// } +// +// public void setCellWidth(BigDecimal[] cellWidth) { +// this.cellWidth = cellWidth; +// } +// +// +// public void setSheetNo(Integer sheetNo) { +// this.sheetNo = sheetNo; +// } +// +// public void setQueryDataInterface(QueryDataInterface queryDataInterface) { +// this.queryDataInterface = queryDataInterface; +// } +// +//} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java index f82a656..1a6ff37 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPlanBatchCompileModel.java @@ -42,9 +42,6 @@ public class ProdPlanBatchCompileModel { @ApiParam("班次") private String shiftCode; - @ApiParam("客户名称") - private String custCodeName; - @ApiParam("客户代码") private String custCode; @@ -75,4 +72,52 @@ public class ProdPlanBatchCompileModel { @ApiParam("计划类型名称") private String planTypeName; + @ApiParam("数量1") + private String qty1; + + @ApiParam("完成数量1") + private String completeQty1; + + @ApiParam("数量2") + private String qty2; + + @ApiParam("完成数量2") + private String completeQty2; + + @ApiParam("数量3") + private String qty3; + + @ApiParam("完成数量3") + private String completeQty3; + + @ApiParam("数量4") + private String qty4; + + @ApiParam("完成数量4") + private String completeQty4; + + @ApiParam("数量5") + private String qty5; + + @ApiParam("完成数量5") + private String completeQty5; + + @ApiParam("数量6") + private String qty6; + + @ApiParam("完成数量6") + private String completeQty6; + + @ApiParam("数量7") + private String qty7; + + @ApiParam("完成数量7") + private String completeQty7; + + @ApiParam("合计") + private String amountStr; + + @ApiParam("完成合计") + private String completeAmountStr; + }