From 9cfcb2a59d96bc30fd418f75e4dba6f6d4e59569 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 9 Jun 2021 11:49:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=A2=9E=E5=8A=A0&PO=E5=A2=9E=E5=8A=A0=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=9C=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 8 +++++--- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 323b3f8..37fc2ec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -263,7 +263,9 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "收货日期时间") public String receiveDateTime; - + @Transient + @ApiParam("默认收货库存地") + private String erpAreaNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 571116c..3da2cb3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -236,7 +236,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean); DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean); - + DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); From ee42edc94c613f0595042fc830703ac5fab5f17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 9 Jun 2021 16:14:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=903484=2020063-=E5=BE=85=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=8A=A5=E5=B7=A5=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?-20210610=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++- .../i3plus/pojo/mes/bean/MesFailureModeParts.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesPendingReportType.java | 44 ++++++++++++++++++ .../repository/MesFailureModePartsRepository.java | 15 ++++++ .../repository/MesPendingReportTypeRepository.java | 15 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++++++ 6 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.java 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 f4df909..8277381 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 @@ -2101,7 +2101,9 @@ public class MesEnumUtil { MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"), MES_JISA(640, "jisaExcelService", "JISA导入"), MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), - MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"); + MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"), + MES_PENDING_REPORT_TYPE(670, "PendingReportTypeExcelService", "待处理报工类型导入"), + MES_FAILURE_MODE_PARTS(680, "FailureModePartsExcelService", "失效模式零件导入"); private int value; private String service; @@ -8432,4 +8434,37 @@ public class MesEnumUtil { return tmp; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PENDING_REPORT_TYPE { + + IDENTIFICATION_TYPE(10, "鉴定类型"), + FAILURE_MODE(20, "失效模式"); + + private int value; + private String description; + + PENDING_REPORT_TYPE(int value, String description) { + this.value = value; + this.description = 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; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java new file mode 100644 index 0000000..0e91071 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeParts.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FAILURE_MODE_PARTS") +@Api("MES_失效模式零件") +public class MesFailureModeParts extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("零件名称") + private String partNameRdd; + + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam("上限值") + private Double maximum = 0d; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java new file mode 100644 index 0000000..6557e2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPendingReportType.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PENDING_REPORT_TYPE") +@Api("MES_待处理报工类型") +public class MesPendingReportType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "REPORT_TYPE") + @ApiParam("类型") + private Integer reportType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.java new file mode 100644 index 0000000..db123d0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModePartsRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFailureModeParts; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesFailureModePartsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.java new file mode 100644 index 0000000..546c407 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPendingReportTypeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPendingReportType; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Repository +public interface MesPendingReportTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index b759a7d..147360b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3825,4 +3825,21 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesDbDataCheck.getIsValid(), "isValid", packBean); return packBean; } + + public static DdlPackBean getMesPendingReportType(MesPendingReportType mesPendingReportType) { + DdlPackBean packBean = getAllBaseData(mesPendingReportType.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesPendingReportType.getPatternCode(), "patternCode", packBean); + DdlPreparedPack.getStringEqualPack(mesPendingReportType.getPatternName(), "patternName", packBean); + DdlPreparedPack.getNumEqualPack(mesPendingReportType.getReportType(), "reportType", packBean); + DdlPreparedPack.getNumEqualPack(mesPendingReportType.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesFailureModeParts(MesFailureModeParts mesFailureModeParts) { + DdlPackBean packBean = getAllBaseData(mesFailureModeParts.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesFailureModeParts.getPatternCode(), "patternCode", packBean); + DdlPreparedPack.getStringEqualPack(mesFailureModeParts.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(mesFailureModeParts.getIsValid(), "isValid", packBean); + return packBean; + } }