From df6f4325345bae9e488f20a8cff91f5d7f4c6683 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Sat, 12 Oct 2019 12:59:00 +0800 Subject: [PATCH 01/19] =?UTF-8?q?1012=20=E4=BF=AE=E6=94=B9=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=85=B3=E9=94=AE=E4=BB=B6=20=E5=92=8C=20=E5=B7=A5?= =?UTF-8?q?=E5=BA=8Fbom=E6=B7=BB=E5=8A=A0isBindKey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 44 ++++++++++++++++++++-- .../i3plus/pojo/mes/pcn/bean/MesProcessBom.java | 6 ++- .../pojo/mes/pcn/model/StationRequestBean.java | 3 ++ .../estsh/i3plus/pojo/mes/bean/MesProcessBom.java | 6 ++- 4 files changed, 54 insertions(+), 5 deletions(-) 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 a88694e..c21185e 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 @@ -1256,13 +1256,13 @@ public class MesPcnEnumUtil { } /** - * redis过期时间 + * 条码类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PCN_SN_TYPE { - NORMAL(10, "不过期"), - FIRST_INSPECTION(20, "一分钟"); + NORMAL(10, "正常件"), + FIRST_INSPECTION(20, "首检件"); private int value; private String description; @@ -1292,4 +1292,42 @@ public class MesPcnEnumUtil { } + /** + * MesPlanOrder实体对应的source值 计划来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CACHE_KEY { + + TRAY("TRAY:", "托盘缓存key"), + + SERIAL_NO("PCN_SERIAL:", "条码缓存key"); + + private String value; + private String description; + + CACHE_KEY(String value, String description) { + this.value = value; + this.description = description; + } + + public String 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.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java index 37acf86..1a26eff 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java @@ -76,9 +76,13 @@ public class MesProcessBom extends BaseBean { private Integer isCheck; @Column(name = "IS_FEED") - @ApiParam(value = "是否检查") + @ApiParam(value = "是否投料配置") private Integer isFeed; + @Column(name = "is_BIND_KEY") + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + @Transient @ApiParam("是否已绑定") private Boolean isBind; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java index cf69df3..da1d6ed 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java @@ -61,4 +61,7 @@ public class StationRequestBean implements Serializable { @ApiParam("工单号") private String workOrderNo; + + @ApiParam("托盘号") + private String tray; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java index 646c69a..a01c774 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java @@ -80,9 +80,13 @@ public class MesProcessBom extends BaseBean { @Column(name = "IS_FEED") - @ApiParam(value = "是否检查") + @ApiParam(value = "是否投料配置") private Integer isFeed; + @Column(name = "is_BIND_KEY") + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + @Transient @ApiParam("是否已绑定") private Boolean isBind; From 09ea0929e4e2a4c3cd705864a5780065e7caacd8 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Sat, 12 Oct 2019 15:58:39 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= 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 deletion(-) 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 318eba2..cf19219 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 @@ -3354,7 +3354,6 @@ public class WmsEnumUtil { INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"), INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"), INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"), - INVENTORY_FIT(50, "INVENTORY_FIT", "库位一致"), INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘"); private int value; From d814887570335074d91a9d7f1e63b30d500d01fa Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 12 Oct 2019 17:15:57 +0800 Subject: [PATCH 03/19] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../i3plus/pojo/mes/model/MesEquipmentModel.java | 31 +++++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 983e285..b6e1b2c 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 @@ -672,7 +672,8 @@ public class MesEnumUtil { OPEN(30, "启动"), PAUSE(40, "暂停"), CANCEL(50, "取消"), - CLOSE(60, "关闭"); + CLOSE(60, "关闭"), + COMPLETE(70, "完成"); private int value; private String description; 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 2f34121..cfa042c 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 @@ -64,6 +64,27 @@ public class MesEquipmentModel implements Serializable { @ApiParam("连接类型") private Integer connectType; + @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 MesEquipmentModel() { @@ -92,7 +113,7 @@ public class MesEquipmentModel implements Serializable { } - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType) { + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -110,5 +131,13 @@ public class MesEquipmentModel implements Serializable { this.receiveDate = receiveDate; this.enableDate = enableDate; this.connectType = connectType; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; } + } From c39462cd3577abc20188e690d784cc38f7883e61 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 12 Oct 2019 17:30:27 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java | 4 +--- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java index dd0961b..9b2017c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="ANDON_BRODCAST") +@Table(name="ANDON_BROADCAST") @Api("安灯广播") public class AndonBroadCast extends BaseBean { @Column(name="DEVICE_NUM") @@ -71,6 +71,4 @@ public class AndonBroadCast extends BaseBean { @Column(name="PLAY_TIME") @ApiParam("播放循环次数") private Integer playTime = 1; - - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java index e5ecfff..dfc769a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java @@ -28,7 +28,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="ANDON_BRODCAST_CFG") +@Table(name="ANDON_BROADCAST_CFG") @Api("生产区域") public class AndonBroadCastCfg extends BaseBean { @Column(name="ALARM_CODE") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 431a96d..2193643 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -702,7 +702,8 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum NOTICE_MESSAGE_SEND_TYPE { SMS("10","短信"), - EMAIL("20","邮箱"); + EMAIL("20","邮箱"), + BROAD_CAST("30","广播"); private String value; private String description; From 104d308d3046b77f373a9428291f2bf10b84fcb6 Mon Sep 17 00:00:00 2001 From: jokelone Date: Sat, 12 Oct 2019 17:33:42 +0800 Subject: [PATCH 05/19] =?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 06/19] =?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 07/19] =?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 08/19] =?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 09/19] =?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 10/19] =?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 11/19] =?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 12/19] =?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 13/19] =?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 14/19] =?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 15/19] =?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 16/19] =?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 17/19] =?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 18/19] =?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 19/19] =?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); }