diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java index 325358c..eee532e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java @@ -1,7 +1,5 @@ package cn.estsh.i3plus.pojo.base.annotation; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; 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 3dbbb91..742ff35 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 @@ -897,5 +897,39 @@ public class MesEnumUtil { } } + /** + * 条码生成业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMPANY_TYPE { + PREFIX("prefix", "前缀"), + PART_NO("partNo", "物料号"), + CUST_PART_NO("custPartNo", "客户物料号"), + CUST_CODE("custCode", "客户代码"), + PROD_LOCATION("prodLocation", "产地"), + YEAR("year", "年"), + MOTH("month", "月"), + DAY("day", "日"), + HOUR("hour", "小时"), + MINUTE("minute", "分钟"), + SECOND("second", "秒"), + SERIAL("serialNo", "序列号"); + + private String value; + private String description; + + COMPANY_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } 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 dc68917..e47e78e 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 @@ -10,6 +10,44 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @Modify: **/ public class MesPcnEnumUtil { + + /** + * mes-pcn定时任务同步结果状态 + * 10. + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PCN_TASK_SYNC_STATUS{ + + SUCCESS(1,"mes主服务定时任务工作清单同步成功"), + ERROR(2,"mes主服务定时任务工作清单同步失败"); + + private int value; + private String description; + + MES_PCN_TASK_SYNC_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * PCN同步MES主数据同步方式枚举 * 10. diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java index 8d05091..fb98a2a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java @@ -82,4 +82,73 @@ public class SoftSwitchEnumUtil { } } + /** + * 认证方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VERIFICATION_METHOD{ + LOGIN(1,"登录"); + + private int value; + private String description; + + VERIFICATION_METHOD(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; + } + } + + /** + * 认证类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum KEY_TYPE{ + ACCOUNT_PASSWORD(1,"账号密码"); + + private int value; + private String description; + + KEY_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; + } + } + + //keyTypeId } 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 203bbce..f324149 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 @@ -1139,8 +1139,7 @@ public class WmsEnumUtil { CREATE(10, "创建"), BE_HANDLE(20, "待处理"), FINISH(30, "已处理"), - HANDLE_ERROR(40, "处理出错"), - TEST(50, "调试"); + HANDLE_ERROR(40, "处理出错"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 22b0e41..40f9822 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -531,4 +531,5 @@ public class DdlPreparedPack { } return name; } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java index 0d83b74..9285d25 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java @@ -38,7 +38,7 @@ public class MesNumberRule extends BaseBean { @Column(name = "PREFIX") @ApiParam("前缀") - private Integer prefix; + private String prefix; @Column(name = "NUMBER_RULE") @ApiParam("编码规则") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java new file mode 100644 index 0000000..9a0d1d1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java @@ -0,0 +1,51 @@ +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 :mes-pcn定时任务工作清单同步记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_TASK_LOG") +@Api("mes-pcn定时任务工作清单同步记录") +public class MesPcnTaskLog extends BaseBean { + + @Column(name="SYNC_TIME_START") + @ApiParam("同步数据开始时间") + private String syncTimeStart; + + @Column(name="SYNC_TIME_END") + @ApiParam("同步数据截止时间") + private String syncTimeEnd; + + @Column(name="SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name="ERROR_CONTENT") + @ApiParam("异常内容") + private String errorContent; + + public int getSyncStatusVal() { + return this.syncStatus == null ? 0 : this.syncStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java new file mode 100644 index 0000000..bd0498c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 打印条码工步， 打印信息模板 + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("过程条码打印信息模板") +public class StepPrintSnModel extends MesProduceSn { + @ApiParam("打印描述") + private String printDesc; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java new file mode 100644 index 0000000..66621f9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java @@ -0,0 +1,16 @@ +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.MesPcnTaskLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Repository +public interface MesPcnTaskLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java new file mode 100644 index 0000000..68295ee --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java @@ -0,0 +1,16 @@ +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.MesPcnTask; +import org.springframework.stereotype.Repository; + +/** + * @Description :mes-pcn定时任务清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Repository +public interface MesPcnTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java index 0e0da69..d58ea90 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; /** * @Author: Wynne.Lu * @CreateDate: 2019/8/19 7:00 PM - * @Description: + * @Description: mes文件下载的model -> Esop **/ @Data diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java new file mode 100644 index 0000000..7d68ab1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule; +import cn.estsh.i3plus.pojo.mes.bean.MesNumberSerialno; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 11:42 AM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("生成条码模型") +public class GenSerialNoModel extends BaseBean { + + @ApiParam("规则代码") + private String ruleCode; + + @ApiParam("规则描述") + private String ruleDesc; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户物料号") + private String custPartNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("产地") + private String prodLocation; + + @ApiParam("前缀") + private Integer prefix; + + @ApiParam("编码规则") + private String numberRule; + + @ApiParam("序号长度") + private Integer serialnoLength; + + @ApiParam("增量") + private Integer serialnoIncrement; + + @ApiParam("最大值后循环") + private Integer isCycle; + + @ApiParam("当前编号前缀") + private String currentNumberPrefix; + + @ApiParam("当前序号") + private Integer currentSerialno; + + @ApiParam("当前编号") + private String currentNumber; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java index d845f61..de4ffea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java @@ -16,7 +16,4 @@ import java.util.List; @Repository public interface MesMethodRepository extends BaseRepository { - List findByMethodCodeAndIsValidAndIsDeleted(String methodCode, Integer isValid, Integer isDeleted); - - List findByOrganizeCodeAndIsDeleted(String organizeCode, int value); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java index 5ee49bb..546ec1b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberRuleRepository.java @@ -1,16 +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.MesNumberRule; -import cn.estsh.i3plus.pojo.mes.bean.MesPart; import org.springframework.stereotype.Repository; /** - * @Description :条码生成规则 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-23 - * @Modify: + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 1:22 PM + * @Description: **/ @Repository public interface MesNumberRuleRepository extends BaseRepository { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberSerialnoRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberSerialnoRepository.java new file mode 100644 index 0000000..02be967 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberSerialnoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesNumberSerialno; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 1:23 PM + * @Description: + **/ + +@Repository +public interface MesNumberSerialnoRepository 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 511125e..cbbb025 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 @@ -234,6 +234,14 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getAllBaseDataByNormalPro(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + /** * MES区域信息查询条件封装 * @@ -445,6 +453,19 @@ public class MesHqlPack { * @param mesESOP * @return */ + public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) { + DdlPackBean packBean = getAllBaseDataByNormalPro(org); + DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean); + DdlPreparedPack.getStringEqualPack(mesESOP.getStepCode(), "stepCode", packBean); + DdlPreparedPack.getNumEqualPack(mesESOP.getStepSeq(), "stepSeq", packBean); + DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getNumNOEqualPack(mesESOP.getId(), "id", packBean); + return packBean; + } + public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode); if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())) { @@ -834,9 +855,19 @@ public class MesHqlPack { /** * MES 产品配置信息查询条件封装 * - * @param prodCfg + * @param * @return */ + + public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) { + DdlPackBean packBean = getAllBaseDataByNormalPro(org); + DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumNOEqualPack(mesProdRouteCfg.getId(), "id", packBean); + return packBean; + } + public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode); if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java index ee14fce..3b748f8 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java @@ -48,7 +48,7 @@ public class SuitCoreModel { private String suitCaseStatusCode; /** - * 安全证书 + * 适配认证 */ private BsSslKey sslKey; @@ -88,7 +88,7 @@ public class SuitCoreModel { /** * * @param requestSource 请求来源 - * @param sslKey 安全证书对象 + * @param sslKey 适配认证对象 * @param bsSuitCase 适配器信息 */ public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) { diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index 6b239f8..eac48cd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -132,4 +132,11 @@ public class SysTaskPlan extends BaseBean { @Column(name = "NOTICE_CHANNEL") @ApiParam(value = "通知渠道") private String noticeChannel; + + public int getTaskPlanStatusVal() { + if(taskPlanStatus != null){ + return taskPlanStatus.intValue(); + } + return taskPlanStatus; + } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java index 275709a..f449535 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java @@ -64,7 +64,7 @@ public class BsParamAdapter extends BaseBean { private String transferParamName; @Column(name = "TRANSFER_PARAM_VAL_TYPE_ID") - @ApiParam(value = "转换参数类型") + @ApiParam(value = "转换参数值类型") private Integer transferParamValTypeId; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java index 232477e..e422ef8 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java @@ -17,7 +17,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description : 安全证书 + * @Description : 适配认证 * @Reference : * @Author : yunhao * @CreateDate : 2019-08-13 9:21 @@ -29,9 +29,13 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SSL_KEY") -@Api(value = "安全证书", description = "安全证书") +@Api(value = "适配认证", description = "适配认证") public class BsSslKey extends BaseBean { + @Column(name = "KEY_NAME") + @ApiParam(value = "证书名称") + private String keyName; + @Column(name = "VERIFICATION_METHOD_ID") @ApiParam(value = "认证方式(枚举)") private Integer verificationMethodId; @@ -40,13 +44,9 @@ public class BsSslKey extends BaseBean { @ApiParam(value = "认证url") private String verificationUrl; - @Column(name = "KEY_TYPE") + @Column(name = "KEY_TYPE_ID") @ApiParam(value = "证书类型枚举") - private Integer keyType; - - @Column(name = "KEY_NAME") - @ApiParam(value = "证书名称") - private String keyName; + private Integer keyTypeId; @Column(name = "KEY_FILE_ID") @ApiParam(value = "证书文件id") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java index 287cfb3..f9837ca 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java @@ -16,7 +16,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description : 安全证书参数 + * @Description : 适配认证参数 * @Reference : * @Author : yunhao * @CreateDate : 2019-08-13 9:21 @@ -28,7 +28,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "BS_SSL_KEY_PARAM") -@Api(value = "安全证书参数", description = "安全证书参数") +@Api(value = "适配认证参数", description = "适配认证参数") @XStreamAlias("BsSslKeyParam") public class BsSslKeyParam extends BaseBean { @@ -45,4 +45,8 @@ public class BsSslKeyParam extends BaseBean { @ApiParam(value = "参数值") private String paramValue; + @Column(name = "PARAM_DESCRIPTION") + @ApiParam(value = "参数描述") + private String paramDescription; + } 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 8a88131..47d1e44 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 @@ -95,9 +95,13 @@ public class BsSuitCase extends BaseBean { private Integer failNum; @Column(name = "SUIT_CASE_DESCRIPTION") - @ApiParam(value = "适配类型描述") + @ApiParam(value = "适配器描述") private String suitCaseDescription; + @Column(name = "SUIT_CASE_STATUS") + @ApiParam(value = "适配器状态") + private Integer suitCaseStatus; + @Transient @ApiParam(value = "适配器参数") List bsSuitCaseParamList; 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 0c61a85..2563cbf 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 @@ -59,6 +59,10 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配方式id枚举") private Integer suitMethodId; + @Column(name = "SUIT_METHOD_NAME_RDD") + @ApiParam(value = "适配方式名称枚举") + private Integer suitMethodNameRdd; + @Column(name = "SUIT_TYPE_ID") @ApiParam(value = "适配类型id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java similarity index 95% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index bb04309f..5b384ce 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "SUIT_RECORD_PARAM") @Api(value = "适配记录参数", description = "适配记录参数") -public class SuitRecordParam extends BaseBean { +public class BsSuitRecordParam extends BaseBean { @Column(name = "SUIT_RECORD_ID") @ApiParam(value = "适配记录id") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyParamRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyParamRepository.java new file mode 100644 index 0000000..2dcfb34 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam; + +/** + * @Description : 安全证书参数 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-21 17:47 + * @Modify: + **/ +public interface BsSslKeyParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java index 5549947..dd7ef61 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java @@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; import org.springframework.stereotype.Repository; /** - * @Description : 安全证书 + * @Description : 适配认证 * @Reference : * @Author : yunhao * @CreateDate : 2019-08-13 9:21 diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordParamRepository.java similarity index 65% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordParamRepository.java index e2b4a0b..ac8d35b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordParamRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.softswitch.bean.SuitRecordParam; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecordParam; import org.springframework.stereotype.Repository; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface SuitRecordParamRepository extends BaseRepository { +public interface BsSuitRecordParamRepository extends BaseRepository { } 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 e10ea61..09901b1 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 @@ -177,7 +177,7 @@ public class SoftSwitchHqlPack { } /** - * 安全证书查询条件分页 + * 适配认证查询条件分页 * @param bsSslKey 查询条件 * @return */ @@ -185,7 +185,7 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyType(),"keyType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean); ddlPackBean.setOrderByStr(bsSslKey.orderBy()); @@ -193,7 +193,7 @@ public class SoftSwitchHqlPack { } /** - * 安全证书唯一校验 + * 适配认证唯一校验 * @param bsSslKey * @return */ @@ -206,4 +206,66 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * 适配认证参数按条件查询 + * @param bsSslKeyParam 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); + + ddlPackBean.setOrderByStr(bsSslKeyParam.orderBy()); + + return ddlPackBean; + } + + /** + * 适配认证参数唯一校验 + * @param bsSslKeyParam + * @return + */ + public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); + + return ddlPackBean; + } + + /** + * 数据源查询条件封装 + * @param bsDataSource + * @return + */ + public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsDataSource.getDataSourceTypeId(), "dataSourceTypeId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsDataSource.getIsValid(), "isValid", ddlPackBean); + + ddlPackBean.setOrderByStr(bsDataSource.orderBy()); + + return ddlPackBean; + } + + /** + * 数据源唯一校验 + * @param bsDataSource + * @return + */ + public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); + + return ddlPackBean; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 4c288f4..4bc52e7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库位表 @@ -96,6 +97,11 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "零件数", example = "-1") private Double partQty; + // 导入用 + @ApiParam(value = "工厂") + @Transient + private String factory; + public Integer getMaxPackageQty() { return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); }