diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/.DS_Store differ 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 bb07db9..df02291 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 @@ -7038,4 +7038,201 @@ public class WmsEnumUtil { return null; } } + + /** + * 产品条码事务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BACTH_TRANS_TYPE { + REPORT(10, "REPORT", "报工"), + UNTYING(20, "UNTYING", "解绑"), + CHECK(30, "CHECK", "检测"), + REPAIR(40, "REPAIR", "挑选返修"), + BIND(50, "BIND", "绑定"), + OUTSTOCK(60, "OUTSTOCK", "出库"); + private int value; + private String code; + private String description; + + BACTH_TRANS_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static BACTH_TRANS_TYPE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } + + /** + * 业务表：BH类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_TYPE { + HOLD_LOCATE(10, "hold库位"), + QUALITY_CONTROL(20, "质检中"), + PRE_INSTOCK(30, "待入库"); + + private int value; + private String description; + + BH_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + + public static Integer descriptionOfValue(String desc) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * BH库位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_LOCATE_TYPE { + HOLD(10, "HOLD", "HOLD库位"), + WAIT_CHECK(20, "WAIT_CHECK", "待检测库位"), + WAIT_OUT(30, "WAIT_OUT", "待出库库位"); + + private int value; + private String code; + private String description; + + BH_LOCATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static BH_LOCATE_TYPE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } 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 index 1e4ee99..9a9ab5c 100644 --- 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 @@ -99,6 +99,9 @@ public class MesPlcModel implements Serializable { @ApiParam("PLC类型") private Integer plcType; + @ApiParam("默认赋值属性") + private String defaultRule; + public MesPlcModel() { } @@ -106,7 +109,7 @@ public class MesPlcModel implements Serializable { 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, String device, String objectCode, String opcUrl, Integer plcType) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl, Integer plcType, String defaultRule) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -135,5 +138,6 @@ public class MesPlcModel implements Serializable { this.objectCode = objectCode; this.opcUrl = opcUrl; this.plcType = plcType; + this.defaultRule = defaultRule; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java index 11e12c2..5a96543 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -15,8 +17,8 @@ import javax.persistence.Table; /** * @Description : BH检测大类表 * @Reference : - * @Author : jimmy.zeng - * @CreateDate : 2020-05-22 11:14 + * @Author : jason.niu + * @CreateDate : 2020-05-23 * @Modify: **/ @Data @@ -24,19 +26,24 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="QMS_CHECK_TYPE") -@Api("BH检测大类表") +@Table(name = "QMS_CHECK_TYPE") +@Api("物料子检测项") public class QmsCheckType extends BaseBean { + private static final long serialVersionUID = -4867744538301370899L; + @Column(name = "CHECK_TYPE_CODE") @ApiParam("检测大类代码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String checkTypeCode; @Column(name = "CHECK_TYPE_NAME") @ApiParam("检测大类名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String checkTypeName; - @Column(name="REMARK") - @ApiParam(value ="备注") + @Column(name = "REMARK") + @ApiParam("备注") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String remark; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java index 6a4eee3..cc4a269 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -31,10 +31,6 @@ import javax.persistence.Table; public class WmsBhChildDetectionItem extends BaseBean { private static final long serialVersionUID = -8005468634643773682L; - @Column(name = "CHECK_TYPE") - @ApiParam("检测大类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") - private Integer checkType; @Column(name = "ITEM_CHECK_CODE") @ApiParam("子检测项代码") 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 dc5f9e6..cb8f16f 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 @@ -156,6 +156,11 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones", @ApiParam(value = "三维位置") private String position; + @Column(name = "BH_LOCATE_TYPE") + @ApiParam(value = "BH库位类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_LOCATE_TYPE") + private Integer bhLocateType; + // 导入用 @ApiParam(value = "工厂") @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index bf21ffc..235fd54 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -272,7 +272,6 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double curingTime = 0d; - @Column(name = "IS_RECYCLE", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否回收", example = "2") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java index 2747b2b..6787076 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -48,8 +48,8 @@ public class WmsPartCheckType extends BaseBean { @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") - private Integer checkType; + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkType; @Column(name = "SAMPLE_SIZE") @ApiParam("样本数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 35dfe84..1873af3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -43,8 +43,8 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "CHECK_TYPE") @ApiParam("检测大类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE") - private Integer checkType; + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkType; @Column(name = "CHECK_ITEM_CODE") @ApiParam("子检测项代码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java index 5e546c0..82917a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -1,66 +1,91 @@ package cn.estsh.i3plus.pojo.wms.bean; + import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** - * @Description : 产品条码表 + * @Description : 产品条码信息 * @Reference : - * @Author : jimmy.zeng - * @CreateDate : 2020-05-22 9:41 + * @Author : puxiao.liao + * @CreateDate : 2020-05-23 11:00 * @Modify: **/ @Data @Entity +@Table(name = "WMS_SERIAL_SN", indexes = { + @Index(columnList = "BATCH_NO"), + @Index(columnList = "STOCK_SN"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SERIAL_SN") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_SERIAL_SN") -@Api("产品条码表") +@Api(value = "产品条码信息", description = "产品条码信息") public class WmsSerialSn extends BaseBean { - @Column(name="BATCH_NO") - @ApiParam("BATCH号") + private static final long serialVersionUID = -2540413299274882785L; + + @Column(name = "BATCH_NO") + @ApiParam(value = "BATCH号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String batchNo; - @Column(name="STOCK_SN") - @ApiParam("库存条码") + @Column(name = "STOCK_SN") + @ApiParam(value = "库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String stockSn; - @Column(name="SERIAL_SN") - @ApiParam("产品条码") + @Column(name = "SERIAL_SN") + @ApiParam(value = "产品条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String serialSn; - @Column(name="SRC_STOCK_SN") - @ApiParam("源库存条码") + @Column(name = "SRC_STOCK_SN") + @ApiParam(value = "源库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String srcStockSn; - @Column(name="BH_TYPE") - @ApiParam("BH类型") + @Column(name = "BH_TYPE") + @ApiParam(value = "BH类型") @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE") private Integer bhType; - @Column(name="PART_NO") - @ApiParam("物料号") + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partNo") private String partNo; - @Column(name="PART_NAME_RDD") - @ApiParam("物料名称") + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, + dataSrc = "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + searchColumnName = "partNo,partName", listColumnName = "partNo,partName", explicitColumnName = "partName") private String partNameRdd; - @Column(name="qty") - @ApiParam("数量") - private Double qty; + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double qty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java new file mode 100644 index 0000000..6fa1259 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialTrans.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 产品条码事务表 + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-05-23 10:44 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "WMS_SERIAL_TRANS") +@Api("产品条码事务") +public class WmsSerialTrans extends BaseBean { + private static final long serialVersionUID = -5026295121251346312L; + + @Column(name = "BATCH_NO") + @ApiParam(value = "父物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String batchNo; + + + @Column(name = "SERIAL_SN") + @ApiParam(value = "产品条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String serialSn; + + @Column(name = "BH_TYPE") + @ApiParam(value = "BH类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.BH_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_TYPE") + private Integer bhType; + + @Column(name = "PART_NO") + @ApiParam(value = "物料号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String partNameRdd; + + @Column(name = "SRC_STOCK_SN") + @ApiParam(value = "原库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String srcStockSn; + + @Column(name = "DEST_STOCK_SN") + @ApiParam(value = "目的库存条码") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String destStockSn; + + @Column(name = "TRANS_TYPE") + @ApiParam(value = "操作类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BACTH_TRANS_TYPE") + private Integer transType; + + @Column(name = "IS_OK") + @ApiParam(value = "是否合格") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE") + private Integer isOk; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 43fe989..bb25c21 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -6,10 +6,10 @@ public class WmsInterfaceEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DIRECTION_TYPE { - SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), - WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), - MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"); + SAP2WMS(10, "SAP2WMS-2", "SAP --> WMS"), + WMS2SAP(20, "WMS2SAP-2", "WMS --> SAP"), + MES2WMS(30, "MES2WMS-2", "MES --> WMS"), + WMS2MES(40, "WMS2MES-2", "WMS --> MES"); private int value; private String name; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java index b276887..c12772b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java @@ -4,13 +4,6 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.QmsCheckType; import org.springframework.stereotype.Repository; -/** - * @Description : BH检测大类表 - * @Reference : - * @Author : jimmy.zeng - * @CreateDate : 2020-05-22 11:17 - * @Modify: - **/ @Repository -public interface QmsCheckTypeRepository extends BaseRepository { +public interface QmsCheckTypeRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java index ea92c06..682a78e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java @@ -5,12 +5,12 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn; import org.springframework.stereotype.Repository; /** - * @Description : 产品条码表 + * @Description : 产品条码信息dao层 * @Reference : - * @Author : jimmy.zeng - * @CreateDate : 2020-05-22 9:44 + * @Author : puxiao.liao + * @CreateDate : 2020-05-23 11:00 * @Modify: **/ @Repository -public interface WmsSerialSnRepository extends BaseRepository { +public interface WmsSerialSnRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java new file mode 100644 index 0000000..305bb13 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialTransRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSerialTrans; + +/** + * @Description : 产品条码事务 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-05-21 15:53 + * @Modify: + **/ +public interface WmsSerialTransRepository extends BaseRepository { + +}