From 8a6c9aadef9580e3dcb4beccaaf99ff470277b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 21 Apr 2020 11:36:52 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 111 +++++++++++++++++++++ .../pojo/wms/modelbean/BasBeanFieldModel.java | 3 + 2 files changed, 114 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 697fc86..821ff98 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6252,4 +6252,115 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 数据导入类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TEMPLATE_IMPORT_TYPE { + SINGLE_TABLE(10, "SINGLE_TABLE", "单表"), + MULTI_TABLE(20, "MULTI_TABLE", "多表"); + + private int value; + private String code; + private String description; + + TEMPLATE_IMPORT_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 数据更新类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TEMPLATE_UPDATE_TYPE { + FULL_COVERAGE(10, "FULL_COVERAGE", "全覆盖"), + DIFF_UPDATE(20, "DIFF_UPDATE", "差异更新"), + REPEATE_NO_IMPORT(30, "REPEATE_NO_IMPORT", "重复不导入"); + + private int value; + private String code; + private String description; + + TEMPLATE_UPDATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java index 7b2421c..ed03f5e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java @@ -34,4 +34,7 @@ public class BasBeanFieldModel { @ApiParam("实例字段名称") public String propertyName; + + @ApiParam("实例类全名") + public String entityClassName; } From 4e02acb9e3d2bcebabc0c027518a1040d3e4582a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 21 Apr 2020 15:09:16 +0800 Subject: [PATCH 02/28] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1683-?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java | 10 ++++------ .../estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 2 +- .../pojo/mes/repository/MesBoardEquDetailRepository.java | 15 +++++++++++++++ .../pojo/mes/repository/MesBoardEquStatusRepository.java | 15 +++++++++++++++ .../mes/repository/MesBoardMonitorObjectRepository.java | 15 +++++++++++++++ .../pojo/mes/repository/MesBoardPictureRepository.java | 15 +++++++++++++++ .../mes/repository/MesBoardPlanCapacityRepository.java | 15 +++++++++++++++ .../pojo/mes/repository/MesBoardShiftRepository.java | 15 +++++++++++++++ .../MesBoardShiftSectionCapacityRepository.java | 15 +++++++++++++++ .../mes/repository/MesBoardShiftSectionRepository.java | 15 +++++++++++++++ .../mes/repository/MesBoardTypeBaseCfgRepository.java | 15 +++++++++++++++ .../pojo/mes/repository/MesBoardTypeRepository.java | 15 +++++++++++++++ 13 files changed, 157 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.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 578c559..6a9bff3 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 @@ -643,7 +643,8 @@ public class MesEnumUtil { REPAIR("REPAIR", "处理措施"), SCRAP("SCRAP", "报废原因"), QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"), - WC_CHECK("WC_CHECK", "开线检查项"); + WC_CHECK("WC_CHECK", "开线检查项"), + BOARD("BOARD", "看板类型"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 8359735..154eada 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -42,11 +42,9 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; - @Column(name = "X") - @ApiParam("横坐标") - private Double x; + @ApiParam(value = "横坐标") + private Float horizontalAxis = 0f; - @Column(name = "Y") - @ApiParam("纵坐标") - private Double y; + @ApiParam(value = "纵坐标") + private Float verticalAxis = 0f; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 5b21418..6922121 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -25,7 +25,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_BOARD_PLAN_CAPACITY") -@Api("MES_看板时段计划产量") +@Api("MES_看板计划产能") public class MesBoardPlanCapacity extends BaseBean implements Serializable { private static final long serialVersionUID = 7355311263972875850L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.java new file mode 100644 index 0000000..41b78cb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquDetailRepository.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.MesBoardEquDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:49 上午 + * @Modify: + */ +@Repository +public interface MesBoardEquDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.java new file mode 100644 index 0000000..e3d77fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardEquStatusRepository.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.MesBoardEquStatus; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:50 上午 + * @Modify: + */ +@Repository +public interface MesBoardEquStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.java new file mode 100644 index 0000000..5e85eb7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardMonitorObjectRepository.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.MesBoardMonitorObject; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:51 上午 + * @Modify: + */ +@Repository +public interface MesBoardMonitorObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.java new file mode 100644 index 0000000..1241b79 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPictureRepository.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.MesBoardPicture; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:52 上午 + * @Modify: + */ +@Repository +public interface MesBoardPictureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.java new file mode 100644 index 0000000..01bd1f8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardPlanCapacityRepository.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.MesBoardPlanCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:53 上午 + * @Modify: + */ +@Repository +public interface MesBoardPlanCapacityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.java new file mode 100644 index 0000000..854cf62 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftRepository.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.MesBoardShift; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 10:59 上午 + * @Modify: + */ +@Repository +public interface MesBoardShiftRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java new file mode 100644 index 0000000..209e270 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.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.MesBoardShiftSectionCapacity; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 11:07 上午 + * @Modify: + */ +@Repository +public interface MesBoardShiftSectionCapacityRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.java new file mode 100644 index 0000000..ab6817b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionRepository.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.MesBoardShiftSection; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 11:00 上午 + * @Modify: + */ +@Repository +public interface MesBoardShiftSectionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.java new file mode 100644 index 0000000..573f19b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeBaseCfgRepository.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.MesBoardTypeBaseCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 9:55 下午 + * @Modify: + */ +@Repository +public interface MesBoardTypeBaseCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.java new file mode 100644 index 0000000..2217998 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardTypeRepository.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.MesBoardType; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 11:11 上午 + * @Modify: + */ +@Repository +public interface MesBoardTypeRepository extends BaseRepository { +} From 88ce1e59cf0c4c9594356d0c1b489aa96f539661 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 21 Apr 2020 15:16:42 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E3=80=901604=20=E5=BE=85=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 9c83839..917f0a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -328,6 +328,18 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "是否需要报工") private Integer isReportPartNo; + @Transient + @ApiParam(value = "库存地代码") + private String areaNo; + + @Transient + @ApiParam(value = "物料规格") + private String partSpec; + + @Transient + @ApiParam(value = "箱数") + private Long boxQtys; + public WmsStockSn() { } @@ -421,4 +433,63 @@ public class WmsStockSn extends BaseBean { this.createDatetime=createDatetime; this.modifyDatetime = modifyDatetime; } + + public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo,String partSpec,Integer qcStatus, Double qty, Long boxQtys, + String locateNo, String zoneNo, String whNo, String lotNo,String refSrc, + String dateCode, String packageNo, String createDatetime, String createUser, + String modifyDatetime, String modifyUser) { + this.id = id; + this.organizeCode = organizeCode; + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.areaNo = areaNo; + this.partSpec = partSpec; + this.qcStatus = qcStatus; + this.qty = qty; + this.boxQtys = boxQtys; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.refSrc = refSrc; + this.dateCode = dateCode; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + + public WmsStockSn(Long id,String organizeCode,String sn, String partNo, String partNameRdd, String unit, Integer snStatus, + String areaNo,Integer qcStatus, Double qty, + String locateNo, String zoneNo, String whNo, String lotNo,String refSrc, + String dateCode, String packageNo, String createDatetime, String createUser, + String modifyDatetime, String modifyUser) { + this.id = id; + this.organizeCode = organizeCode; + this.sn = sn; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.snStatus = snStatus; + this.areaNo = areaNo; + this.qcStatus = qcStatus; + this.qty = qty; + this.locateNo = locateNo; + this.zoneNo = zoneNo; + this.whNo = whNo; + this.lotNo = lotNo; + this.refSrc = refSrc; + this.dateCode = dateCode; + this.packageNo = packageNo; + this.createDatetime = createDatetime; + this.createUser = createUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; + } + } From dac1358009bb6242ea028de4fa958eccd3988401 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 13 Apr 2020 18:37:56 +0800 Subject: [PATCH 04/28] =?UTF-8?q?1.=20=E5=85=B3=E9=97=ADregister=20,=20gat?= =?UTF-8?q?eway=20,=20console=20=E6=97=A5=E5=BF=97=E6=8C=81=E4=B9=85?= =?UTF-8?q?=E5=8C=96=E6=8A=80=E6=9C=AF=202.=20Sonar=20Bug=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=203.=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 +- .../pojo/platform/platbean/SysLogConsole.java | 127 +++++++++++++++++++++ 2 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 7dfb083..b380bd4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -43,7 +43,8 @@ public class CommonEnumUtil { SURFACE(98, 0, 0, "i3surface", "对外服务"), CLOUD(97, 0, 0, "i3cloud", "微服务"), GATEWAY(96, 9000, 3, "impp-gateway", "服务网关"), - CONSOLE(95, 8010, 2, "impp-console", "服务监控台"); + CONSOLE(95, 8010, 2, "impp-console", "服务监控台"), + DEV(9999, 0000, 0, "Development", "系统调试"); /** * 产品ID @@ -1231,7 +1232,7 @@ public class CommonEnumUtil { * 日志记录方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum LOG_DETAIL_SHOW_TYPE { + public enum LOG_DETAIL_SHOW_TYPE { DEBUG(1, "DEBUG"), OVER_TIME(2, "记录超时服务"), ALL_METHOD(3, "所有服务"), diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java new file mode 100644 index 0000000..8bebcfa --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -0,0 +1,127 @@ +package cn.estsh.i3plus.pojo.platform.platbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-9 下午8:41 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_LOG_CONSOLE") +@Api(value="系统异常表",description = "记录系统出现的异常") +public class SysLogConsole extends BaseBean { + + /******** 服务器信息 ********/ + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品名称") + private String softType; + + @Column(name="LOG_HOST") + @ApiParam(value ="服务器IP") + private String logHost; + + @Column(name="LOG_PID") + @ApiParam(value ="应用PID") + private Long logPid; + + @Column(name="LOG_PORT") + @ApiParam(value ="应用端口") + private Integer logPort; + + @Column(name="LOG_GORP") + @ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)") + private String logGorp; + + @Column(name="LOG_LEVEL") + @ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)") + private String logLevel; + + @Column(name="LOG_TYPE") + @ApiParam(value ="操作类型(post,put,get)") + private String logType; + + /******** 用户信息 ********/ + + @Column(name="USER_HOST") + @ApiParam(value ="用户登录IP") + private String userHost; + + @Column(name="USER_BROWSER") + @ApiParam(value ="用户登录浏览器") + private String userBrowser; + + @Column(name="USER_OS") + @ApiParam(value ="用户登录操作系统") + private String userOs; + + @Column(name="USER_ID") + @ApiParam(value ="账号ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="用户登录名称") + private String userLoginName; + + /******** 日志信息 ********/ + + @Column(name="EXECUTE_THREAD_ID") + @ApiParam(value ="执行线程") + private String executeThreadId; + + @Column(name="EXECUTE_CLASS_NAME") + @ApiParam(value ="执行Class") + private String executeClassName; + + @Column(name="EXECUTE_METHOD") + @ApiParam(value ="执行方法") + private String executeMethod; + + @Column(name="EXECUTE_LINE_NUMBER") + @ApiParam(value ="报错行数") + private Integer executeLineNumber; + + @Column(name="EXECUTE_TITLE") + @ApiParam(value ="方法标题") + private String executeTitle; + + @Column(name="EXECUTE_ARGS") + @ApiParam(value ="执行参数") + private String executeArgs; + + @Column(name="EXECUTE_TIME") + @ApiParam(value ="执行耗时") + private Integer executeTime; + + @Column(name="EXECUTE_STATUS") + @ApiParam(value ="执行状态") + private String executeStatus; + + @Column(name="EXECUTE_MESSAGE") + @ApiParam(value ="执行日志信息") + private String executeMessage; + + @Column(name="ERROR_STACK_TRACE",length = 5000) + @ApiParam(value ="执行异常堆栈信息") + private String errorStackTrace; + +} From 69346da06d02dafa9138c84036845b94e3628bc4 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 15 Apr 2020 23:00:07 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2Bug?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java | 9 +++++++++ .../cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java | 1 + .../cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index f0f7fb2..b372f78 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -35,6 +36,14 @@ public class SysConfig extends BaseBean { @ApiParam(value ="名称") private String name; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + @Column(name="CONFIG_TYPE") @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1") private Integer configType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index 8bebcfa..d5d8333 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="系统异常表",description = "记录系统出现的异常") public class SysLogConsole extends BaseBean { + /******** 服务器信息 ********/ @Column(name="SOFT_TYPE") @ApiParam(value ="产品名称") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 5268d83..fedc271 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -43,7 +43,7 @@ public class SysLogTaskTime extends BaseBean { @Column(name="SCHEDULER_SERVER_PORT") @ApiParam(value ="调度服务器端口") - private String schedulerServerPort; + private Integer schedulerServerPort; @Column(name="TASK_THREAD_ID") @ApiParam(value ="任务线程id") From fe46d8da29a51d9322c7e5e1583030989f8d070d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Sat, 18 Apr 2020 15:47:19 +0800 Subject: [PATCH 06/28] =?UTF-8?q?1.=20=E6=8E=88=E6=9D=83=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4=202.=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=9F=A5=E8=AF=A2=E5=B0=81=E8=A3=85?= =?UTF-8?q?=203.=20=E6=B7=BB=E5=8A=A0=E8=BD=AF=E9=80=82=E9=85=8D=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=204.=20p?= =?UTF-8?q?om.xml=20=E5=BC=95=E7=94=A8=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/license/ImppLicense.java | 107 +++++++++++++++++++++ .../pojo/model/license/ImppLicenseSenseshield.java | 55 +++++++++++ .../pojo/model/softswitch/BsSuitCaseModel.java | 8 ++ .../pojo/model/softswitch/SuitImppCloudModel.java | 35 +++++++ .../pojo/platform/platbean/SysLogConsole.java | 1 + .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 7 ++ 6 files changed, 213 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java new file mode 100644 index 0000000..b7395fd --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java @@ -0,0 +1,107 @@ +package cn.estsh.i3plus.pojo.model.license; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.Objects; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-2-10 下午5:10 + * @Modify: + **/ +@Data +public class ImppLicense implements Serializable { + + private static final long serialVersionUID = 2365830603839063328L; + /** + * + * 授权人名称 + * 授权开始时间 + * 授权结束时间 + * + * 授权工厂 + * 仓库 + * 产线 + * 用户 + * 授权描述 + * 同时最大在线数量 + * + */ + + /* 基础信息 */ + @ApiParam(value ="授权ID") + private Long Id; // ID + @ApiParam(value ="授权应用ID") + private Long appId; // APP_ID + @ApiParam(value ="授权读取授权数据ID") + private Integer licenseSourceId; // 授权数据来源 + public String getLicenseSourceTxt() { + return licenseSourceId == null ? null : CommonEnumUtil.LICENSE_SOURCE.valueOf(licenseSourceId); + } + + /* 授权信息 */ + @ApiParam(value ="授权开始时间") + private Date licenseStartDateTime; // 授权开始时间 + @ApiParam(value ="授权结束时间") + private Date licenseEndDateTime; // 授权结束时间 + @ApiParam(value ="授权组织数量") + private Integer licenseMaxOrganize; // 授权组织数量 + @ApiParam(value ="授权仓库数量") + private Integer licenseMaxWarehouse; // 授权仓库数量 + @ApiParam(value ="授权产线数量") + private Integer licenseMaxProductionLine; // 授权产线数量 + @ApiParam(value ="授权用户数量") + private Integer licenseMaxUser; // 授权用户数量 + @ApiParam(value ="授权同时在线数量") + private Integer licenseMaxUserSession; // 授权在线用户数量 + @ApiParam(value ="授权描述信息") + private String licenseDescription; // 授权描述信息 + @ApiParam(value ="深思授权信息") + private ImppLicenseSenseshield senseshield; + + /* 业务人员信息 */ + @ApiParam(value ="授权创建时间") + private Date licenseCreateDateTime; // 授权时间 + @ApiParam(value ="授权创建人员ID") + private Long licenseCreateUserId; // 授权用户ID + @ApiParam(value ="授权创建人员名称") + private String licenseCreateUserName; // 授权人名称 + @ApiParam(value ="授权更新人员ID") + private Long licenseUpdateUserId; // 授权更新人员ID + @ApiParam(value ="授权更新人员名称") + private String licenseUpdateUserName; // 授权人名称 + @ApiParam(value ="授权更新人员时间") + private Date licenseUpdateDateTime; // 授权更新时间 + + /* 授权锁信息(软锁,usb锁) */ + @ApiParam(value ="授权使用开始时间") + private Date lockStartTime; + @ApiParam(value ="授权使用结束时间") + private Date lockEndTime; + @ApiParam(value ="锁类型") + private String lockType; + + /* 基础业务逻辑 */ + @ApiParam(value ="到期时间") + private Date maturityDateTime; + + public void setSenseshield(ImppLicenseSenseshield senseshield) { + if(Objects.nonNull(senseshield)){ + try { + this.lockStartTime = new Date(senseshield.getLast_update_timestamp() * 1000L); + this.lockEndTime = new Date((senseshield.getLast_update_timestamp() + senseshield.getSpan_time()) * 1000L); + this.lockType = senseshield.getType(); + this.maturityDateTime = lockEndTime.getTime() > licenseEndDateTime.getTime() ? licenseEndDateTime: lockEndTime; + }catch (Exception e){ + } + } + this.senseshield = senseshield; + } + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java new file mode 100644 index 0000000..4606b0e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.model.license; + +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-16 下午7:54 + * @Modify: + **/ +@Data +public class ImppLicenseSenseshield { + + + /** + * license_id : 170817 + * enable : true + * guid : 6cece6946234ed4292617306ccd1191a + * first_use_time : 1587029768 + * span_time : 315360000 + * concurrent_type : win_user_session + * concurrent : 1000 + * version : 0 + * module : 0000000000000000 + * last_update_timestamp : 1587029200 + * last_update_timesn : 0 + * rom_size : 1184 + * raw_size : 1184 + * pub_size : 0 + * developer_id : 0800000000001005 + * type : local + * sn : 9733c801000702075ed2000200270021 + */ + + private int license_id; + private boolean enable; + private String guid; + private int first_use_time; + private int span_time; + private String concurrent_type; + private int concurrent; + private int version; + private String module; + private int last_update_timestamp; + private int last_update_timesn; + private int rom_size; + private int raw_size; + private int pub_size; + private String developer_id; + private String type; + private String sn; + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 0bb8f7c..4c5ea4f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,12 +1,14 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.*; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.Objects; /** * @Description : 适配器model @@ -23,6 +25,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "适配器") private BsSuitCase bsSuitCase; + @ApiParam(value = "适配器同步处理Cloud微服务标识") + private Integer resultSoftType; + @ApiParam(value = "数据源适配套件") private BsSuitCaseDataSource bsSuitCaseDataSource; @@ -49,5 +54,8 @@ public class BsSuitCaseModel implements Serializable { public BsSuitCaseModel(BsSuitCase bsSuitCase) { this.bsSuitCase = bsSuitCase; + if(Objects.nonNull(bsSuitCase.getResultSoftType())){ + this.resultSoftType = bsSuitCase.getResultSoftType(); + } } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java new file mode 100644 index 0000000..83ac2e0 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-18 上午10:26 + * @Modify: + **/ +@Data +public class SuitImppCloudModel { + + @ApiParam(value = "适配器信息") + private BsSuitCaseModel model; + + @ApiParam(value = "请求参数信息") + private Object param; + + public SuitImppCloudModel() { + } + + public SuitImppCloudModel(SuitServerModel serverModel) { + this.model = serverModel.getBsSuitCaseModel(); + this.param = serverModel.getObj(); + this.param = serverModel.getObj(); + } + + public SuitImppCloudModel(BsSuitCaseModel model, Object param) { + this.model = model; + this.param = param; + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index d5d8333..fd31e35 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.platbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index b757ba7..deb2151 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -108,6 +108,13 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "是否推送MQ") private Integer isPushMQ; + @Column(name = "RESULT_SOFT_TYPE") + @ApiParam(value = "同步调用微服务") + private Integer resultSoftType; + public String getResultSoftTypeTxt() { + return resultSoftType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(resultSoftType); + } + @Column(name = "SSL_KEY_ID") @ApiParam(value = "证书id") @JsonSerialize(using = ToStringSerializer.class) From effae233bf494aff1f263f793b78a92527002964 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 21 Apr 2020 15:02:58 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20Pojo=20=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 44 ++++++++++++ .../i3plus/pojo/model/common/ClassFieldModel.java | 1 + .../estsh/i3plus/pojo/model/common/ClassModel.java | 1 + .../i3plus/pojo/model/license/ImppLicense.java | 29 +++++--- .../i3plus/pojo/platform/bean/SysPojoVersion.java | 82 ++++++++++++++++++++++ .../pojo/platform/bean/SysPojoVersionDetail.java | 56 +++++++++++++++ .../pojo/platform/bean/SysPojoVersionPlan.java | 56 +++++++++++++++ .../repository/SysPojoVersionDetailRepository.java | 14 ++++ .../repository/SysPojoVersionPlanRepository.java | 14 ++++ .../repository/SysPojoVersionRepository.java | 14 ++++ 10 files changed, 303 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index b380bd4..00f6f1b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1964,6 +1964,50 @@ public class CommonEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DAO_OPERATE_TYPE { + INSERT(1, "新增"), + DELETE(2, "删除"), + UPDATE(3, "修改"), + SELECT(4, "查询"); + + private int value; + private String description; + + private DAO_OPERATE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(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 static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * actuator env */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java index 907b15a..e375044 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassFieldModel.java @@ -18,6 +18,7 @@ import java.io.Serializable; @Data public class ClassFieldModel implements Serializable { + private static final long serialVersionUID = -8873901724079105728L; @ApiParam(value ="包名") private String packageName; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java index e601f37..976368d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ClassModel.java @@ -21,6 +21,7 @@ import java.util.List; @Data public class ClassModel implements Serializable { + private static final long serialVersionUID = -8024274383480419754L; @ApiParam(value ="服务ID") private int serverId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java index b7395fd..77c3e53 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicense.java @@ -3,8 +3,11 @@ package cn.estsh.i3plus.pojo.model.license; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import java.io.Serializable; +import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.Objects; @@ -19,6 +22,8 @@ import java.util.Objects; public class ImppLicense implements Serializable { private static final long serialVersionUID = 2365830603839063328L; + + private static final String TIME_FORMAT = "yyyy-MM-dd HH:mm:ss"; /** * * 授权人名称 @@ -47,9 +52,9 @@ public class ImppLicense implements Serializable { /* 授权信息 */ @ApiParam(value ="授权开始时间") - private Date licenseStartDateTime; // 授权开始时间 + private String licenseStartDateTime; // 授权开始时间 @ApiParam(value ="授权结束时间") - private Date licenseEndDateTime; // 授权结束时间 + private String licenseEndDateTime; // 授权结束时间 @ApiParam(value ="授权组织数量") private Integer licenseMaxOrganize; // 授权组织数量 @ApiParam(value ="授权仓库数量") @@ -81,23 +86,31 @@ public class ImppLicense implements Serializable { /* 授权锁信息(软锁,usb锁) */ @ApiParam(value ="授权使用开始时间") - private Date lockStartTime; + private String lockStartTime; @ApiParam(value ="授权使用结束时间") - private Date lockEndTime; + private String lockEndTime; @ApiParam(value ="锁类型") private String lockType; /* 基础业务逻辑 */ @ApiParam(value ="到期时间") - private Date maturityDateTime; + private String maturityDateTime; + + public String getMaturityDateTime() { + if(StringUtils.isBlank(maturityDateTime)){ + return StringUtils.isNotBlank(lockEndTime) ? lockEndTime : licenseEndDateTime; + } + return maturityDateTime; + } public void setSenseshield(ImppLicenseSenseshield senseshield) { if(Objects.nonNull(senseshield)){ try { - this.lockStartTime = new Date(senseshield.getLast_update_timestamp() * 1000L); - this.lockEndTime = new Date((senseshield.getLast_update_timestamp() + senseshield.getSpan_time()) * 1000L); + Date lockEndTime = new Date((senseshield.getLast_update_timestamp() + senseshield.getSpan_time()) * 1000L); + Date licenseEndDateTime = new Date(this.licenseEndDateTime); + this.lockType = senseshield.getType(); - this.maturityDateTime = lockEndTime.getTime() > licenseEndDateTime.getTime() ? licenseEndDateTime: lockEndTime; + this.maturityDateTime = DateFormatUtils.format(lockEndTime.getTime() > licenseEndDateTime.getTime() ? licenseEndDateTime: lockEndTime,TIME_FORMAT); }catch (Exception e){ } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java new file mode 100644 index 0000000..3fe7559 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersion.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.platform.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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.*; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-20 上午9:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_POJO_VERSION") +@Api(value="对象历史") +public class SysPojoVersion extends BaseBean { + + + private static final long serialVersionUID = -2456588444446248239L; + + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="REF_ID") + @ApiParam(value ="对象id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long refId; + + @Column(name="REF_CLASS") + @ApiParam(value ="记录对象") + private String refClass; + + @Column(name="VERSION_NO") + @ApiParam(value ="记录对象版本号") + private Integer versionNo = 0; + + @Column(name="operateType") + @ApiParam(value ="操作类型") + private Integer operateType; + public String getOperateTypeTxt() { + return operateType == null ? null : CommonEnumUtil.DAO_OPERATE_TYPE.valueOf(operateType); + } + + @Column(name="VERSION_METHOD_NAME") + @ApiParam(value ="操作方法名称") + private String versionMethodName; + + @Column(name="POJO_DETAIL_ID") + @ApiParam(value ="对象明细id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoDetailId; + + @Lob + @Column(name="POJO_COMPARE") + @ApiParam(value ="记录对象对比差异") + private String pojoCompare; + + @Transient + @ApiParam(value ="用户部门信息") + private SysPojoVersionDetail versionDetail; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java new file mode 100644 index 0000000..19f9d82 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionDetail.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.platform.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-20 上午9:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_POJO_VERSION_DETAIL") +@Api(value="对象历史") +public class SysPojoVersionDetail extends BaseBean { + + + private static final long serialVersionUID = -2456588444446248239L; + @Column(name="POJO_VERSION_ID") + @ApiParam(value ="对象id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long pojoVersionId; + + @Lob + @Column(name="POJO_BEFORE",length = 5000) + @ApiParam(value ="原始对象信息") + private String pojoBefore; + + @Lob + @Column(name="POJO_AFTER",length = 5000) + @ApiParam(value ="修改之后对象信息") + private String pojoAfter; + + @Lob + @Column(name="POJO_COMPARE",length = 5000) + @ApiParam(value ="记录对象对比差异") + private String pojoCompare; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java new file mode 100644 index 0000000..407d667 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPojoVersionPlan.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.platform.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; +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; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-20 上午9:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_POJO_VERSION_PLAN") +@Api(value="对象历史") +public class SysPojoVersionPlan extends BaseBean { + + private static final long serialVersionUID = -1120504360281638917L; + @Column(name="SOFT_TYPE") + @ApiParam(value ="产品类型") + private Integer softType; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + @Column(name="REF_CLASS") + @ApiParam(value ="记录对象") + private String refClass; + + @Column(name="REF_CLASS_TITLE") + @ApiParam(value ="记录对象名称") + private String refClassTitle; + + @Column(name="PLAN_STATUS") + @ApiParam(value ="记录对象状态") + private Integer planStatus; + + @Column(name="PLAN_DESCRIPTION") + @ApiParam(value ="记录对象描述") + private String planDescription; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.java new file mode 100644 index 0000000..33af517 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionDetail; + +/** + * @Description : 对象记录明细 + * @Reference : + * @Author : wei.peng + * @Date : 2020-04-21 14:19:34 + * @Modify : + **/ +public interface SysPojoVersionDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.java new file mode 100644 index 0000000..feaa6da --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionPlanRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan; + +/** + * @Description : 对象记录拦截 + * @Reference : + * @Author : wei.peng + * @Date : 2020-04-21 14:19:34 + * @Modify : + **/ +public interface SysPojoVersionPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.java new file mode 100644 index 0000000..78fbb6f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPojoVersionRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion; + +/** + * @Description : 对象记录 + * @Reference : + * @Author : wei.peng + * @Date : 2020-04-21 14:19:34 + * @Modify : + **/ +public interface SysPojoVersionRepository extends BaseRepository { +} From 9da9a568f59431770ffb539da1b5a3bbf818312e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 21 Apr 2020 15:27:13 +0800 Subject: [PATCH 08/28] mes --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java index 73200ff..34d947e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java @@ -41,6 +41,8 @@ public class RequestModel { private ActionRequestModel actionRequestBean;//工单状态 + private String serialNumber;//过程条码 + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { this.queueOrderList = queueOrderList; this.currentSeq = currentSeq; @@ -166,4 +168,8 @@ public class RequestModel { public void setDestStatus(Integer destStatus) { this.destStatus = destStatus; } + + public String getSerialNumber() { return serialNumber; } + + public void setSerialNumber(String serialNumber) { this.serialNumber = serialNumber; } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 27cfed2..3fc6e54 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -334,4 +334,11 @@ public class PtlHqlPack { DdlPreparedPack.getNumEqualPack(areaRoute.getRouteType(), "routeType", packBean); return packBean; } + + public static DdlPackBean getPtlArea(PtlArea area, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(area, organizeCode); + DdlPreparedPack.getStringLikerPack(area.getAreaNo(), "areaNo", packBean); + DdlPreparedPack.getStringLikerPack(area.getAreaName(), "areaName", packBean); + return packBean; + } } From f6988f36c8a662dd4f8068af1e67f00fc2d61c98 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 21 Apr 2020 16:15:30 +0800 Subject: [PATCH 09/28] =?UTF-8?q?1655=20=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=9B=BF=E4=BB=A3=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 51 ++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 60 +++++++++++++++++++++ .../pojo/wms/bean/WmsPurchasePlanHistory.java | 62 ++++++++++++++++++++++ .../WmsPurchasePlanHistoryRepository.java | 16 ++++++ 4 files changed, 189 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 821ff98..cf7ca41 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6363,4 +6363,55 @@ public class WmsEnumUtil { return valueOf(val); } } + + + /** + * 采购计划历史状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PURCHASE_PLAN_HISTORY_STATUS { + CREATE(10, "CREATE", "采购订单创建"), + PUBLISH(20, "PUBLISH", "采购订单发布"), + VERDOR_CONFIRM(30, "VERDOR_CONFIRM", "供应商确认订单"), + VERDOR_PRINT(40, "VERDOR_PRINT", "供应商打印"), + VERDOR_SNED(50, "VERDOR_SNED", "供应商发货"), + RECEIPT_FINISH(60, "RECEIPT_FINISH", "收货完成"), + FAIL(70, "FAIL", "质检完成"); + + private int value; + private String code; + private String description; + + PURCHASE_PLAN_HISTORY_STATUS(int value, String code,String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 0544b33..2f5c2fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -163,6 +163,32 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("集装箱号") private String containerNo; + + @Transient + @ApiParam("采购订单状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description") + private Integer purchaseItemStatus; + + @Transient + @ApiParam("供应商") + private String vendorNo; + + @Transient + @ApiParam("供应商名称") + private String vendorName; + + @Transient + @ApiParam("开始时间") + private String planStratDate; + + @Transient + @ApiParam("结束时间") + private String planEndDate; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + public Double getSnpVal() { return snp; } @@ -185,4 +211,38 @@ public class WmsPOMasterDetails extends BaseBean { this.erpAreaNo = erpAreaNo; this.organizeCode = organizeCode; } + + public WmsPOMasterDetails( + String organizeCode, + String orderNo, + Integer purchaseItemStatus, + String planDate, + String planTime, + String partNo, + String partNameRdd, + Double qty, + Double rcQty, + String vendorNo, + String createUser, + String createDatetime, + String modifyUser, + String modifyDatetime, + String remark + ){ + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.purchaseItemStatus = purchaseItemStatus; + this.planDate = planDate; + this.planTime = planTime; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.rcQty = rcQty; + this.vendorNo = vendorNo; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.remark = remark; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java new file mode 100644 index 0000000..8691970 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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 javax.persistence.Transient; + +/** + * @Description : 采购计划历史 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-04-15 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PURCHASE_PLAN_HISTORY") +@Api("采购计划历史") +public class WmsPurchasePlanHistory extends BaseBean { + private static final long serialVersionUID = -8147353212724381079L; + + @Column(name = "ORDER_NO") + @ApiParam("单号") + private String orderNo; + + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @Column(name = "CAR_NO") + @ApiParam("车牌号") + private String carNo; + + @Column(name = "CONTACT") + @ApiParam("联系人") + private String contact; + + @Column(name = "CONTACT_TEL") + @ApiParam("联系电话") + private String contactTel; + + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.java new file mode 100644 index 0000000..9db9dd0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPurchasePlanHistory; +import org.springframework.stereotype.Repository; + +/** + * @Description : 采购计划历史dao层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-04-15 10:30 + * @Modify: + **/ +@Repository +public interface WmsPurchasePlanHistoryRepository extends BaseRepository { +} From 795312637c1171f5d9c12bf16b07b04695256153 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 21 Apr 2020 17:14:45 +0800 Subject: [PATCH 10/28] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1683-?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E7=AE=A1=E7=90=86=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BA=A7=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 6922121..cb09cd4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -11,8 +11,10 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: * @Author: jokelin @@ -53,4 +55,8 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @Column(name = "PLAN_CAPACITY") @ApiParam("计划产量") private Integer planCapacity; + + @Transient + @ApiParam("看板时段计划产量") + private List boardShiftSectionCapacities; } From 4d383dda1b80653c72df9985ae2acd18fde97490 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 21 Apr 2020 17:34:14 +0800 Subject: [PATCH 11/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 12 +++++++++ .../i3plus/pojo/wms/dto/VendorDelayArrivedDto.java | 19 ++++++++++++++ .../i3plus/pojo/wms/dto/VendorDelayQueryDto.java | 30 ++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 65e800d..44e8a69 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -138,4 +138,16 @@ public class WmsDocFgDetail extends BaseBean { @ApiParam(value = "BOM生效日期") @Column(name = "EFF_START_TIME") private String effStartTime; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "ACTUAL_REPORT_LINE") + @ApiParam("实际报工产线") + private String actualReportLine; + + @Column(name = "BATCH_NO") + @ApiParam("批号") + private String batchNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java new file mode 100644 index 0000000..88f5c79 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class VendorDelayArrivedDto { + @ApiParam(value = "供应商代码") + private String vendorNo; + + @ApiParam(value = "供应商名称") + private String vendorName; + + @ApiParam(value = "延迟次数") + private Integer delayCount; + + @ApiParam(value = "工厂代码") + private String organizeCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java new file mode 100644 index 0000000..28ad833 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class VendorDelayQueryDto extends Pager { + + @ApiParam(value = "工厂代码") + private String organizeCode; + + @ApiParam(value = "供应商代码") + private String vendorNo; + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "完成状态") + private String completeStatus; + + @ApiParam(value = "单据编号") + private String orderNo; + + @ApiParam(value = "开始时间") + private String startDateTime; + + @ApiParam(value = "结束时间") + private String endDateTime; +} From aa9ee803b87f90888a47a4d8d395b366a07a547f Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 21 Apr 2020 19:53:31 +0800 Subject: [PATCH 12/28] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1683-?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E7=AE=A1=E7=90=86=20=E5=B1=95=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java new file mode 100644 index 0000000..b4284e5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/21 6:55 下午 + * @Modify: + */ +@Data +public class BoardModel { + + @ApiParam("看板名称") + private String boardName; + + @ApiParam("班别") + private String shiftName; + + @ApiParam("对象值描述") + private String objectValueDesc; + + @ApiParam("计划人数") + private Integer planPeopleNum; + + @ApiParam("实际人数") + private Integer actualPeopleNum; + + @ApiParam("目标达成数") + private Integer achievedPeopleNum; + + @ApiParam("看板时段计划产量") + private List boardShiftSectionCapacityList; +} From 156f0feedcc05768a61f46ed3ac74974b86896b9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 21 Apr 2020 20:32:39 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E3=80=901603=20=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E6=9F=A5=E8=AF=A2=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 79 ++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 5ea2ac2..6c182e1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -200,6 +200,54 @@ public class WmsMoveSn extends BaseBean { @ApiParam("是否寄售 1-是 2-否") private Integer consignation; + @Transient + @ApiParam("收货物料编码") + public String rcPartNo; + + @Transient + @ApiParam("发运物料编码") + public String outPartNo; + + @Transient + @ApiParam("发运单据") + public String outRefSrc; + + @Transient + @ApiParam("收货单据") + public String rcRefSrc; + + @Transient + @ApiParam("发运条码") + public String outSn; + + @Transient + @ApiParam("收货条码") + public String rcSn; + + @Transient + @ApiParam("发运单位") + public String outUnit; + + @Transient + @ApiParam("收货单位") + public String rcUnit; + + @Transient + @ApiParam("发运数量") + public Double outQty; + + @Transient + @ApiParam("收货数量") + public Double rcQty; + + @Transient + @ApiParam("委外发运时间") + public String outDatetime; + + @Transient + @ApiParam("委外收货时间") + public String rcDatetime; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } @@ -281,4 +329,35 @@ public class WmsMoveSn extends BaseBean { this.modifyDatetime = modifyDatetime; this.modifyUser = modifyUser; } + + public WmsMoveSn(Long id,String organizeCode,String vendorNo,String rcPartNo,String outPartNo, Double destQty) { + this.id = id; + this.organizeCode = organizeCode; + this.vendorNo = vendorNo; + this.rcPartNo = rcPartNo; + this.outPartNo = outPartNo; + this.destQty = destQty; + } + + public WmsMoveSn(Long id,String organizeCode,String outRefSrc,String rcRefSrc,String outSn,String rcSn, + String rcPartNo,String outPartNo,String outUnit,String rcUnit, Double outQty ,Double rcQty, + String outDatetime,String rcDatetime ,String vendorNo, String modifyUser,String modifyDatetime) { + this.id = id; + this.organizeCode = organizeCode; + this.outRefSrc = outRefSrc; + this.rcRefSrc = rcRefSrc; + this.outSn = outSn; + this.rcSn = rcSn; + this.outPartNo = outPartNo; + this.rcPartNo = rcPartNo; + this.outUnit = outUnit; + this.rcUnit = rcUnit; + this.outQty = outQty; + this.rcQty = rcQty; + this.outDatetime = outDatetime; + this.rcDatetime = rcDatetime; + this.vendorNo = vendorNo; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } } From ee1c2131ff3ccc233f3818140643ee570f24c72f Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 22 Apr 2020 11:32:21 +0800 Subject: [PATCH 14/28] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1716=20?= =?UTF-8?q?=E5=86=99=E5=85=A5=E4=BA=A7=E5=93=81=E4=B8=8B=E7=BA=BF=E8=AE=B0?= =?UTF-8?q?=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesOffLineRecord.java | 68 ++++++++++++++++++++++ .../mes/repository/MesOffLineRecordRepository.java | 15 +++++ 2 files changed, 83 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java new file mode 100644 index 0000000..46fe2ed --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java @@ -0,0 +1,68 @@ +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: jokelin + * @Date: 2020/4/22 11:03 上午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OFF_LINE_RECORD") +@Api("MES_产品下线记录") +public class MesOffLineRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2767323581134885752L; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "OFF_LINE_TIME") + @ApiParam("下线时间") + private String offLineTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.java new file mode 100644 index 0000000..80e3159 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.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.MesOffLineRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/22 11:10 上午 + * @Modify: + */ +@Repository +public interface MesOffLineRecordRepository extends BaseRepository { +} From 2303186fc42a132bbdd1a9b0f340afe36b2ae844 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 22 Apr 2020 18:57:12 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E3=80=90657=E3=80=91=E3=80=90=E4=B8=AD?= =?UTF-8?q?=E8=88=AAWMS=E7=9C=8B=E6=9D=BF=EF=BC=8D=E6=88=90=E5=93=81?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=8E=87=E7=9C=8B=E6=9D=BF=E3=80=91=20?= =?UTF-8?q?=E3=80=90658=E3=80=91=E3=80=90=E4=B8=AD=E8=88=AAWMS=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=EF=BC=8D=E5=8F=91=E8=BF=90=E7=AA=97=E5=8F=A3=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=9C=8B=E6=9D=BF=E3=80=91=20=E3=80=90656=E3=80=91?= =?UTF-8?q?=E3=80=90=20=E4=B8=AD=E8=88=AAWMS=E7=9C=8B=E6=9D=BF=EF=BC=8D?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=AE=8C=E6=88=90=E7=8E=87=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E3=80=91=20=E3=80=90655=E3=80=91=E3=80=90=20=E4=B8=AD=E8=88=AA?= =?UTF-8?q?WMS=E7=9C=8B=E6=9D=BF=EF=BC=8D=E4=BB=93=E5=BA=93=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=9C=8B=E6=9D=BF=E3=80=91=20=E3=80=90654=E3=80=91?= =?UTF-8?q?=E3=80=90=E4=B8=AD=E8=88=AAWMS=E7=9C=8B=E6=9D=BF=EF=BC=8D?= =?UTF-8?q?=EF=BC=93=EF=BC=90=E5=A4=A9=E4=BE=9B=E5=BA=94=E5=95=86=E5=BB=B6?= =?UTF-8?q?=E6=9C=9F=E5=88=B0=E8=B4=A7=E8=B7=9F=E8=B8=AA=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 21 +++--- .../estsh/i3plus/pojo/wms/bean/WmsCustWindow.java | 3 + .../pojo/wms/bean/WmsDocMovementDetails.java | 15 ++++- .../i3plus/pojo/wms/dto/WmsCustWindowDto.java | 57 ++++++++++++++++ .../wms/dto/WmsMoveMovementEffectivenessDto.java | 45 +++++++++++++ .../estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java | 75 ++++++++++++++++++++++ .../pojo/wms/dto/WmsSupplierExtensionDto.java | 35 ++++++++++ .../pojo/wms/dto/WmsWarehouseWarningDto.java | 62 ++++++++++++++++++ .../pojo/wms/modelbean/WmsTmsShippingExtModel.java | 2 +- 9 files changed, 302 insertions(+), 13 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index cf7ca41..1b3c5ae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -304,6 +304,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { CREATE(10, "CREATE", "创建"), + PROCESSING(50, "PROCESSING", "发运中"), RECEIPTED(20, "FINISHED", "已完成"), CANCEL(30, "CANCLE", "行取消"), PRINTED(40, "PRINTED", "已打印"); @@ -6095,16 +6096,16 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WEEK_TYPE { - MONDAY(10, "星期一"), - TUESDAY(20, "星期二"), - WEDNESDAY(30, "星期三"), - THURSDAY(40, "星期四"), - FRIDAY(50, "星期五"), - SATURDAY(60, "星期六"), - SUNDAY(70, "星期七"); - - private int value; - private String description; + MONDAY(20, "星期一"), + TUESDAY(30, "星期二"), + WEDNESDAY(40, "星期三"), + THURSDAY(50, "星期四"), + FRIDAY(60, "星期五"), + SATURDAY(70, "星期六"), + SUNDAY(10, "星期日"); + + private final int value; + private final String description; WEEK_TYPE(int value, String description) { this.value = value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java index 65a6608..f250b58 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -38,6 +40,7 @@ public class WmsCustWindow extends BaseBean { private String custWindowTime; @Column(name = "WEEKS") + @AnnoOutputColumn(refClass = WmsEnumUtil.WEEK_TYPE.class, refForeignKey = "value", value = "description") @ApiParam(value = "星期") private String weeks; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 0b173cb..5458927 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -11,8 +11,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; -import java.util.Objects; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description :移库单明细实体(用于转储类业务) @@ -108,6 +112,13 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; + + /** + * 已创建，已收货，已发运，已拣货 + */ + @Transient + @ApiParam(value = "状态中文") + private String itemStatusStr; /** * 是否免费:0=计费,1=免费 */ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java new file mode 100644 index 0000000..f26fe08 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCustWindowDto.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description :窗口输出类 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-21 2:37 下午 + * @Modify: + **/ +@Entity +@Data +@Api("窗口输出类") +public class WmsCustWindowDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + + @ApiParam(value = "窗口时间") + private String custWindowTime; + + @ApiParam(value = "星期一客户") + private String mondayCust; + + @ApiParam(value = "星期二客户") + private String tuesdayCust; + + @ApiParam(value = "星期三客户") + private String wednesdayCust; + + @ApiParam(value = "星期四客户") + private String thursdayCust; + + @ApiParam(value = "星期五客户") + private String fridayCust; + + @ApiParam(value = "星期六客户") + private String saturdayCust; + + @ApiParam(value = "星期日客户") + private String sundayCust; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java new file mode 100644 index 0000000..479bc1f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsMoveMovementEffectivenessDto.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description :移动单效率(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Entity +@Api("移动单效率(出参)") +public class WmsMoveMovementEffectivenessDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "日期") + private String date; + + @ApiParam(value = "比列") + private Double percentage; + + public WmsMoveMovementEffectivenessDto(String date, Double percentage) { + this.date = date; + this.percentage = percentage; + } + + public WmsMoveMovementEffectivenessDto() { + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java new file mode 100644 index 0000000..ffaf492 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsStockSnDto.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description :装车单打印输出model(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Entity +@Api("静态盘点查询输出实体类") +public class WmsStockSnDto { + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + @ApiParam(value = "库位") + private String locateNo; + @ApiParam(value = "物料号") + private String partNo; + @ApiParam(value = "物料名称") + private String partNameRdd; + @ApiParam(value = "数量") + private Double qty; + @ApiParam(value = "生产批次") + private String dateCode; + + @ApiParam(value = "规格") + private String partSpec; + + @ApiParam(value = "存储区") + private String zoneNo; + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + } + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + this.partSpec = partSpec; + } + + public WmsStockSnDto(String locateNo, String partNo, String partNameRdd, Double qty, String dateCode, String partSpec, String zoneNo) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.dateCode = dateCode; + this.partSpec = partSpec; + this.zoneNo = zoneNo; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java new file mode 100644 index 0000000..680c401 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsSupplierExtensionDto.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description :供应商延期输出实体类(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("供应商延期输出实体类") +public class WmsSupplierExtensionDto { + + @ApiParam(value = "序号") + private Integer rn; + + @ApiParam(value = "供应商编号") + private String vendorNo; + + @ApiParam(value = "数量") + private Integer num; + + public WmsSupplierExtensionDto() { + + } + + public WmsSupplierExtensionDto(String vendorNo, Integer num) { + this.vendorNo = vendorNo; + this.num = num; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java new file mode 100644 index 0000000..d025df0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsWarehouseWarningDto.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 中航WMS看板－仓库预警看板(出参) + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("中航WMS看板－仓库预警看板(出参)") +public class WmsWarehouseWarningDto { + + @ApiParam(value = "零件号") + private String partNo; + + @ApiParam(value = "存储区") + private String zoneNo; + + @ApiParam(value = "零件号名称") + private String partNameRdd; + + @ApiParam(value = "库存") + private Double qty; + + @ApiParam(value = "最大库存") + private Double maxqty; + + @ApiParam(value = "最小库存") + private Double minqty; + + @ApiParam(value = "库存状态") + private String stockStatus; + + @ApiParam(value = "库位") + private String locateNo; + + @ApiParam(value = "颜色") + private String color; + + public WmsWarehouseWarningDto(String partNo, String zoneNo, String partNameRdd, Double qty, Double maxqty, + Double minqty, String stockStatus, String locateNo, String color) { + this.partNo = partNo; + this.zoneNo = zoneNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.maxqty = maxqty; + this.minqty = minqty; + this.stockStatus = stockStatus; + this.locateNo = locateNo; + this.color = color; + } + + public WmsWarehouseWarningDto() { + + } + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java index 7ab26ec..e1103b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; /** - * @Description :装车单打印输出model + * @Description :装车单打印输出model(出参) * @Reference : * @Author :QianHuaSheng * @CreateDate : 2020-04-10 3:21 下午 From 7b2a4fdea7abc44f52e65ffb0113f8429bf4d9f5 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Apr 2020 19:18:43 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E5=90=88=E5=B9=B6dev=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dto/VendorDelayArrivedDto.java | 19 -------------- .../i3plus/pojo/wms/dto/VendorDelayQueryDto.java | 30 ---------------------- 2 files changed, 49 deletions(-) delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java delete mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java deleted file mode 100644 index 88f5c79..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayArrivedDto.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.dto; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -@Data -public class VendorDelayArrivedDto { - @ApiParam(value = "供应商代码") - private String vendorNo; - - @ApiParam(value = "供应商名称") - private String vendorName; - - @ApiParam(value = "延迟次数") - private Integer delayCount; - - @ApiParam(value = "工厂代码") - private String organizeCode; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java deleted file mode 100644 index 28ad833..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/VendorDelayQueryDto.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.dto; - -import cn.estsh.i3plus.pojo.base.common.Pager; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -@Data -public class VendorDelayQueryDto extends Pager { - - @ApiParam(value = "工厂代码") - private String organizeCode; - - @ApiParam(value = "供应商代码") - private String vendorNo; - - @ApiParam(value = "零件号") - private String partNo; - - @ApiParam(value = "完成状态") - private String completeStatus; - - @ApiParam(value = "单据编号") - private String orderNo; - - @ApiParam(value = "开始时间") - private String startDateTime; - - @ApiParam(value = "结束时间") - private String endDateTime; -} From f3e53ff1eb5575826a5fc188129c4fc5f8f28faa Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 22 Apr 2020 19:54:30 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E3=80=908150=2020011--=20=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86=E7=95=8C=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E3=80=91=20=E3=80=908151=2020011--=20=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86=E7=95=8C=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E9=87=8D=E6=89=93=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E6=89=93=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E4=B8=89=E4=B8=AA=E6=8C=89=E9=92=AE=E7=89=9B?= =?UTF-8?q?=E5=9D=87=E6=97=A0=E6=B3=95=E6=89=93=E5=87=BA=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=E3=80=82=E5=85=B3=E8=81=94bug7501--?= =?UTF-8?q?-0429=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsMoveDetailsBySnModel.java | 28 +++++++ .../i3plus/pojo/model/wms/WmsPoSnPrintModel.java | 4 + .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 4 +- .../java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java | 97 ++++++++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 8 ++ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 10 ++- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 9 ++ .../pojo/wms/repository/QadBopRepository.java | 2 + .../pojo/wms/repository/SodDetRepository.java | 17 ++++ 9 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java new file mode 100644 index 0000000..4d0778d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsBySnModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-22 19:46 + * @Modify: + **/ +@Data +public class WmsMoveDetailsBySnModel implements Serializable { + + private static final long serialVersionUID = -3023644672955363786L; + + @ApiParam("明细数据") + private List detailsList; + + @ApiParam("分页") + private Pager pager; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java index c198e17..44c8c9a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsPoSn; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -22,4 +23,7 @@ public class WmsPoSnPrintModel implements Serializable { @ApiParam("打印条码") private List wmsStockSnList; + + @ApiParam("单据条码") + private List wmsPoSnList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index dba988a..59f3f84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -18,7 +18,7 @@ import javax.persistence.*; import java.io.Serializable; /** - * @Description : 包材BOM信息 + * @Description : QAD_BOP信息 * @Reference : * @Author : jimmy.zeng * @CreateDate : 2020-01-09 14:40 @@ -29,7 +29,7 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @Table(name="QAD_BOP") -@Api("包材BOM信息") +@Api("QAD_BOP信息") public class QadBop implements Serializable { private static final long serialVersionUID = 4673217061075875734L; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java new file mode 100644 index 0000000..e33e3c1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SodDet.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : SOD_DET信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-22 16:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="SOD_DET") +@Api("SOD_DET信息") +public class SodDet implements Serializable { + + private static final long serialVersionUID = 539607553249262854L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="COLUMN_GROUP") + @ApiParam("分组列名") + public String columnGroup; + + @Column(name="COLUMN_GROUP_VALUE") + @ApiParam("分组列名值") + public String columnGroupValue; + + @Column(name="PROPERTIES_NAME") + @ApiParam("参数名") + public String propertiesName; + + @Column(name="PROPERTIES_VALUE") + @ApiParam("参数值") + public String propertiesValue; + + @Column(name="table_name") + @ApiParam("表名") + public String tableName; + + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 0b173cb..57ebad4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -245,6 +245,14 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") private Integer executeStatus; + @Transient + @ApiParam(value = "客户发往地编号") + private String flagNo; + + @Transient + @ApiParam("执行") + private Integer isMakeUp; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 9e8d916..9bba40c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -127,7 +127,6 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; - @Transient @ApiParam("打印模板") private String templateNo; @@ -136,6 +135,15 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam("剩余箱数量") private Long countBox; + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; + public WmsDocMovementSn(){} public WmsDocMovementSn(Long countBox,String partNo) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 917f0a0..c9fdc27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -340,6 +340,15 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "箱数") private Long boxQtys; + @Transient + private String dockcode; + + @Transient + private String storagelocation; + + @Transient + private String requerimentCode; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java index f6c8ef8..c271680 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.QadBop; +import org.springframework.stereotype.Repository; /** * @Description : @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.QadBop; * @CreateDate : 2020-01-09 15:06 * @Modify: **/ +@Repository public interface QadBopRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java new file mode 100644 index 0000000..f5cf661 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SodDetRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QadBop; +import cn.estsh.i3plus.pojo.wms.bean.SodDet; +import org.springframework.stereotype.Repository; + +/** + * @Description : SOD_DET信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +@Repository +public interface SodDetRepository extends BaseRepository { +} From 755fccb45e171a70033464e1471231815598f488 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 22 Apr 2020 20:15:39 +0800 Subject: [PATCH 18/28] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1690=20?= =?UTF-8?q?=E4=BA=A7=E8=83=BD=E7=9B=91=E6=8E=A7=E7=9C=8B=E6=9D=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 89 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- .../i3plus/pojo/mes/bean/MesBoardEquDetail.java | 2 + .../i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 4 + .../i3plus/pojo/mes/bean/MesBoardShiftSection.java | 5 ++ .../mes/bean/MesBoardShiftSectionCapacity.java | 5 ++ .../cn/estsh/i3plus/pojo/mes/model/BoardModel.java | 16 +++- 7 files changed, 121 insertions(+), 2 deletions(-) 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 6a9bff3..99f2ba2 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 @@ -4996,4 +4996,93 @@ public class MesEnumUtil { } } + /** + * 看板类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_TYPE { + BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), + BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"); + + private String code; + private String description; + + BOARD_TYPE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static BOARD_TYPE getByCode(String code) { + for (BOARD_TYPE boardType : values()) { + if (boardType.getCode().equals(code)) { + return boardType; + } + } + return null; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 看板类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_OBJECT_TYPE { + ORGANIZE_CODE("organizeCode", "工厂代码"), + AREA_CODE("areaCode", "区域代码"), + WORK_CENTER_CODE("workCenterCode", "产线代码"); + + private String value; + private String description; + + BOARD_OBJECT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static BOARD_OBJECT_TYPE getByCode(String code) { + for (BOARD_OBJECT_TYPE boardObjectType : values()) { + if (boardObjectType.getValue().equals(code)) { + return boardObjectType; + } + } + return null; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 75612bd..b7d0c56 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SHIPPING_ACTUAL_STATUS { CREATE(10, "创建"), - SHIPPED(20, "已发运"); + CANCEL(20, "已发运"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 154eada..22c7b64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -42,9 +42,11 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; + @Column(name = "HORIZONTAL_AXIS") @ApiParam(value = "横坐标") private Float horizontalAxis = 0f; + @Column(name = "VERTICAL_AXIS") @ApiParam(value = "纵坐标") private Float verticalAxis = 0f; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index cb09cd4..842f52f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -57,6 +57,10 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { private Integer planCapacity; @Transient + @ApiParam("班次名称") + private String shiftName; + + @Transient @ApiParam("看板时段计划产量") private List boardShiftSectionCapacities; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java index 64f4771..e9138cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -49,4 +50,8 @@ public class MesBoardShiftSection extends BaseBean implements Serializable { @Column(name = "IS_SPANDAY") @ApiParam("是否跨天") private Integer isSpanday; + + @Transient + @ApiParam("班次名称") + private String shiftName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java index cdf0482..2b2e211 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -53,4 +54,8 @@ public class MesBoardShiftSectionCapacity extends BaseBean implements Serializab @Column(name = "PLAN_CAPACITY") @ApiParam("计划产量") private Integer planCapacity; + + @Transient + @ApiParam("实际产量") + private Integer actualCapacity; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index b4284e5..d1dd2da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus; import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,9 +31,21 @@ public class BoardModel { @ApiParam("实际人数") private Integer actualPeopleNum; + @ApiParam("计划产量") + private Integer planCapacity; + @ApiParam("目标达成数") - private Integer achievedPeopleNum; + private Integer achievedNum; + + @ApiParam("看板图片路径") + private String pictureUrl; @ApiParam("看板时段计划产量") private List boardShiftSectionCapacityList; + + @ApiParam("看板设备状态") + private List boardEquStatusList; + + @ApiParam("看板设备明细") + private List boardEquDetailList; } From a1eb3c3bc2d412a6d374330cab864057fa7b38e4 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Apr 2020 20:56:23 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpom=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 0cf8b6d..3d6cbc0 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 8f44402..96472ad 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0bfac69..3937425 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index b7991cc..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 91f8894..8b15a31 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3b9e57a..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 06ec837..f9957c9 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index c7bebed..409b79a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 6ae777d..846c302 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8767603..23f68bd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 977c14a..28cf55f 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index dc4ea86..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index cb6c1ce..1b72275 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 3930e69..910d630 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 284329f..e5b4e5c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 8bc1aa2..0ecf190 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c4793b9..fbbe86f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 3428e74..932bdd9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 3fbf532c84982e924ce1fbf54db6721a8b8664eb Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Apr 2020 21:17:11 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpom=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 4 ++-- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 11691be..004fb69 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 0cf8b6d..9302dfc 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 8f44402..a933723 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 0bfac69..712a842 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index b7991cc..a44418c 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 5bfdd66..375d0fd 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 91f8894..d1ea30d 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3b9e57a..50ab2c2 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 06ec837..a2bb2df 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index c7bebed..8664dd2 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 6ae777d..265f98d 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 8767603..0080b0c 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 977c14a..24de8cf 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index dc4ea86..0fbfb69 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index cb6c1ce..069a4e2 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 3930e69..590b56c 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 284329f..ac9e7dd 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 8bc1aa2..f153994 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index c4793b9..1bef72c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-PROD-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform diff --git a/sonar-project.properties b/sonar-project.properties index 3428e74..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From cace95fbedd36adea56c1cac17c5d86d6c4d82f6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 23 Apr 2020 12:08:02 +0800 Subject: [PATCH 21/28] ptl --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java | 40 ------------------ .../i3plus/pojo/ptl/bean/PtlWindowElement.java | 40 ------------------ .../pojo/ptl/bean/PtlWindowElementAttribute.java | 49 ---------------------- 3 files changed, 129 deletions(-) delete mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java delete mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java delete mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java deleted file mode 100644 index 66904b1..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.ptl.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; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面") -public class PtlWindow extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596443842758197995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - private String windowNo; - - @Column(name = "WINDOW_NAME") - @ApiParam("界面名称") - private String windowName; -} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java deleted file mode 100644 index 02ee762..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.ptl.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; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW_ELEMENT") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面元素") -public class PtlWindowElement extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596427582758197995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - private String windowNo; - - @Column(name = "ELEMENT_NO") - @ApiParam("元素代码") - private String elementNo; -} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java deleted file mode 100644 index b291eff..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.ptl.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; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW_ELEMENT_ATTRIBUTE") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面元素属性") -public class PtlWindowElementAttribute extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596427582758285995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - private String windowNo; - - @Column(name = "ELEMENT_NO") - @ApiParam("元素代码") - private String elementNo; - - @Column(name = "ATTRIBUTE_NO") - @ApiParam("属性代码") - private String attributeNo; - - @Column(name = "ATTRIBUTE_VALUE") - @ApiParam("属性值") - private String attributeValue; - -} From cb8688105cd4f7f6eb6325e861cb2f0e7dd71f6c Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 23 Apr 2020 13:52:50 +0800 Subject: [PATCH 22/28] task:1727;1728;1729 --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 91 ++++++++++++++++++++++ .../pojo/wms/bean/WmsBhChildDetectionItem.java | 52 +++++++++++++ .../i3plus/pojo/wms/bean/WmsPartCheckType.java | 57 ++++++++++++++ .../i3plus/pojo/wms/bean/WmsPartItemCheck.java | 77 ++++++++++++++++++ .../WmsBhChildDetectionItemRepository.java | 16 ++++ .../wms/repository/WmsPartCheckTypeRepository.java | 16 ++++ .../wms/repository/WmsPartItemCheckRepository.java | 16 ++++ 7 files changed, 325 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 1b3c5ae..a4a7078 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6415,4 +6415,95 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * BatchHold 检测大类 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_CHECK_TYPE { + FUNCTION(10, "FUNCTION", "功能检测"), + SIZE(20, "SIZE", "尺寸检测"), + DEPTH(30, "DEPTH", "熔深检测"); + + private int value; + private String code; + private String description; + + BH_CHECK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * BatchHold 值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_VALUE_TYPE { + NUMBER(10, "NUMBER", "功能检测"), + TEXT(20, "TEXT", "尺寸检测"); + + private int value; + private String code; + private String description; + + BH_VALUE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java new file mode 100644 index 0000000..e157150 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @Description : BH子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_BH_CHILD_DETECTION_ITEM") +@Api("BH子检测项") +public class WmsBhChildDetectionItem extends BaseBean { + + @Column(name = "CHECK_TYPE") + @ApiParam("检测大类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + private Integer checkType; + + @Column(name = "ITEM_CHECK_CODE") + @ApiParam("子检测项代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemCheckCode; + + @Column(name = "ITEM_CHECK_NAME") + @ApiParam("子检测项名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemCheckName; + + @Column(name = "VALUE_TYPE") + @ApiParam("值类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + private Integer valueType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java new file mode 100644 index 0000000..5af3d21 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @Description : 物料检测大类 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_CHECK_TYPE") +@Api("物料检测大类") +public class WmsPartCheckType extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partName; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测大类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + private Integer checkType; + + @Column(name = "SAMPLE_SIZE") + @ApiParam("样本数") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer sampleSize; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java new file mode 100644 index 0000000..8498c36 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @Description : 物料子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_ITEM_CHECK") +@Api("物料子检测项") +public class WmsPartItemCheck extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测大类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + private Integer checkType; + + @Column(name = "CHECK_ITEM_CODE") + @ApiParam("子检测项代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemCode; + + @Column(name = "CHECK_ITEM_NAME") + @ApiParam("子检测项名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemName; + + @Column(name = "VALUE_TYPE") + @ApiParam("子检测箱值类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + private Integer valueType; + + @Column(name = "STANDARD") + @ApiParam("标准值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double standard; + + @Column(name = "MAX") + @ApiParam("最大值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double max; + + @Column(name = "MIN") + @ApiParam("最小值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double min; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java new file mode 100644 index 0000000..9698716 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsBhChildDetectionItem; +import org.springframework.stereotype.Repository; + +/** + * @Description : BH子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Repository +public interface WmsBhChildDetectionItemRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java new file mode 100644 index 0000000..5c0dbe7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartCheckType; +import org.springframework.stereotype.Service; + +/** + * @Description : 物料检测大类 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Service +public interface WmsPartCheckTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java new file mode 100644 index 0000000..4c6d2ec --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartItemCheck; +import org.springframework.stereotype.Repository; + +/** + * @Description : 持久层物料子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Repository +public interface WmsPartItemCheckRepository extends BaseRepository { +} From b23915236b580423552c5491e50d2bb75402e21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 23 Apr 2020 14:21:03 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=8A=A8=E6=80=81=E7=94=9F=E6=88=90=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=96=87=E6=A1=A3=E9=A1=B5=E9=9D=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/BasBeanFieldInfoModel.java | 48 ++++++++++++++++++++++ .../i3plus/pojo/model/wms/BasBeanInfoModel.java | 34 +++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java new file mode 100644 index 0000000..df22498 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanFieldInfoModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-24 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class BasBeanFieldInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646448895L; + + @ApiParam(value = "表名称") + public String tableName; + + @ApiParam(value = "表字段名称") + private String fieldName; + + @ApiParam(value = "表字段描述") + private String fieldDesc; + + @ApiParam(value = "表字段类型") + private String fieldType; + + @ApiParam(value = "主键") + private String isFieldPrimaryKey; + + @ApiParam(value = "非空") + private String isFieldNull; + + @ApiParam(value = "外键") + private String isFieldForeignKey; + + @ApiParam(value = "唯一约束") + private String isFieldUnique; + + @ApiParam(value = "自增") + private String isFieldGeneric; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java new file mode 100644 index 0000000..fe7f66d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BasBeanInfoModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : Wms实体字段Model信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-24 09:53 + * @Modify: + **/ +@Data +@NoArgsConstructor +public class BasBeanInfoModel implements Serializable { + + private static final long serialVersionUID = -6376845639646448495L; + + @ApiParam(value = "实体名称") + public String entityName; + + @ApiParam(value = "数据表名称") + private String tableName; + + @ApiParam(value = "数据表描述") + private String tableDesc; + + @ApiParam(value = "字段列表数据") + private List fieldInfoModelList; +} From bc82c85790f42b686ee0043e5b28a2130aa1091c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 23 Apr 2020 16:44:12 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E3=80=901721=20BH-BH=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=AE=A1=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 57 ++++++++++++++++ .../i3plus/pojo/wms/bean/WmsTestResultDetails.java | 63 +++++++++++++++++ .../i3plus/pojo/wms/bean/WmsTestResultSummary.java | 79 ++++++++++++++++++++++ .../repository/WmsTestResultDetailsRepository.java | 16 +++++ .../repository/WmsTestResultSummaryRepository.java | 16 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 25 +++++++ 6 files changed, 256 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a4a7078..57e81fc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6506,4 +6506,61 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 返修、挑选状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REWORK_STATUS { + INIT(10, "INIT", "初始化"), + BE_HANDLE(20, "BE_HANDLE", "待处理"), + FINISH(30, "FINISH", "已处理"), + NONE(40, "NONE", "不处理"); + + private int value; + private String code; + private String description; + + REWORK_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(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 static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java new file mode 100644 index 0000000..28445f7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.wms.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; + +/** + * @Description : 检测结果明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-23 11:03 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_TEST_RESULT_DETAILS") +@Api("检测结果明细表") +public class WmsTestResultDetails extends BaseBean { + + private static final long serialVersionUID = -3295112411840494690L; + @Column(name = "BH_CODE") + @ApiParam("BH号") + public String bhCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + public String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + public String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + public String partName; + + @Column(name = "CHECK_TYPE") + @ApiParam("大检测项类型") + public Integer checkType; + + @Column(name = "qr_code") + @ApiParam("二维码") + public String qrCode; + + @Column(name = "is_qualified") + @ApiParam("是否合格") + public Integer isQualified; + + @Column(name = "check_value") + @ApiParam("检测值") + public String checkValue; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java new file mode 100644 index 0000000..08d6631 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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; + +/** + * @Description :检测结果汇总表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-23 10:50 + * @Modify: + **/ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_TEST_RESULT_SUMMARY") +@Api("检测结果汇总表") +public class WmsTestResultSummary extends BaseBean { + + private static final long serialVersionUID = -4600850017207281216L; + + @Column(name = "BH_CODE") + @ApiParam("BH号") + public String bhCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + public String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + public String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + public String partName; + + @Column(name = "FLAG_NO") + @ApiParam("客户发往地") + public String flagNo; + + @Column(name = "IS_QUALIFIED") + @ApiParam("是否合格") + public Integer isQualified; + + @Column(name = "REWORK_STATUS") + @ApiParam("返修状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") + public Integer reworkStatus; + + @Column(name = "REWORK_RESULT") + @ApiParam("返修结果") + public Integer reworkResult; + + @Column(name = "PICK_STATUS") + @ApiParam("挑选状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description") + + public Integer pickStatus; + + @Column(name = "PICK_RESULT") + @ApiParam("挑选结果") + public Integer pickResult; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.java new file mode 100644 index 0000000..7882dad --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultDetailsRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTestResultDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 检测结果明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-23 11:03 + * @Modify: + **/ +@Repository +public interface WmsTestResultDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.java new file mode 100644 index 0000000..8f8e536 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTestResultSummaryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTestResultSummary; +import org.springframework.stereotype.Repository; + +/** + * @Description : 检测结果汇总表 + * @Reference : + * @Author : jimmy.z + * @CreateDate : 2020-04-23 11:03 + * @Modify: + **/ +@Repository +public interface WmsTestResultSummaryRepository extends BaseRepository { +} 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 b9e6a01..b62c8c8 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 @@ -3110,4 +3110,29 @@ public class WmsHqlPack { getStringBuilderPack(details, result); return result; } + + /** + * 检测结果汇总表 分页查询 + * + * @param wmsTestResultSummary + * @return + */ + public static DdlPackBean packHqWmsTestResultSummary(WmsTestResultSummary wmsTestResultSummary) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsTestResultSummary.getBhCode(), "bhCode", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkResult(), "reworkStatus", result); + DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result); + DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(), + wmsTestResultSummary.getCreateDateTimeEnd(), "createDatetime", result, true); + DdlPreparedPack.timeBuilder(wmsTestResultSummary.getModifyDateTimeStart(), + wmsTestResultSummary.getModifyDateTimeEnd(), "modifyDateTime", result, true); + getStringBuilderPack(wmsTestResultSummary, result); + + return result; + } } From abd974f54f267377f5f5d6f8c89e518e24e85be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 24 Apr 2020 10:53:56 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E3=80=901693-=E8=AE=BE=E5=A4=87=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9B=91=E6=8E=A7=E7=9C=8B=E6=9D=BF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java | 6 ++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 12 ++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 14 ++++++++++++++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 154eada..8dcd494 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -42,9 +42,11 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; + @Column(name = "X_AXES") @ApiParam(value = "横坐标") - private Float horizontalAxis = 0f; + private Double xAxes = 0d; + @Column(name = "Y_AXES") @ApiParam(value = "纵坐标") - private Float verticalAxis = 0f; + private Double yAxes = 0d; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java index acd5675..9efed7a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquStatus.java @@ -36,7 +36,7 @@ public class MesBoardEquStatus extends BaseBean implements Serializable { @Column(name = "EQU_CODE") @ApiParam("设备代码") - private String equCOde; + private String equCode; @Column(name = "EQU_STATUS_CODE") @ApiParam("状态代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 0aa86da..80b4a21 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -158,6 +158,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "乐观锁", example = "1") public Integer lockVersion; + @Column(name = "CATEGORY_CODE1") + @ApiParam("类型1") + private String categoryCode1; + + @Column(name = "CATEGORY_CODE2") + @ApiParam("类型2") + private String categoryCode2; + + @Column(name = "CATEGORY_CODE3") + @ApiParam("类型3") + private String categoryCode3; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") 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 2345cc4..0e90503 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 @@ -2494,4 +2494,18 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) { + DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean); + DdlPreparedPack.getNumEqualPack(mesBoardEquDetail.getIsValid(), "isValid", packBean); + return packBean; + } + + public static DdlPackBean getMesBoardEquStatus(MesBoardEquStatus mesBoardEquStatus) { + DdlPackBean packBean = getAllBaseData(mesBoardEquStatus.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesBoardEquStatus.getBoardCode(), "boardCode", packBean); + DdlPreparedPack.getNumEqualPack(mesBoardEquStatus.getIsValid(), "isValid", packBean); + return packBean; + } } From 2c50fceec96717f7006051d6f8b8a3be2e53d0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 24 Apr 2020 10:57:29 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E3=80=901693-=E8=AE=BE=E5=A4=87=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9B=91=E6=8E=A7=E7=9C=8B=E6=9D=BF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/repository/IfRawPartDataRepository.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfRawPartDataRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfRawPartDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfRawPartDataRepository.java new file mode 100644 index 0000000..a7e492a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfRawPartDataRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfRawPartData; + +/** + * @Description : + * @Reference : + * @CreateDate : 2020-04-21 09:53 + * @Modify: + **/ +public interface IfRawPartDataRepository extends BaseRepository { +} From b96eb1b6691460007ac8e7791e139ffa33a385db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 24 Apr 2020 11:33:15 +0800 Subject: [PATCH 27/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 39 +++++++ .../estsh/i3plus/pojo/mes/bean/MesShiftClass.java | 40 +++++++ .../i3plus/pojo/mes/bean/MesShiftClassDetail.java | 53 ++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesSkills.java | 40 +++++++ .../estsh/i3plus/pojo/mes/bean/MesUserSkill.java | 52 +++++++++ .../i3plus/pojo/mes/bean/MesWorkCellSkill.java | 52 +++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java | 45 ++++++++ .../i3plus/pojo/mes/model/SkillsUserModel.java | 34 ++++++ .../repository/MesShiftClassDetailRepository.java | 14 +++ .../mes/repository/MesShiftClassRepository.java | 14 +++ .../pojo/mes/repository/MesSkillsRepository.java | 14 +++ .../mes/repository/MesUserSkillRepository.java | 14 +++ .../mes/repository/MesWorkCellSkillRepository.java | 14 +++ .../pojo/mes/repository/MesWorkDayRepository.java | 14 +++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 117 +++++++++++++++++++++ 15 files changed, 556 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSkillsRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUserSkillRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellSkillRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkDayRepository.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 99f2ba2..c653f59 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 @@ -5085,4 +5085,43 @@ public class MesEnumUtil { } } + /** + * mes 员工技能等级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SKILL_LEVEL { + + TRAINING("10", "培训中"), + QUALIFIED("20", "合格"), + GOOD("30", "良好"), + CAN_GUIDE_OTHERS("40", "可指导他人"); + + private String value; + private String description; + + SKILL_LEVEL(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java new file mode 100644 index 0000000..0403694 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClass.java @@ -0,0 +1,40 @@ +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: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SHIFT_CLASS") +@Api("MES_班制表") +public class MesShiftClass extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1222874834741345978L; + @Column(name = "SHIFT_CLASS_CODE") + @ApiParam("班制代码") + private String shiftClassCode; + + @Column(name = "SHIFT_CLASS_NAME") + @ApiParam("班制名称") + private String shiftClassName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java new file mode 100644 index 0000000..e172b88f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftClassDetail.java @@ -0,0 +1,53 @@ +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: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SHIFT_CLASS_DETAIL") +@Api("MES_班制班次表") +public class MesShiftClassDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1222874274741347278L; + @Column(name = "SHIFT_CLASS_CODE") + @ApiParam("班制代码") + private String shiftClassCode; + + @Column(name = "SHIFT_CLASS_NAME") + @ApiParam("班制名称") + private String shiftClassName; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "SHIFT_NAME") + @ApiParam("班次名称") + private String shiftName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java new file mode 100644 index 0000000..d22f305 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSkills.java @@ -0,0 +1,40 @@ +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: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SKILLS") +@Api("MES_技能表") +public class MesSkills extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825214741345978L; + @Column(name = "SKILL_CODE") + @ApiParam("技能代码") + private String skillCode; + + @Column(name = "SKILL_NAME") + @ApiParam("技能名称") + private String skillName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java new file mode 100644 index 0000000..276699a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.java @@ -0,0 +1,52 @@ +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: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_USER_SKILL") +@Api("MES_人员技能表") +public class MesUserSkill extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1222847514741345978L; + @Column(name = "USER_EMP_NO") + @ApiParam("员工编码") + private String userEmpNo; + + @Column(name = "USER_NAME") + @ApiParam("员工名称") + private String userName; + + @Column(name = "SKILL_CODE") + @ApiParam("技能代码") + private String skillCode; + + @Column(name = "SKILL_NAME") + @ApiParam("技能名称") + private String skillName; + + @Column(name = "SKILL_LEVEL") + @ApiParam("技能等级") + private String skillLevel; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java new file mode 100644 index 0000000..153521a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.java @@ -0,0 +1,52 @@ +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: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_SKILL") +@Api("MES_工位技能表") +public class MesWorkCellSkill extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1239825214741345208L; + @Column(name = "SKILL_CODE") + @ApiParam("技能代码") + private String skillCode; + + @Column(name = "SKILL_NAME") + @ApiParam("技能名称") + private String skillName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java new file mode 100644 index 0000000..d431ff4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkDay.java @@ -0,0 +1,45 @@ +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; +import java.util.Date; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate: 2020\04\21 13:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORKDAY") +@Api("MES_工作日历表") +public class MesWorkDay extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1222899824741345978L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_DATE") + @ApiParam("日期") + private String workDate; + + @Column(name = "SHIFT_CLASS_CODE") + @ApiParam("班制代码") + private String shiftClassCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java new file mode 100644 index 0000000..c6aa422 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesUserSkill; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Description : 人员技能-获取用户信息 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-10-11 11:02 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("用户信息model") +public class SkillsUserModel { + + @ApiParam(value ="姓名") + private String userName; + + @ApiParam(value ="工号") + private String userEmpNo; + + @ApiParam("技能矩阵信息") + private List mesUserSkillList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassDetailRepository.java new file mode 100644 index 0000000..e45dafa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesShiftClassDetail; + +/** + * @Description:班制维护 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesShiftClassDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassRepository.java new file mode 100644 index 0000000..0f4fc24 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesShiftClass; + +/** + * @Description:班制维护 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesShiftClassRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSkillsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSkillsRepository.java new file mode 100644 index 0000000..c7bd02e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSkillsRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesSkills; + +/** + * @Description:人员技能管理 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesSkillsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUserSkillRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUserSkillRepository.java new file mode 100644 index 0000000..3e78cb8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUserSkillRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesUserSkill; + +/** + * @Description:人员技能管理 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesUserSkillRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellSkillRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellSkillRepository.java new file mode 100644 index 0000000..e8f783f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellSkillRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellSkill; + +/** + * @Description:人员技能管理 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesWorkCellSkillRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkDayRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkDayRepository.java new file mode 100644 index 0000000..abc6bf9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkDayRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkDay; + +/** + * @Description:人员技能管理 + * @Reference: + * @Author: adair + * @CreateDate: 2020\04\21 + * @Modify: + **/ +public interface MesWorkDayRepository 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 0e90503..0e1510d 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 @@ -2508,4 +2508,121 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesBoardEquStatus.getIsValid(), "isValid", packBean); return packBean; } + + /** + * MES 人员技能 + * + * @param mesSkills + * @param organizeCode + * @return + */ + public static DdlPackBean getMesSkills(MesSkills mesSkills, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesSkills, organizeCode); + if (!StringUtils.isEmpty(mesSkills.getSkillCode())) { + DdlPreparedPack.getStringLikerPack(mesSkills.getSkillCode(), "skillCode", packBean); + } + if (!StringUtils.isEmpty(mesSkills.getSkillName())) { + DdlPreparedPack.getStringLikerPack(mesSkills.getSkillName(), "skillName", packBean); + } + return packBean; + } + + /** + * MES 工位技能 + * + * @param mesWorkCellSkill + * @param organizeCode + * @return + */ + public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCellSkill, organizeCode); + if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) { + DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillName())) { + DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillName(), "skillName", packBean); + } + if (!StringUtils.isEmpty(mesWorkCellSkill.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCellSkill.getWorkCellCode())) { + DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getWorkCellCode(), "workCellCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkCellSkill.getWorkCellName())) { + DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getWorkCellName(), "workCellName", packBean); + } + return packBean; + } + + /** + * MES 人员技能 + * + * @param mesUserSkill + * @param organizeCode + * @return + */ + public static DdlPackBean getMesUserSkill(MesUserSkill mesUserSkill, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesUserSkill, organizeCode); + if (!StringUtils.isEmpty(mesUserSkill.getSkillCode())) { + DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillCode(), "skillCode", packBean); + } + if (!StringUtils.isEmpty(mesUserSkill.getSkillName())) { + DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillName(), "skillName", packBean); + } + if (!StringUtils.isEmpty(mesUserSkill.getSkillLevel())) { + DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillLevel(), "skillLevel", packBean); + } + if (!StringUtils.isEmpty(mesUserSkill.getUserEmpNo())) { + DdlPreparedPack.getStringLikerPack(mesUserSkill.getUserEmpNo(), "userEmpNo", packBean); + } + if (!StringUtils.isEmpty(mesUserSkill.getUserName())) { + DdlPreparedPack.getStringLikerPack(mesUserSkill.getUserName(), "userName", packBean); + } + return packBean; + } + + /** + * MES 班制维护 + * + * @param mesShiftClass + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftClass(MesShiftClass mesShiftClass, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesShiftClass, organizeCode); + if (!StringUtils.isEmpty(mesShiftClass.getShiftClassCode())) { + DdlPreparedPack.getStringLikerPack(mesShiftClass.getShiftClassCode(), "shiftClassCode", packBean); + } + if (!StringUtils.isEmpty(mesShiftClass.getShiftClassName())) { + DdlPreparedPack.getStringLikerPack(mesShiftClass.getShiftClassName(), "shiftClassName", packBean); + } + return packBean; + } + + /** + * MES 班制班次维护 + * + * @param mesShiftClassDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftDetailClass(MesShiftClassDetail mesShiftClassDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesShiftClassDetail, organizeCode); + if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftClassCode())) { + DdlPreparedPack.getStringEqualPack(mesShiftClassDetail.getShiftClassCode(), "shiftClassCode", packBean); + } + if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftClassName())) { + DdlPreparedPack.getStringLikerPack(mesShiftClassDetail.getShiftClassName(), "shiftClassName", packBean); + } + if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftCode())) { + DdlPreparedPack.getStringEqualPack(mesShiftClassDetail.getShiftCode(), "shiftCode", packBean); + } + if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftName())) { + DdlPreparedPack.getStringLikerPack(mesShiftClassDetail.getShiftName(), "shiftName", packBean); + } + if (!StringUtils.isEmpty(mesShiftClassDetail.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesShiftClassDetail.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } } From 279ec2d1fec1888bc0c7dbab7ea5216071de473c Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 24 Apr 2020 11:37:27 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/common/ImppMessage.java | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppMessage.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppMessage.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppMessage.java new file mode 100644 index 0000000..d6ed87b --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppMessage.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.model.common; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-22 下午7:46 + * @Modify: + **/ +@Data +public class ImppMessage implements Serializable { + + private static final long serialVersionUID = 6840525365653629445L; + @ApiParam(value ="产品") + private Integer softType; + + @ApiParam(value ="消息组") + private Integer messageGroup; + + @ApiParam(value ="消息内容") + private String messageParam; + + public String getSoftTypeTxt() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType); + } + + public CommonEnumUtil.SOFT_TYPE getSoftTypeEnum() { + return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOf(softType); + } + + +}