diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 86caaa2..a8484af 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -5,12 +5,19 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @Description :字段元信息注解 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface FieldAnnotation { boolean property() default true; - boolean modify() default true; - boolean display() default true; - int pric() default 2; - boolean mainkey() default false; + boolean modify() default true; // 是否能修改 + boolean display() default true; // 是否需要在界面显示 + int pric() default 2; // 对于浮点型，界面显示的精度 + boolean mainkey() default false; // 是否为主键 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java index 9b577f0..26bfdf7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java @@ -5,9 +5,16 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @Description :字段传播依赖设置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface RippleAnnotation { - String[] dependence() default {}; - String method() default ""; + String[] dependence() default {}; // 字段依赖的路径 + String method() default ""; // 字段值计算时调用的方法，方法写在service中. } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index a6f4432..12c9683 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -58,6 +58,10 @@ public class BaseOrder extends BaseCode { @ApiParam(value ="接单日期") private Date receiveDate; + @Column(name="SPECIFY_MATERIAL_NUM") + @ApiParam(value ="专料号") + private String specifyMaterialNum; + @Column(name="MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index fb8b71f..0cfc671 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE; -import cn.estsh.i3plus.pojo.aps.holders.EExportDetail; import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index e6935d0..13689af 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -53,4 +53,8 @@ public class MatCalcRule extends BaseRule { @ApiParam(value ="批量补充") private Boolean batchSupply; + @Column(name="ASSIGN_LIMIT") + @ApiParam(value ="物料分配制约") + private Integer assignLimit; + } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index f3f1368..4483e7e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -72,19 +72,19 @@ public class Material extends BaseCode { @Column(name="IS_AUTO_FIX_PEGGING") @ApiParam(value ="自动补充标识") - private boolean autoFixPegging; + private Boolean autoFixPegging; - @Column(name="MAX_MANUF_BATCH") + @Column(name="MAX_PRODUCT_BATCH") @ApiParam(value ="最大制造批量") - private Double maxManufBatch; + private Double maxProductBatch; - @Column(name="MIN_MANUF_BATCH") + @Column(name="MIN_PRODUCT_BATCH") @ApiParam(value ="最小制造批量") - private Double minManufBatch; + private Double minProductBatch; - @Column(name="MANUF_UNIT_BATCH") + @Column(name="UNIT_PRODUCT_BATCH") @ApiParam(value ="制造批量单位") - private Double manufUnitBatch; + private Double UnitProductBatch; @Column(name="MAX_PUR_BATCH") @ApiParam(value ="最大采购批量") @@ -94,9 +94,9 @@ public class Material extends BaseCode { @ApiParam(value ="最小采购批量") private Double minPurBatch; - @Column(name="PUR_UNIT_BATCH") + @Column(name="UNIT_PUR_BATCH") @ApiParam(value ="采购批量单位") - private Double purUnitBatch; + private Double unitPurBatch; @Column(name="MIN_STOCK_COUNT") @ApiParam(value ="最小库存数量") @@ -110,6 +110,10 @@ public class Material extends BaseCode { @ApiParam(value ="最大库存数量") private Double maxStockCount; + @Column(name="ORDER_BATCH_PERIOD") + @ApiParam(value ="订单合并期间") + private String orderBatchPeriod; + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 620909a..e14540e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -50,21 +50,13 @@ public class Operation extends BaseAPS { private String ratio; @Column(name="COUNT") - @ApiParam(value ="分割数量") - private Double count; + @ApiParam(value ="分割的工作个数") + private Integer count; @Column(name="BATCH") @ApiParam(value ="分割批量") private Double batch; - @Column(name="MIN_BATCH") - @ApiParam(value ="最小批量") - private Double minBatch; - - @Column(name="TAIL_DEAL") - @ApiParam(value ="尾数处理") - private TAIL_DEAL tailDeal; - @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") private CONSTRAINT_TYPE consType; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 4a0d1e5..cabd90a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -30,21 +30,13 @@ public class StandOperation extends BaseCode { private String ratio; @Column(name="COUNT") - @ApiParam(value ="分割数量") - private Double count; + @ApiParam(value ="分割的工作个数") + private Integer count; @Column(name="BATCH") @ApiParam(value ="分割批量") private Double batch; - @Column(name="MIN_BATCH") - @ApiParam(value ="最小批量") - private Double minBatch; - - @Column(name="TAIL_DEAL") - @ApiParam(value ="尾数处理方式") - private TAIL_DEAL tailDeal; - @Column(name="DIRECTION") @ApiParam(value ="排程方向") private DIRECTION direction; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index e7c42df..a9992f3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -97,6 +97,22 @@ public class Work extends BaseCode { @ApiParam(value ="计划主资源") private String planResource; + @Column(name="FIX_SPLIT") + @ApiParam(value ="已分割的工作是否重新分割") + private Boolean fixSplit; + + @Column(name="NEED_PREV_COUNT") + @ApiParam(value ="需要的前工作数量") + private Double needPrevCount; + + @Column(name="SCH_FAILED") + @ApiParam(value ="是否排程失败") + private Boolean schFailed; + + @Column(name="FAILED_REASON") + @ApiParam(value ="排程失败原因") + private String failedReason; + @Column(name="ORDER_ID") @ApiParam(value ="订单") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 3b46af2..8b1c8f9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -7,6 +7,14 @@ import javax.persistence.MappedSuperclass; import java.util.HashMap; import java.util.Map; +/** + * @Description :APS基类 + * 对于APS所有实体类均需继承该类。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Data @MappedSuperclass public abstract class BaseAPS extends BaseBean { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index a0f477b..de0cb5f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -6,6 +6,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import java.util.*; import java.util.function.Consumer; +/** + * @Description :APS 实体对象的元信息 + * 包含实体对象之间的关联关系信息。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class BeanInfo { private Class cls; private BeanInfo superBeanInfo; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index d5fb2b3..1eaa05e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -9,6 +9,14 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; +/** + * @Description :关联关系工具类 + * + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class BeanRelation { Map, Map, List>>> caches = new HashMap<>(); @@ -74,6 +82,14 @@ public class BeanRelation { } public static T get(BaseBean bean, Predicate pred, Enum holder, Enum... args) { + List nextBeans = list(bean, holder); + for (BaseBean nextEntity : nextBeans) { + T result = getImpl(nextEntity, pred, args, 0); + if (result != null) { + return result; + } + } + return null; } @@ -149,7 +165,7 @@ public class BeanRelation { * @param relaBean */ public static void set(BaseBean bean, Enum holder, BaseBean relaBean) { - if (bean == null) { + if (bean == null || holder == null) { return; } if (relaBean == null) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java new file mode 100644 index 0000000..e068a04 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * 物料分配限制 + * 主要考虑输出订的最晚计算时间不能晚于输入的最晚计算时间 + */ +public enum MATERIAL_ASSIGN_LIMIT { + NONE(0), // 不进行任何制约 + INVENTORY(1), // 库存制约 + PURCHASE(2), // 采购制约 + PRODUCT(4); // 制造制约 + + private int _value; + + MATERIAL_ASSIGN_LIMIT(int value) { + _value = value; + } + + public int value() { + return this._value; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java new file mode 100644 index 0000000..95383b4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum WORK_SPLIT_TYPE { + NONE, // 不分割 + RATIO, // 按比例分割 + COUNT, // 按数量分割 + BATCH // 按批量分割 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java new file mode 100644 index 0000000..314ecfa --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.WorkResource; + +import java.util.List; + +/** + * @Description :主副资源配套组合 + * 只允许一个主资源，可以有多个副资源，但同一套号的副资源不能有多个。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-11 + * @Modify: + **/ +public class ResourceCompose { + public WorkResource resource; + public List assResource; +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 3f8ab14..bd8ea37 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -4,7 +4,7 @@ - + @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml index 28b6264..1c21db2 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml @@ -1,6 +1,6 @@ - + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 87731f4..3b43308 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -114,6 +114,7 @@ public class BlockSoftSwitchEnumUtil { /* WebService */ SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"), SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"), + SERVER_WEB_SERVICE_RECORDING_XML(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240004,"记录请求Body"), // CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"), CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"), CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"), @@ -816,4 +817,51 @@ public class BlockSoftSwitchEnumUtil { } } + + /** + * 适配报文处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_PROCESS_STATUS { + UNPROCESSED(10, "未处理"), + PROCESSING(20, "处理中"), + PROCESS(30, "已处理"); + + private int value; + private String description; + + private SUIT_PROCESS_STATUS (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static SUIT_PROCESS_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java similarity index 88% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java index 113151d..0f2aa79 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/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("数据源代码") @@ -55,6 +55,10 @@ public class MesDb extends BaseBean { @ApiParam("密码") private String dsPassword; + @Column(name = "DS_DB_NAME") + @ApiParam("数据库名称") + private String dsDbName; + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java index 8cd2304..c21e26b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java @@ -35,5 +35,8 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("关闭按钮") private boolean closeButton; + @ApiParam("完成按钮") + private boolean completeButton; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java similarity index 57% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java rename to modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java index 0b7d77e..b803066 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDbRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java @@ -2,12 +2,12 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDb; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDatasource; /** * @Author: Wynne.Lu * @CreateDate: 2019/9/27 1:58 PM * @Description: **/ -public interface MesDbRepository extends BaseRepository { +public interface MesDatasourceRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index b6d76f0..c5da050 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -63,4 +64,8 @@ public class MesDatasource extends BaseBean { @ApiParam("数据库名称") private String dsDbName; + @Transient + @ApiParam("设备名称") + private String equipmentName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java new file mode 100644 index 0000000..7005067 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :设备周期作业计划 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK_PLAN") +@Api("设备周期作业计划") +public class MesEquTaskPlan extends BaseBean { + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name="TASK_CYCLE") + @ApiParam("周期(天)") + private Integer taskCycle; + + @Column(name="LAST_TIME") + @ApiParam("上一执行时间") + private String lastTime; + + @Column(name="DAYS_IN_ADVANCE") + @ApiParam("创建提前天数") + private Integer daysInAdvance; + + @Transient + @ApiParam(value="生产线") + private String workCenterCode; + + @Transient + @ApiParam(value="设备类别") + private String equipmentCategory; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java index 9a8c536..888bb7a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_CAUSE") -@Api("PLC配置表") +@Api("mes设备故障原因表") public class MesFaultCause extends BaseBean { @Column(name = "FC_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java index 22a4f2a..06d07d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_METHOD") -@Api("PLC配置表") +@Api("mes设备故障方法表") public class MesFaultMethod extends BaseBean { @Column(name = "FM_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index 576626b..b3ec52c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_PHENOMENON") -@Api("PLC配置表") +@Api("mes设备故障现象表") public class MesFaultPhenomenon extends BaseBean { @Column(name = "FP_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index ec8b51e..79eb8f3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -70,11 +71,11 @@ public class MesPlc extends BaseBean { private String equipmentCode; @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") + @ApiParam("生产线") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") + @ApiParam("工位") private String workCellCode; @Column(name = "PLC_CFG") @@ -88,4 +89,8 @@ public class MesPlc extends BaseBean { @Column(name = "IS_ANALYSIS") @ApiParam("是否解析") private String isAnalysis; + + @Transient + @ApiParam("设备名称") + private String equipmentName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java new file mode 100644 index 0000000..f83d057 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\15 17:20 + * @Modify: + **/ +@Data +public class MesDatasourceModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam( "有效性") + public Integer isValid; + + @ApiParam( "是否已删除") + public Integer isDeleted; + + @ApiParam( "创建用户") + public String createUser; + + @ApiParam( "创建日期") + public String createDatetime; + + @ApiParam( "修改人") + public String modifyUser; + + @ApiParam( "修改日期") + public String modifyDatetime; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("数据源代码") + private String dsCode; + + @ApiParam("数据源名称") + private String dsName; + + @ApiParam("数据源类型") + private String dsType; + + @ApiParam("主机") + private String dsHost; + + @ApiParam("端口") + private Integer dsPort; + + @ApiParam("用户名") + private String dsUser; + + @ApiParam("密码") + private String dsPassword; + + @ApiParam("数据库名称") + private String dsDbName; + + public MesDatasourceModel() { + + } + + public MesDatasourceModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, + String modifyUser, String modifyDatetime, String organizeCode, String dsCode, String dsName, String dsType, + String dsHost, Integer dsPort, String dsUser, String dsPassword, String dsDbName) { + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.organizeCode = organizeCode; + this.dsCode = dsCode; + this.dsName = dsName; + this.dsType = dsType; + this.dsHost = dsHost; + this.dsPort = dsPort; + this.dsUser = dsUser; + this.dsPassword = dsPassword; + this.dsDbName = dsDbName; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java new file mode 100644 index 0000000..3464fb4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskPlanModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam("周期(天)") + private Integer taskCycle; + + @ApiParam("上一执行时间") + private String lastTime; + + @ApiParam("创建提前天数") + private Integer daysInAdvance; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("设备类别") + private String equipmentCategory; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("有效性") + public Integer isValid; + + @ApiParam("是否已删除") + public Integer isDeleted; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("设备类别") + private String equipmentCategoryName; + + + public MesEquTaskPlanModel() { + + } + + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.taskType = taskType; + this.taskCycle = taskCycle; + this.lastTime = lastTime; + this.daysInAdvance = daysInAdvance; + this.workCenterCode = workCenterCode; + this.equipmentCategory = equipmentCategory; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java index 58d977b..ca5f0ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java @@ -20,7 +20,7 @@ public class MesEquTaskStandardModel implements Serializable { private Integer taskType; @ApiParam("操作项") - private Integer actionItem; + private String actionItem; @ApiParam("操作标准") private String actionStandard; @@ -31,33 +31,42 @@ public class MesEquTaskStandardModel implements Serializable { @ApiParam("生产线") private String workCenterCode; - @ApiParam(value ="组织代码") + @ApiParam("设备类别") + private String equipmentCategory; + + @ApiParam("组织代码") public String organizeCode; - @ApiParam(value = "有效性") + @ApiParam("有效性") public Integer isValid; - @ApiParam(value = "是否已删除") + @ApiParam("是否已删除") public Integer isDeleted; - @ApiParam(value = "创建用户") + @ApiParam("创建用户") public String createUser; - @ApiParam(value = "创建日期") + @ApiParam("创建日期") public String createDatetime; - @ApiParam(value = "修改人") + @ApiParam("修改人") public String modifyUser; - @ApiParam(value = "修改日期") + @ApiParam("修改日期") public String modifyDatetime; + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("设备类别") + private String equipmentCategoryName; + public MesEquTaskStandardModel() { } - public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer actionItem, String actionStandard, String actionGuide, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -66,6 +75,7 @@ public class MesEquTaskStandardModel implements Serializable { this.actionStandard = actionStandard; this.actionGuide = actionGuide; this.workCenterCode = workCenterCode; + this.equipmentCategory = equipmentCategory; this.organizeCode = organizeCode; this.isValid = isValid; this.isDeleted = isDeleted; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index 63cad36..5e09c06 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -85,6 +85,18 @@ public class MesEquipmentModel implements Serializable { @ApiParam( "修改日期") public String modifyDatetime; + @ApiParam("设备状态") + private String statusName; + + @ApiParam("设备类型") + private String equipmentTypeName; + + @ApiParam("设备类别") + private String equipmentCategoryName; + + @ApiParam("连接类型") + private String connectTypeName; + public MesEquipmentModel() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java new file mode 100644 index 0000000..ab63d8f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -0,0 +1,122 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\15 15:58 + * @Modify: + **/ +@Data +public class MesPlcModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam( "有效性") + public Integer isValid; + + @ApiParam( "是否已删除") + public Integer isDeleted; + + @ApiParam( "创建用户") + public String createUser; + + @ApiParam( "创建日期") + public String createDatetime; + + @ApiParam( "修改人") + public String modifyUser; + + @ApiParam( "修改日期") + public String modifyDatetime; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("PLC代码") + private String plcCode; + + @ApiParam("PLC名称") + private String plcName; + + @ApiParam("PLC型号") + private String plcModel; + + @ApiParam("PLC IP") + private String plcIp; + + @ApiParam("通道") + private String channel; + + @ApiParam("标签名称") + private String tagName; + + @ApiParam("标签地址") + private String tagAddress; + + @ApiParam("标签数据类型") + private String dataType; + + @ApiParam("分组名称") + private String groupName; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("PLC的值的设定") + private String plcCfg; + + @ApiParam("解析规则") + private String analysisRule; + + @ApiParam("是否解析") + private String isAnalysis; + + public MesPlcModel(){ + + } + + public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, + String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, + String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis){ + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.organizeCode = organizeCode; + this.plcCode = plcCode; + this.plcName = plcName; + this.plcModel = plcModel; + this.plcIp = plcIp; + this.channel = channel; + this.tagName = tagName; + this.tagAddress = tagAddress; + this.dataType = dataType; + this.groupName = groupName; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.plcCfg = plcCfg; + this.analysisRule = analysisRule; + this.isAnalysis = isAnalysis; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java index 1d37fff..4a5af7e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java @@ -44,5 +44,8 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("关闭按钮") private boolean closeButton; + @ApiParam("完成按钮") + private boolean completeButton; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java new file mode 100644 index 0000000..33c9dc1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlan; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : 王杰 + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 27ff855..ad38b80 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1266,16 +1266,16 @@ public class MesHqlPack { public static DdlPackBean getMesPlc(MesPlc mesPlc, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesPlc, organizeCode); if (!StringUtils.isEmpty(mesPlc.getPlcCode())) { - DdlPreparedPack.getStringEqualPack(mesPlc.getPlcCode(), "plcCode", packBean); + DdlPreparedPack.getStringLikerPack(mesPlc.getPlcCode(), "plcCode", packBean); } if (!StringUtils.isEmpty(mesPlc.getPlcName())) { - DdlPreparedPack.getStringEqualPack(mesPlc.getPlcName(), "plcName", packBean); + DdlPreparedPack.getStringLikerPack(mesPlc.getPlcName(), "plcName", packBean); } if (!StringUtils.isEmpty(mesPlc.getChannel())) { - DdlPreparedPack.getStringEqualPack(mesPlc.getChannel(), "channel", packBean); + DdlPreparedPack.getStringLikerPack(mesPlc.getChannel(), "channel", packBean); } if (!StringUtils.isEmpty(mesPlc.getTagAddress())) { - DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean); + DdlPreparedPack.getStringLikerPack(mesPlc.getTagAddress(), "tagAddress", packBean); } if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean); @@ -1295,13 +1295,13 @@ public class MesHqlPack { public static DdlPackBean getMesDatasource(MesDatasource mesDatasource, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesDatasource, organizeCode); if (!StringUtils.isEmpty(mesDatasource.getDsCode())) { - DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean); + DdlPreparedPack.getStringLikerPack(mesDatasource.getDsCode(), "dsCode", packBean); } if (!StringUtils.isEmpty(mesDatasource.getDsType())) { - DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean); + DdlPreparedPack.getStringLikerPack(mesDatasource.getDsType(), "dsType", packBean); } if (!StringUtils.isEmpty(mesDatasource.getDsDbName())) { - DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean); + DdlPreparedPack.getStringLikerPack(mesDatasource.getDsDbName(), "dsDbName", packBean); } return packBean; } @@ -1315,19 +1315,13 @@ public class MesHqlPack { public static DdlPackBean getMesFaultMethod(MesFaultMethod mesFaultMethod, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultMethod, organizeCode); if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmCode(), "fmCode", packBean); } if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { - DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean); - } - if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean); - } - if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { - DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmName(), "fmName", packBean); } if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); } return packBean; } @@ -1341,19 +1335,13 @@ public class MesHqlPack { public static DdlPackBean getMesFaultCause(MesFaultCause mesFaultCause, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultCause, organizeCode); if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcCode(), "fcCode", packBean); } if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { - DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean); - } - if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean); - } - if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { - DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcName(), "fcName", packBean); } if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); } return packBean; } @@ -1367,19 +1355,13 @@ public class MesHqlPack { public static DdlPackBean getMesFaultPhenomenon(MesFaultPhenomenon mesFaultPhenomenon, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultPhenomenon, organizeCode); if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean); - } - if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { - DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); - } - if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean); } if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { - DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); } if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) { - DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); + DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); } return packBean; } @@ -1398,12 +1380,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean); } - if (!StringUtils.isEmpty(mesQcCheckStandard.getPartNo())) { - DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean); - } - if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean); - } if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean); } @@ -1411,7 +1387,7 @@ public class MesHqlPack { DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean); } if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) { - DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean); + DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean); } return packBean; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java index 5adc7d5..6d68047 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java @@ -15,7 +15,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description :存储区 + * @Description :物料线路关系表 * @Reference : * @Author : hansen.ke * @CreateDate : 2018-11-06 11:50 @@ -38,7 +38,7 @@ public class WmsPartRouting extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路编号") private String routingCode; - + public WmsPartRouting(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index 9d5414b..a67bfda 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -15,7 +15,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description :存储区 + * @Description :物流线路规则表 * @Reference : * @Author : hansen.ke * @CreateDate : 2018-11-06 11:50 @@ -82,7 +82,7 @@ public class WmsRoutingRule extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路代码") private String routingCode; - + public WmsRoutingRule(){} } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index ff1eadc..0abcde9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -116,4 +116,39 @@ public class WmsInterfaceDataMapper extends BaseBean { @Column(name = "LAST_SYNC_TIME") public String lastSyncTime; + /** + * 软适配编号 + */ + @Column(name = "SOFT_ADAPATOR_CODE") + public String softAdaptorCode; + + /** + * 扩展脚本编号，用于扩展接口功能 + */ + @Column(name = "SCRIPT_NO") + public String ScriptNo; + + /** + * 调用脚本方法获取数据 + */ + @Column(name = "USE_SCRIPT_PULL") + public int useScriptPull; + + /** + * 调用脚本方法保存数据 + */ + @Column(name = "USE_SCRIPT_PUSH") + public int useScriptPush; + + /** + * 调用脚本方法更新同步标志 + */ + @Column(name = "USE_SCRIPT_MARK") + public int useScriptMark; + + /** + * 调用脚本方法过滤数据（查询来源数据后过滤） + */ + @Column(name = "USE_SCRIPT_FILTER") + public int useScriptFilter; }