wms数据同步迁移至mes

yun-zuoyi
qianhs 5 years ago
parent 11adb5ff09
commit 20f5bfc9eb

@ -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;
}
}
}

@ -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;
}
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}
}

@ -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<MappingItem> 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;
}

@ -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;
}
}
}

@ -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;
}

@ -123,6 +123,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("展示组件")
private Object moduleService;
@ApiParam("客户工厂代码")
private String customerFactoryCode;
@Override
public String toString() {
return "StationRequestBean{" +

@ -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<EngineScriptPersistence, Long> {
/**
*
* @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();
}

@ -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<MesInterfaceDataMapper,Long> {
}

@ -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<MesQueueShippingDetail, Long> {
}

@ -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<MesQueueShipping, Long> {
}

@ -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;
}
}

Loading…
Cancel
Save