merge test
wynne1005
5 years ago
commit
b18408b3bb
@ -0,0 +1,56 @@
|
||||
package cn.estsh.i3plus.pojo.mes.bean;
|
||||
|
||||
|
||||
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;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Lob;
|
||||
import javax.persistence.Table;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/7/30 9:30 AM
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "IF_EDI_INITIAL_DATA")
|
||||
@Api("EDI_初始数据表")
|
||||
public class IfEdiInitialData extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = -523843818485699827L;
|
||||
|
||||
@Column(name = "PROGRAM_DATA")
|
||||
@ApiParam("EDI抓取程序代码")
|
||||
private String programData;
|
||||
|
||||
@Column(name = "CONTENT")
|
||||
@ApiParam("数据")
|
||||
private String content;
|
||||
|
||||
@Column(name = "FILE_NAME")
|
||||
@ApiParam("文件名称")
|
||||
private String fileName;
|
||||
|
||||
@Lob
|
||||
@Column(name = "FILE_URL")
|
||||
@ApiParam("文件URL")
|
||||
private String fileUrl;
|
||||
|
||||
@Column(name = "SYNC_STATUS")
|
||||
@ApiParam("同步状态")
|
||||
private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/27 21:39
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_EDI_PARSER_CONFIG")
|
||||
@Api("EDI解析配置表")
|
||||
public class MesEdiParserConfig extends BaseBean implements Serializable {
|
||||
private static final long serialVersionUID = 7225381299744633270L;
|
||||
|
||||
@Column(name = "PARSER_CODE")
|
||||
@ApiParam("解析配置代码")
|
||||
private String parserCode;
|
||||
|
||||
@Column(name = "PARSER_NAME")
|
||||
@ApiParam("解析配置名称")
|
||||
private String parserName;
|
||||
|
||||
@Column(name = "PARSER_TYPE")
|
||||
@ApiParam("解析程序集")
|
||||
private String parserType;
|
||||
|
||||
@Column(name = "GETTING_CODE")
|
||||
@ApiParam("edi抓取程序代码")
|
||||
private String gettingCode;
|
||||
|
||||
@Column(name = "CURRENT_ORDER")
|
||||
@ApiParam("当前订单号")
|
||||
private String currentOrder;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 15:23
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
public class EdiFileModel implements Serializable {
|
||||
private static final long serialVersionUID = 7085611430865514271L;
|
||||
|
||||
private String content;
|
||||
|
||||
private String fileName;
|
||||
|
||||
private String fileUrl;
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 14:51
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
public class EdiRequestModel implements Serializable {
|
||||
private static final long serialVersionUID = 7203497485903427292L;
|
||||
|
||||
private String organizeCode;
|
||||
|
||||
private String sourcePath;
|
||||
|
||||
private String fileName;
|
||||
|
||||
private String fileUrl;
|
||||
|
||||
private String content;
|
||||
|
||||
private Integer ediType;
|
||||
|
||||
private String ediCode;
|
||||
|
||||
private String host;
|
||||
|
||||
private String config;
|
||||
|
||||
private String programCode;
|
||||
|
||||
private String messageType;
|
||||
|
||||
private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 17:17
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class QueueJitPlanModel {
|
||||
|
||||
private MesQueueJitPlan jitPlan;
|
||||
|
||||
private List<MesQueueJitPlanDetail> jitPlanDetails;
|
||||
|
||||
private List<MesQueueJitPlanBom> jitPlanBoms;
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
|
||||
|
||||
import com.thoughtworks.xstream.annotations.XStreamAlias;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 12:36
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@XStreamAlias("coderule")
|
||||
public class CodeRule implements Serializable {
|
||||
private static final long serialVersionUID = 6090471998165282835L;
|
||||
|
||||
@XStreamAlias("code")
|
||||
private String code;
|
||||
|
||||
@XStreamAlias("type")
|
||||
private String type;
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
|
||||
|
||||
import com.thoughtworks.xstream.annotations.XStreamAlias;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 12:32
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@XStreamAlias("document")
|
||||
public class Document implements Serializable {
|
||||
private static final long serialVersionUID = 2814403876905527454L;
|
||||
|
||||
@XStreamAlias("head")
|
||||
private Head head;
|
||||
|
||||
@XStreamAlias("message")
|
||||
private Message message;
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
|
||||
|
||||
import com.thoughtworks.xstream.annotations.XStreamAlias;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 12:32
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@XStreamAlias("head")
|
||||
public class Head implements Serializable {
|
||||
private static final long serialVersionUID = 7799977037966652535L;
|
||||
|
||||
@XStreamAlias("customerno")
|
||||
private String customerno;
|
||||
|
||||
@XStreamAlias("customername")
|
||||
private String customername;
|
||||
|
||||
@XStreamAlias("plantcode")
|
||||
private String plantcode;
|
||||
|
||||
@XStreamAlias("plantname")
|
||||
private String plantname;
|
||||
|
||||
@XStreamAlias("suppliernumber")
|
||||
private String suppliernumber;
|
||||
|
||||
@XStreamAlias("suppliername")
|
||||
private String suppliername;
|
||||
|
||||
@XStreamAlias("status")
|
||||
private String status;
|
||||
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
|
||||
|
||||
import com.thoughtworks.xstream.annotations.XStreamAlias;
|
||||
import com.thoughtworks.xstream.annotations.XStreamImplicit;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 12:33
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@XStreamAlias("message")
|
||||
public class Message implements Serializable {
|
||||
private static final long serialVersionUID = 8628748312808962449L;
|
||||
|
||||
@XStreamImplicit
|
||||
private List<Pn> pns;
|
||||
|
||||
@XStreamAlias("customerno")
|
||||
private String customerNo;
|
||||
|
||||
@XStreamAlias("customername")
|
||||
private String customerName;
|
||||
|
||||
@XStreamAlias("plantcode")
|
||||
private String plantCode;
|
||||
|
||||
@XStreamAlias("plantname")
|
||||
private String plantName;
|
||||
|
||||
@XStreamAlias("suppliernumber")
|
||||
private String supplierNumber;
|
||||
|
||||
@XStreamAlias("suppliername")
|
||||
private String supplierName;
|
||||
|
||||
@XStreamAlias("status")
|
||||
private String status;
|
||||
|
||||
@XStreamAlias("sequenceno")
|
||||
private String sequenceNo;
|
||||
|
||||
@XStreamAlias("vin")
|
||||
private String vin;
|
||||
|
||||
@XStreamAlias("date")
|
||||
private String date;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/27 15:39
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
public class MgnBjJitPlanModel {
|
||||
|
||||
private String org;
|
||||
|
||||
private String userInfo;
|
||||
|
||||
private List<Part> flPnParts;
|
||||
|
||||
private String flPnRecipe;
|
||||
|
||||
private List<Part> frPnParts;
|
||||
|
||||
private String frPnRecipe;
|
||||
|
||||
private List<Part> rlPnParts;
|
||||
|
||||
private String rlPnRecipe;
|
||||
|
||||
private List<Part> rrPnParts;
|
||||
|
||||
private String rrPnRecipe;
|
||||
|
||||
private Map<String, List<Part>> groupPartsMap = new HashMap<>();
|
||||
|
||||
public void setFlPnParts(List<Part> flPnParts) {
|
||||
this.groupPartsMap.put("FL", flPnParts);
|
||||
this.flPnRecipe = getGroupRecipe(flPnParts);
|
||||
this.flPnParts = flPnParts;
|
||||
}
|
||||
|
||||
public void setFrPnParts(List<Part> frPnParts) {
|
||||
this.groupPartsMap.put("FR", frPnParts);
|
||||
this.frPnRecipe = getGroupRecipe(frPnParts);
|
||||
this.frPnParts = frPnParts;
|
||||
}
|
||||
|
||||
public void setRlPnParts(List<Part> rlPnParts) {
|
||||
this.groupPartsMap.put("RL", rlPnParts);
|
||||
this.rlPnRecipe = getGroupRecipe(rlPnParts);
|
||||
this.rlPnParts = rlPnParts;
|
||||
}
|
||||
|
||||
public void setRrPnParts(List<Part> rrPnParts) {
|
||||
this.groupPartsMap.put("RR", rrPnParts);
|
||||
this.rrPnRecipe = getGroupRecipe(rrPnParts);
|
||||
this.rrPnParts = rrPnParts;
|
||||
}
|
||||
|
||||
public MgnBjJitPlanModel(String org, String userInfo) {
|
||||
this.org = org;
|
||||
this.userInfo = userInfo;
|
||||
}
|
||||
|
||||
private String getGroupRecipe(List<Part> groupParts) {
|
||||
List<String> groupPartsRecipe = groupParts.stream().filter(d -> StringUtils.isNotBlank(d.getRecipeSeq()))
|
||||
.sorted(Comparator.comparing(Part::getRecipeSeq))
|
||||
.map(Part::getRecipeItem)
|
||||
.collect(Collectors.toList());
|
||||
return String.join("", groupPartsRecipe);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/30 15:24
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
public class MgnBjRecipePartsModel {
|
||||
|
||||
private String location;
|
||||
|
||||
private String recipe;
|
||||
|
||||
private List<Part> parts;
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
|
||||
|
||||
import com.thoughtworks.xstream.annotations.XStreamAlias;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 12:36
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@XStreamAlias("optioncode")
|
||||
public class OptionCode implements Serializable {
|
||||
private static final long serialVersionUID = -4790746701135990728L;
|
||||
|
||||
@XStreamAlias("coderule")
|
||||
private List<CodeRule> codeRules;
|
||||
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
|
||||
|
||||
import com.thoughtworks.xstream.annotations.XStreamAlias;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 12:35
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@XStreamAlias("part")
|
||||
public class Part implements Serializable {
|
||||
private static final long serialVersionUID = -8947770816754458901L;
|
||||
|
||||
@XStreamAlias("item")
|
||||
private String item;
|
||||
|
||||
@XStreamAlias("dock")
|
||||
private String dock;
|
||||
|
||||
@XStreamAlias("qty")
|
||||
private String qty;
|
||||
|
||||
@ApiParam("是否是baseModule")
|
||||
private boolean isBaseModule;
|
||||
|
||||
@ApiParam("前左数量")
|
||||
private String flQty;
|
||||
|
||||
@ApiParam("前右数量")
|
||||
private String frQty;
|
||||
|
||||
@ApiParam("后左数量")
|
||||
private String rlQty;
|
||||
|
||||
@ApiParam("后右数量")
|
||||
private String rrQty;
|
||||
|
||||
@ApiParam("产品位置")
|
||||
private String produceCtgyCode;
|
||||
|
||||
@ApiParam("配方")
|
||||
private String recipeItem;
|
||||
|
||||
@ApiParam("配方顺序")
|
||||
private String recipeSeq;
|
||||
|
||||
|
||||
@ApiParam("Mes物料号")
|
||||
private String partNo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
|
||||
|
||||
import com.thoughtworks.xstream.annotations.XStreamAlias;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 12:35
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@XStreamAlias("parts")
|
||||
public class Parts implements Serializable {
|
||||
private static final long serialVersionUID = -7294906162624860932L;
|
||||
|
||||
@XStreamAlias("parts")
|
||||
private List<Part> parts;
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
|
||||
|
||||
import com.thoughtworks.xstream.annotations.XStreamAlias;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Wynne.Lu
|
||||
* @date 2020/6/23 12:33
|
||||
* @desc
|
||||
*/
|
||||
@Data
|
||||
@XStreamAlias("PN")
|
||||
public class Pn implements Serializable {
|
||||
private static final long serialVersionUID = 194164925380216505L;
|
||||
|
||||
@XStreamAlias("vin")
|
||||
private String vin;
|
||||
|
||||
@XStreamAlias("seqno")
|
||||
private String seqno;
|
||||
|
||||
@XStreamAlias("date")
|
||||
private String date;
|
||||
|
||||
@XStreamAlias("vehicleCode")
|
||||
private String vehicleCode;
|
||||
|
||||
@XStreamAlias("version")
|
||||
private String version;
|
||||
|
||||
@XStreamAlias("parts")
|
||||
private List<Part> parts;
|
||||
|
||||
@XStreamAlias("optioncode")
|
||||
private List<CodeRule> codeRules;
|
||||
|
||||
@ApiParam("新vin号")
|
||||
private String newVin;
|
||||
|
||||
@ApiParam("新vin号")
|
||||
private Boolean result;
|
||||
|
||||
|
||||
}
|
||||
@ -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.IfEdiInitialData;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wynne.lu
|
||||
* @CreateDate : 2019-07-30
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IfEdiInitialDataRepository extends BaseRepository<IfEdiInitialData, Long> {
|
||||
}
|
||||
@ -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.MesEdiParserConfig;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wynne.lu
|
||||
* @CreateDate : 2019-07-30
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesEdiParserConfigRepository extends BaseRepository<MesEdiParserConfig, Long> {
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package cn.estsh.i3plus.pojo.wms.modelbean;
|
||||
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Description : 自动过滤物流路线
|
||||
* @Reference :
|
||||
* @Author : puxiao.liao
|
||||
* @CreateDate : 2020-07-01
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Api("自动过滤物流路线")
|
||||
public class WmsAutoFilterRoutingRuleModel {
|
||||
|
||||
@ApiParam("工厂代码")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam("料架车")
|
||||
private String parentSpec;
|
||||
}
|
||||
Loading…
Reference in New Issue