diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 7b07732..520d956 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -16,16 +16,18 @@ public class MesEnumUtil { * MES_SPC关键数据 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SPC_KEY_DATA_OBJECT_TYPE{ - POJO_OBJECT(10,"实体对象（单表）"), - DYNAMIC(20,"动态对象（生产数据表）"); + public enum SPC_KEY_DATA_OBJECT_TYPE { + POJO_OBJECT(10, "实体对象（单表）"), + DYNAMIC(20, "动态对象（生产数据表）"); private Integer value; private String description; - SPC_KEY_DATA_OBJECT_TYPE(Integer value,String description ){ + + SPC_KEY_DATA_OBJECT_TYPE(Integer value, String description) { this.value = value; this.description = description; } + public static String valueOfDesc(String val) { for (int i = 0; i < values().length; i++) { if (values()[i].value.equals(val)) { @@ -154,16 +156,17 @@ public class MesEnumUtil { * 启用还是禁用 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum IS_VALID{ - YES(1,"启用"), - NO(2,"禁用"); + public enum IS_VALID { + YES(1, "启用"), + NO(2, "禁用"); private Integer isValid; private String description; - IS_VALID(int isValid,String description){ + IS_VALID(int isValid, String description) { this.isValid = isValid; this.description = description; } + public int getIsValid() { return isValid; } @@ -180,6 +183,7 @@ public class MesEnumUtil { this.description = description; } } + /** * 排序方式 */ @@ -2055,7 +2059,8 @@ public class MesEnumUtil { MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), MES_LOCATION(570, "locationExcelService", "库位信息导入"), MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"), - MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"); + MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"), + MES_SPARE_PARTS(600, "sparePartsExcelService", "备件计划导入"); private int value; private String service; @@ -7702,4 +7707,78 @@ public class MesEnumUtil { } } + /** + * edi解析方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EDI_PARSE_TYPE { + JOB(10, "定时任务解析文件"), + SPARE_PARTS(20, "备件excel上传"); + + private int value; + private String description; + + EDI_PARSE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * edi解析方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EDI_REPORT_TYPE { + JSP(1, "jsp解析"), + JSA(2, "jsa解析"); + + private int value; + private String description; + + EDI_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 001d4cd..ba85092 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,7 +29,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PRODUCT_OFF_LINE") @Api("生产报工表") -public class IfProductOffLine extends BaseBean implements Serializable { +public class IfProductOffLine extends BaseBean implements Serializable { private static final long serialVersionUID = -4960147948435537306L; @Column(name = "PART_NO") @@ -148,4 +149,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; + + @Column(name = "BASE_MODULE") + @ApiParam("BaseModule零件号") + private String baseModule; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java new file mode 100644 index 0000000..d649fd4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.model.excel.mgnbj; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/10 13:15 + * @desc + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Api("备件计划导入model") +public class SparePartsImportModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("用户名") + private String userName; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @ApiParam("客户工厂代码") + private String custPlantCode; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("JIT顺序号") + private String jitSeq; + + @ApiParam("供应商代码") + private String supplierCode; + + @ApiParam("客户零件号") + private String custPartNo; + + @ApiParam("用量") + private Double qty; + + @ApiParam("单元格编号") + private Map cellNoMap = new HashMap<>(); + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java new file mode 100644 index 0000000..71dc11c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsJspModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model.excel.mgnbj; + +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail; +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/10/11 15:31 + * @desc + */ +@Data +public class SparePartsJspModel { + + private MesQueueJitPlan queueJitPlan; + + private List jitPlanBomList; + + private List jitPlanDetailList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java index a493487..d9dd5d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.mes.model.mgnbj; -import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java index b091b3a..55efd0e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * @author Wynne.Lu @@ -55,4 +57,8 @@ public class Part implements Serializable { @ApiParam("Mes物料号") private String partNo; + @ApiParam("单元格编号") + private Map cellNoMap = new HashMap<>(); + + }