From 20f5bfc9eb50a001e79919f5c879187f7e3396eb Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 10 Apr 2020 18:57:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?wms=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=87=B3mes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ++++++ .../cn/estsh/i3plus/pojo/mes/bean/BasVendor.java | 103 +++++++++++++ .../i3plus/pojo/mes/bean/IfQueueShipping.java | 3 +- .../i3plus/pojo/mes/bean/MesQueueShipping.java | 66 +++++++++ .../pojo/mes/bean/MesQueueShippingDetail.java | 73 ++++++++++ .../i3plus/pojo/mes/dbinterface/MappingItem.java | 50 +++++++ .../mes/dbinterface/MesInterfaceDataMapper.java | 161 +++++++++++++++++++++ .../pojo/mes/dbinterface/MesInterfaceEnumUtil.java | 74 ++++++++++ .../pojo/mes/dbinterface/UpdateSyncItem.java | 26 ++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 3 + .../IEngineScriptPersistenceRepository.java | 38 +++++ .../MesInterfaceDataMapperRepository.java | 16 ++ .../MesQueueShippingDetailRepository.java | 14 ++ .../mes/repository/MesQueueShippingRepository.java | 14 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 47 ++++++ 15 files changed, 732 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.java 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 8e46651..341cc2e 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 @@ -4713,4 +4713,50 @@ public class MesEnumUtil { return tmp; } } + + /** + * 脚本语言类型 + * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby + */ + public enum LANGUAGE_TYPE { + GROOVY(1, "Groovy", 10), + PYTHON(2, "jython", 20), // "jython" string can not change + JS(3, "JavaScript", 30); + // 下面这2种语言没人会写，暂不支持 + //SCALA(40,"scala"), + //JRUBY(50,"jruby"); + + private int index; + private String description; + private int value; + + LANGUAGE_TYPE(int index, String description, int value) { + this.index = index; + this.description = description; + this.value = value; + } + + public String getDescription() { + return description; + } + + public int getIndex() { + return this.index; + } + + public int getValue() { + return value; + } + + // 根据枚举编号获取语言代码 + public static String getCodeByIndex(Integer index) { + for (MesEnumUtil.LANGUAGE_TYPE languageType : MesEnumUtil.LANGUAGE_TYPE.values()) { + if (languageType.getValue() == index.intValue()) { + return languageType.getDescription(); + } + } + + return null; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java new file mode 100644 index 0000000..30e8294 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java @@ -0,0 +1,103 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 供应商 + * @Reference : + * @Author : amy + * @CreateDate : 2018-11-07 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_VENDOR") +@Api("供应商信息") +public class BasVendor extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592779L; + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + private String vendorNo; + + @Column(name="VENDOR_NAME") + @ApiParam("供应商简称") + private String vendorName; + + @Column(name="VENDOR_DESC") + @ApiParam("供应商全称") + private String vendorDesc; + + @Column(name="VENDOR_ADDR") + @ApiParam("供应商地址") + private String vendorAddr; + + @Column(name="VENDOR_OWNER") + @ApiParam("联系人") + private String vendorOwner; + + @Column(name="VENDOR_EMAIL") + @ApiParam("邮箱") + private String vendorEmail; + + @Column(name = "IS_ASN") + @ApiParam(value = "是否发ASN", example = "0") + private Integer isAsn; + + @Column(name = "USER_NAME") + @ApiParam(value = "用户名") + private String userName; + + @Column(name = "PASSWORD") + @ApiParam(value = "密码") + private String password; + + @Column(name = "VENDOR_CALL") + @ApiParam("供应商电话") + private String vendorCall; + + @Column(name = "VENDOR_FAX") + @ApiParam("传真") + private String vendorFax; + + @Column(name = "VENDOR_PHONE") + @ApiParam("手机") + private String vendorPhone; + + @Column(name = "KILOBIT") + @ApiParam("千位符号") + private String kilobit; + + @Column(name = "DECIMALS") + @ApiParam("小数位符号") + private String decimals; + + //20-承运商 + @Column(name = "VENDOR_TYPE") + private Integer vendorType; + + @Column(name = "MAP_LOCATION") + @ApiParam("经纬度") + private String mapLocation; + + public BasVendor() { + } + + public BasVendor(Long id, String userName) { + this.id = id; + this.userName = userName; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index d239828..b656d3f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -79,13 +79,12 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("异常消息") private String errorMessage; - @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; @Column(name = "IF_CODE") @ApiParam("接口代码") - private Integer ifCode; + private String ifCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java new file mode 100644 index 0000000..db10be7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java @@ -0,0 +1,66 @@ +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 java.io.Serializable; + +/** + * @Description :MES_JIT发运队列 + * @Reference : + * @Author : qianhausheng + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_SHIPPING") +@Api("MES_JIT发运队列") +public class MesQueueShipping extends BaseBean implements Serializable { + + private static final long serialVersionUID = 655875369308414110L; + + @Column(name = "JIT_NO") + @ApiParam("队列编号") + private String jitNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "SEQ") + @ApiParam("排序号") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java new file mode 100644 index 0000000..c212bb9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -0,0 +1,73 @@ +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 java.io.Serializable; + +/** + * @Description :MES_JIT发运队列明细 + * @Reference : + * @Author : qianhausheng + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_SHIPPING_DETAIL") +@Api("MES_JIT发运队列明细") +public class MesQueueShippingDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1442091799346314190L; + + @Column(name = "JIT_NO") + @ApiParam("队列编号") + private String jitNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "status") + @ApiParam("状态") + private Integer status; + + @Column(name="SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + + @Column(name = "GROUP_SEQ") + @ApiParam("分组序号") + private String groupSeq; + + @Column(name = "qty") + @ApiParam("数量") + private Double qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java new file mode 100644 index 0000000..7bf7604 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MappingItem.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * Mes - SAP 字段映射关系 + * 暂时不考虑字段的类型 + * + * @author Rock.Yu + * @since 2019-06-09 21:06 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MappingItem { + /** + * 来源字段名称 + */ + public String srcName; + /** + * 目标对象的名称 + */ + public String destBeanName; + /** + * 目标对象的属性名称 + */ + public String destName; + /** + * 该字段在目标表是不是主键 + * 1=主键 + */ + public Integer destPk; + /** + * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确 + * 可以使用的表达式： #date, #time, #guid, #Q.warehouse(#zone) + */ + public Object defaultValue; + + @Override + public String toString() { + return "srcName:" + + this.srcName + ", destBeanName:" + + this.destBeanName + ", destName" + + this.destName + ", defaultValue:" + + this.defaultValue + ", destPk:" + + this.destPk; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java new file mode 100644 index 0000000..6fe17fb --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceDataMapper.java @@ -0,0 +1,161 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * Mes - SAP 中间数据库接口映射关系 + * + * @author Rock.Yu + * @since 2019-06-09 20:08 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_INTERFACE_DATA_MAPPER") +@Api("接口数据映射") +public class MesInterfaceDataMapper extends BaseBean { + /** + * 排序编号 + */ + @Column(name = "SEQ") + public Integer seq; + /** + * 来源表的每次查询记录数，防止大量数据造成内存溢出 + */ + @Column(name = "SRC_GET_LIMIT") + public Integer srcGetLimit; + /** + * 接口数据源编号（在动态表单中配置） + */ + @Column(name = "SRC_DATA_SOURCE", length = 50) + public String dataSource; + /** + * 来源表名 + */ + @Column(name = "SRC_TABLE_NAME", length = 50) + public String srcTableName; + /** + * 来源表的排序条件 + */ + @Column(name = "SRC_ORDER_BY", length = 50) + public String srcOrderBy; + /** + * 来源表的查询条件 + */ + @Column(name = "SRC_WHERE", length = 500) + public String srcWhere; + + /** + * 来源表的分组条件，按分组发送，多个列名用半角逗号分隔 + */ + @Column(name = "SRC_GROUP_COLUMNS", length = 255) + public String srcGroupColumns; + /** + * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔 + * 例如：SYNFLG=Y,SYNDATE={#XX} + * 可以使用的动态变量： #sap_date, #sap_time, #date, #time, #guid + */ + @Column(name = "SRC_UPDATE_SYNC", length = 255) + public String srcUpdateSync; + /** + * 业务表单的主键，多个主键用半角逗号分隔 + */ + @Column(name = "SRC_PK_COLUMNS", length = 255) + public String srcPkColumns; + /** + * 按照组织代码(半角逗号分隔)复制多份到业务表（用于物料、供应商、客户...等集团数据） + */ + @Column(name = "COPY_BY_ORGS", length = 50) + public String copyByOrgs; + /** + * 目标实体对象的名字，多个字段用半角逗号分隔 + */ + @Column(name = "DEST_BEAN_NAME", length = 500) + public String destBeanName; + /** + * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔 + */ + @Column(name = "DEST_PK_PROPERTIES", length = 500) + public String destPkProperties; + /** + * 源表字段与目标对象属性的映射关系，List 对象，JSON 格式存储 + * + */ + @Column(name = "DEST_COLUMN_MAPPING", length = 5000) + public String destColumnMapping; + + /** + * 接口分组名称 + * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS + */ + @Column(name = "GROUP_NAME") + public String groupName; + + /** + * 业务的路由规则 + * 一表对多表时需要配置路由规则 + */ + @Column(name = "BUSI_ROUTE") + public String busiRoute; + + /** + * 同步频率 + */ + @Column(name = "SYNC_FREQUENCY") + public Integer syncFrequency; + + /** + * 上次同步时间 + */ + @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 Integer useScriptPull; + + /** + * 调用脚本方法保存数据 + */ + @Column(name = "USE_SCRIPT_PUSH") + public Integer useScriptPush; + + /** + * 调用脚本方法更新同步标志 + */ + @Column(name = "USE_SCRIPT_MARK") + public Integer useScriptMark; + + /** + * 调用脚本方法过滤数据（查询来源数据后过滤） + */ + @Column(name = "USE_SCRIPT_FILTER") + public Integer useScriptFilter; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java new file mode 100644 index 0000000..76123e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import com.fasterxml.jackson.annotation.JsonFormat; + +public class MesInterfaceEnumUtil { + + @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"); + + private int value; + private String name; + private String description; + + DIRECTION_TYPE() { + } + + DIRECTION_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + 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].getName(); + } + } + return tmp; + } + + public static int nameOf(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(val)) { + tmp = values()[i].value; + } + } + return tmp; + } + + /** + * -1 不在范围内 + * @param desc + * @return + */ + 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; + } + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java new file mode 100644 index 0000000..4136acd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/UpdateSyncItem.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.dbinterface; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 回写接口库的值 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class UpdateSyncItem { + + /** + * 字段名 + */ + public String columnName; + + /** + * 写入的值 + * 支持表达式 + * #sap_date, #sap_time, #guid + */ + public String updateValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 21d65dd..331dd1d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -123,6 +123,9 @@ public class StationRequestBean implements Serializable { @ApiParam("展示组件") private Object moduleService; + @ApiParam("客户工厂代码") + private String customerFactoryCode; + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java new file mode 100644 index 0000000..db00b1d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IEngineScriptPersistenceRepository.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistence; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +/** + * @Description : 脚本引擎持久化类 + * @Reference : + * @Author : Rock.Yu + * @CreateDate : 2019-04-16 09:53 + * @Modify: + **/ +public interface IEngineScriptPersistenceRepository extends BaseRepository { + /** + * 按照工厂代码和脚本编号查询脚本实体对象 + * @param organizeCode 工厂代码 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo); + + /** + * 按照脚本编号查询脚本实体对象 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByScriptNo(String scriptNo); + + /** + * 查找所有的脚本语言类型 + * @return 数据库中已经存在的脚本语言类型 + */ + @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType") + List findGroupByLanguageType(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.java new file mode 100644 index 0000000..c426600 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesInterfaceDataMapperRepository.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.dbinterface.MesInterfaceDataMapper; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface MesInterfaceDataMapperRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.java new file mode 100644 index 0000000..9aeef83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingDetailRepository.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.MesQueueShippingDetail; + +/** + * @Description :发运队列明细 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:56 上午 + * @Modify: + **/ +public interface MesQueueShippingDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.java new file mode 100644 index 0000000..a5ffa65 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueShippingRepository.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.MesQueueShipping; + +/** + * @Description : + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:56 上午 + * @Modify: + **/ +public interface MesQueueShippingRepository 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 b408ff1..7b90365 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 @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; +import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import org.springframework.util.StringUtils; /** @@ -2312,4 +2313,50 @@ public class MesHqlPack { } return packBean; } + + /** + * 接口映射分页查询条件 + * + * @param mesInterfaceDataMapper + * @return + */ + public static DdlPackBean packHqlMesInterfaceDataMapper(MesInterfaceDataMapper mesInterfaceDataMapper) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getSrcTableName(), "srcTableName", result); + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getDestBeanName(), "destBeanName", result); + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getBusiRoute(), "busiRoute", result); + DdlPreparedPack.getStringLikerPack(mesInterfaceDataMapper.getGroupName(), "groupName", result); + + getStringBuilderPack(mesInterfaceDataMapper, result); + + return result; + } + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (org.apache.commons.lang3.StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + + DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr); + if (org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && org.apache.commons.lang3.StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true); + } + // 封装有效状态、删除状态、创建人和创建时间 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + } From 69b620336f0fbd5d5fc6ee9b48a130fd56f3eddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 10 Apr 2020 20:11:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=95=A3=E4=BB=B6BOM=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 90 +++++++++++++++++++++- .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 + .../pojo/mes/model/ExcelImportResultModel.java | 3 + .../i3plus/pojo/mes/model/MesRouteCfgModel.java | 3 + .../pojo/mes/model/MesRouteCfgParamModel.java | 3 - .../pojo/mes/model/MesRouteCfgStepModel.java | 6 ++ 6 files changed, 105 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 341cc2e..66938b2 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 @@ -1803,7 +1803,8 @@ public class MesEnumUtil { MES_PLC(390, "PLC地址清单"), MES_PROCESS(400, "工序信息"), MES_KPSN_RULE(410, "关键件条码校验规则"), - MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"); + MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"), + MES_PART_BOM_IMPORT(430, "散件BOM导入"); private int value; private String description; @@ -4759,4 +4760,91 @@ public class MesEnumUtil { return null; } } + + + /** + * 产品特性 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_TRAIT { + NORMAL(10, "正常件"), + FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"), + FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"); + + private int value; + private String description; + + PART_TRAIT(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 String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } + + /** + * 配置类型 + */ + /** + * mes工步类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROD_CFG_TYPE { + + NORMAL("10", "正常"), + SCATTERED("20", "散件"); + + private String value; + private String description; + + PROD_CFG_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/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 011f6f5..4995b43 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 @@ -92,6 +92,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String pptCode; + @Column(name = "PART_TRAIT") + @ApiParam("物料特性") + private Integer partTrait; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelImportResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelImportResultModel.java index 16dc4f7..e3ed164 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelImportResultModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelImportResultModel.java @@ -39,4 +39,7 @@ public class ExcelImportResultModel implements Serializable { @ApiParam("导入数据集合") private List excelList; + @ApiParam("导入进度") + private String importSpeed; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java index bc4ac3d..af0d641 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgModel.java @@ -24,4 +24,7 @@ public class MesRouteCfgModel { @ApiParam("流程代码") private String routeCode; + + @ApiParam("是否执行 1=是 2=否") + private Integer isActive; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java index 94e14e2..5f29e63 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgParamModel.java @@ -18,8 +18,5 @@ public class MesRouteCfgParamModel { @ApiParam("工序代码") private String processCode; - @ApiParam("是否执行 1=是 2=否") - private Integer isActive; - List stepModelList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java index be57f42..f1b9b77 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteCfgStepModel.java @@ -18,5 +18,11 @@ public class MesRouteCfgStepModel { @ApiParam("工步代码") private String stepCode; + @ApiParam("参数代码") + private String paramCode; + + @ApiParam("参数值") + private String paramValue; + List routeCfgModelList; } From 810927563079f7b0c090469412caad26c738cf82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 10 Apr 2020 20:17:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=A3=E4=BB=B6BOM?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/ImportBomExcelDataModel.java | 118 +++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java new file mode 100644 index 0000000..089013a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java @@ -0,0 +1,118 @@ +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.util.LinkedList; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("散件BOM导入MODEL") +public class ImportBomExcelDataModel { + + @ApiParam("零件号") + private String partNo; + + @ApiParam("零件名称") + private String partName; + + @ApiParam("零件简称") + private String briefText; + + @ApiParam("零件规格") + private String partSpec; + + @ApiParam("分类1") + private String categoryCode1; + + @ApiParam("分类2") + private String categoryCode2; + + @ApiParam("分类3") + private String categoryCode3; + + @ApiParam("单位") + private String unit; + + @ApiParam("包装规格代码") + private String packSpecCode; + + @ApiParam("默认工作中心") + private String defaultWorkCenter; + + @ApiParam("产品位置") + private String produceCategoryCode; + + @ApiParam("过程编码匹配类型") + private Integer processMatchType; + + @ApiParam("包装编码匹配类型") + private Integer packageMatchType; + + @ApiParam("产品编码匹配类型") + private Integer productMatchType; + + @ApiParam("产品类型代码") + private String pptCode; + + @ApiParam("物料特性") + private Integer partTrait; + + @ApiParam("产品类型名称") + private String produceCategoryName; + + @ApiParam("过程编码匹配类型名称") + private String processMatchTypeName; + + @ApiParam("包装编码匹配类型") + private String packageMatchTypeName; + + @ApiParam("产品编码匹配类型") + private String productMatchTypeName; + + @ApiParam("分类名称") + private String categoryName; + + @ApiParam("原材料物料号") + private String itemPartNo; + + @ApiParam("原材料物料名称") + private String itemPartName; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("产出工位") + private String workCellCode; + + @ApiParam("工位名称") + private String workCellName; + + @ApiParam(value = "数量", example = "0") + private Double qty; + + @ApiParam("消耗工位") + private String usedWorkCellCode; + + @ApiParam("客户物料号") + private String custPartNo; + + @ApiParam("配置") + private LinkedList cfgCodeList; + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("用户名") + private String userName; + + @ApiParam("关键物料类型") + private String keyPartType; + + @ApiParam("是否关键件") + private Integer isKeyPart; +} From f1baf4fdbe60482cb501b2728819c2e2a0b6ba4b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 10 Apr 2020 20:28:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[=E9=BA=A6=E6=A0=BC=E7=BA=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A111=20=E6=A3=80=E6=B5=8B=E9=A1=B9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 1b9a071..2790baa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -37,6 +37,10 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index 0be20a3..659bb9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -56,6 +56,10 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String sn; + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + @Column(name = "QTY") @ApiParam("产品数量") private Double qty; From a5a81303884201a7565adcee1037022906fbe3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 13 Apr 2020 09:13:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=85=BC?= =?UTF-8?q?=E5=AE=B9sqlserver=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 35f31e4..e85e34c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -56,7 +56,7 @@ public class WmsMoveMaster extends BaseBean { private String transTypeCode; @Lob - @Column(name = "ERROR_MESSAGE", columnDefinition = "TEXT") + @Column(name = "ERROR_MESSAGE") @ApiParam(value = "错误信息") private String errorMessage;