diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 6ad589e..2b22bce 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -34,5 +34,5 @@ public class RuleGroup extends BaseAPS { private Integer orderNumber; @JsonBackReference - List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } + public List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } } 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 a61cf7b..e9e3ae3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,118 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + + /** + * RAW_PART_STATUS 原材料状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RAW_PART_STATUS { + + READY(10, "待投料"), + ALREADY(20, "已投料"); + + private int value; + private String description; + + RAW_PART_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; + } + } + + /** + * 接口同步状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IF_SYNC_STATUS { + + NO_SYNC(10, "未同步"), + ALREADY_SYNC(20, "已同步"), + FAIL_SYNC(30, "同步失败"); + + private int value; + private String description; + + IF_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; + } + } + + /** + * 包装层级 MES_PACKAGE + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_PACKLEVEL { + + FIRST(1, "第一层"), + SECOND(2, "第二层"), + THIRD(3, "第三层"), + FOURTH(4, "第四层"); + + private int value; + private String description; + + PACKAGE_PACKLEVEL(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; + } + } + /** * MesIf 交互方式 */ 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 c06ad50..0711dcc 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 @@ -3809,7 +3809,8 @@ public class WmsEnumUtil { CREATE_TASK(10, "CREATE_TASK", "生成任务"), AUTO_OPT(20, "AUTO_OPT", "自动操作"), MENU_OPT(30, "MENU_OPT", "手工操作"), - AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"); + AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"), + CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"); private int value; private String code; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java index 0aff72b..c3ae649 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java @@ -73,9 +73,9 @@ public class MesPart extends BaseBean { @ApiParam("产品类型") private String produceCategory; - @Column(name = "PORCESS_MATCH_TYPE") + @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private String porcessMatchType; + private String processMatchType; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index 7e6eff9..6ee033d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -49,4 +49,5 @@ public class MesLabelTemplate extends BaseBean { @Transient @ApiParam(value = "模板id对应的模板参数") private List labelTemplateParamList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 7502dd2..397ff0b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -77,9 +77,9 @@ public class MesPart extends BaseBean { @ApiParam("产品类型名称") private String produceCategoryName; - @Column(name = "PORCESS_MATCH_TYPE") + @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private String porcessMatchType; + private String processMatchType; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java new file mode 100644 index 0000000..6ab949d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 9:34 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("动作函数关系model") +public class IfRawPartDataModel implements Serializable { + + @ApiParam("id") + private Long id; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("原料类型") + private String partType; + + @ApiParam("原料条码") + private String serialNumber; + + @ApiParam("数量") + private BigDecimal qty; + + @ApiParam("单位") + private String unit; + + @ApiParam("收货批次") + private String srcLotNo; + + @ApiParam("生产批次") + private String lotNo; + + @ApiParam("特殊批次") + private String fixLotNo; + + @ApiParam("供应商代码") + private String supplierCode; + + @ApiParam("工厂代码") + private String organizationCode; + + @ApiParam("同步状态") + private Integer syncStatus; + + @ApiParam("异常消息") + private String errorMessage; + + @ApiParam("动作代码") + private String actionCode; + + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java new file mode 100644 index 0000000..5c0b2ab --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintTemplateModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 产品/包装打印模板model + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +public class SnPrintTemplateModel implements Serializable { + + @ApiParam("产品条码模板") + private MesLabelTemplate prodSnPrintTemplate; + + @ApiParam("包装条码模板集合") + private List packageSnPrintTemplateList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDismantleRecordRepository.java new file mode 100644 index 0000000..165ab5e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfDismantleRecordRepository.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.IfDismantleRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:33 + * @Modify: + **/ +public interface IfDismantleRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageDetailRepository.java new file mode 100644 index 0000000..e7d0602 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPackageDetailRepository.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.IfPackageDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface IfPackageDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfProductOffLineRepository.java new file mode 100644 index 0000000..abdbfba --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfProductOffLineRepository.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.IfProductOffLine; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:32 + * @Modify: + **/ +public interface IfProductOffLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRawPartSnRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRawPartSnRepository.java new file mode 100644 index 0000000..8dbe9f8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesRawPartSnRepository.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.MesRawPartSn; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 11:17 + * @Modify: + **/ +public interface MesRawPartSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 442a5c4..81db268 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -58,6 +58,10 @@ public class WmsLocatePart extends BaseBean { @ApiParam(value = "是否生成领料单", example = "2") private Integer isGeneratePicklist; + @Column(name = "SAFETY_STOCK", columnDefinition = "decimal(18,8)") + @ApiParam(value = "安全库存", example = "0") + private Double safetyStock; + @Transient @ApiParam("库位类型") private Integer locateType; 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 e120ba0..9fd93de 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 @@ -61,6 +61,16 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目标存储区" , example = "2") private String destZoneNo; + @Column(name = "DEST_BUSI_TYPE_CODE") + @ApiParam(value = "目标业务类型编码" , example = "") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + private String destBusiTypeCode; + + @Column(name = "SRC_BUSI_TYPE_CODE") + @ApiParam(value = "源业务类型编码" , example = "") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + private String srcBusiTypeCode; + @Column(name = "DEST_OP_TYPE_CODE") @ApiParam(value = "目标作业类型" , example = "2") private String destOpTypeCode; @@ -69,10 +79,6 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目标交易类型" , example = "1") private String destTransTypeCode; - @Column(name = "SRC_OP_TYPE_CODE") - @ApiParam(value = "源作业类型" , example = "2") - private String srcOpTypeCode; - @Column(name = "SRC_TRANS_TYPE_CODE") @ApiParam(value = "源交易类型" , example = "1") private String srcTransTypeCode;