I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

Browse Source
yun-zuoyi
陈思洁 5 years ago
parent 49f0c0c33a 98849d3131
commit 556f112ef8
211 changed files with 6742 additions and 858 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-andon/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java
Unescape Escape View File

@ -51,10 +51,12 @@ public class AndonCellAlarmCause extends BaseBean implements Serializable {
@ApiParam(value = "事件描述")
private String acCode;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "安灯类型名称")
private String alarmCodeName;
@AnnoOutputColumn(hidden = true)
@Transient
@ApiParam(value = "呼叫原因描述")
private String acName;

3
modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java
Unescape Escape View File

@ -45,4 +45,7 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
private boolean errorInnerAction = false;
@ApiModelProperty("默认异常入库")
private boolean errorInsertFlag = true;
}

2
modules/i3plus-pojo-aps/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

18
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
Unescape Escape View File

@ -65,10 +65,10 @@ public class Material extends BaseAPS {
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String purchaseLeadTime;
@Column(name="MANUF_LEAD_TIME")
@Column(name="PRODUCT_LEAD_TIME")
@ApiParam(value ="生产提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String manufLeadTime;
private String productLeadTime;
@Column(name="SHIPMENT_LEAD_TIME")
@ApiParam(value ="配送提前期")
@ -79,9 +79,9 @@ public class Material extends BaseAPS {
@ApiParam(value ="单位采购量")
private Integer unitPurchase;
@Column(name="UNIT_MANUF")
@Column(name="UNIT_PRODUCT")
@ApiParam(value ="单位生产量")
private Integer unitManuf;
private Integer unitProduct;
@Column(name="UNIT_SHIPMENT")
@ApiParam(value ="单位配送量")
@ -109,7 +109,7 @@ public class Material extends BaseAPS {
@Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="生产批量单位")
private Double UnitProductBatch;
private Double unitProductBatch;
@Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大采购批量")
@ -143,6 +143,14 @@ public class Material extends BaseAPS {
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String orderBatchPeriod;
@Column(name="LABEL_NAME")
@ApiParam(value ="标签名称")
private String labelName;
@Column(name="LABEL_COLOR")
@ApiParam(value ="标签颜色")
private String labelColor;
@JsonBackReference
public List<ProductRouting> getProductRoutings() {
return BeanRelation.list(this, EMaterial.ProductRoutings);

52
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java
Unescape Escape View File

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import cn.estsh.i3plus.pojo.aps.holders.EMaterialDeliveryPromise;
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 javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* @Description :物料交期承诺
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-06-11
* @Modify:
**/
@Data
@EqualsAndHashCode(callSuper = true)
@Entity
@Table(name = "APS_MATERIAL_DELIVERY_PROMISE")
@Api("物料")
public class MaterialDeliveryPromise extends BaseBean {
@Column(name="QTY")
@ApiParam(value ="到货数量")
private Double count;
@Column(name="DATE_TIME")
@ApiParam(value ="到货日期")
private Date dateTime;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material", notEmpty = true)
private Long materialId;
public Material getMaterial() {
return BeanRelation.get(this, EMaterialDeliveryPromise.Material);
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EMaterialDeliveryPromise.Material, material);
}
}

5
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
Unescape Escape View File

@ -51,6 +51,11 @@ public class SalesOrder extends BaseOrder {
@FieldAnnotation(modify = false)
private String calcLeadTime;
@Column(name="ALLOW_DELAY_TIME")
@ApiParam(value ="允许延期时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String allowDelayTime;
@JsonIgnore
public Work getWork() {
return BeanRelation.get(this, EBaseOrder.Works);

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
Unescape Escape View File

@ -84,7 +84,7 @@ public class Work extends BaseAPS {
private Long specifyResourceId;
@Column(name="SPECIFY_PRODUCE_TIME")
@ApiParam(value ="指定制造时间")
@ApiParam(value ="指定生产时间")
private String specifyProduceTime;
@Column(name="SPECIFY_PREV_TIME")

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
Unescape Escape View File

@ -388,9 +388,11 @@ public class BeanRelation {
List<BaseBean> relaBeans = list(bean, holders[index]);
for (BaseBean relaBean : relaBeans) {
if (relaBean.getId() != bean.getId()) {
recursionImpl(relaBean, fun, holders, index + 1);
}
}
}
/**
* 判断target是否为bean为起点的以holders路径上的点。

4
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
Unescape Escape View File

@ -29,6 +29,10 @@ public class DateDuration {
private double rate = 0.0;
private boolean bValid = false;
public DateDuration(int value) {
this.time = value;
}
public DateDuration(String value) {
setValue(value);
}

5
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java
Unescape Escape View File

@ -0,0 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EMaterialDeliveryPromise {
Material,
}

70
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java
Unescape Escape View File

@ -0,0 +1,70 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.Date;
/**
* @Description : 延期订单
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-06-11
* @Modify:
**/
@Data
public class DelaySalesOrder {
@ApiParam(value ="订单ID")
private Long orderId;
@ApiParam(value ="订单编码")
private String orderCode;
@ApiParam(value ="订单名称")
private String orderName;
@ApiParam(value ="物料编码")
private String materialCode;
@ApiParam(value ="物料名称")
private String materialName;
@ApiParam(value ="订单数量")
private Double count;
@ApiParam(value ="最晚结束时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date let;
@ApiParam(value ="计划开始时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date planStart;
@ApiParam(value ="计划结束时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date planEnd;
@ApiParam(value ="总跨度时间")
private String overTime;
@ApiParam(value ="总生产时间")
private String productTime;
@ApiParam(value ="延期时间")
private String delayTime;
@ApiParam(value ="允许的最大延期时间")
private String allowDelayTime;
// 0正常显示，1显示黄色，2显示红色
@ApiParam(value ="背景显示颜色")
private Integer backgroundColor;
}

66
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java
Unescape Escape View File

@ -0,0 +1,66 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.Date;
/**
* @Description : 大跨度订单
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-06-11
* @Modify:
**/
@Data
public class LargeSpanOrder {
@ApiParam(value ="订单ID")
private Long orderId;
@ApiParam(value ="订单编码")
private String orderCode;
@ApiParam(value ="订单名称")
private String orderName;
@ApiParam(value ="物料编码")
private String materialCode;
@ApiParam(value ="物料名称")
private String materialName;
@ApiParam(value ="订单数量")
private Double count;
@ApiParam(value ="最晚结束时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date let;
@ApiParam(value ="计划开始时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date planStart;
@ApiParam(value ="计划结束时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date planEnd;
@ApiParam(value ="总跨度时间")
private String overTime;
@ApiParam(value ="总生产时间")
private String productTime;
@ApiParam(value ="跨度时间")
private String spanTime;
// 0正常显示，1显示黄色，2显示红色
@ApiParam(value ="背景显示颜色")
private Integer backgroundColor;
}

60
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java
Unescape Escape View File

@ -0,0 +1,60 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.Date;
/**
* @Description : 物料交期分析表
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-06-11
* @Modify:
**/
@Data
public class MaterialDeliveryAnalyze {
@ApiParam(value ="订单ID")
private Long orderId;
@ApiParam(value ="订单编码")
private String orderCode;
@ApiParam(value ="订单名称")
private String orderName;
@ApiParam(value ="物料编码")
private String materialCode;
@ApiParam(value ="物料名称")
private String materialName;
@ApiParam(value ="标签名称")
private String labelName;
@ApiParam(value ="标签颜色")
private String labelColor;
@ApiParam(value ="需求数量")
private Double requireCount;
@ApiParam(value ="需求日期")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date requireDate;
@ApiParam(value ="最早到货日期")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date arrivalDate;
// 0正常显示，1显示红色
@ApiParam(value ="背景显示颜色")
private Integer backgroundColor;
private Double count;
}

61
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java
Unescape Escape View File

@ -0,0 +1,61 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.Date;
/**
* @Description : 过早生产
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-06-11
* @Modify:
**/
@Data
public class PrematureProduct {
@ApiParam(value ="订单ID")
private Long orderId;
@ApiParam(value ="订单编码")
private String orderCode;
@ApiParam(value ="订单名称")
private String orderName;
@ApiParam(value ="物料编码")
private String materialCode;
@ApiParam(value ="物料名称")
private String materialName;
@ApiParam(value ="订单编码")
private Double count;
@ApiParam(value ="最晚结束时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date let;
@ApiParam(value ="计划开始时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date planStart;
@ApiParam(value ="计划结束时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date planEnd;
@ApiParam(value ="提前完成时间")
private String times;
// 0正常显示，1显示红色
@ApiParam(value ="背景显示颜色")
private Integer backgroundColor;
}

43
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleAnalyze.java
Unescape Escape View File

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.aps.model;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.Date;
/**
* @Description : 排程结果分析及建议
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-06-11
* @Modify:
**/
@Data
public class ScheduleAnalyze {
@ApiParam(value ="工作编码")
private String workCode;
@ApiParam(value ="数量")
private Double count;
@ApiParam(value ="计划开始时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date planStart;
@ApiParam(value ="计划结束时间")
@JsonSerialize(using = CustomDateSerializer.class)
@JsonDeserialize(using = CustomDateDeserializer.class)
private Date planEnd;
@ApiParam(value ="问题描述")
private String describe;
@ApiParam(value ="解决方案")
private String solution;
}

9
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialDeliveryPromiseRepository.java
Unescape Escape View File

@ -0,0 +1,9 @@
package cn.estsh.i3plus.pojo.aps.repository;
import cn.estsh.i3plus.pojo.aps.bean.MaterialDeliveryPromise;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface MaterialDeliveryPromiseRepository extends CrudRepository<MaterialDeliveryPromise, Long> {
}

5
modules/i3plus-pojo-aps/src/main/resources/relations/MaterialDeliveryPromise.xml
Unescape Escape View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="MaterialDeliveryPromise">
<Relation field="Material" name="Material" type="MULTI_TO_ONE">
</Relation>
</Class>

2
modules/i3plus-pojo-base/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

45
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java
Unescape Escape View File

@ -31,6 +31,27 @@ public class Pager {
@ApiParam("翻页操作")
private String pageMethod;
/* 默认最小数量分页 */
private static final Pager min;
/* 默认最大数量分页 */
private static final Pager max;
/* 默认数量分页 */
private static final Pager defaultPager;
static {
min = new Pager();
min.setCurrentPage(1);
min.setPageSize(10);
max = new Pager();
max.setCurrentPage(1);
max.setPageSize(65535);
defaultPager = new Pager();
defaultPager.setCurrentPage(1);
defaultPager.setPageSize(100);
}
public Pager() {
}
@ -231,6 +252,30 @@ public class Pager {
return currentPage > 1;
}
/**
* 获取默认最小分页数量
* @return
*/
public static Pager defaultMinPager(){
return min;
}
/**
* 默认最大分页数量
* @return
*/
public static Pager defaultMaxPager(){
return max;
}
/**
* 默认分页数量
* @return
*/
public static Pager defaultPager(){
return defaultPager;
}
@Override
public String toString() {
return "Pager{" +

213
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java
Unescape Escape View File

@ -1,18 +1,29 @@
package cn.estsh.i3plus.pojo.base.common;
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.alibaba.fastjson.JSON;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import com.thoughtworks.xstream.core.util.QuickWriter;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.io.naming.NameCoder;
import com.thoughtworks.xstream.io.naming.NoNameCoder;
import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
import com.thoughtworks.xstream.io.xml.XppDomDriver;
import lombok.Data;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
import java.io.Writer;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import static cn.estsh.i3plus.pojo.base.common.XStreamFactory.toJavaBean;
import static cn.estsh.i3plus.pojo.base.common.XStreamFactory.toXml;
/**
* @Description : Xml 工厂
@ -120,9 +131,9 @@ public class XStreamFactory {
}
/**
* Javabean 转XML
*
* @param <T>
* @return xml字符串
*/
@ -141,6 +152,7 @@ public class XStreamFactory {
/**
* Javabean 转XML
*
* @param <T>
* @return xml字符串
*/
@ -159,101 +171,108 @@ public class XStreamFactory {
public static <T> T toJavaBean(String xmlStr) {
return (T) xStream.fromXML(xmlStr);
}
//
// public static void main(String[] args) {
// User u = new User(0, "zhangsan0", "zhangsanpwd0");
// User u1 = new User(1, "zhangsan1", "zhangsanpwd");
// User u2 = new User(2, "zhangsan2", "zhangsanpwd");
// User u3 = new User(3, "zhangsan3", "zhangsanpwd");
//
// Role r1 = new Role(1, "Admin", "Admin1");
// Role r2 = new Role(2, "Admin", "Admin2");
// Role r3 = new Role(3, "Admin", "Admin3");
//
// DataAdapter ad = new DataAdapter(10086L,UUID.randomUUID().toString(),"sssfwef",u1);
// u1.setRole(r1);
//
// u2.getRoleList().add(r1);
// u2.getRoleList().add(r2);
// u2.getRoleList().add(r3);
//
// u3.setRole(r1);
// u3.getRoleList().add(r2);
// u3.getRoleList().add(r3);
//
// System.out.println(toXml(u) + "\n\n ");
// System.out.println(toXml(u1) + "\n\n ");
// System.out.println(toXml(u2) + "\n\n ");
// System.out.println(toXml(u3) + "\n\n ");
// System.out.println(toXml(ad) + "\n\n ");
//
// System.out.println(JSON.toJSONString(toJavaBean(toXml(ad))));
//
// }
}
//
//@Data
//@XStreamAlias("DataAdapter")
////对应carInfos元素
//class DataAdapter implements Serializable {
//
// @XStreamAsAttribute
// private Long scId;
// private String key;
// @XStreamCDATA
// private String resultData;
//
// private Object auth;
//
// public DataAdapter(Long scId, String key, String resultData, Object auth) {
// this.scId = scId;
// this.key = key;
// this.resultData = resultData;
// this.auth = auth;
// }
//}
//
//@Data
//@XStreamAlias("user")
////对应carInfos元素
//class User implements Serializable {
// private static final long serialVersionUID = -7554548655397869156L;
//
// @XStreamAsAttribute
// private Integer id;
// private String loginName;
// private String loginPwd;
//
// private Role role;
// private List<Role> roleList = new ArrayList<Role>();
// private List<Role> roleArray;
//
// public User() {
// }
//
// public User(Integer id, String loginName, String loginPwd) {
// this.id = id;
// this.loginName = loginName;
// this.loginPwd = loginPwd;
// }
//}
//
//@Data
//@XStreamAlias("role")
////对应carInfos元素
//class Role implements Serializable {
// private static final long serialVersionUID = -3134157833696958743L;
// @XStreamAsAttribute
// private Integer id;
// private String roleName;
// private String roleCode;
//
// public Role() {
// }
//
// public Role(Integer id, String roleName, String roleCode) {
// this.id = id;
// this.roleName = roleName;
// this.roleCode = roleCode;
// }
//}
class Test {
public static void main(String[] args) {
User u = new User(0, "zhangsan0", "zhangsanpwd0");
User u1 = new User(1, "zhangsan1", "zhangsanpwd");
User u2 = new User(2, "zhangsan2", "zhangsanpwd");
User u3 = new User(3, "zhangsan3", "zhangsanpwd");
Role r1 = new Role(1, "Admin", "Admin1");
Role r2 = new Role(2, "Admin", "Admin2");
Role r3 = new Role(3, "Admin", "Admin3");
DataAdapter ad = new DataAdapter(10086L, UUID.randomUUID().toString(), "sssfwef", u1);
u1.setRole(r1);
u2.getRoleList().add(r1);
u2.getRoleList().add(r2);
u2.getRoleList().add(r3);
u3.setRole(r1);
u3.getRoleList().add(r2);
u3.getRoleList().add(r3);
System.out.println(toXml(u) + "\n\n ");
System.out.println(toXml(u1) + "\n\n ");
System.out.println(toXml(u2) + "\n\n ");
System.out.println(toXml(u3) + "\n\n ");
System.out.println(toXml(ad) + "\n\n ");
System.out.println(JSON.toJSONString(toJavaBean(toXml(ad))));
}
@Data
@XStreamAlias("DataAdapter")
static
//对应carInfos元素
class DataAdapter implements Serializable {
@XStreamAsAttribute
private Long scId;
private String key;
@XStreamCDATA
private String resultData;
private Object auth;
public DataAdapter(Long scId, String key, String resultData, Object auth) {
this.scId = scId;
this.key = key;
this.resultData = resultData;
this.auth = auth;
}
}
@Data
@XStreamAlias("user")
static
//对应carInfos元素
class User implements Serializable {
private static final long serialVersionUID = -7554548655397869156L;
@XStreamAsAttribute
private Integer id;
private String loginName;
private String loginPwd;
private Role role;
private List<Role> roleList = new ArrayList<Role>();
private List<Role> roleArray;
public User() {
}
public User(Integer id, String loginName, String loginPwd) {
this.id = id;
this.loginName = loginName;
this.loginPwd = loginPwd;
}
}
@Data
@XStreamAlias("role")
static
//对应carInfos元素
class Role implements Serializable {
private static final long serialVersionUID = -3134157833696958743L;
@XStreamAsAttribute
private Integer id;
private String roleName;
private String roleCode;
public Role() {
}
public Role(Integer id, String roleName, String roleCode) {
this.id = id;
this.roleName = roleName;
this.roleCode = roleCode;
}
}
}

29
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
Unescape Escape View File

@ -1110,4 +1110,33 @@ public class ApsEnumUtil {
return description;
}
}
/**
* 订单状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_STATUS {
NOPLAN("NOPLAN", "未计划"),
PLANDONE("PLANDONE", "计划完毕"),
INDICATIONDONE("INDICATIONDONE", "指示完毕"),
CONFIRM("CONFIRM", "确认"),
STARTPRODUCT("STARTPRODUCT", "开始生产"),
FINISH("FINISH", "完成");
private String value;
private String description;
ORDER_STATUS(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

82
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
Unescape Escape View File

@ -1069,6 +1069,88 @@ public class BlockFormEnumUtil {
/**
* 元素编辑信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_EDIT_STATUS {
ON(1, "ON", "开启"),
OFF(2, "OFF", "关闭"),
READONLY(3, "READONLY", "只读");
private int value;
private String code;
private String description;
private PROPERTY_EDIT_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
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 PROPERTY_EDIT_STATUS valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 属性字段排序规则
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

5
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
Unescape Escape View File

@ -689,8 +689,9 @@ public class BlockSoftSwitchEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FTP_ENCODE {
CONN_SUCCESS(10, "UTF-8", "UTF-8"),
CONN_FAILURE(20, "GBK", "GBK");
UTF8(10, "UTF-8", "UTF-8"),
GBK(20, "GBK", "GBK"),
ISO88591(30, "ISO-8859-1", "ISO-8859-1");
private int value;
private String encode;

43
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
Unescape Escape View File

@ -1234,4 +1234,47 @@ public class ImppEnumUtil {
return null;
}
}
/**
* 密码策略
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CHECK_TEXT {
PASSWORD_VERIFY(1, "保存策略"),
PASSWORD_LOGIN(2, "登录策略");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private CHECK_TEXT(int value, String description) {
this.value = value;
this.description = 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 CHECK_TEXT valueOfEnum(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
}

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MdmEnumUtil.java
Unescape Escape View File

@ -123,7 +123,7 @@ public class MdmEnumUtil {
public enum MDM_SYNC_TYPE{
INSERT(1, "新增"),
UPDATE(2, "修改"),
DELETE(2, "删除");
DELETE(3, "删除");
private int value;
private String description;

257
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -70,8 +70,9 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TYPE {
MONITOR_MODULE(10, "监听组件"),
REVEAL_MODULE(10, "展示组件"),
BUTTON_MODULE(30, "按钮组件");
REVEAL_MODULE(20, "展示组件"),
BUTTON_MODULE(30, "按钮组件"),
TIMING_MODULE(40, "定时组件");
private int value;
private String description;
@ -1143,6 +1144,16 @@ public class MesEnumUtil {
return tmp;
}
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 description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
@ -1903,7 +1914,13 @@ public class MesEnumUtil {
MES_KPSN_RULE(410, "kpsnRuleExcelService", "关键件条码校验规则，支持编辑"),
MES_QUEUE_JIT_ACTUAL(420, "queueJitActualExcelService", "客户JIT生产队列"),
MES_PART_BOM_IMPORT(430, "partBomExcelService", "散件BOM导入"),
MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑");
MES_PLAN_ORDER_BATCH_COMPILE(440, "planOrderBatchCompileExcelService", "生产计划批量编制，支持编辑"),
MES_WORK_ORDER_PAINT(450, "workOrderPaintExcelService", "生产工单-涂装"),
NEW_SCATTER_BOM(460, "scatterBomCfgExcelService", "新散件BOM导入"),
ENCODE_RULE_MAP(470, "mesEncodeRuleMapExcelService", "编码规则映射导入"),
SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"),
MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"),
MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系");
private int value;
private String service;
@ -3246,7 +3263,8 @@ public class MesEnumUtil {
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"),
REPAIR(70, "返修插单");
REPAIR(70, "返修插单"),
FICTIVE(80, "虚拟工单");
private int value;
private String description;
@ -3273,6 +3291,16 @@ public class MesEnumUtil {
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -3482,6 +3510,7 @@ public class MesEnumUtil {
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
REDO(60, "重做"),
CLOSE(90, "关闭"),
;
@ -3632,7 +3661,8 @@ public class MesEnumUtil {
QUALIFIED(10, "合格"),
DEFECTED(20, "不合格"),
SCRAPED(30, "报废"),
DISMANTLED(40, "已拆解");
DISMANTLED(40, "已拆解"),
PRE_CHECK(50, "待检测");
private int value;
private String description;
@ -3829,7 +3859,8 @@ public class MesEnumUtil {
QUALIFIED(10, "number", "数字"),
DEFECTED(20, "text", "字符串"),
SCRAPED(30, "select", "可选值"),
BUTTON(40, "button", "按钮");
BUTTON(40, "button", "按钮"),
WINDOW(50, "window", "开窗");
private int value;
private String code;
@ -4893,7 +4924,8 @@ public class MesEnumUtil {
public enum PART_TRAIT {
NORMAL(10, "正常件"),
FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"),
FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成");
FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"),
FICTIVE(40, "虚拟件");
private int value;
private String description;
@ -5082,6 +5114,16 @@ public class MesEnumUtil {
}
return tmp;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -5774,6 +5816,15 @@ public class MesEnumUtil {
}
return tmp;
}
public static String codeOfValue(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -6277,4 +6328,196 @@ public class MesEnumUtil {
return tmp;
}
}
/**
* 停机类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOP_MACHINE_TYPE {
TIMER_TIME_OUT(10, "计时器超时停机"),
DELAY_HELP(20, "延时帮助停机"),
URGENT_STOP(30, "急停停机");
private int value;
private String description;
STOP_MACHINE_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 String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 选项代码
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OPTION_CODE {
EXISTENCE("+", "存在"),
NON_EXISTENCE("-", "不存在"),
BRACKET_OPERATION("()", "括号运算"),
AND("&", " 与"),
OR("|", "或");
private String value;
private String description;
OPTION_CODE(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 value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 条码生成模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GENERATE_TYPE {
RELEASE_GENERATION(10, "下达生成"),
STATION_GENERATION(20, "工位生成");
private Integer value;
private String description;
GENERATE_TYPE(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 客户JIT预装队列状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_JIT_PLAN_STATUS {
CREATE(10, "创建"),
RELEASED(20, "已释放"),
ERROR(999, "异常");
private Integer value;
private String description;
QUEUE_JIT_PLAN_STATUS(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 客户JIT预装队列 工单类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE {
SPARE_PART_PRODUCTION(10, "备件生产"),
REPRODUCTION_RMS(20, "重新生产-报功"),
REPRODUCTION_NOT_RMS(30, "重新生产-不报功");
private Integer value;
private String description;
QUEUE_JIT_PLAN_WORK_ORDER_TYPE(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

223
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -18,8 +18,9 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TYPE {
MONITOR_MODULE(10, "监听组件"),
REVEAL_MODULE(10, "展示组件"),
BUTTON_MODULE(30, "按钮组件");
REVEAL_MODULE(20, "展示组件"),
BUTTON_MODULE(30, "按钮组件"),
TIMING_MODULE(40, "定时组件");
private int value;
private String description;
@ -716,7 +717,8 @@ public class MesPcnEnumUtil {
QUALIFIED(10, "合格"),
DEFECTED(20, "不合格"),
SCRAPED(30, "报废"),
DISMANTLED(40, "已拆解");
DISMANTLED(40, "已拆解"),
PRE_CHECK(50, "待检测");
private int value;
private String description;
@ -2023,7 +2025,8 @@ public class MesPcnEnumUtil {
NORMAL(10, "正常"),
CLOSE(20, "关闭"),
FINISH(30, "完成");
FINISH(30, "完成"),
OFF_LINE_REWORK(40, "线下返修");
private int value;
private String description;
@ -2376,6 +2379,7 @@ public class MesPcnEnumUtil {
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPPING(50, "发运"),
REDO(60, "重做"),
CLOSE(90, "关闭");
private int value;
@ -2403,6 +2407,16 @@ public class MesPcnEnumUtil {
}
return tmp;
}
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;
}
}
@ -2476,7 +2490,7 @@ public class MesPcnEnumUtil {
public enum PACKAGE_PRINT_STATUS {
UNPRINTED(10, "未打印"),
PRINTED(20, "打印");
PRINTED(20, "已打印");
private int value;
private String description;
@ -3398,6 +3412,7 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FSM_STATE_TYPE {
BEGIN(10, "begin", "开始状态点"),
BACK(20, "back", "回退状态点"),
END(40, "end", "结束状态点");
private int value;
@ -3600,7 +3615,8 @@ public class MesPcnEnumUtil {
START(10, "START", "开始状态"),
EXECUTING(20, "EXECUTING", "执行中状态"),
TERMINATE(30, "TERMINATE", "中断状态"),
FINISH(40, "FINISH", "完成状态");
FINISH(40, "FINISH", "完成状态"),
BACK(99, "BACK", "回退状态");
private int value;
private String code;
@ -4114,4 +4130,199 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
* plc状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PLC_STATUS {
UN_CONNECT(0, "断开"),
CONNECT(1, "连接");
private int value;
private String description;
MES_PLC_STATUS(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 String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MES_生产队列散件清单 选配类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_OPTION_TYPE {
OPTION_PART(1, "选配件"),
BOM_DISASSEMBLY(2, "BOM拆解");
private int value;
private String description;
MES_OPTION_TYPE(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 Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 绑定模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum KEY_BIND_MODE {
PRODUCE_BOM_BIND(10, "产品BOM绑定"),
SCATTER_BOM_BIND(20, "散件BOM绑定");
private int value;
private String description;
KEY_BIND_MODE(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 Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 不良品处理类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BAD_HANDLE_TYPE {
BACK_SPRAY(10, "BACK_SPRAY", "返喷"),
SCRAPPED(20, "SCRAPPED", "报废"),
POLISHING(30, "POLISHING", "抛光"),
DETERMIND(40, "DETERMIND", "待定");
private int value;
private String code;
private String description;
BAD_HANDLE_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 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 String valueOfDescription(int val) {
return valueOf(val);
}
}
}

38
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
Unescape Escape View File

@ -1281,7 +1281,7 @@ public class PtlPcnEnumUtil {
}
/**
* mes-pcn定时任务同步结果状态
* ptl-pcn定时任务同步结果状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_PCN_TASK_SYNC_STATUS {
@ -1583,4 +1583,40 @@ public class PtlPcnEnumUtil {
return tmp;
}
}
/**
* 同步标识
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYNC_FLAG {
UNSYNC(1, "未同步"),
SYNCED(2, "已同步");
private int value;
private String description;
SYNC_FLAG(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;
}
}
}

845
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -514,7 +514,8 @@ public class WmsEnumUtil {
NC_LOCATE(60, "N", "NC库"),
SPILLAGE_LOCATE(70, "Y", "溢料库"),
TRANSIT_LOCATE(80, "T", "在途库"),
UTENSIL_LOCATE(90, "U", "器具库");
UTENSIL_LOCATE(90, "U", "器具库"),
OPERATION_PALTFORM(100, "W", "工作台");
private int value;
private String code;
@ -726,7 +727,12 @@ public class WmsEnumUtil {
TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
LOADING_ORDER(530, "LOADING_ORDER", "装车单"),
SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途");
SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"),
FORK_INSTORE(550, "FORK_INSTORE", "叉车入库"),
CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "AGV料车出库"),
CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"),
AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"),
FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库");
private int value;
private String code;
private String description;
@ -769,6 +775,19 @@ public class WmsEnumUtil {
return tmp;
}
public static OUT_MOVEMENT_BUSI_TYPE codeOfs(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;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -921,7 +940,8 @@ public class WmsEnumUtil {
VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"),
TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料");
TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料"),
INTELLIGENT("INTELLIGENT", "智能化");
private String value;
private String description;
@ -1347,7 +1367,8 @@ public class WmsEnumUtil {
PART_COVERAGE(110, "物料分类覆盖"),
TOUCH(120, "动碰"),
ZORE_STOCK(130, "零库存"),
MATERIAL_COVERAGE(140, "物料覆盖");
MATERIAL_COVERAGE(140, "物料覆盖"),
CHECK(150, "点检");
private int value;
private String description;
@ -3361,6 +3382,7 @@ public class WmsEnumUtil {
public enum SRC_STATUS {
ZMMES("ZMMES", "知明MES"),
TBMES("TBMES", "MES接口"),
TGMES("TGMES", "泰国MES"),
AMP("AMP", "AMP系统"),
DR("DR", "直送拉动");
@ -3379,6 +3401,16 @@ public class WmsEnumUtil {
public String getDescription() {
return description;
}
public static String descriptionOfValue(String value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
public static Map<String, Object> getEnumByName(String enumName) throws Exception {
@ -4133,7 +4165,8 @@ public class WmsEnumUtil {
MENU_OPT(30, "MENU_OPT", "手工操作"),
AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"),
CREATE_DOCMOVE(50, "CREATE_DOCMOVE", "生成移库单"),
UPDATE_TASK(60, "UPDATE_TASK", "复用任务");
UPDATE_TASK(60, "UPDATE_TASK", "复用任务"),
AUTO_INSTORE_DOCMOVE(70, "AUTO_INSTORE", "自动入库移库单");
private int value;
private String code;
private String description;
@ -7550,16 +7583,16 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCAN_CATEGORY {
ASN(10, "wmsDoMovementMasterRepository", "ASN"),
PO(20, "wmsDoMovementMasterRepository", "PO"),
SO(30, "wmsDoMovementMasterRepository", "SO"),
MOVE(40, "wmsDoMovementMasterRepository", "移库单"),
IN_STOCK(50, "wmsDoMovementMasterRepository", "入库单"),
SHIPPING(60, "wmsDoMovementMasterRepository", "发运单"),
QC(70, "wmsDoMovementMasterRepository", "质检单"),
ASN(10, "wmsDocMovementMasterRepository", "ASN"),
PO(20, "wmsDocMovementMasterRepository", "PO"),
SO(30, "wmsDocMovementMasterRepository", "SO"),
MOVE(40, "wmsDocMovementMasterRepository", "移库单"),
IN_STOCK(50, "wmsDocMovementMasterRepository", "入库单"),
SHIPPING(60, "wmsDocMovementMasterRepository", "发运单"),
QC(70, "wmsQCMasterRepository", "质检单"),
CS(80, "wmsCSOrderMasterRepository", "盘点单"),
SN(90, "wmsStockSnRepository", "条码"),
PO_SN(100, "wmsPoSnRepository", "收货条码");
PO_SN(100, "wmsPoSnRepository,wmsASNMasterDetailsRepository", "收货条码");
private int value;
private String code;
@ -7635,4 +7668,790 @@ public class WmsEnumUtil {
return null;
}
}
/**
* 策略等级
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRACTICS_GRADE {
ONE_TRACTICS_GRADE(10, "ONE_TRACTICS_GRADE", "1级策略"),
TWO_TRACTICS_GRADE(20, "TWO_TRACTICS_GRADE", "2级策略"),
THREE_TRACTICS_GRADE(30, "THREE_TRACTICS_GRADE", "3级策略");
private int value;
private String code;
private String description;
TRACTICS_GRADE(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 TRACTICS_GRADE 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;
}
}
/**
* 策略组
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRACTICS_GROUP {
INSTOCK(10, "INSTOCK", "上架"),
PICKING(20, "PICKING", "拣货");
private int value;
private String code;
private String description;
TRACTICS_GROUP(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 TRACTICS_GROUP 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;
}
}
/**
* 上架:策略项:1级策略
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INSTOCK_TRACTICS_ITEM_ONE {
COI_RECOMMEND(10, "COI_RECOMMEND", "COI推荐"),
ADJACENT_RECOMMEND(20, "ADJACENT_RECOMMEND", "高频推荐(相邻)"),
AREA_RECOMMEND(30, "AREA_RECOMMEND", "区域随机推荐"),
INERTIA_RECOMMEND(40, "INERTIA_RECOMMEND", "惯性推荐"),
ARTIFICIAL_RECOMMEND(50, "ARTIFICIAL_RECOMMEND", "人工指定");
private int value;
private String code;
private String description;
INSTOCK_TRACTICS_ITEM_ONE(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 INSTOCK_TRACTICS_ITEM_ONE 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;
}
}
/**
* 上架:策略项:2级策略
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INSTOCK_TRACTICS_ITEM_TWO {
FULL_RECOMMEND(10, "FULL_RECOMMEND", "放满推荐"),
EMPTY_RECOMMEND(20, "EMPTY_RECOMMEND", "空位推荐");
private int value;
private String code;
private String description;
INSTOCK_TRACTICS_ITEM_TWO(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 INSTOCK_TRACTICS_ITEM_TWO 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;
}
}
/**
* 上架:策略项:3级策略
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INSTOCK_TRACTICS_ITEM_THREE {
FCL_RECOMMEND(10, "FCL_RECOMMEND", "整箱推荐"),
EMPTY_BOX_RECOMMEND(20, "EMPTY_BOX_RECOMMEND", "零箱推荐"),
WHOLE_BOX_RECOMMEND(30, "WHOLE_BOX_RECOMMEND", "整零箱推荐");
private int value;
private String code;
private String description;
INSTOCK_TRACTICS_ITEM_THREE(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 INSTOCK_TRACTICS_ITEM_THREE 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;
}
}
/**
* 拣货:策略项:1级策略
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PICKING_TRACTICS_ITEM_ONE {
ABSOLUTE_PATH(10, "ABSOLUTE_PATH", "绝对路径"),
RELATIVE_PATH(20, "RELATIVE_PATH", "相对路径"),
LOCATE_ORDER_BY(30, "LOCATE_ORDER_BY", "库位编号排序");
private int value;
private String code;
private String description;
PICKING_TRACTICS_ITEM_ONE(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 PICKING_TRACTICS_ITEM_ONE 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;
}
}
/**
* 库位坐标是否允许偏移
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DOWN_OR_UP {
IS_TRUE(10, "IS_TRUE", "允许"),
IS_FALSE(20, "IS_FALSE", "不允许");
private int value;
private String codeValue;
private String description;
DOWN_OR_UP(int value, String codeValue, String description) {
this.value = value;
this.codeValue = codeValue;
this.description = description;
}
public int getValue() {
return value;
}
public String getCodeValue() {
return codeValue;
}
public String getDescription() {
return description;
}
}
/**
* 动作类型
* 10-锁定库位，20-锁定库存、30-锁定料车、40-解锁库存、50-解锁库位、60-解锁料车、70-生成任务、
* 80-取消任务、90-递进交换
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STRATEGY_ACTION_TYPE {
LOCKING_LOCATE(10, "LOCKING_LOCATE", "锁定库位"),
LOCKING_IN_STOCK(20, "LOCKING_IN_STOCK", "锁定库存"),
LOCKING_FEED_CAR(30, "LOCKING_FEED_CAR", "锁定料车"),
UNLOCK_IN_STOCK(40, "UNLOCK_IN_STOCK", "解锁库存"),
UNLOCK_LOCATE(50, "UNLOCK_LOCATE", "解锁库位"),
UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"),
GENERATE_TASK(70, "GENERATE_TASK", "生成任务"),
CANCEL_TASK(80, "CANCEL_TASK", "取消任务"),
PROGRESSIVE_EXCHANGE(90, "PROGRESSIVE_EXCHANGE", "递进交换");
private int value;
private String code;
private String description;
STRATEGY_ACTION_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 STRATEGY_ACTION_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;
}
}
/**
* 自动化策略 数量控制
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AUTO_STRATEGY_QTY_CONTROL {
LESS_SEND(10, "少发"),
MANY_SEND(20, "多发"),
CONSISTENT(30, "一致");
private int value;
private String description;
AUTO_STRATEGY_QTY_CONTROL(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static AUTO_STRATEGY_QTY_CONTROL codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
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;
}
}
/**
* 自动入库任务
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AUTO_FORK_TASK_TYPE {
START(10, "start", "start"),
END(20, "end", "end");
private int value;
private String code;
private String description;
AUTO_FORK_TASK_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 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 String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* AUTO 命令状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AUTO_FORK_TASK_STATUS {
CREATE(10, "新建"),
PROCESSING(20, "处理中"),
COMPLETE(30, "已完成"),
ERROR(40, "处理异常");
private int value;
private String description;
AUTO_FORK_TASK_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static AUTO_FORK_TASK_STATUS codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
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;
}
}
/**
* 自动化日志记录-操作类型
* 10-单据生成，20-策略动作、30-任务生成、40-START、50-END、60-其它
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OPERATE_TYPE {
ORDER_GENERATE(10, "ORDER_GENERATE", "单据生成"),
STRATEGIC_ACTION(20, "STRATEGIC_ACTION", "策略动作"),
TASK_GENERATE(30, "TASK_GENERATE", "任务生成"),
START(40, "START", "START"),
END(50, "END", "END"),
OTHER(60, "OTHER", "其它");
private int value;
private String code;
private String description;
OPERATE_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 OPERATE_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;
}
}
}

30
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -392,7 +392,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> listPager(Pager pager) {
if (pager.getTotalRows() > 0) {
if (pager != null) {
return entityManager.createQuery("from " + persistentClass.getName())
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
@ -649,7 +649,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff;
return entityManager.createQuery(queryString)
.setParameter(propertyName, value)
@ -661,7 +661,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
@ -792,7 +792,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) {
if(pager.getTotalRows() > 0){
if(pager != null){
if(propertyNames.length != values.length){
throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
}
@ -827,7 +827,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Deprecated
@Override
public List<T> findByHqlWherePage(String hqlWhere, Pager pager) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
@ -846,7 +846,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlWherePage(DdlPackBean packBean, Pager pager) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
+ " as model where 1=1 " + packBean.getPackedHql());
@ -924,7 +924,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlPage(String hqlWhere, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
StringBuffer queryString = new StringBuffer();
queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
@ -943,7 +943,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlPage(DdlPackBean packBean, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
+ " as model where 1=1 " + packBean.getPackedHql());
@ -961,7 +961,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
@ -989,7 +989,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List findBySqlPage(String sql, Pager pager) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
return entityManager.createNativeQuery(sql)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
@ -1001,7 +1001,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<?> findBySqlPage(String sql, Class entity, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
return entityManager.createNativeQuery(sql,entity)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())
@ -1114,7 +1114,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<T> findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
StringBuffer queryString = new StringBuffer();
queryString.append(hql + " as model where 1=1 ");
@ -1153,7 +1153,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<Object[]> findByHqlPageObjects(String hql, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
}else{
return new ArrayList<Object[]>();
@ -1162,7 +1162,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<Object[]> findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) {
if(pager.getTotalRows() > 0) {
if(pager != null) {
Query queryObject = entityManager.createQuery(hql);
for (int i = 0; i < paramName.length; i++) {
if (paramValue[i] != null) {
@ -1183,7 +1183,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public List<Object[]> findBySqlObjListByPager(String sql, Pager pager) {
if(pager.getTotalRows() > 0){
if(pager != null){
return entityManager.createNativeQuery(sql)
.setFirstResult(pager.getStartRow())
.setMaxResults(pager.getPageSize())

2
modules/i3plus-pojo-form/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

6
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
Unescape Escape View File

@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
@ -108,4 +110,8 @@ public class BfMethodDetailProperty extends BaseBean {
@Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD")
@ApiParam(value ="关联对象元素属性Code")
private String secElementPropertyCodeRdd;
@Transient
@ApiParam(value ="表单功能明细关联属性")
private List<BfMethodDetailPropertyRef> refList;
}

64
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java
Unescape Escape View File

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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 : yunhao
* @CreateDate : 2019-03-21 21:03
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_METHOD_DETAIL_PROPERTY")
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
public class BfMethodDetailPropertyRef extends BaseBean {
private static final long serialVersionUID = -7541677357317732343L;
@Column(name="DETAIL_PROPERTY_ID")
@ApiParam(value ="功能明细关联属性id")
@JsonSerialize(using = ToStringSerializer.class)
private Long detailPropertyId;
@Column(name="PRI_ELEMENT_PROPERTY_ID")
@ApiParam(value ="主对象元素属性id")
@JsonSerialize(using = ToStringSerializer.class)
private Long priElementPropertyId;
@Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD")
@ApiParam(value ="主对象元素属性名称")
private String priElementPropertyNameRdd;
@Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD")
@ApiParam(value ="主对象元素属性code")
private String priElementPropertyCodeRdd;
@Column(name="SEC_ELEMENT_PROPERTY_ID")
@ApiParam(value ="关联对象元素属性id")
@JsonSerialize(using = ToStringSerializer.class)
private Long secElementPropertyId;
@Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD")
@ApiParam(value ="关联对象元素属性名称")
private String secElementPropertyNameRdd;
@Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD")
@ApiParam(value ="关联对象元素属性Code")
private String secElementPropertyCodeRdd;
}

14
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfElementConstraintPropertyRepository.java
Unescape Escape View File

@ -1,14 +0,0 @@
//package cn.estsh.i3plus.pojo.form.repository;
//
//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
//import cn.estsh.i3plus.pojo.form.bean.BfElementConstraintProperty;
//
///**
// * @Description : 元素约束属性
// * @Reference :
// * @Author : yunhao
// * @CreateDate : 2019-03-21 20:27
// * @Modify:
// **/
//public interface BfElementConstraintPropertyRepository extends BaseRepository<BfElementConstraintProperty, Long> {
//}

14
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/repository/BfMethodDetailPropertyRefRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.form.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.form.bean.BfMethodDetailPropertyRef;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-06-16 16:56
* @Modify:
**/
public interface BfMethodDetailPropertyRefRepository extends BaseRepository<BfMethodDetailPropertyRef, Long> {
}

14
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
Unescape Escape View File

@ -394,7 +394,6 @@ public final class FormHqlPack {
return ddlPackBean;
}
/**
* 数据对象查询条件拼接
* @param bfCascade
@ -409,4 +408,17 @@ public final class FormHqlPack {
return ddlPackBean;
}
/**
* 数据对象查询条件拼接
* @param bfMethodDetailPropertyRef
* @return
*/
public static DdlPackBean packHqlBfMethodDetailPropertyRef(BfMethodDetailPropertyRef bfMethodDetailPropertyRef){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfMethodDetailPropertyRef);
DdlPreparedPack.getNumEqualPack(bfMethodDetailPropertyRef.getDetailPropertyId(), "detailPropertyId", ddlPackBean);
return ddlPackBean;
}
}

2
modules/i3plus-pojo-hardswitch/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-ics/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-jobflow/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-lac/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mdm/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

12
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
Unescape Escape View File

@ -30,12 +30,13 @@ public abstract class BaseMdmBean extends BaseBean {
@Transient
@ApiModelProperty("是否主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
@Column(name = "MDM_VERSION")
@ApiModelProperty("mdm数据版本")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
private Long mdmVersion;
public long getMdmVersionVal() {
@ -50,21 +51,26 @@ public abstract class BaseMdmBean extends BaseBean {
@Column(name = "IS_MDM_PUBLISHED")
@ApiModelProperty("是否发布")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
private Integer isMdmPublished;
@Column(name = "MDM_OPERATE_TYPE")
@ApiModelProperty("操作类型")
@AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class)
@AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true)
private Integer mdmOperateType;
public Integer getMdmOperateTypeVal() {
return mdmOperateType == null ? MdmEnumUtil.MDM_OPERATE_TYPE.INSERT.getValue() : mdmOperateType;
}
public String getMdmOperateTypeTxt(){
return MdmEnumUtil.MDM_OPERATE_TYPE.valueOfDescription(getMdmOperateTypeVal());
}
@Column(name = "MDM_REF_ID")
@ApiModelProperty("关联id")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
private Long mdmRefId;
//排序方式

12
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java
Unescape Escape View File

@ -28,22 +28,22 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean {
@Transient
@ApiModelProperty("是否主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Transient
@ApiModelProperty("主数据Class")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Class<BaseMdmBean> mdmMasterClass = BaseMdmBean.class;
@AnnoOutputColumn(hidden = true)
protected static Class<BaseMdmBean> mdmMasterClass = BaseMdmBean.class;
@Transient
@ApiModelProperty("软件模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Integer mdmSoftType;
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
protected static Integer mdmSoftType;
@Column(name = "MDM_MASTER_ID")
@ApiModelProperty("主数据id")
@JsonSerialize(using = ToStringSerializer.class)
private Long mdmMasterId;
public Long mdmMasterId;
}

10
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java
Unescape Escape View File

@ -11,6 +11,11 @@ import io.swagger.annotations.ApiModelProperty;
**/
public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends BaseMdmBusiExtdBean> {
public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
this.mdmMasterBean = mdmMasterBean;
this.mdmBusiBean = mdmBusiBean;
}
@ApiModelProperty("主数据")
private M mdmMasterBean;
@ -20,11 +25,6 @@ public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends Base
public BaseMdmBusiModelBean() {
}
public BaseMdmBusiModelBean(M mdmMasterBean, B mdmBusiBean) {
this.mdmMasterBean = mdmMasterBean;
this.mdmBusiBean = mdmBusiBean;
}
/**
* 获取主数据m
*

12
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java
Unescape Escape View File

@ -31,10 +31,18 @@ public class MdmSyncData implements Serializable {
return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType;
}
public String getSyncTypeTxt(){
return syncType == null ? "无":MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType);
}
@ApiModelProperty("同步模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class)
private Integer syncSoftType;
public String getSyncSoftTypeTxt(){
return syncSoftType == null ? "无":CommonEnumUtil.SOFT_TYPE.valueOfDescription(syncSoftType);
}
@ApiModelProperty("是否是主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
private Integer isMasterData;
@ -43,6 +51,10 @@ public class MdmSyncData implements Serializable {
return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData;
}
public String getIsMasterDataTxt(){
return isMasterData == null ? "无":CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData);
}
@ApiModelProperty("同步数据class")
private String syncDataClass;

4
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java
Unescape Escape View File

@ -36,12 +36,12 @@ public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean {
@Transient
@ApiModelProperty("主数据Class")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(hidden = true)
public static Class mdmMasterClass = MdmGear.class;
@Transient
@ApiModelProperty("软件模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
@Column(name = "CORE_NUM")

13
modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/MdmHqlPack.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
import java.util.List;
@ -43,7 +44,17 @@ public class MdmHqlPack {
DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
DdlPreparedPack.getStringLikerPack(mdmGear.getName(),"name",ddlPackBean);
DdlPreparedPack.timeBuilder(mdmGear.getCreateDatetime(),"createDatetime",ddlPackBean,false,true);
DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
return ddlPackBean;
}
public static DdlPackBean packHqlMdmGearCoreExtd(MdmGearCoreBusiExtd mdmGear) {
DdlPackBean ddlPackBean = getMdmPackBean(mdmGear);
DdlPreparedPack.getNumEqualPack(mdmGear.getId(),"id",ddlPackBean);
DdlPreparedPack.getNumEqualPack(mdmGear.getMdmMasterId(),"mdmMasterId",ddlPackBean);
DdlPreparedPack.timeBuilder(mdmGear.getModifyDatetime(),"modifyDatetime",ddlPackBean,false,true);
return ddlPackBean;
}

2
modules/i3plus-pojo-mes-pcn/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-pojo-mes/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-PROD-SNAPSHOT</version>
<version>1.0-TEST-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

90
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java
Unescape Escape View File

@ -0,0 +1,90 @@
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.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :不良信息接口表
* @Reference :
* @Author : siliter.yuan
* @CreateDate : 2020-06-28
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_DEFECT_DATA")
@Api("不良信息接口数据")
public class IfDefectData extends BaseBean implements Serializable {
private static final long serialVersionUID = 4320604250440221049L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serailNumber;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "DEFECT_NAME")
@ApiParam("缺陷名称")
private String defectName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private Integer defectActionType;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "SYNC_STATUS")
@ApiParam("同步状态")
private Integer syncStatus;
@Lob
@Column(name = "ERROR_MESSAGE")
@ApiParam("异常消息")
private String errorMessage;
@Column(name = "ACTION_TYPE")
@ApiParam("动作代码")
private String actionType;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
private String ifCode;
}

56
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java
Unescape Escape View File

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

10
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java
Unescape Escape View File

@ -40,9 +40,13 @@ public class IfPackageDetail extends BaseBean implements Serializable {
private String partName;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "PACKAGE_NO")
@ApiParam("包装条码")
private String packageNo;
@ -107,4 +111,8 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@Column(name = "CUST_DELIVERY_LOCATION")
@ApiParam("客户发往地")
private String custDeliveryLocation;
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
Unescape Escape View File

@ -123,4 +123,12 @@ public class IfProductOffLine extends BaseBean implements Serializable {
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
}

24
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
Unescape Escape View File

@ -79,7 +79,6 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@ -109,6 +108,10 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("原材料物料号")
private String itemPartNo;
@Column(name = "CUST_PART_NO")
@ApiParam("客户物料号")
private String custPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料物料名称")
private String itemPartName;
@ -121,4 +124,23 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("原材料物料用量")
private String itemUnit;
@Column(name = "JIT_SEQ")
@ApiParam("jit排序号")
private Double jitSeq;
@Column(name = "JIT_TYPE_FLAG")
@ApiParam("JIT类型标识")
private String jitTypeFlag;
@Column(name = "CUST_POINT_DATE")
@ApiParam("客户需求时间")
private String custPointDate;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "DOCK_NO")
@ApiParam("道口")
private String dockNo;
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -66,6 +67,13 @@ public class MesCellFeed extends BaseBean implements Serializable {
@ApiParam("供应商代码")
private String supplierCode;
@Transient
@ApiParam("工单号")
private String orderNo;
@Transient
@ApiParam(value = "原料类型名称")
private String rawTypeName;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;

6
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java
Unescape Escape View File

@ -30,6 +30,11 @@ import java.io.Serializable;
@Api("工位投料履历信息")
public class MesCellFeedRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971369489107783L;
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@ -66,7 +71,6 @@ public class MesCellFeedRecord extends BaseBean implements Serializable {
@ApiParam("供应商代码")
private String supplierCode;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java
Unescape Escape View File

@ -45,4 +45,8 @@ public class MesCustomerPart extends BaseBean implements Serializable {
@Column(name = "CUSTOMER_PART_NAME")
@ApiParam("客户零件描述")
private String customerPartName;
@Column(name = "CUSTOMER_CFG_CODE")
@ApiParam("客戶配置代碼")
private String customerCfgCode;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java
Unescape Escape View File

@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable {
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "DEFECT_FLAG_VALUE")
@ApiParam("缺陷标识值")
private String defectFlagValue;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;

12
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
Unescape Escape View File

@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -81,14 +80,17 @@ public class MesDefectRecord extends BaseBean implements Serializable {
@ApiParam("备注")
private String memo;
// @Column(name = "WORK_ORDER_NO")
// @ApiParam("工单号")
// private String workOrderNo;
@Column(name = "DEFECT_ACTION_TYPE")
@ApiParam("不良处理类型")
private Integer defectActionType;
@Transient
private List<MesDefect> mesDefectList;
@Transient
@ApiParam("后移数量")
private Integer backwardNum;
public int getRepairStatusVal() {
return this.repairStatus == null ? 0 : this.repairStatus;
}

52
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java
Unescape Escape View File

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

64
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java
Unescape Escape View File

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
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:
* @Reference:
* @Author: wangjie
* @CreateDate: 2019\11\5 10:47
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EXTEND_OBJECT_CFG")
@Api("扩展对象结构")
public class MesExtendObjectCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -6773040095905972250L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name = "FIELD_CODE")
@ApiParam("扩展字段代码")
private String fieldCode;
@Column(name = "FIELD_NAME")
@ApiParam("扩展字段名称")
private String fieldName;
@Column(name = "FIELD_TYPE")
@ApiParam("扩展字段类型")
@AnnoOutputColumn(refClass = MesEnumUtil.DATA_FORMAT.class, refForeignKey = "value", value = "description")
private Integer fieldType;
@Column(name = "FIELD_LENGTH")
@ApiParam("扩展字段长度")
private String fieldLength;
@Column(name = "DEFAULT_VALUE")
@ApiParam("默认值")
private String defaultValue;
@Column(name = "FIELD_DESC")
@ApiParam("扩展字段描述")
private String fieldDesc;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
Unescape Escape View File

@ -55,6 +55,10 @@ public class MesKpData extends BaseBean implements Serializable {
@ApiParam("数据下限")
private Double lowerLimit;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;

41
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java
Unescape Escape View File

@ -0,0 +1,41 @@
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_模具_零件对照表
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_MOULD_PART")
@Api("MES_模具_零件对照表")
public class MesMouldPart extends BaseBean implements Serializable {
private static final long serialVersionUID = -773118210589936438L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "MOULD_CODE")
@ApiParam("模具代码")
private String mouldCode;
}

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
Unescape Escape View File

@ -43,7 +43,7 @@ public class MesPackSpec extends BaseBean implements Serializable {
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "包装数量", example = "0")
private Double qty;
private Double qty = 0d;
@Column(name = "QTY2")
@ColumnDefault("0")

10
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
Unescape Escape View File

@ -118,6 +118,16 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("客户发往地")
private String custDeliveryLocation;
// 赋值模板代码
@Column(name = "PACKAGE_LABEL_TEMPLATE")
@ApiParam("包装标签模板")
private String packageLabelTemplate;
// 二维码
@Column(name = "QR_CODE")
@ApiParam("包装二维码")
private String qrCode;
public MesPackage() {
}

24
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
Unescape Escape View File

@ -48,6 +48,10 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("零件规格")
private String partSpec;
@Column(name = "PART_SPEC_QTY")
@ApiParam("标准包规数量")
private Double partSpecQty;
@Column(name = "CATEGORY_CODE1")
@ApiParam("分类1")
private String categoryCode1;
@ -96,6 +100,26 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam("物料特性")
private Integer partTrait;
@Column(name = "COLOR_CODE")
@ApiParam("颜色代码")
private String colorCode;
@Column(name = "SHELVES_AMOUNT")
@ApiParam("挂架数")
private Integer shelvesAmount;
@Column(name = "QUANTITY_PER_RACK")
@ApiParam("挂架可放零件数")
private Integer quantityPerRack;
@Column(name = "PAINT_TANK_CODE")
@ApiParam("供漆罐代码")
private String paintTankCode;
@Column(name = "PRE_PART_NO")
@ApiParam("打磨件物料号")
private String prePartNo;
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;

12
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -56,4 +57,15 @@ public class MesPartCheck extends BaseBean implements Serializable {
@ApiParam("校验表达式描述")
private String recordNumDesc;
@Transient
@ApiParam("复核结果")
private Integer reviewResult = 1;
@Transient
@ApiParam("对象名称")
private String objectCodeName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java
Unescape Escape View File

@ -38,6 +38,14 @@ public class MesPartFormula extends BaseBean implements Serializable {
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "FORMULA_DESC")
@ApiParam("配方描述")
private String formulaDesc;
@Column(name = "QTY")
@ApiParam("配方零件总数")
private Integer qty;
@Column(name = "FORMULA_TYPE")
@ApiParam("配方类型")
private Integer formulaType;

37
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProdCfgType.java
Unescape Escape View File

@ -0,0 +1,37 @@
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;
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "MES_PART_PROD_CFG_TYPE")
@EqualsAndHashCode(callSuper = true)
@Api("MES_物料项目关系")
public class MesPartProdCfgType extends BaseBean implements Serializable {
private static final long serialVersionUID = -640972198237355570L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
}

50
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartTakt.java
Unescape Escape View File

@ -0,0 +1,50 @@
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 javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :MES_生产节拍
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLAN_TAKT")
@Api("MES_生产节拍")
public class MesPartTakt extends BaseBean implements Serializable {
private static final long serialVersionUID = -7731182105899332278L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("零件名称")
private String partName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "PLAN_TAKT")
@ApiParam("节拍")
private Integer planTakt;
}

1
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java
Unescape Escape View File

@ -11,6 +11,7 @@ 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;

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
Unescape Escape View File

@ -112,7 +112,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
@ApiParam("产品条码零件名称")
private String partName;
@Transient
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料零件名称")
private String itemPartName;

50
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java
Unescape Escape View File

@ -0,0 +1,50 @@
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 :产品工作中心配置
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_WORK_CENTER")
@Api("产品工作中心配置")
public class MesProdWorkCenter extends BaseBean implements Serializable {
private static final long serialVersionUID = 9215737252535074536L;
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "IS_DEFAULT")
@ApiParam("是否默认")
private Integer isDefault;
@Column(name = "PART_SN")
@ApiParam("料箱条码")
private String partSn;
}

6
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java
Unescape Escape View File

@ -26,7 +26,7 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_CATEGORY")
@Api("系统业务动作")
@Api("MES_产品位置")
public class MesProduceCategory extends BaseBean implements Serializable {
private static final long serialVersionUID = -992595557921651448L;
@ -37,4 +37,8 @@ public class MesProduceCategory extends BaseBean implements Serializable {
@Column(name = "PRODUCE_CTGY_NAME")
@ApiParam("产品类型名称")
private String produceCategoryName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
}

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
Unescape Escape View File

@ -140,6 +140,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("产品标签模板")
private String prodLabelTemplate;
@Column(name = "CUST_LABEL_TEMPLATE")
@ApiParam("客户标签模板")
private String custLabelTemplate;
@Column(name = "LOT_NO")
@ApiParam("生产批次")
private String lotNo;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")
@ -173,7 +181,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("条码类型名称")
private String snTypeName;
@Transient
@ApiParam("条码打印状态名称")
private String printStatusName;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public Integer lockVersion;
public MesProduceSn() {
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
Unescape Escape View File

@ -118,6 +118,14 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
@ApiParam("客户产线代码")
private String custProdLineCode;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "IS_LOCK")
@ApiParam("锁定标识")
private Integer isLock;
@Transient
@ApiParam("客户需求开始时间")
private String custPointStartDate;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
Unescape Escape View File

@ -56,6 +56,10 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
@ApiParam("用量")
private Double qty = 0d;
@Column(name = "DOCK_NO")
@ApiParam("道口")
private String dockNo;
@Column(name = "PART_COLOR_VALUE")
@ApiParam("零件色值")
private String partColorValue;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
Unescape Escape View File

@ -89,6 +89,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@ApiParam("选项代码")
private String optionCode;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;

44
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
Unescape Escape View File

@ -10,7 +10,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
@ -53,7 +55,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
@Column(name = "SEQ")
@ApiParam("计划排序号")
private String seq;
private Double seq;
@Column(name = "STATUS")
@ApiParam("状态")
@ -74,4 +76,44 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
@Column(name = "VERSION")
@ApiParam("版本号")
private String version;
@Column(name = "JIT_SEQ")
@ApiParam("JIT排序号")
private String jitSeq;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商编号")
private String supplierCode;
@Column(name = "SUPPLIER_NAME")
@ApiParam("供应商名称")
private String supplierName;
@Column(name = "FILE_NAME")
@ApiParam("解析文件名")
private String fileName;
@Column(name = "FILE_URL")
@ApiParam("解析文件路径")
private String fileUrl;
@Column(name = "WORK_ORDER_TYPE")
@ApiParam("工单类型")
private Integer workOrderType;
@Transient
@ApiParam("计划上线开始时间")
private String planStartDate;
@Transient
@ApiParam("计划上线结束时间")
private String planEndDate;
}

10
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java
Unescape Escape View File

@ -35,13 +35,17 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable {
@ApiParam("队列编号")
private String jisPlanNo;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "ITEM_PART_NO")
@ApiParam("原材料物料号")
private String itemPartNo;
@Column(name = "CUST_PART_NO")
@ApiParam("客户物料号")
private String custPartNo;
@Column(name = "DOCK_NO")
@ApiParam("道口")

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java
Unescape Escape View File

@ -44,6 +44,18 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("产品名称")
@ApiParam("物料名称")
private String partName;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "CUST_PART_NO")
@ApiParam("客户物料号")
private String custPartNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
Unescape Escape View File

@ -65,11 +65,11 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
private String workType;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品类型代码")
@ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "PRODUCE_CATEGORY_NAME_RDD")
@ApiParam("产品类型名称")
@ApiParam("产品位置名称")
private String produceCategoryNameRdd;
@Column(name = "PPT_CODE")
@ -104,6 +104,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("组件编号")
private String assyNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Transient
@ApiParam("队列序号")
private Double queueSeq;

88
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterBomCfg.java
Unescape Escape View File

@ -0,0 +1,88 @@
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 adair.song
* @date 2020/06/17 13:12
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "MES_SCATTER_BOM_CFG")
@EqualsAndHashCode(callSuper = true)
@Api("MES_散件BOM配置")
public class MesScatterBomCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 521506217898252289L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "CUSTOMER_PART_NO")
@ApiParam("客户零件号")
private String customerPartNo;
@Column(name = "PART_LOCATION1")
@ApiParam("产品位置1")
private String partLocation1;
@Column(name = "PART_LOCATION2")
@ApiParam("产品位置2")
private String partLocation2;
@Column(name = "PART_LOCATION3")
@ApiParam("产品位置3")
private String partLocation3;
@Column(name = "PART_LOCATION4")
@ApiParam("产品位置4")
private String partLocation4;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "CATEGORY_CODE2")
@ApiParam("类型2")
private String categoryCode2;
@Column(name = "CATEGORY_CODE3")
@ApiParam("类型3")
private String categoryCode3;
@Column(name = "IS_BIND_KEY")
@ApiParam("是否关键件")
private Integer isBindKey = 1;
@Column(name = "CHECK_GROUP")
@ApiParam("校验分组号")
private String checkGroup;
@Column(name = "OPTION_CODE")
@ApiParam("选项代码")
private String optionCode;
@Column(name = "RECIPE_ITEM")
@ApiParam("配方项")
private String recipeItem;
@Column(name = "RECIPE_SEQ")
@ApiParam("配方序号")
private String recipeSeq;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java
Unescape Escape View File

@ -78,6 +78,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
@ApiParam("状态类型 10=初始化状态")
private Integer statusType;
@Column(name = "SEQ")
@ApiParam("状态点顺序")
private Integer seq;
@Transient
@ApiParam("状态点是否完成")
private boolean isComplete;

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
Unescape Escape View File

@ -130,6 +130,22 @@ public class MesStationBom extends BaseBean implements Serializable {
@ApiParam("主任务编号")
private String orderNo;
@Transient
@ApiParam("产品类型代码")
private String produceCategoryCode;
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;
@Transient
@ApiParam("字符长度")
private Integer length;
@Transient
@ApiParam("校验内容")
private String checkContent;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

31
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java
Unescape Escape View File

@ -11,7 +11,10 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description :工步参数
@ -49,4 +52,32 @@ public class MesStepParam extends BaseBean implements Serializable {
@Column(name = "PARAM_ATTRIBUTE")
@ApiParam("参数属性 text select")
private String paramAttribute;
@Column(name = "EXHIBITION_KEY")
@ApiParam("展示key")
private String exhibitionKey;
@Column(name = "EXHIBITION_VALUE")
@ApiParam("展示value")
private String exhibitionValue;
@Column(name = "OBJECT_CODE")
@ApiParam("参数对象")
private String objectCode;
@Column(name = "TYPE")
@ApiParam("type")
private Integer type = 0;
@Transient
@ApiParam("可选值的数据")
private List<Map<String, Object>> enumList;
@Transient
@ApiParam("key的值")
private Object geValue;
@Transient
@ApiParam("value的值")
private Object geDescription;
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
Unescape Escape View File

@ -79,6 +79,14 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable {
@ApiParam("显示颜色")
private String color;
@Column(name = "VIN_CODE")
@ApiParam("Vin")
private String vinCode;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品位置代码")
private String produceCategoryCode;
public double getQueueSeqVal() {
return this.queueSeq == null ? 0 : this.queueSeq;
}

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
Unescape Escape View File

@ -62,6 +62,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
@ApiParam("产能")
private Integer productionCapacity;
@Column(name = "GENERATE_TYPE")
@ApiParam("条码生成模式")
private Integer generateType;
@Transient
@ApiParam(value = "子集列表")
private List<MesWorkCell> childTreeList;

24
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
Unescape Escape View File

@ -153,6 +153,11 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("首检生成数量")
private Double fiGenerateQty;
@Lob
@Column(name = "EXTEND")
@ApiParam("扩展数据")
public String extend;
@Column(name = "RESERVED1")
@ApiParam("预留字段1")
private String reserved1;
@ -169,9 +174,9 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("预留字段4")
private String reserved4;
@Column(name = "RESERVED5")
@ApiParam("预留字段5")
private String reserved5;
@Column(name = "PARENT_PART_NO")
@ApiParam("父阶物料号")
private String parentPartNo;
@Version
@Column(name = "LOCK_VERSION")
@ -264,6 +269,18 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam(value = "完成按钮编号")
public String comButtonCode;
@Transient
@ApiParam("工单源序号")
private Double srcSeq;
@Transient
@ApiParam("零件号集合")
private String partNoList;
@Transient
@ApiParam("零件名称集合")
private String partNameList;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}
@ -295,4 +312,5 @@ public class MesWorkOrder extends BaseBean implements Serializable {
public int getApprovalStatusVal() {
return this.approvalStatus == null ? 0 : this.approvalStatus;
}
}

9
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java
Unescape Escape View File

@ -151,6 +151,11 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
@ApiParam("首检生成数量")
private Double fiGenerateQty;
@Lob
@Column(name = "EXTEND")
@ApiParam("扩展数据")
private String extend;
@Column(name = "RESERVED1")
@ApiParam("预留字段1")
private String reserved1;
@ -167,10 +172,6 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
@ApiParam("预留字段4")
private String reserved4;
@Column(name = "RESERVED5")
@ApiParam("预留字段5")
private String reserved5;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value = "工作中心名称")

53
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java
Unescape Escape View File

@ -0,0 +1,53 @@
package cn.estsh.i3plus.pojo.mes.bean.template;
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 javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/6/17 8:39 下午
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_DEFECT")
@Api("MES_工位缺陷")
public class MesWorkCellDefect extends BaseBean implements Serializable {
private static final long serialVersionUID = -528051790747923632L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;
@Column(name = "PART_ASSEMBLE")
@ApiParam("物料集")
private String partAssemble;
@Transient
@ApiParam("缺陷名称")
private String defectCodeName;
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java
Unescape Escape View File

@ -55,4 +55,7 @@ public class ButtonComponentReqModel {
@ApiParam("用户信息")
private String userInfo;
@ApiParam("json数据")
private String data;
}

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java
Unescape Escape View File

@ -30,4 +30,6 @@ public class CellFeedModel {
private String scanQty;
private String lineRemainQty;
}

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
Unescape Escape View File

@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@Api("数据复核model")
public class DataReviewStepModel {
public class DataReviewModel {
@ApiParam("关键件")
private String itemPartNo;
@ -25,5 +25,4 @@ public class DataReviewStepModel {
@ApiParam("对象代码")
private String objectCode;
}

21
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java
Unescape Escape View File

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

41
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java
Unescape Escape View File

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

181
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ExcelDataParamModel.java
Unescape Escape View File

@ -1,181 +0,0 @@
//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 org.apache.poi.ss.usermodel.CellStyle;
//import org.springframework.util.StringUtils;
//
//import java.io.Serializable;
//import java.math.BigDecimal;
//
///**
// * @Author: wangjie
// * @CreateDate: 2019/8/21 9:19 AM
// * @Description:
// **/
//@Data
//@NoArgsConstructor
//@AllArgsConstructor
//@Api("EXCEL参数model")
//public class ExcelDataParamModel<T> implements Serializable {
//
// public ExcelDataParamModel(Class<T> clazz){
// this.clazz = clazz;
// }
//
// @ApiParam("获取相对应的类，用来映射数据,如果不设置此值，那么整个数据将会用String[]作为数据，不再通过映射拿取数据")
// private Class<T> clazz;
//
// @ApiParam("对应类的映射字段名，String类型")
// private String[] strField;
//
// @ApiParam("对应类的标题，需要一一对应")
// private String[] titleStr;
//
// @ApiParam("大标题")
// private String title;
//
// @ApiParam("文件名，如果传入的ExcelDataParamModel是一个List的时候，以sheetNo = 1为文件名，如果sheetNo为空，则默认随机")
// private String fileName;
//
// @ApiParam("后缀")
// private String sufix;
//
// @ApiParam("大标题样式")
// private CellStyle bigTitleCellStyle;
//
// @ApiParam("标题样式")
// private CellStyle titleCellStyle;
//
// @ApiParam("数据样式")
// private CellStyle cellStyle;
//
// @ApiParam("sheet名")
// private String sheetName;
//
// @ApiParam("每个格子的宽度")
// private BigDecimal[] cellWidth;
//
// @ApiParam("如果传入的ExcelDataParamModel是List的时候，默认以sheetNo排序")
// private Integer sheetNo;
//
// @ApiParam("导出数据转换器")
// private QueryDataInterface queryDataInterface;
//
// public Class<T> getClazz() {
// return clazz;
// }
//
// public String[] getStrField() {
// return strField;
// }
//
// public String[] getTitleStr() {
// return titleStr;
// }
//
// public String getTitle() {
// if(StringUtils.isEmpty(this.title)){
// return "无效的标题";
// }else{
// return title;
// }
// }
//
// public String getFileName() {
// if(StringUtils.isEmpty(this.fileName)){
// return "未命名";
// }else{
// return this.fileName;
// }
// }
//
// public CellStyle getBigTitleCellStyle() {
// return bigTitleCellStyle;
// }
//
// public CellStyle getTitleCellStyle() {
// return titleCellStyle;
// }
//
// public CellStyle getCellStyle() {
// return cellStyle;
// }
//
// public String getSheetName() {
// return sheetName;
// }
//
// public Integer getSheetNo() {
// return sheetNo;
// }
//
// public BigDecimal[] getCellWidth() {
// return cellWidth;
// }
//
// public String getSufix() {
// return sufix;
// }
//
// public QueryDataInterface getQueryDataInterface() {
// return queryDataInterface;
// }
//
// public void setClazz(Class<T> clazz) {
// this.clazz = clazz;
// }
//
// public void setStrField(String[] strField) {
// this.strField = strField;
// }
//
// public void setTitleStr(String[] titleStr) {
// this.titleStr = titleStr;
// }
//
// public void setTitle(String title) {
// this.title = title;
// }
//
// public void setFileName(String fileName) {
// this.fileName = fileName;
// }
//
// public void setSufix(String sufix) {
// this.sufix = sufix;
// }
//
// public void setBigTitleCellStyle(CellStyle bigTitleCellStyle) {
// this.bigTitleCellStyle = bigTitleCellStyle;
// }
//
// public void setTitleCellStyle(CellStyle titleCellStyle) {
// this.titleCellStyle = titleCellStyle;
// }
//
// public void setCellStyle(CellStyle cellStyle) {
// this.cellStyle = cellStyle;
// }
//
// public void setSheetName(String sheetName) {
// this.sheetName = sheetName;
// }
//
// public void setCellWidth(BigDecimal[] cellWidth) {
// this.cellWidth = cellWidth;
// }
//
//
// public void setSheetNo(Integer sheetNo) {
// this.sheetNo = sheetNo;
// }
//
// public void setQueryDataInterface(QueryDataInterface queryDataInterface) {
// this.queryDataInterface = queryDataInterface;
// }
//
//}

42
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java
Unescape Escape View File

@ -0,0 +1,42 @@
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;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("注塑生产控制MODEL")
public class InjectionProductionControlModel {
@ApiParam("物料号")
private String partNo;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("当前合格数量")
private String standardQtyCur;
@ApiParam("当前合格数量")
private String completeQty;
@ApiParam("总不合格数量")
private String scrapQty;
@ApiParam("包装编号")
private String packageNo;
@ApiParam("数量")
private String qty;
@ApiParam("包装时间")
private String createDatetime;
@ApiParam("箱条码状态")
private String printStatusName;
}

45
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java
Unescape Escape View File

@ -0,0 +1,45 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: siliter.yuan
* @CreateDate: 2020\06\22 15:58
* @Modify:
**/
@Data
public class MesPaintSnPrintModel implements Serializable {
@ApiParam("过程条码")
private String serialNumber;
@ApiParam("产品条码")
private String produceSn;
@ApiParam("包装编号")
private String packageNo;
@ApiParam("工单号")
private String workOrderNo;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("物料号")
private String partNo;
@ApiParam("工厂代码")
private String organizeCode;
@ApiParam("打印模板")
private MesLabelTemplate labelTemplate;
}

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save