From 104d308d3046b77f373a9428291f2bf10b84fcb6 Mon Sep 17 00:00:00 2001 From: jokelone Date: Sat, 12 Oct 2019 17:33:42 +0800 Subject: [PATCH 01/38] =?UTF-8?q?PLC=20DB=20=E8=AE=BE=E5=A4=87=E6=95=85?= =?UTF-8?q?=E9=9A=9C=20=E8=BF=87=E7=A8=8B=E8=B4=A8=E9=87=8F=E6=A3=80?= =?UTF-8?q?=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/codemaker/SnowflakeIdMaker.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 95 +++++++++++++ .../pcn/repository/MesQcCheckDataRepository.java | 14 ++ .../mes/bean/{MesDb.java => MesDatasource.java} | 8 +- .../estsh/i3plus/pojo/mes/bean/MesFaultCause.java | 42 ++++++ .../estsh/i3plus/pojo/mes/bean/MesFaultMethod.java | 42 ++++++ .../i3plus/pojo/mes/bean/MesFaultPhenomenon.java | 42 ++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 95 +++++++++++++ .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 63 +++++++++ .../mes/repository/MesDatasourceRepository.java | 15 ++ .../mes/repository/MesFaultCauseRepository.java | 14 ++ .../mes/repository/MesFaultMethodRepository.java | 14 ++ .../repository/MesFaultPhenomenonRepository.java | 14 ++ .../pojo/mes/repository/MesPlcRepository.java | 14 ++ .../repository/MesQcCheckStandardRepository.java | 14 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 154 ++++++++++++++++++++- 16 files changed, 637 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/{MesDb.java => MesDatasource.java} (88%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDatasourceRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultCauseRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultMethodRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultPhenomenonRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcCheckStandardRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java index 50b1ca8..7b74ecf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java @@ -20,7 +20,7 @@ import java.net.NetworkInterface; * @CreateDate : 2018-09-11 16:35 * @Modify: **/ -public class SnowflakeIdMaker { +public class SnowflakeIdMaker { public static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeIdMaker.class); diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java new file mode 100644 index 0000000..84bd7b8 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -0,0 +1,95 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: joke.wang + * @CreateDate: 2019\10\12 16:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_QC_CHECK_DATA") +@Api("质量过程检测数据") +public class MesQcCheckData extends BaseBean { + + @Column(name = "CHECK_ID") + @ApiParam("检测id") + private String checkId; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private String checkType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + + @Column(name = "CHECK_RESULT") + @ApiParam("判定结果") + private String checkResult; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private String qty; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java new file mode 100644 index 0000000..8c909e7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckData; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 16:43 + * @Modify: + **/ +public interface MesQcCheckDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java similarity index 88% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index 3f9c070..b6d76f0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -23,9 +23,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DB") +@Table(name = "MES_DATASOURCE") @Api("地址清单") -public class MesDb extends BaseBean { +public class MesDatasource extends BaseBean { @Column(name = "DS_CODE") @ApiParam("数据源代码") @@ -59,4 +59,8 @@ public class MesDb extends BaseBean { @ApiParam("设备代码") private String equipmentCode; + @Column(name = "DS_DB_NAME") + @ApiParam("数据库名称") + private String dsDbName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java new file mode 100644 index 0000000..9a8c536 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java @@ -0,0 +1,42 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FAULT_CAUSE") +@Api("PLC配置表") +public class MesFaultCause extends BaseBean { + + @Column(name = "FC_CODE") + @ApiParam("故障原因代码") + private String fcCode; + + @Column(name = "FC_NAME") + @ApiParam("故障原因描述") + private String fcName; + + @Column(name = "PARENT_FC_CODE") + @ApiParam("父阶原因代码") + private String parentFcCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java new file mode 100644 index 0000000..22a4f2a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java @@ -0,0 +1,42 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FAULT_METHOD") +@Api("PLC配置表") +public class MesFaultMethod extends BaseBean { + + @Column(name = "FM_CODE") + @ApiParam("故障方法代码") + private String fmCode; + + @Column(name = "FM_NAME") + @ApiParam("故障方法描述") + private String fmName; + + @Column(name = "PARENT_FM_CODE") + @ApiParam("父阶故障代码") + private String parentFmCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java new file mode 100644 index 0000000..576626b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -0,0 +1,42 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FAULT_PHENOMENON") +@Api("PLC配置表") +public class MesFaultPhenomenon extends BaseBean { + + @Column(name = "FP_CODE") + @ApiParam("故障现象代码") + private String fpCode; + + @Column(name = "FP_NAME") + @ApiParam("故障现象描述") + private String fpName; + + @Column(name = "PARENT_FP_CODE") + @ApiParam("父阶现象代码") + private String parentFpCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java new file mode 100644 index 0000000..e0b2153 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -0,0 +1,95 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate:2019\10\9 0009 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLC") +@Api("PLC配置表") +public class MesPlc extends BaseBean { + + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + + @Column(name = "PLC_NAME") + @ApiParam("PLC名称") + private String plcName; + + @Column(name = "PLC_MODEL") + @ApiParam("PLC型号") + private String plcModel; + + @Column(name = "PLC_IP") + @ApiParam("PLC IP") + private String plcIp; + + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "TAG_NAME") + @ApiParam("标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam("标签地址") + private String tagAddress; + + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + + @Column(name = "GROUP_NAME") + @ApiParam("分组名称") + private String groupName; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "ENABLED") + @ApiParam("是否启用 0 false 1 true") + private Integer enabled; + + @Column(name = "PLC_CFG") + @ApiParam("PLC的值的设定") + private String plcCfg; + + @Column(name = "ANALYSIS_RULE") + @ApiParam("解析规则") + private String analysisRule; + + @Column(name = "IS_ANALYSIS") + @ApiParam("是否解析") + private String isAnalysis; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java new file mode 100644 index 0000000..1e11e68 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -0,0 +1,63 @@ +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; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 14:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_QC_CHECK_STANDARD") +@Api("质量检测标准") +public class MesQcCheckStandard extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDatasourceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDatasourceRepository.java new file mode 100644 index 0000000..77f4d89 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDatasourceRepository.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.MesDatasource; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate:2019\10\9 + * @Modify: + **/ +public interface MesDatasourceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultCauseRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultCauseRepository.java new file mode 100644 index 0000000..f3b5403 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultCauseRepository.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.MesFaultCause; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:08 + * @Modify: + **/ +public interface MesFaultCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultMethodRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultMethodRepository.java new file mode 100644 index 0000000..7b8d201 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultMethodRepository.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.MesFaultMethod; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:07 + * @Modify: + **/ +public interface MesFaultMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultPhenomenonRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultPhenomenonRepository.java new file mode 100644 index 0000000..da0ccbe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultPhenomenonRepository.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.MesFaultPhenomenon; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:05 + * @Modify: + **/ +public interface MesFaultPhenomenonRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java new file mode 100644 index 0000000..9413a87 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.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.MesPlc; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate:2019\10\9 0009 11:16 + * @Modify: + **/ +public interface MesPlcRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcCheckStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcCheckStandardRepository.java new file mode 100644 index 0000000..484efa9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcCheckStandardRepository.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.MesQcCheckStandard; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 0012 14:58 + * @Modify: + **/ +public interface MesQcCheckStandardRepository 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 7d31328..edcde4c 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 @@ -129,7 +129,11 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); } - + if (StringUtils.isNotEmpty(mesPart.getProduceCategoryCode()) && mesPart.getProduceCategoryCode().toUpperCase().equals("WXJ")) { + DdlPreparedPack.getStringEqualPack("WXJ", "produceCategoryCode", packBean); + } else { + DdlPreparedPack.getStringNoEqualPack("WXJ", "produceCategoryCode", packBean); + } DdlPreparedPack.getOrderDefault(mesPart); DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean); return packBean; @@ -1144,7 +1148,6 @@ public class MesHqlPack { return packBean; } - /** * Mes条码生成规则 * @@ -1254,4 +1257,151 @@ public class MesHqlPack { return packBean; } +<<<<<<< Updated upstream +======= + + /** + * MES Plc设备信息配置查询条件封装 + * @param mesPlc + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPlc(MesPlc mesPlc, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesPlc, organizeCode); + if (StringUtils.isNotEmpty(mesPlc.getPlcCode())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getPlcCode(), "plcCode", packBean); + } + if (StringUtils.isNotEmpty(mesPlc.getPlcName())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getPlcName(), "plcName", packBean); + } + if (StringUtils.isNotEmpty(mesPlc.getChannel())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getChannel(), "channel", packBean); + } + if (StringUtils.isNotEmpty(mesPlc.getTagAddress())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean); + } + if (StringUtils.isNotEmpty(mesPlc.getEquCode())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getEquCode(), "equCode", packBean); + } + if (StringUtils.isNotEmpty(mesPlc.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesPlc.getPlcCode())) { + DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean); + } + return packBean; + } + + /** + * MES DB地址清单查询条件封装 + * @param mesDatasource + * @param organizeCode + * @return + */ + public static DdlPackBean getMesDatasource(MesDatasource mesDatasource, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesDatasource, organizeCode); + if (StringUtils.isNotEmpty(mesDatasource.getDsCode())) { + DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean); + } + if (StringUtils.isNotEmpty(mesDatasource.getDsName())) { + DdlPreparedPack.getStringEqualPack(mesDatasource.getDsName(), "dsName", packBean); + } + if (StringUtils.isNotEmpty(mesDatasource.getDsType())) { + DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean); + } + if (StringUtils.isNotEmpty(mesDatasource.getDsDbName())) { + DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean); + } + if (StringUtils.isNotEmpty(mesDatasource.getEquCode())) { + DdlPreparedPack.getStringEqualPack(mesDatasource.getEquCode(), "equCode", packBean); + } + return packBean; + } + + /** + * MES 设备故障处理方法查询条件封装 + * @param mesFaultMethod + * @param organizeCode + * @return + */ + public static DdlPackBean getMesFaultMethod(MesFaultMethod mesFaultMethod, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultMethod, organizeCode); + if (StringUtils.isNotEmpty(mesFaultMethod.getFmCode())) { + DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean); + } + if (StringUtils.isNotEmpty(mesFaultMethod.getFmName())) { + DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean); + } + if (StringUtils.isNotEmpty(mesFaultMethod.getParentFmCode())) { + DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); + } + return packBean; + } + + /** + * MES 设备故障原因查询条件封装 + * @param mesFaultCause + * @param organizeCode + * @return + */ + public static DdlPackBean getMesFaultCause(MesFaultCause mesFaultCause, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultCause, organizeCode); + if (StringUtils.isNotEmpty(mesFaultCause.getFcCode())) { + DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean); + } + if (StringUtils.isNotEmpty(mesFaultCause.getFcName())) { + DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean); + } + if (StringUtils.isNotEmpty(mesFaultCause.getParentFcCode())) { + DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); + } + return packBean; + } + + /** + * MES 设备故障现象查询条件封装 + * @param mesFaultPhenomenon + * @param organizeCode + * @return + */ + public static DdlPackBean getMesFaultPhenomenon(MesFaultPhenomenon mesFaultPhenomenon, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultPhenomenon, organizeCode); + if (StringUtils.isNotEmpty(mesFaultPhenomenon.getFpCode())) { + DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean); + } + if (StringUtils.isNotEmpty(mesFaultPhenomenon.getFpName())) { + DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); + } + if (StringUtils.isNotEmpty(mesFaultPhenomenon.getParentFpCode())) { + DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); + } + return packBean; + } + + /** + * MES 过程质量检验查询条件封装 + * @param mesQcCheckStandard + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQcCheckStandard(MesQcCheckStandard mesQcCheckStandard, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckStandard, organizeCode); + if (StringUtils.isNotEmpty(mesQcCheckStandard.getPartNo())) { + DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(mesQcCheckStandard.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean); + } + if (StringUtils.isNotEmpty(mesQcCheckStandard.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean); + } + if (null == mesQcCheckStandard.getCheckType()) { + DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); + } + if (StringUtils.isNotEmpty(mesQcCheckStandard.getCheckItem())) { + DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean); + } + return packBean; + } +>>>>>>> Stashed changes } From 9e2b13e3ad0f2ca019ca202bed3c1506075acaf6 Mon Sep 17 00:00:00 2001 From: jokelone Date: Sat, 12 Oct 2019 17:47:40 +0800 Subject: [PATCH 02/38] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 61 ++++++++++------------ 1 file changed, 29 insertions(+), 32 deletions(-) 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 edcde4c..263e26b 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 @@ -129,7 +129,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); } - if (StringUtils.isNotEmpty(mesPart.getProduceCategoryCode()) && mesPart.getProduceCategoryCode().toUpperCase().equals("WXJ")) { + if (!StringUtils.isEmpty(mesPart.getProduceCategoryCode()) && mesPart.getProduceCategoryCode().toUpperCase().equals("WXJ")) { DdlPreparedPack.getStringEqualPack("WXJ", "produceCategoryCode", packBean); } else { DdlPreparedPack.getStringNoEqualPack("WXJ", "produceCategoryCode", packBean); @@ -1256,10 +1256,7 @@ public class MesHqlPack { DdlPreparedPack.getOrderByPack(new String[]{String.valueOf(CommonEnumUtil.ASC_OR_DESC.ASC.getValue())}, new String[]{"startTime", "shiftCode"}, packBean); return packBean; } - -<<<<<<< Updated upstream -======= - + /** * MES Plc设备信息配置查询条件封装 * @param mesPlc @@ -1268,25 +1265,25 @@ public class MesHqlPack { */ public static DdlPackBean getMesPlc(MesPlc mesPlc, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesPlc, organizeCode); - if (StringUtils.isNotEmpty(mesPlc.getPlcCode())) { + if (!StringUtils.isEmpty(mesPlc.getPlcCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getPlcCode(), "plcCode", packBean); } - if (StringUtils.isNotEmpty(mesPlc.getPlcName())) { + if (!StringUtils.isEmpty(mesPlc.getPlcName())) { DdlPreparedPack.getStringEqualPack(mesPlc.getPlcName(), "plcName", packBean); } - if (StringUtils.isNotEmpty(mesPlc.getChannel())) { + if (!StringUtils.isEmpty(mesPlc.getChannel())) { DdlPreparedPack.getStringEqualPack(mesPlc.getChannel(), "channel", packBean); } - if (StringUtils.isNotEmpty(mesPlc.getTagAddress())) { + if (!StringUtils.isEmpty(mesPlc.getTagAddress())) { DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean); } - if (StringUtils.isNotEmpty(mesPlc.getEquCode())) { + if (!StringUtils.isEmpty(mesPlc.getEquCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getEquCode(), "equCode", packBean); } - if (StringUtils.isNotEmpty(mesPlc.getWorkCenterCode())) { + if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(mesPlc.getPlcCode())) { + if (!StringUtils.isEmpty(mesPlc.getPlcCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean); } return packBean; @@ -1300,20 +1297,20 @@ public class MesHqlPack { */ public static DdlPackBean getMesDatasource(MesDatasource mesDatasource, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesDatasource, organizeCode); - if (StringUtils.isNotEmpty(mesDatasource.getDsCode())) { + if (!StringUtils.isEmpty(mesDatasource.getDsCode())) { DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean); } - if (StringUtils.isNotEmpty(mesDatasource.getDsName())) { + if (!StringUtils.isEmpty(mesDatasource.getDsName())) { DdlPreparedPack.getStringEqualPack(mesDatasource.getDsName(), "dsName", packBean); } - if (StringUtils.isNotEmpty(mesDatasource.getDsType())) { + if (!StringUtils.isEmpty(mesDatasource.getDsType())) { DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean); } - if (StringUtils.isNotEmpty(mesDatasource.getDsDbName())) { + if (!StringUtils.isEmpty(mesDatasource.getDsDbName())) { DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean); } - if (StringUtils.isNotEmpty(mesDatasource.getEquCode())) { - DdlPreparedPack.getStringEqualPack(mesDatasource.getEquCode(), "equCode", packBean); + if (!StringUtils.isEmpty(mesDatasource.getEquipmentCode())) { + DdlPreparedPack.getStringEqualPack(mesDatasource.getEquipmentCode(), "equCode", packBean); } return packBean; } @@ -1326,13 +1323,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesFaultMethod(MesFaultMethod mesFaultMethod, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultMethod, organizeCode); - if (StringUtils.isNotEmpty(mesFaultMethod.getFmCode())) { + if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) { DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean); } - if (StringUtils.isNotEmpty(mesFaultMethod.getFmName())) { + if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean); } - if (StringUtils.isNotEmpty(mesFaultMethod.getParentFmCode())) { + if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) { DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); } return packBean; @@ -1346,13 +1343,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesFaultCause(MesFaultCause mesFaultCause, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultCause, organizeCode); - if (StringUtils.isNotEmpty(mesFaultCause.getFcCode())) { + if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) { DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean); } - if (StringUtils.isNotEmpty(mesFaultCause.getFcName())) { + if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean); } - if (StringUtils.isNotEmpty(mesFaultCause.getParentFcCode())) { + if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) { DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); } return packBean; @@ -1366,13 +1363,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesFaultPhenomenon(MesFaultPhenomenon mesFaultPhenomenon, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultPhenomenon, organizeCode); - if (StringUtils.isNotEmpty(mesFaultPhenomenon.getFpCode())) { + if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) { DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean); } - if (StringUtils.isNotEmpty(mesFaultPhenomenon.getFpName())) { + if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); } - if (StringUtils.isNotEmpty(mesFaultPhenomenon.getParentFpCode())) { + if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) { DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); } return packBean; @@ -1386,22 +1383,22 @@ public class MesHqlPack { */ public static DdlPackBean getMesQcCheckStandard(MesQcCheckStandard mesQcCheckStandard, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckStandard, organizeCode); - if (StringUtils.isNotEmpty(mesQcCheckStandard.getPartNo())) { + if (!StringUtils.isEmpty(mesQcCheckStandard.getPartNo())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(mesQcCheckStandard.getWorkCellCode())) { + if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(mesQcCheckStandard.getWorkCenterCode())) { + if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean); } if (null == mesQcCheckStandard.getCheckType()) { DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); } - if (StringUtils.isNotEmpty(mesQcCheckStandard.getCheckItem())) { + if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean); } return packBean; } ->>>>>>> Stashed changes + } From 778c1a79a7eba6fb3d9f0f993ab3f3b68bb836e6 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Sat, 12 Oct 2019 17:50:33 +0800 Subject: [PATCH 03/38] =?UTF-8?q?=E3=80=90=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E3=80=91=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 cf19219..747cd65 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 @@ -1070,8 +1070,8 @@ public class WmsEnumUtil { DAY_INVENTORY(10, "日常盘点"), MONTH_INVENTORY(20, "月度盘点"), SEASON_INVENTORY(30, "季度盘点"), - YEAR_INVENTORY(40, "年度盘点"); - + YEAR_INVENTORY(40, "年度盘点"), + AJUST_INVENTORY(50, "库存调整盘点"); private int value; private String description; From a4d873f36f661ee6aa8384f9a97d490c4c8f5ce6 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Sat, 12 Oct 2019 19:44:37 +0800 Subject: [PATCH 04/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 01911a3..6d3a0dd 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 @@ -1964,6 +1964,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result); DdlPreparedPack.getStringNotNullPack("locateNo", result); result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''"); @@ -2375,7 +2376,7 @@ public class WmsHqlPack { /** * 业务：库存查询封装 * - * @param wmsStockQuan + * @param “wmsStockQuan” * @return */ public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) { From 61a38c9acdd2c10d094fae3c7ea248aff9cffaf8 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Sat, 12 Oct 2019 20:44:45 +0800 Subject: [PATCH 05/38] =?UTF-8?q?WebService=20Server=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 1 + .../i3plus/pojo/model/softswitch/SuitServerModel.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index bc2e58a..6141b92 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -116,6 +116,7 @@ public class BlockSoftSwitchEnumUtil { SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"), // CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"), + CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"), /* 数据源 */ CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"), diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index 2654ae6..2c549e6 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -3,7 +3,7 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; +import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,43 +41,43 @@ public class SuitServerModel { /** * 适配结果信息 */ - @XStreamImplicit +// @XStreamImplicit private String suitMessage; /** * 适配状态码 */ - @XStreamImplicit +// @XStreamImplicit private String suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); /** * 适配结果 */ - @XStreamImplicit +// @XStreamImplicit private boolean suitSuccess = true; /** * 适配记录 */ - @XStreamImplicit + @XStreamOmitField private BsSuitRecord bsSuitRecord; /** * 适配器信息 */ - @XStreamImplicit + @XStreamOmitField private BsSuitCaseModel bsSuitCaseModel; /** * 请求来源 */ - @XStreamImplicit +// @XStreamImplicit private Integer requestSource; /** * 适配方式 */ - @XStreamImplicit +// @XStreamImplicit private Integer suitMethodId; public int getSuitMethodIdVal(){ @@ -87,6 +87,6 @@ public class SuitServerModel { return suitMethodId.intValue(); } - @XStreamImplicit +// @XStreamImplicit private String analyzeMessage; } From f3867c64f4cb43df0d41bbcf8d506ae3215723c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 12 Oct 2019 21:15:15 +0800 Subject: [PATCH 06/38] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=BE=AE?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 46 ++++++++++++++++++++++ .../pojo/model/softswitch/SuitClientModel.java | 4 +- .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 13 ++++++ .../pojo/softswitch/bean/BsSuitDataDetail.java | 6 +++ .../i3plus/pojo/softswitch/bean/BsSuitFile.java | 5 +++ .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 6 +++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 22 ++++++++++- 7 files changed, 100 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index bc2e58a..5180d2f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -766,4 +766,50 @@ public class BlockSoftSwitchEnumUtil { return tmp; } } + + /** + * 适配报文类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_DATA_TYPE { + XML(10, "XML"), + JSON(20, "JSON"); + + private int value; + private String description; + + private SUIT_DATA_TYPE (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static SUIT_DATA_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index bf14618..ec568ed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import com.thoughtworks.xstream.annotations.XStreamImplicit; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,6 +42,7 @@ public class SuitClientModel { /** * 适配记录 */ + @XStreamImplicit private BsSuitRecord bsSuitRecord; /** @@ -87,7 +89,7 @@ public class SuitClientModel { * 适配报文 */ @XStreamCDATA - private String suitResultMessage; + private Object suitResultMessage; public SuitClientModel() { } 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 c24db02..67c8c15 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -108,6 +109,18 @@ public class BsSuitCase extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long sslKeyId; + + @Column(name = "SUIT_DATA_TYPE") + @ApiParam(value = "适配报文类型") + private Integer suitDataType; + + public Integer getSuitDataType(){ + if(suitDataType == null){ + suitDataType = BlockSoftSwitchEnumUtil.SUIT_DATA_TYPE.XML.getValue(); + } + return suitDataType; + } + @Column(name = "REGULAR_SUIT_NUM") @ApiParam(value = "定时适配次数") private Integer regularSuitNum; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index e5863a8..403d234 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -13,6 +13,8 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : 适配报文详情 @@ -82,5 +84,9 @@ public class BsSuitDataDetail extends BaseBean { @ApiParam(value = "处理时间") private String processTime; + @Transient + @ApiParam(value = "适配请求文件列表") + private List bsSuitFileList; + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index d6a3655..baae56a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -34,6 +34,11 @@ public class BsSuitFile extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitCaseId; + @Column(name = "SUIT_RECORD_ID") + @ApiParam(value = "适配记录id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitRecordId; + @Column(name = "SUIT_CASE_NAME_RDD") @ApiParam(value = "适配套件名称") private String suitCaseName; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 93ec29a..f173120 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -11,6 +11,7 @@ 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; import javax.persistence.Transient; import java.util.List; @@ -95,6 +96,7 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配结果") private Integer suitResult; + @Lob @Column(name = "SUIT_MESSAGE") @ApiParam(value = "适配信息") private String suitMessage; @@ -119,5 +121,9 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配请求记录") private BsSuitRequestRecord bsSuitRequestRecord; + @Transient + @ApiParam(value = "适配请求文件列表") + private List bsSuitFileList; + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 0f00093..b48be74 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -362,7 +362,6 @@ public class SoftSwitchHqlPack { return ddlPackBean; } - /** * 适配文件条件封装 * @param bsSuitFile 查询条件 @@ -381,4 +380,25 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlSuitRecordBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); + + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); + + return ddlPackBean; + } + public static DdlPackBean packHqlSuitRecordBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getInPackArray(suitRecordIds,"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); + + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); + + return ddlPackBean; + } } From babaf2f7d67fe883f631e2a63ccf0a9b9b203fbd Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Sat, 12 Oct 2019 22:08:03 +0800 Subject: [PATCH 07/38] =?UTF-8?q?WebService=20=E5=AE=A2=E6=88=B7=E7=AB=AFX?= =?UTF-8?q?ml=E5=8F=82=E6=95=B0=E8=B0=83=E8=AF=95=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/softswitch/SuitParamModel.java | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java index 3a2a57c..ec7dd0a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java @@ -29,8 +29,11 @@ public class SuitParamModel { private String pathKey; /* 标签内容 */ private String vaule; - /* 标签类型 Default:PARAM_VALUE_TYPE.STRING */ - private Integer type; // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE + /** + * 标签 内容 类型 暂未定义 + * 设计思路： type 说明这个字段属于什么类型的值， 例如 Date,BigDecimal 等特殊类型标注 + */ + private String type; /* 标签属性 */ private Map attr; @@ -38,4 +41,20 @@ public class SuitParamModel { private SuitParamModel parent; /* 标签子集 */ private List childList; + + @Override + public String toString() { + return "SuitParamModel{" + + "tagName='" + tagName + '\'' + + ", classPath='" + classPath + '\'' + + ", methodName='" + methodName + '\'' + + ", id='" + id + '\'' + + ", name='" + name + '\'' + + ", pathKey='" + pathKey + '\'' + + ", vaule='" + vaule + '\'' + + ", type=" + type + + ", attr=" + attr + + ", childList=" + childList + + '}'; + } } From 746a04f96d0e6baefa3a9a8e4eb02f2a1f4dce77 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Mon, 14 Oct 2019 10:23:57 +0800 Subject: [PATCH 08/38] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java index 2bb7afa..d723fc2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java @@ -21,7 +21,6 @@ public interface WmsStockSnRepository extends BaseRepository { */ WmsStockSn findFirstBySn(String sn); - /** * Rock.Yu at 2019-06-22 11:05 * 按照存储区代码查询最早批次的物料条码 From 417b4a09db3d7ef9ca6a81c61df2d69b3649df52 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Mon, 14 Oct 2019 10:26:33 +0800 Subject: [PATCH 09/38] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 106 +++++++++++++++++++++ 1 file changed, 106 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 747cd65..d9d4402 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 @@ -3701,5 +3701,111 @@ public class WmsEnumUtil { return tmp; } } + /** + * 物流规则 处理模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTING_RULE_TYPE { + PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"), + REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则"); + private int value; + private String code; + private String description; + + ROUTING_RULE_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); + } + + 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; + } + } + /** + * 物流规则 处理单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUTING_DELAY_UNIT { + M(10, "M", "分"), + D(20, "D", "天"); + private int value; + private String code; + private String description; + + ROUTING_DELAY_UNIT(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); + } + + 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; + } + } } \ No newline at end of file From 9ac327e6224f35a641fbf4838a7c3869c7eca772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 14 Oct 2019 11:51:35 +0800 Subject: [PATCH 10/38] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java | 6 +++++- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 4 ++-- .../cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) 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 67c8c15..b757ba7 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 @@ -104,12 +104,15 @@ public class BsSuitCase extends BaseBean { return isNeedCertification.intValue(); } + @Column(name = "IS_PUSH_MQ") + @ApiParam(value = "是否推送MQ") + private Integer isPushMQ; + @Column(name = "SSL_KEY_ID") @ApiParam(value = "证书id") @JsonSerialize(using = ToStringSerializer.class) private Long sslKeyId; - @Column(name = "SUIT_DATA_TYPE") @ApiParam(value = "适配报文类型") private Integer suitDataType; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index baae56a..21f5df5 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -41,12 +41,16 @@ public class BsSuitFile extends BaseBean { @Column(name = "SUIT_CASE_NAME_RDD") @ApiParam(value = "适配套件名称") - private String suitCaseName; + private String suitCaseNameRdd; @Column(name = "SUIT_CASE_CODE") @ApiParam(value = "适配套件代码") private String suitCaseCode; + @Column(name = "CASE_TYPE_ID") + @ApiParam(value = "套件类型id(枚举)") + private Integer caseTypeId; + @Column(name = "FOLDER_PATH") @ApiParam(value = "文件夹路径") private String folderPath; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index f173120..260df43 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -36,9 +36,9 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配套件名称") private String suitCaseNameRdd; - @Column(name = "SUIT_CASE_CODE_RDD") + @Column(name = "SUIT_CASE_CODE") @ApiParam(value = "适配套件代码") - private String suitCaseCodeRdd; + private String suitCaseCode; @Column(name = "SUIT_CASE_ID") @ApiParam(value = "适配器套件id") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index b48be74..da8290e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -333,7 +333,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); @@ -370,7 +370,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitCaseFile(BsSuitFile bsSuitFile){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseName(),"suitCaseName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean); From d83de01d33c98402c925213b7afe1eb08d1bc923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 14 Oct 2019 15:50:54 +0800 Subject: [PATCH 11/38] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E9=80=82?= =?UTF-8?q?=E9=85=8D=E6=97=A5=E5=BF=97bug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/common/XStreamFactory.java | 1 - .../pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 7 +++++-- .../i3plus/pojo/model/softswitch/SuitClientModel.java | 4 ++-- .../i3plus/pojo/model/softswitch/SuitServerModel.java | 16 ++++++---------- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index 0d742da..d43e7a2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -11,7 +11,6 @@ import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import com.thoughtworks.xstream.io.xml.XppDomDriver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import java.io.Writer; import java.lang.reflect.Field; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 5180d2f..64eb818 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -122,7 +122,7 @@ public class BlockSoftSwitchEnumUtil { /* Restful */ CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"), - SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120001,"Client REST服务端适配器"), + SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,220001,"Client REST服务端适配器"), /* Socket */ SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"), @@ -216,7 +216,10 @@ public class BlockSoftSwitchEnumUtil { SCHEDULE(2,"定时调度"), RABBITMQ(3,"MQ 调用"), HTTP(4,"接口调用"), - CLOUD(5,"Cloud调用"); + CLOUD(5,"Cloud调用"), + REST(6,"REST调用"), + WEB_SERVICE(7,"WebService"), + SOCKET(8,"socket"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index ec568ed..7e64efb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamImplicit; +import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -42,7 +42,7 @@ public class SuitClientModel { /** * 适配记录 */ - @XStreamImplicit + @XStreamOmitField private BsSuitRecord bsSuitRecord; /** diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index 2654ae6..af25922 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -3,10 +3,9 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; +import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; - import java.util.List; import java.util.Map; @@ -41,43 +40,40 @@ public class SuitServerModel { /** * 适配结果信息 */ - @XStreamImplicit private String suitMessage; /** * 适配状态码 */ - @XStreamImplicit private String suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); /** * 适配结果 */ - @XStreamImplicit private boolean suitSuccess = true; /** * 适配记录 */ - @XStreamImplicit + @XStreamOmitField private BsSuitRecord bsSuitRecord; /** * 适配器信息 */ - @XStreamImplicit + @XStreamOmitField private BsSuitCaseModel bsSuitCaseModel; /** * 请求来源 */ - @XStreamImplicit + @XStreamOmitField private Integer requestSource; /** * 适配方式 */ - @XStreamImplicit + @XStreamOmitField private Integer suitMethodId; public int getSuitMethodIdVal(){ @@ -87,6 +83,6 @@ public class SuitServerModel { return suitMethodId.intValue(); } - @XStreamImplicit + @XStreamOmitField private String analyzeMessage; } From 647508d92c965064f5976a9f6bc6f9c05072c68a Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Mon, 14 Oct 2019 16:45:14 +0800 Subject: [PATCH 12/38] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=98=BE=E7=A4=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 0666d27..392c8e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.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; @@ -75,6 +77,7 @@ public class WmsASNMasterDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; @Column(name = "PACKAGE") 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 3f3e2b6..865dea6 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 @@ -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; @@ -112,6 +114,7 @@ public class WmsPOMasterDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam("状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; @Column(name = "SNP", columnDefinition = "decimal(18,8)") From 72bdd253facc6c8f982c25700f91e7515629d4f7 Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 14 Oct 2019 17:37:48 +0800 Subject: [PATCH 13/38] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 8 ++- .../pojo/mes/pcn/bean/MesQcCheckStandard.java | 76 ++++++++++++++++++++++ .../repository/MesQcCheckStandardRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/bean/MesDatasource.java | 4 ++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 8 +-- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 33 +++++++--- 6 files changed, 128 insertions(+), 15 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 84bd7b8..bab8391 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -11,6 +11,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description: @@ -46,7 +48,7 @@ public class MesQcCheckData extends BaseBean { @Column(name = "CHECK_TYPE") @ApiParam("检测类型") - private String checkType; + private Integer checkType; @Column(name = "CHECK_ITEM") @ApiParam("检测项") @@ -92,4 +94,8 @@ public class MesQcCheckData extends BaseBean { @ApiParam("客户代码") private String custCode; + @Transient + @ApiParam("过程质量检测数据") + private List mesQcCheckStandardList; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java new file mode 100644 index 0000000..4301c73 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 javax.persistence.Transient; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 14:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_QC_CHECK_STANDARD") +@Api("质量检测标准") +public class MesQcCheckStandard extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("检测结果") + private String checkResult; + + @Transient + @ApiParam("检测值") + private String checkValue; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java new file mode 100644 index 0000000..1348b9c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 14:58 + * @Modify: + **/ +public interface MesQcCheckStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index b6d76f0..25838bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -63,4 +63,8 @@ public class MesDatasource extends BaseBean { @ApiParam("数据库名称") private String dsDbName; + @Column(name = "DS_DB_NAME") + @ApiParam("数据库名称") + private String dsDbName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index e0b2153..ec8b51e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -65,9 +65,9 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; - @Column(name = "EQU_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") @@ -77,10 +77,6 @@ public class MesPlc extends BaseBean { @ApiParam("工作单元") private String workCellCode; - @Column(name = "ENABLED") - @ApiParam("是否启用 0 false 1 true") - private Integer enabled; - @Column(name = "PLC_CFG") @ApiParam("PLC的值的设定") private String plcCfg; 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 263e26b..d61eb27 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 @@ -1256,7 +1256,7 @@ public class MesHqlPack { DdlPreparedPack.getOrderByPack(new String[]{String.valueOf(CommonEnumUtil.ASC_OR_DESC.ASC.getValue())}, new String[]{"startTime", "shiftCode"}, packBean); return packBean; } - + /** * MES Plc设备信息配置查询条件封装 * @param mesPlc @@ -1277,9 +1277,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPlc.getTagAddress())) { DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean); } - if (!StringUtils.isEmpty(mesPlc.getEquCode())) { - DdlPreparedPack.getStringEqualPack(mesPlc.getEquCode(), "equCode", packBean); - } if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean); } @@ -1309,9 +1306,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesDatasource.getDsDbName())) { DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean); } - if (!StringUtils.isEmpty(mesDatasource.getEquipmentCode())) { - DdlPreparedPack.getStringEqualPack(mesDatasource.getEquipmentCode(), "equCode", packBean); - } return packBean; } @@ -1329,6 +1323,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean); } + if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) { + DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean); + } + if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { + DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean); + } if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) { DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); } @@ -1349,6 +1349,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean); } + if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) { + DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean); + } + if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { + DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean); + } if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) { DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); } @@ -1369,6 +1375,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); } + if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) { + DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean); + } + if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { + DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); + } if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) { DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); } @@ -1389,6 +1401,12 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean); } + if (!StringUtils.isEmpty(mesQcCheckStandard.getPartNo())) { + DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) { + DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean); + } if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean); } @@ -1400,5 +1418,4 @@ public class MesHqlPack { } return packBean; } - } From f35461ef57dbdd1a1b3b7e36aa87c0632ebd691d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 14 Oct 2019 17:41:39 +0800 Subject: [PATCH 14/38] =?UTF-8?q?WebService=20Server=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index 7e6578b..725277a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -59,13 +60,13 @@ public class SuitServerModel { /** * 适配记录 */ - @XStreamImplicit + @XStreamOmitField private BsSuitRecord bsSuitRecord; /** * 适配器信息 */ - @XStreamImplicit + @XStreamOmitField private BsSuitCaseModel bsSuitCaseModel; /** From 5d730ed5c846110174c7fb444c48562dc1851a7d Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 14 Oct 2019 19:37:10 +0800 Subject: [PATCH 15/38] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 --- 2 files changed, 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index 25838bb..b6d76f0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -63,8 +63,4 @@ public class MesDatasource extends BaseBean { @ApiParam("数据库名称") private String dsDbName; - @Column(name = "DS_DB_NAME") - @ApiParam("数据库名称") - private String dsDbName; - } 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 d61eb27..27ff855 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 @@ -1297,9 +1297,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesDatasource.getDsCode())) { DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean); } - if (!StringUtils.isEmpty(mesDatasource.getDsName())) { - DdlPreparedPack.getStringEqualPack(mesDatasource.getDsName(), "dsName", packBean); - } if (!StringUtils.isEmpty(mesDatasource.getDsType())) { DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean); } From 37f7e92d53749d556f81fed53eec069cd9136815 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 15 Oct 2019 09:35:10 +0800 Subject: [PATCH 16/38] =?UTF-8?q?mes=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 97 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 77 ++++++++++++++++- .../i3plus/pojo/mes/bean/MesEquTaskStandard.java | 64 ++++++++++++++ .../pojo/mes/model/MesEquTaskStandardModel.java | 77 +++++++++++++++++ .../i3plus/pojo/mes/model/MesEquipmentModel.java | 34 ++++---- .../repository/MesEquTaskStandardRepository.java | 16 ++++ 6 files changed, 347 insertions(+), 18 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.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 b6e1b2c..3c7e1fa 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 @@ -11,6 +11,103 @@ import com.fasterxml.jackson.annotation.JsonFormat; **/ public class MesEnumUtil { + + /** + * mes设备作业要求-作业类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_INSERT_EXCEL { + + MES_PLAN_ORDER(10, "生产计划"), + MES_EQUIPMENT(20, "设备台账"), + MES_EQU_TASK_STANDARD(30, "设备作业要求"); + + private int value; + private String description; + + MES_INSERT_EXCEL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_INSERT_EXCEL getByValue(int value) { + for (MES_INSERT_EXCEL mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业要求-作业类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_STANDARD_TASK_TYPE { + + CHECK(10, "点检"), + MAINTAIN(20, "保养"), + REPAIR(30, "维修"); + + private int value; + private String description; + + MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * mes设备类型 */ 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 c21185e..19ca8a0 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 @@ -817,7 +817,8 @@ public class MesPcnEnumUtil { OPEN(30, "启动"), PAUSE(40, "暂停"), CANCEL(50, "取消"), - CLOSE(60, "关闭"); + CLOSE(60, "关闭"), + COMPLETE(70, "完成"); private int value; private String description; @@ -1163,6 +1164,80 @@ public class MesPcnEnumUtil { } /** + * 条码生成业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMPANY_TYPE { + RULECODE("ruleCode", "规则编码"), + PREFIX("prefix", "前缀"), + PART_NO("partNo", "物料号"), + CUST_PART_NO("custPartNo", "客户物料号"), + CUST_CODE("custCode", "客户代码"), + PROD_LOCATION("prodLocation", "产地"), + YEAR("year", "年"), + MOTH("month", "月"), + DAY("day", "日"), + HOUR("hour", "小时"), + MINUTE("minute", "分钟"), + SECOND("second", "秒"), + SERIAL("serialNo", "序列号"); + + private String value; + private String description; + + COMPANY_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + + /** + * mes工步类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STEP_TYPE { + + AUTO_RUN(10, "自动执行"), + SCAN_RUN(20, "扫描执行"); + + + private Integer value; + private String description; + + MES_STEP_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer 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; + } + } + + /** * MesRoute 流程的类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java new file mode 100644 index 0000000..51d7fb3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java @@ -0,0 +1,64 @@ +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 javax.persistence.Transient; + +/** + * @Description :设备作业要求 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK_STANDARD") +@Api("设备作业要求") +public class MesEquTaskStandard extends BaseBean { + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name="ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name="ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name="ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Transient + @ApiParam(value="生产线") + private String workCenterCode; + + @Transient + @ApiParam(value="设备类别") + private String equipmentCategory; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java new file mode 100644 index 0000000..58d977b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskStandardModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam("操作项") + private Integer actionItem; + + @ApiParam("操作标准") + private String actionStandard; + + @ApiParam("操作指导") + private String actionGuide; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam(value = "有效性") + public Integer isValid; + + @ApiParam(value = "是否已删除") + public Integer isDeleted; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; + + + public MesEquTaskStandardModel() { + + } + + public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer actionItem, String actionStandard, String actionGuide, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.taskType = taskType; + this.actionItem = actionItem; + this.actionStandard = actionStandard; + this.actionGuide = actionGuide; + this.workCenterCode = workCenterCode; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index cfa042c..63cad36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data public class MesEquipmentModel implements Serializable { - @ApiParam(value ="id") + @ApiParam("id") private Long id; @ApiParam("设备代码") @@ -19,34 +19,34 @@ public class MesEquipmentModel implements Serializable { @ApiParam("设备状态") private Integer status; - @ApiParam(value ="生产线") + @ApiParam("生产线") private String workCenterCode; - @ApiParam(value ="工位") + @ApiParam("工位") private String workCellCode; - @ApiParam(value ="区域") + @ApiParam("区域") private String areaCode; - @ApiParam(value ="设备工位关联ID") + @ApiParam("设备工位关联ID") private Long wcId; - @ApiParam(value ="设备&工位") + @ApiParam("设备&工位") private String equipmentNameAndworkCellName; @ApiParam("设备类型") private Integer equipmentType; - @ApiParam(value ="设备类别") + @ApiParam("设备类别") private String equipmentCategory; - @ApiParam(value ="备注") + @ApiParam("备注") private String memo; - @ApiParam(value ="设备型号") + @ApiParam("设备型号") private String equipmentModel; - @ApiParam(value ="设备规格") + @ApiParam("设备规格") private String equipmentSpec; @ApiParam("制造商") @@ -64,25 +64,25 @@ public class MesEquipmentModel implements Serializable { @ApiParam("连接类型") private Integer connectType; - @ApiParam(value ="组织代码") + @ApiParam("组织代码") public String organizeCode; - @ApiParam(value = "有效性") + @ApiParam( "有效性") public Integer isValid; - @ApiParam(value = "是否已删除") + @ApiParam( "是否已删除") public Integer isDeleted; - @ApiParam(value = "创建用户") + @ApiParam( "创建用户") public String createUser; - @ApiParam(value = "创建日期") + @ApiParam( "创建日期") public String createDatetime; - @ApiParam(value = "修改人") + @ApiParam( "修改人") public String modifyUser; - @ApiParam(value = "修改日期") + @ApiParam( "修改日期") public String modifyDatetime; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java new file mode 100644 index 0000000..49e83b9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskStandard; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : 王杰 + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskStandardRepository extends BaseRepository { +} From a79769d229e9df3e51627e0374ab4a00ec6751a9 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 15 Oct 2019 10:52:23 +0800 Subject: [PATCH 17/38] =?UTF-8?q?mes-pcn=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 47 +++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 77 +++++++++++++++++++++- 2 files changed, 123 insertions(+), 1 deletion(-) 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 b6e1b2c..70e549b 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 @@ -12,6 +12,53 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes过程质量检测类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_CHECK_TYPE { + + FIRST_CHECK(10, "首检"), + ON_SITE_CHECK(20, "巡检"), + END_CHECK(30, "尾检"); + + private int value; + private String description; + + MES_QC_CHECK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * mes设备类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 c21185e..19ca8a0 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 @@ -817,7 +817,8 @@ public class MesPcnEnumUtil { OPEN(30, "启动"), PAUSE(40, "暂停"), CANCEL(50, "取消"), - CLOSE(60, "关闭"); + CLOSE(60, "关闭"), + COMPLETE(70, "完成"); private int value; private String description; @@ -1163,6 +1164,80 @@ public class MesPcnEnumUtil { } /** + * 条码生成业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMPANY_TYPE { + RULECODE("ruleCode", "规则编码"), + PREFIX("prefix", "前缀"), + PART_NO("partNo", "物料号"), + CUST_PART_NO("custPartNo", "客户物料号"), + CUST_CODE("custCode", "客户代码"), + PROD_LOCATION("prodLocation", "产地"), + YEAR("year", "年"), + MOTH("month", "月"), + DAY("day", "日"), + HOUR("hour", "小时"), + MINUTE("minute", "分钟"), + SECOND("second", "秒"), + SERIAL("serialNo", "序列号"); + + private String value; + private String description; + + COMPANY_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + + /** + * mes工步类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STEP_TYPE { + + AUTO_RUN(10, "自动执行"), + SCAN_RUN(20, "扫描执行"); + + + private Integer value; + private String description; + + MES_STEP_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer 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; + } + } + + /** * MesRoute 流程的类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 45b4264c67f018edaa6255e4343e4b3605000623 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Tue, 15 Oct 2019 11:19:04 +0800 Subject: [PATCH 18/38] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=98=BE=E7=A4=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 20 ++++++++++++++++++++ 1 file changed, 20 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 d9d4402..7860945 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 @@ -285,6 +285,26 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOfDescription(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; + } + } /** From 9e1b86eb2b5cf7a0ca47655c9df228b7b016e7c8 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Tue, 15 Oct 2019 13:21:35 +0800 Subject: [PATCH 19/38] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=98=BE=E7=A4=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 865dea6..aed40c4 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 @@ -114,7 +114,7 @@ public class WmsPOMasterDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam("状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; @Column(name = "SNP", columnDefinition = "decimal(18,8)") From d9dd10761e8242774049c82bf1c3888491f1239b Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 15 Oct 2019 13:29:11 +0800 Subject: [PATCH 20/38] =?UTF-8?q?WebService=20=E6=AC=A7=E6=B4=B2=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java | 3 --- .../java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index d43e7a2..b1738c3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -34,6 +34,9 @@ public class XStreamFactory { public static final String CDATA_PREFIX = ""; + private XStreamFactory() { + } + public static XStream getXStream() { final NameCoder nameCoder = new NoNameCoder(); XStream xStream = new XStream(new XppDomDriver(nameCoder) { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index 25838bb..72fcca5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -63,8 +63,5 @@ public class MesDatasource extends BaseBean { @ApiParam("数据库名称") private String dsDbName; - @Column(name = "DS_DB_NAME") - @ApiParam("数据库名称") - private String dsDbName; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index 725277a..abee745 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import com.thoughtworks.xstream.annotations.XStreamAlias; From 95a354f5370282335b2d3b145af69dc6ed9c9c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 15 Oct 2019 13:50:24 +0800 Subject: [PATCH 21/38] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=A4=84=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index da8290e..5ea76e3 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -384,6 +384,17 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlSuitRecordBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); + + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlSuitDataDetailBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCodeRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); @@ -391,10 +402,22 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + public static DdlPackBean packHqlSuitRecordBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackArray(suitRecordIds,"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getInPackArray(suitRecordIds,"id",ddlPackBean); + DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); + + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getInPackArray(suitRecordIds,"suitRecordId",ddlPackBean); DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean); From c6813403553527530bef1d0f9d4cfebc75815497 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 15 Oct 2019 15:18:42 +0800 Subject: [PATCH 22/38] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9E=9A=E4=B8=BE=E4=B8=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 d4e24f6..7bbf94e 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 @@ -1241,7 +1241,9 @@ public class MesEnumUtil { MODULE_CONTENT("moduleContent", "组件内容"), CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"), - RENEW_REQUEST_PARAMS("renewRequestParams","回传刷新StationResultBean"); + STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), + RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); + private String value; private String description; From b7b78b85acffc1f75478765b8dc196018d674a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 15 Oct 2019 18:34:19 +0800 Subject: [PATCH 23/38] =?UTF-8?q?=E8=AF=AF=E6=8B=89=E4=BA=86test=E5=88=86?= =?UTF-8?q?=E6=94=AF=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=9A=E8=BF=98=E5=8E=9F?= 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 | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/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 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 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-TEST-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 4426ba9..b6adafd 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-TEST-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 d790ef1..e97c0bb 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 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-TEST-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 23e5bee..0ba3645 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-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 c1e2cb9..6706323 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-TEST-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 86d7736..3681eb6 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-TEST-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 09f2c4a..e388a1d 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/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-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 0798953..39a7704 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 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-TEST-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 bd09726..e36fcf7 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-TEST-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 4c96781..81fb02b 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 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-TEST-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 18c811c..bc41914 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-TEST-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 1171f4e..93f9732 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f220aa1..f355cca 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 7863325afdf746d494d223acee78ba71524a0af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 15 Oct 2019 18:39:24 +0800 Subject: [PATCH 24/38] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AF=AF=E6=8B=89?= =?UTF-8?q?=E4=BA=86=E6=B5=8B=E8=AF=95=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=90=8E=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=86=E6=94=AF=E6=8B=89=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=88=86=E6=94=AF=E7=9A=84=E4=BB=A3=E7=A0=81=E4=B9=9F=E5=BE=97?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= 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 | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/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 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 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-DEV-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 b6adafd..4426ba9 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-DEV-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 e97c0bb..d790ef1 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-DEV-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 90e744d..c6141da 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-DEV-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 0ba3645..23e5bee 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-DEV-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 6706323..c1e2cb9 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-DEV-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 3681eb6..86d7736 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-DEV-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 e388a1d..09f2c4a 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-DEV-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 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39a7704..0798953 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-DEV-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 e310bfd..ec9e100 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-DEV-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 e36fcf7..bd09726 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-DEV-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 81fb02b..4c96781 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-DEV-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 1f622d9..2c24e41 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-DEV-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 bc41914..18c811c 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-DEV-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 93f9732..1171f4e 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f355cca..f220aa1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 05fd0fe686ef6a8e2ceecf8eb94bde60e9810081 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 15 Oct 2019 18:44:14 +0800 Subject: [PATCH 25/38] =?UTF-8?q?WebService=20Server=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 87731f4..6e71ffb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -114,6 +114,7 @@ public class BlockSoftSwitchEnumUtil { /* WebService */ SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"), SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"), + SERVER_WEB_SERVICE_RECORDING_XML(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240004,"记录请求Body"), // CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"), CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"), From 6c1891c19333be8a0d3926c05e095bcb0bec542e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 15 Oct 2019 19:20:22 +0800 Subject: [PATCH 26/38] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E7=8A=B6=E6=80=81=E5=8F=8A=E5=BE=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 87731f4..62b8b63 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -816,4 +816,51 @@ public class BlockSoftSwitchEnumUtil { } } + + /** + * 适配报文处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_PROCESS_STATUS { + UNPROCESSED(10, "未处理"), + PROCESSING(20, "处理中"), + PROCESS(30, "已处理"); + + private int value; + private String description; + + private SUIT_PROCESS_STATUS (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static SUIT_PROCESS_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } } From 2238bee7d478ed6d3acd455a0d8a84e1d9b4c561 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 15 Oct 2019 20:21:09 +0800 Subject: [PATCH 27/38] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesDatasource.java | 5 + .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 9 +- .../i3plus/pojo/mes/model/MesDatasourceModel.java | 98 +++++++++++++++++ .../estsh/i3plus/pojo/mes/model/MesPlcModel.java | 122 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 58 +++------- 5 files changed, 249 insertions(+), 43 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index b6d76f0..c5da050 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -63,4 +64,8 @@ public class MesDatasource extends BaseBean { @ApiParam("数据库名称") private String dsDbName; + @Transient + @ApiParam("设备名称") + private String equipmentName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index ec8b51e..79eb8f3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -70,11 +71,11 @@ public class MesPlc extends BaseBean { private String equipmentCode; @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") + @ApiParam("生产线") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") + @ApiParam("工位") private String workCellCode; @Column(name = "PLC_CFG") @@ -88,4 +89,8 @@ public class MesPlc extends BaseBean { @Column(name = "IS_ANALYSIS") @ApiParam("是否解析") private String isAnalysis; + + @Transient + @ApiParam("设备名称") + private String equipmentName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java new file mode 100644 index 0000000..f83d057 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\15 17:20 + * @Modify: + **/ +@Data +public class MesDatasourceModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam( "有效性") + public Integer isValid; + + @ApiParam( "是否已删除") + public Integer isDeleted; + + @ApiParam( "创建用户") + public String createUser; + + @ApiParam( "创建日期") + public String createDatetime; + + @ApiParam( "修改人") + public String modifyUser; + + @ApiParam( "修改日期") + public String modifyDatetime; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("数据源代码") + private String dsCode; + + @ApiParam("数据源名称") + private String dsName; + + @ApiParam("数据源类型") + private String dsType; + + @ApiParam("主机") + private String dsHost; + + @ApiParam("端口") + private Integer dsPort; + + @ApiParam("用户名") + private String dsUser; + + @ApiParam("密码") + private String dsPassword; + + @ApiParam("数据库名称") + private String dsDbName; + + public MesDatasourceModel() { + + } + + public MesDatasourceModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, + String modifyUser, String modifyDatetime, String organizeCode, String dsCode, String dsName, String dsType, + String dsHost, Integer dsPort, String dsUser, String dsPassword, String dsDbName) { + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.organizeCode = organizeCode; + this.dsCode = dsCode; + this.dsName = dsName; + this.dsType = dsType; + this.dsHost = dsHost; + this.dsPort = dsPort; + this.dsUser = dsUser; + this.dsPassword = dsPassword; + this.dsDbName = dsDbName; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java new file mode 100644 index 0000000..ab63d8f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -0,0 +1,122 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\15 15:58 + * @Modify: + **/ +@Data +public class MesPlcModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam( "有效性") + public Integer isValid; + + @ApiParam( "是否已删除") + public Integer isDeleted; + + @ApiParam( "创建用户") + public String createUser; + + @ApiParam( "创建日期") + public String createDatetime; + + @ApiParam( "修改人") + public String modifyUser; + + @ApiParam( "修改日期") + public String modifyDatetime; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("PLC代码") + private String plcCode; + + @ApiParam("PLC名称") + private String plcName; + + @ApiParam("PLC型号") + private String plcModel; + + @ApiParam("PLC IP") + private String plcIp; + + @ApiParam("通道") + private String channel; + + @ApiParam("标签名称") + private String tagName; + + @ApiParam("标签地址") + private String tagAddress; + + @ApiParam("标签数据类型") + private String dataType; + + @ApiParam("分组名称") + private String groupName; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("PLC的值的设定") + private String plcCfg; + + @ApiParam("解析规则") + private String analysisRule; + + @ApiParam("是否解析") + private String isAnalysis; + + public MesPlcModel(){ + + } + + public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, + String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, + String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis){ + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.organizeCode = organizeCode; + this.plcCode = plcCode; + this.plcName = plcName; + this.plcModel = plcModel; + this.plcIp = plcIp; + this.channel = channel; + this.tagName = tagName; + this.tagAddress = tagAddress; + this.dataType = dataType; + this.groupName = groupName; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.plcCfg = plcCfg; + this.analysisRule = analysisRule; + this.isAnalysis = isAnalysis; + } +} 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 27ff855..ad38b80 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 @@ -1266,16 +1266,16 @@ public class MesHqlPack { public static DdlPackBean getMesPlc(MesPlc mesPlc, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesPlc, organizeCode); if (!StringUtils.isEmpty(mesPlc.getPlcCode())) { - DdlPreparedPack.getStringEqualPack(mesPlc.getPlcCode(), "plcCode", packBean); + DdlPreparedPack.getStringLikerPack(mesPlc.getPlcCode(), "plcCode", packBean); } if (!StringUtils.isEmpty(mesPlc.getPlcName())) { - DdlPreparedPack.getStringEqualPack(mesPlc.getPlcName(), "plcName", packBean); + DdlPreparedPack.getStringLikerPack(mesPlc.getPlcName(), "plcName", packBean); } if (!StringUtils.isEmpty(mesPlc.getChannel())) { - DdlPreparedPack.getStringEqualPack(mesPlc.getChannel(), "channel", packBean); + DdlPreparedPack.getStringLikerPack(mesPlc.getChannel(), "channel", packBean); } if (!StringUtils.isEmpty(mesPlc.getTagAddress())) { - DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean); + DdlPreparedPack.getStringLikerPack(mesPlc.getTagAddress(), "tagAddress", packBean); } if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean); @@ -1295,13 +1295,13 @@ public class MesHqlPack { public static DdlPackBean getMesDatasource(MesDatasource mesDatasource, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesDatasource, organizeCode); if (!StringUtils.isEmpty(mesDatasource.getDsCode())) { - DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean); + DdlPreparedPack.getStringLikerPack(mesDatasource.getDsCode(), "dsCode", packBean); } if (!StringUtils.isEmpty(mesDatasource.getDsType())) { - DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean); + DdlPreparedPack.getStringLikerPack(mesDatasource.getDsType(), "dsType", packBean); } if (!StringUtils.isEmpty(mesDatasource.getDsDbName())) { - DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean); + DdlPreparedPack.getStringLikerPack(mesDatasource.getDsDbName(), "dsDbName", packBean); } return packBean; } @@ -1315,19 +1315,13 @@ public class MesHqlPack { public static DdlPackBean getMesFaultMethod(MesFaultMethod mesFaultMethod, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultMethod, organizeCode); if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmCode(), "fmCode", packBean); } if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { - DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean); - } - if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean); - } - if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { - DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmName(), "fmName", packBean); } if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); } return packBean; } @@ -1341,19 +1335,13 @@ public class MesHqlPack { public static DdlPackBean getMesFaultCause(MesFaultCause mesFaultCause, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultCause, organizeCode); if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcCode(), "fcCode", packBean); } if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { - DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean); - } - if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean); - } - if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { - DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcName(), "fcName", packBean); } if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); } return packBean; } @@ -1367,19 +1355,13 @@ public class MesHqlPack { public static DdlPackBean getMesFaultPhenomenon(MesFaultPhenomenon mesFaultPhenomenon, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultPhenomenon, organizeCode); if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean); - } - if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { - DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); - } - if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean); } if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { - DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); } if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); } return packBean; } @@ -1398,12 +1380,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean); } - if (!StringUtils.isEmpty(mesQcCheckStandard.getPartNo())) { - DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean); - } - if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean); - } if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean); } @@ -1411,7 +1387,7 @@ public class MesHqlPack { DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); } if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) { - DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean); + DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean); } return packBean; } From 9a6b1c4bf106ab99c253d70bb7438f0271c120f0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 15 Oct 2019 20:50:28 +0800 Subject: [PATCH 28/38] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/model/MesWorkOrderButtonModel.java | 3 + .../estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 64 ++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesFaultCause.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesFaultMethod.java | 2 +- .../i3plus/pojo/mes/bean/MesFaultPhenomenon.java | 2 +- .../i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 87 ++++++++++++++++++++++ .../pojo/mes/model/MesEquTaskStandardModel.java | 28 ++++--- .../i3plus/pojo/mes/model/MesEquipmentModel.java | 12 +++ .../pojo/mes/model/MesWorkOrderButtonModel.java | 3 + .../mes/repository/MesEquTaskPlanRepository.java | 16 ++++ 10 files changed, 207 insertions(+), 12 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java index 8cd2304..c21e26b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java @@ -35,5 +35,8 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("关闭按钮") private boolean closeButton; + @ApiParam("完成按钮") + private boolean completeButton; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java new file mode 100644 index 0000000..a507c64 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -0,0 +1,64 @@ +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 javax.persistence.Transient; + +/** + * @Description :设备周期作业计划 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK_PLAN") +@Api("设备周期作业计划") +public class MesEquTaskPlan extends BaseBean { + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name="TASK_CYCLE") + @ApiParam("周期(天)") + private Integer taskCycle; + + @Column(name="LAST_TIME") + @ApiParam("上一执行时间") + private String lastTime; + + @Column(name="DAYS_IN_ADVANCE") + @ApiParam("创建提前天数") + private String daysInAdvance; + + @Transient + @ApiParam(value="生产线") + private String workCenterCode; + + @Transient + @ApiParam(value="设备类别") + private String equipmentCategory; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java index 9a8c536..888bb7a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_CAUSE") -@Api("PLC配置表") +@Api("mes设备故障原因表") public class MesFaultCause extends BaseBean { @Column(name = "FC_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java index 22a4f2a..06d07d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_METHOD") -@Api("PLC配置表") +@Api("mes设备故障方法表") public class MesFaultMethod extends BaseBean { @Column(name = "FM_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index 576626b..b3ec52c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_PHENOMENON") -@Api("PLC配置表") +@Api("mes设备故障现象表") public class MesFaultPhenomenon extends BaseBean { @Column(name = "FP_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java new file mode 100644 index 0000000..f406591 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskPlanModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam("周期(天)") + private Integer taskCycle; + + @ApiParam("上一执行时间") + private String lastTime; + + @ApiParam("创建提前天数") + private String daysInAdvance; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("设备类别") + private String equipmentCategory; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("有效性") + public Integer isValid; + + @ApiParam("是否已删除") + public Integer isDeleted; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("设备类别") + private String equipmentCategoryName; + + + public MesEquTaskPlanModel() { + + } + + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, String daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.taskType = taskType; + this.taskCycle = taskCycle; + this.lastTime = lastTime; + this.daysInAdvance = daysInAdvance; + this.workCenterCode = workCenterCode; + this.equipmentCategory = equipmentCategory; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java index 58d977b..ca5f0ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java @@ -20,7 +20,7 @@ public class MesEquTaskStandardModel implements Serializable { private Integer taskType; @ApiParam("操作项") - private Integer actionItem; + private String actionItem; @ApiParam("操作标准") private String actionStandard; @@ -31,33 +31,42 @@ public class MesEquTaskStandardModel implements Serializable { @ApiParam("生产线") private String workCenterCode; - @ApiParam(value ="组织代码") + @ApiParam("设备类别") + private String equipmentCategory; + + @ApiParam("组织代码") public String organizeCode; - @ApiParam(value = "有效性") + @ApiParam("有效性") public Integer isValid; - @ApiParam(value = "是否已删除") + @ApiParam("是否已删除") public Integer isDeleted; - @ApiParam(value = "创建用户") + @ApiParam("创建用户") public String createUser; - @ApiParam(value = "创建日期") + @ApiParam("创建日期") public String createDatetime; - @ApiParam(value = "修改人") + @ApiParam("修改人") public String modifyUser; - @ApiParam(value = "修改日期") + @ApiParam("修改日期") public String modifyDatetime; + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("设备类别") + private String equipmentCategoryName; + public MesEquTaskStandardModel() { } - public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer actionItem, String actionStandard, String actionGuide, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -66,6 +75,7 @@ public class MesEquTaskStandardModel implements Serializable { this.actionStandard = actionStandard; this.actionGuide = actionGuide; this.workCenterCode = workCenterCode; + this.equipmentCategory = equipmentCategory; this.organizeCode = organizeCode; this.isValid = isValid; this.isDeleted = isDeleted; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index 63cad36..5e09c06 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -85,6 +85,18 @@ public class MesEquipmentModel implements Serializable { @ApiParam( "修改日期") public String modifyDatetime; + @ApiParam("设备状态") + private String statusName; + + @ApiParam("设备类型") + private String equipmentTypeName; + + @ApiParam("设备类别") + private String equipmentCategoryName; + + @ApiParam("连接类型") + private String connectTypeName; + public MesEquipmentModel() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java index 1d37fff..4a5af7e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java @@ -44,5 +44,8 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("关闭按钮") private boolean closeButton; + @ApiParam("完成按钮") + private boolean completeButton; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java new file mode 100644 index 0000000..33c9dc1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlan; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : 王杰 + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskPlanRepository extends BaseRepository { +} From fcefe8de38b2b438ee6dbff92c3d62bbd65b038d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Tue, 15 Oct 2019 21:21:34 +0800 Subject: [PATCH 29/38] =?UTF-8?q?1.=20=E9=80=9A=E7=94=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E7=94=A8=E8=BD=AF=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=88=E4=BD=BF=E7=94=A8=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=BC=95=E6=93=8E=E5=AE=9E=E7=8E=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/dbinterface/WmsInterfaceDataMapper.java | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index ff1eadc..0abcde9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -116,4 +116,39 @@ public class WmsInterfaceDataMapper extends BaseBean { @Column(name = "LAST_SYNC_TIME") public String lastSyncTime; + /** + * 软适配编号 + */ + @Column(name = "SOFT_ADAPATOR_CODE") + public String softAdaptorCode; + + /** + * 扩展脚本编号，用于扩展接口功能 + */ + @Column(name = "SCRIPT_NO") + public String ScriptNo; + + /** + * 调用脚本方法获取数据 + */ + @Column(name = "USE_SCRIPT_PULL") + public int useScriptPull; + + /** + * 调用脚本方法保存数据 + */ + @Column(name = "USE_SCRIPT_PUSH") + public int useScriptPush; + + /** + * 调用脚本方法更新同步标志 + */ + @Column(name = "USE_SCRIPT_MARK") + public int useScriptMark; + + /** + * 调用脚本方法过滤数据（查询来源数据后过滤） + */ + @Column(name = "USE_SCRIPT_FILTER") + public int useScriptFilter; } From da97adcbc7129e035d3821d48f7ec2613d5cca69 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 16 Oct 2019 13:37:15 +0800 Subject: [PATCH 30/38] =?UTF-8?q?=E6=9B=B4=E6=94=B9db=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesDatasource.java | 0 .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java | 62 ---------------------- ...epository.java => MesDatasourceRepository.java} | 4 +- 3 files changed, 2 insertions(+), 64 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java rename modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/{MesDbRepository.java => MesDatasourceRepository.java} (57%) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java new file mode 100644 index 0000000..e69de29 diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java deleted file mode 100644 index 113151d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java +++ /dev/null @@ -1,62 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:17 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DB") -@Api("地址清单") -public class MesDb extends BaseBean { - - @Column(name="DS_CODE") - @ApiParam("数据源代码") - private String dsCode; - - @Column(name="DS_NAME") - @ApiParam("数据源名称") - private String dsName; - - @Column(name="DS_TYPE") - @ApiParam("数据源类型") - private String dsType; - - @Column(name="DS_HOST") - @ApiParam("主机") - private String dsHost; - - @Column(name="DS_PORT") - @ApiParam("端口") - private Integer dsPort; - - @Column(name="DS_USER") - @ApiParam("用户名") - private String dsUser; - - @Column(name="DS_PASSWORD") - @ApiParam("密码") - private String dsPassword; - - @Column(name="EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java similarity index 57% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java index 0b7d77e..b803066 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java @@ -2,12 +2,12 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDb; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDatasource; /** * @Author: Wynne.Lu * @CreateDate: 2019/9/27 1:58 PM * @Description: **/ -public interface MesDbRepository extends BaseRepository { +public interface MesDatasourceRepository extends BaseRepository { } From 203b53d3b3e614e0ce1bca41e7a76f29047d2924 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 16 Oct 2019 13:40:51 +0800 Subject: [PATCH 31/38] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesDatasource.java | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java index e69de29..0f2aa79 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:17 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATASOURCE") +@Api("地址清单") +public class MesDatasource extends BaseBean { + + @Column(name="DS_CODE") + @ApiParam("数据源代码") + private String dsCode; + + @Column(name="DS_NAME") + @ApiParam("数据源名称") + private String dsName; + + @Column(name="DS_TYPE") + @ApiParam("数据源类型") + private String dsType; + + @Column(name="DS_HOST") + @ApiParam("主机") + private String dsHost; + + @Column(name="DS_PORT") + @ApiParam("端口") + private Integer dsPort; + + @Column(name="DS_USER") + @ApiParam("用户名") + private String dsUser; + + @Column(name="DS_PASSWORD") + @ApiParam("密码") + private String dsPassword; + + @Column(name = "DS_DB_NAME") + @ApiParam("数据库名称") + private String dsDbName; + + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + +} From 14123c008e096b9a6bd9425b305a3db337313e0c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 16 Oct 2019 15:21:26 +0800 Subject: [PATCH 32/38] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index a507c64..7005067 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -51,7 +51,7 @@ public class MesEquTaskPlan extends BaseBean { @Column(name="DAYS_IN_ADVANCE") @ApiParam("创建提前天数") - private String daysInAdvance; + private Integer daysInAdvance; @Transient @ApiParam(value="生产线") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index f406591..3464fb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -26,7 +26,7 @@ public class MesEquTaskPlanModel implements Serializable { private String lastTime; @ApiParam("创建提前天数") - private String daysInAdvance; + private Integer daysInAdvance; @ApiParam("生产线") private String workCenterCode; @@ -66,7 +66,7 @@ public class MesEquTaskPlanModel implements Serializable { } - public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, String daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; From 8a316ff2d5040cb6f56b28a902f5168ac04c0eb0 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 16 Oct 2019 15:34:39 +0800 Subject: [PATCH 33/38] add mrp function to aps --- .../pojo/aps/annotation/FieldAnnotation.java | 15 +++++++++++---- .../pojo/aps/annotation/RippleAnnotation.java | 11 +++++++++-- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 4 ++++ .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 1 - .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 4 ++++ .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 22 +++++++++++++--------- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 12 ++---------- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 12 ++---------- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 16 ++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 8 ++++++++ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 18 +++++++++++++++++- .../pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java | 22 ++++++++++++++++++++++ .../i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java | 8 ++++++++ .../i3plus/pojo/aps/model/ResourceCompose.java | 18 ++++++++++++++++++ .../src/main/resources/relations/Work.xml | 4 ++-- .../src/main/resources/relations/WorkResource.xml | 2 +- 17 files changed, 145 insertions(+), 40 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 86caaa2..a8484af 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -5,12 +5,19 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @Description :字段元信息注解 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface FieldAnnotation { boolean property() default true; - boolean modify() default true; - boolean display() default true; - int pric() default 2; - boolean mainkey() default false; + boolean modify() default true; // 是否能修改 + boolean display() default true; // 是否需要在界面显示 + int pric() default 2; // 对于浮点型，界面显示的精度 + boolean mainkey() default false; // 是否为主键 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java index 9b577f0..26bfdf7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java @@ -5,9 +5,16 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @Description :字段传播依赖设置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface RippleAnnotation { - String[] dependence() default {}; - String method() default ""; + String[] dependence() default {}; // 字段依赖的路径 + String method() default ""; // 字段值计算时调用的方法，方法写在service中. } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index a6f4432..12c9683 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -58,6 +58,10 @@ public class BaseOrder extends BaseCode { @ApiParam(value ="接单日期") private Date receiveDate; + @Column(name="SPECIFY_MATERIAL_NUM") + @ApiParam(value ="专料号") + private String specifyMaterialNum; + @Column(name="MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index fb8b71f..0cfc671 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE; -import cn.estsh.i3plus.pojo.aps.holders.EExportDetail; import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index e6935d0..13689af 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -53,4 +53,8 @@ public class MatCalcRule extends BaseRule { @ApiParam(value ="批量补充") private Boolean batchSupply; + @Column(name="ASSIGN_LIMIT") + @ApiParam(value ="物料分配制约") + private Integer assignLimit; + } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index f3f1368..4483e7e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -72,19 +72,19 @@ public class Material extends BaseCode { @Column(name="IS_AUTO_FIX_PEGGING") @ApiParam(value ="自动补充标识") - private boolean autoFixPegging; + private Boolean autoFixPegging; - @Column(name="MAX_MANUF_BATCH") + @Column(name="MAX_PRODUCT_BATCH") @ApiParam(value ="最大制造批量") - private Double maxManufBatch; + private Double maxProductBatch; - @Column(name="MIN_MANUF_BATCH") + @Column(name="MIN_PRODUCT_BATCH") @ApiParam(value ="最小制造批量") - private Double minManufBatch; + private Double minProductBatch; - @Column(name="MANUF_UNIT_BATCH") + @Column(name="UNIT_PRODUCT_BATCH") @ApiParam(value ="制造批量单位") - private Double manufUnitBatch; + private Double UnitProductBatch; @Column(name="MAX_PUR_BATCH") @ApiParam(value ="最大采购批量") @@ -94,9 +94,9 @@ public class Material extends BaseCode { @ApiParam(value ="最小采购批量") private Double minPurBatch; - @Column(name="PUR_UNIT_BATCH") + @Column(name="UNIT_PUR_BATCH") @ApiParam(value ="采购批量单位") - private Double purUnitBatch; + private Double unitPurBatch; @Column(name="MIN_STOCK_COUNT") @ApiParam(value ="最小库存数量") @@ -110,6 +110,10 @@ public class Material extends BaseCode { @ApiParam(value ="最大库存数量") private Double maxStockCount; + @Column(name="ORDER_BATCH_PERIOD") + @ApiParam(value ="订单合并期间") + private String orderBatchPeriod; + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 620909a..e14540e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -50,21 +50,13 @@ public class Operation extends BaseAPS { private String ratio; @Column(name="COUNT") - @ApiParam(value ="分割数量") - private Double count; + @ApiParam(value ="分割的工作个数") + private Integer count; @Column(name="BATCH") @ApiParam(value ="分割批量") private Double batch; - @Column(name="MIN_BATCH") - @ApiParam(value ="最小批量") - private Double minBatch; - - @Column(name="TAIL_DEAL") - @ApiParam(value ="尾数处理") - private TAIL_DEAL tailDeal; - @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") private CONSTRAINT_TYPE consType; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 4a0d1e5..cabd90a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -30,21 +30,13 @@ public class StandOperation extends BaseCode { private String ratio; @Column(name="COUNT") - @ApiParam(value ="分割数量") - private Double count; + @ApiParam(value ="分割的工作个数") + private Integer count; @Column(name="BATCH") @ApiParam(value ="分割批量") private Double batch; - @Column(name="MIN_BATCH") - @ApiParam(value ="最小批量") - private Double minBatch; - - @Column(name="TAIL_DEAL") - @ApiParam(value ="尾数处理方式") - private TAIL_DEAL tailDeal; - @Column(name="DIRECTION") @ApiParam(value ="排程方向") private DIRECTION direction; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index e7c42df..a9992f3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -97,6 +97,22 @@ public class Work extends BaseCode { @ApiParam(value ="计划主资源") private String planResource; + @Column(name="FIX_SPLIT") + @ApiParam(value ="已分割的工作是否重新分割") + private Boolean fixSplit; + + @Column(name="NEED_PREV_COUNT") + @ApiParam(value ="需要的前工作数量") + private Double needPrevCount; + + @Column(name="SCH_FAILED") + @ApiParam(value ="是否排程失败") + private Boolean schFailed; + + @Column(name="FAILED_REASON") + @ApiParam(value ="排程失败原因") + private String failedReason; + @Column(name="ORDER_ID") @ApiParam(value ="订单") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 3b46af2..8b1c8f9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -7,6 +7,14 @@ import javax.persistence.MappedSuperclass; import java.util.HashMap; import java.util.Map; +/** + * @Description :APS基类 + * 对于APS所有实体类均需继承该类。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Data @MappedSuperclass public abstract class BaseAPS extends BaseBean { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index a0f477b..de0cb5f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -6,6 +6,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import java.util.*; import java.util.function.Consumer; +/** + * @Description :APS 实体对象的元信息 + * 包含实体对象之间的关联关系信息。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class BeanInfo { private Class cls; private BeanInfo superBeanInfo; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index d5fb2b3..1eaa05e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -9,6 +9,14 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; +/** + * @Description :关联关系工具类 + * + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class BeanRelation { Map, Map, List>>> caches = new HashMap<>(); @@ -74,6 +82,14 @@ public class BeanRelation { } public static T get(BaseBean bean, Predicate pred, Enum holder, Enum... args) { + List nextBeans = list(bean, holder); + for (BaseBean nextEntity : nextBeans) { + T result = getImpl(nextEntity, pred, args, 0); + if (result != null) { + return result; + } + } + return null; } @@ -149,7 +165,7 @@ public class BeanRelation { * @param relaBean */ public static void set(BaseBean bean, Enum holder, BaseBean relaBean) { - if (bean == null) { + if (bean == null || holder == null) { return; } if (relaBean == null) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java new file mode 100644 index 0000000..e068a04 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * 物料分配限制 + * 主要考虑输出订的最晚计算时间不能晚于输入的最晚计算时间 + */ +public enum MATERIAL_ASSIGN_LIMIT { + NONE(0), // 不进行任何制约 + INVENTORY(1), // 库存制约 + PURCHASE(2), // 采购制约 + PRODUCT(4); // 制造制约 + + private int _value; + + MATERIAL_ASSIGN_LIMIT(int value) { + _value = value; + } + + public int value() { + return this._value; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java new file mode 100644 index 0000000..95383b4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum WORK_SPLIT_TYPE { + NONE, // 不分割 + RATIO, // 按比例分割 + COUNT, // 按数量分割 + BATCH // 按批量分割 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java new file mode 100644 index 0000000..314ecfa --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.WorkResource; + +import java.util.List; + +/** + * @Description :主副资源配套组合 + * 只允许一个主资源，可以有多个副资源，但同一套号的副资源不能有多个。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-11 + * @Modify: + **/ +public class ResourceCompose { + public WorkResource resource; + public List assResource; +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 3f8ab14..bd8ea37 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -4,7 +4,7 @@ - + @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml index 28b6264..1c21db2 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml @@ -1,6 +1,6 @@ - + From 6a9924eda60dc4751723319b1376761a78c0d91b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 16 Oct 2019 16:09:53 +0800 Subject: [PATCH 34/38] =?UTF-8?q?=E3=80=90VDA=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E3=80=91=20FIFO=E6=8E=A8=E8=8D=90=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java index 5adc7d5..6d68047 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java @@ -15,7 +15,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description :存储区 + * @Description :物料线路关系表 * @Reference : * @Author : hansen.ke * @CreateDate : 2018-11-06 11:50 @@ -38,7 +38,7 @@ public class WmsPartRouting extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路编号") private String routingCode; - + public WmsPartRouting(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index 9d5414b..a67bfda 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -15,7 +15,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description :存储区 + * @Description :物流线路规则表 * @Reference : * @Author : hansen.ke * @CreateDate : 2018-11-06 11:50 @@ -82,7 +82,7 @@ public class WmsRoutingRule extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路代码") private String routingCode; - + public WmsRoutingRule(){} } From 3828b4863cfabbde97b58222069800ea87f88963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 16 Oct 2019 17:36:47 +0800 Subject: [PATCH 35/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E8=B4=A8?= =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 aed40c4..c667ec4 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 @@ -79,7 +79,7 @@ public class WmsPOMasterDetails extends BaseBean { @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") - private Double rcQty; + private Double rcQty = 0d; //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; } 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 63abadc..b1e3261 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 @@ -163,6 +163,10 @@ public class WmsStockSn extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") private Integer snType = 10; + @Column(name = "QUALITY_DATE") + @ApiParam("保质期日期") + private String qualityDate; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From 986157043daf7a4cd23a2224b1a14f58bace81b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 16 Oct 2019 21:50:51 +0800 Subject: [PATCH 36/38] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=BB=84=E4=BB=B6=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=8F=AF=E9=85=8D=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 7860945..fd3c9db 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 @@ -1520,6 +1520,7 @@ public class WmsEnumUtil { CHECKLIST(1, "可选列表"), NUMBER(10, "数字"), STRING(20, "字符串"), + CONFIGURABLE_STR(25, "可配字符串"), OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"); private int value; From 88754f9a71efb17ab05bbec8d1959270e76264c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 16 Oct 2019 21:52:02 +0800 Subject: [PATCH 37/38] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsPoAsnRecvModel.java | 35 ++++++++++------------ 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index 0c43dd0..536f46c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -16,7 +16,7 @@ import java.time.LocalTime; **/ @Data @Api("供应商收货看板") -public class WmsPoAsnRecvModel extends BaseBean implements Comparable{ +public class WmsPoAsnRecvModel extends BaseBean implements Comparable { @ApiParam("订单号") private String orderNo; @@ -33,9 +33,9 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable Date: Thu, 17 Oct 2019 13:04:17 +0800 Subject: [PATCH 38/38] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 229 ++++++++++++++++++++- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 68 ++++++ .../i3plus/pojo/mes/bean/MesEquTaskDetail.java | 61 ++++++ .../estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 8 + .../mes/repository/MesEquTaskDetailRepository.java | 16 ++ .../mes/repository/MesEquTaskPlanRepository.java | 2 +- .../pojo/mes/repository/MesEquTaskRepository.java | 16 ++ .../repository/MesEquTaskStandardRepository.java | 2 +- 8 files changed, 399 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.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 7bbf94e..784251b 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 @@ -13,7 +13,234 @@ public class MesEnumUtil { /** - * mes设备作业要求-作业类型 + * mes设备作业任务明细-执行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_ACTION_STATUS { + + PENDING(10, "待处理"), + COMPLETE(20, "已完成"), + CANCEL(30, "取消"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_ACTION_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业任务明细-整体结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_FINAL_RESULT { + + YES(10, "合格"), + NO(20, "不合格"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_FINAL_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业任务明细-维修标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG { + + FALSE(10, "否"), + TRUE(20, "是"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_REPAIR_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_STATUS { + + CREATE(10, "创建"), + LANDED(20, "下达"), + OPEN(30, "开启"), + CLOSE(40, "关闭"), + CANCEL(50, "取消"); + + private int value; + private String description; + + MES_EQU_TASK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业任务来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_SOURCE { + + PLAN(10, "周期计划"), + CREATE(20, "手工创建"), + ANDON(30, "ANDON"); + + private int value; + private String description; + + MES_EQU_TASK_SOURCE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业通知标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_NOTIFY_FLAG { + + FALSE(10, "未通知"), + TRUE(20, "已通知"); + + private int value; + private String description; + + MES_EQU_TASK_NOTIFY_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes导入模块 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_INSERT_EXCEL { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java new file mode 100644 index 0000000..2ab832c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.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; + +/** + * @Description :设备作业任务 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK") +@Api("设备作业任务") +public class MesEquTask extends BaseBean { + + @Column(name="TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name="TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name="TASK_STATUS") + @ApiParam("作业状态") + private Integer taskStatus; + + @Column(name="WORK_CENTER_CODE") + @ApiParam(value="生产线") + private String workCenterCode; + + @Column(name="PLAN_TIME") + @ApiParam("计划日期") + private String planTime; + + @Column(name="TASK_SOURCE") + @ApiParam("任务来源") + private Integer taskSource; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="NOTIFY_FLAG") + @ApiParam("通知标识") + private Integer notifyFlag; + + @Column(name="RELATE_TASK") + @ApiParam("关联任务") + private String relateTask; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java new file mode 100644 index 0000000..089895b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -0,0 +1,61 @@ +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; + +/** + * @Description :设备作业任务明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK_DETAIL") +@Api("设备作业任务明细") +public class MesEquTaskDetail extends BaseBean { + + @Column(name="TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="ACTION_STATUS") + @ApiParam("执行状态") + private Integer actionStatus; + + @Column(name="FINAL_RESULT") + @ApiParam("整体结果") + private Integer finalResult; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="REPAIR_FLAG") + @ApiParam("维修标识") + private Integer repairFlag; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 7005067..222fcdf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -61,4 +61,12 @@ public class MesEquTaskPlan extends BaseBean { @ApiParam(value="设备类别") private String equipmentCategory; + @Transient + @ApiParam("计划日期") + private String planTime; + + @Transient + @ApiParam("作业任务编号") + private String taskNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java new file mode 100644 index 0000000..5452007 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java index 33c9dc1..59d6144 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; /** * @Description : * @Reference : - * @Author : 王杰 + * @Author : wangjie * @CreateDate : 2019-10-11 * @Modify: **/ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java new file mode 100644 index 0000000..6e1ce77 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java index 49e83b9..488bec3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; /** * @Description : * @Reference : - * @Author : 王杰 + * @Author : wangjie * @CreateDate : 2019-10-11 * @Modify: **/