Merge remote-tracking branch 'origin/test' into test

yun-zuoyi
钮海涛 5 years ago
commit f061ff7b73

@ -59,4 +59,8 @@ public class AndonAlarmType extends BaseBean implements Serializable {
@ApiParam("安灯类型名称") @ApiParam("安灯类型名称")
private String description; private String description;
@Transient
@ApiParam("工作中心")
private String workCenterCode;
} }

@ -0,0 +1,41 @@
package cn.estsh.i3plus.pojo.andon.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 wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_AREA_ALARM_TYPE")
@EqualsAndHashCode(callSuper = true)
@Api("区域安灯类型")
public class AndonAreaAlarmType extends BaseBean implements Serializable {
private static final long serialVersionUID = -6551224785612729594L;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "ALARM_CODE")
@ApiParam("安灯类型代码")
private String alarmCode;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAreaAlarmType;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-30 11:05
* @Modify:
**/
@Repository
public interface IAndonAreaAlarmTypeRepository extends BaseRepository<AndonAreaAlarmType, Long> {
}

@ -1090,4 +1090,11 @@ public class AndonHqlPack {
DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean); DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean);
return packBean; return packBean;
} }
public static DdlPackBean getAndonAreaAlarmType(AndonAreaAlarmType areaAlarmType, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(areaAlarmType, organizeCode);
DdlPreparedPack.getStringLikerPack(areaAlarmType.getAreaCode(), "areaCode", packBean);
DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean);
return packBean;
}
} }

@ -83,7 +83,6 @@ public abstract class BaseBean implements Serializable {
@Column(name="CREATE_USER",updatable = false) @Column(name="CREATE_USER",updatable = false)
@ApiParam(value = "创建用户") @ApiParam(value = "创建用户")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
dataSrc = "/impp/operate/sys-user/query-user-by-pager", dataSrc = "/impp/operate/sys-user/query-user-by-pager",
searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
@ -97,7 +96,6 @@ public abstract class BaseBean implements Serializable {
@Column(name="MODIFY_USER") @Column(name="MODIFY_USER")
@ApiParam(value = "修改人") @ApiParam(value = "修改人")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
dataSrc = "/impp/operate/sys-user/query-user-by-pager", dataSrc = "/impp/operate/sys-user/query-user-by-pager",
searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName") searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")

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

@ -1006,7 +1006,7 @@ public class CommonEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_LOGIN_STATUS { public enum USER_LOGIN_STATUS {
LOGIN_SUCCESS(1, "登录成功", "登录成功"), LOGIN_SUCCESS(1, "登录成功", "登录成功"),
WRONG_PASSWORD(3, "密码错误", "Linux 密码错误"), WRONG_PASSWORD(3, "密码错误", "用户密码错误"),
WRONG_USERNAME_OR_PASSWORD(2, "用户名或密码错误", "用户名或密码错误"), WRONG_USERNAME_OR_PASSWORD(2, "用户名或密码错误", "用户名或密码错误"),
USER_LOGIN_LOCKING(4, "账号已锁定", "账号已锁定"), USER_LOGIN_LOCKING(4, "账号已锁定", "账号已锁定"),
USER_INFO_NULL(5, "用户信息不存在", "用户信息不存在"), USER_INFO_NULL(5, "用户信息不存在", "用户信息不存在"),

@ -843,7 +843,8 @@ public class ImppEnumUtil {
DATE(3, "date", "时间"), DATE(3, "date", "时间"),
SWITCH(4, "switch", "布尔"), SWITCH(4, "switch", "布尔"),
SELECT(5, "select", "选择"), SELECT(5, "select", "选择"),
FILE(6, "select", "选择"); FILE(6, "select", "选择"),
ARRAY(7, "array", "数组");
private int value; private int value;
private String name; private String name;

@ -991,6 +991,51 @@ public class MesEnumUtil {
} }
} }
/**
* Mes
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OBJECT_CFG_IS_SHOW {
SHOW(1, "是"),
NO_SHOW(2, "否");
private int value;
private String description;
OBJECT_CFG_IS_SHOW(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;
}
}
/** /**
* Mes * Mes
@ -3264,7 +3309,11 @@ public class MesEnumUtil {
JIT_ORDER(50, "JIT工单"), JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"), STOCK_ORDER(60, "库存工单"),
REPAIR(70, "返修插单"), REPAIR(70, "返修插单"),
FICTIVE(80, "虚拟工单"); EMERGENCY_ORDER(80, "紧急插单"),
FICTIVE(90, "虚拟工单"),
SPARE_PART_PRODUCTION(100, "备件生产"),
REPRODUCTION_RMS(110, "重新生产-报功"),
REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
private int value; private int value;
private String description; private String description;
@ -3291,6 +3340,16 @@ public class MesEnumUtil {
} }
return tmp; 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;
}
} }
/** /**
@ -6438,4 +6497,147 @@ public class MesEnumUtil {
return tmp; 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 JIT_ISSUE_CFG_TYPE {
ORDER_CACHE(10, "订单池"),
LOCK_CACHE(20, "锁定池");
private Integer value;
private String description;
JIT_ISSUE_CFG_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 == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* JIT
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum JIT_ORDER_CACHE_STATUS {
CREATE(10, "创建"),
COMPLETE(20, "完成"),
CANCEL(30, "取消");
private Integer value;
private String description;
JIT_ORDER_CACHE_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 == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* JIT
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum JIT_LOCK_CACHE_STATUS {
CREATE(10, "创建"),
RELEASE(20, "下达"),
ONLINE_COMPLETE(30, "上线完成");
private Integer value;
private String description;
JIT_LOCK_CACHE_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 == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
} }

@ -718,7 +718,7 @@ public class MesPcnEnumUtil {
DEFECTED(20, "不合格"), DEFECTED(20, "不合格"),
SCRAPED(30, "报废"), SCRAPED(30, "报废"),
DISMANTLED(40, "已拆解"), DISMANTLED(40, "已拆解"),
PRE_CHECK(50, "待检测"); PRE_CHECK(5, "待检测");
private int value; private int value;
private String description; private String description;
@ -1787,7 +1787,8 @@ public class MesPcnEnumUtil {
PAUSE(40, "暂停"), PAUSE(40, "暂停"),
CANCEL(50, "取消"), CANCEL(50, "取消"),
CLOSE(60, "关闭"), CLOSE(60, "关闭"),
COMPLETE(70, "完成"); COMPLETE(70, "完成"),
FICTIVE(80, "虚拟工单");
private int value; private int value;
private String description; private String description;
@ -1829,7 +1830,11 @@ public class MesPcnEnumUtil {
JIT_ORDER(50, "JIT工单"), JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"), STOCK_ORDER(60, "库存工单"),
REPAIR(70, "返修插单"), REPAIR(70, "返修插单"),
EMERGENCY_ORDER(80, "紧急插单"); EMERGENCY_ORDER(80, "紧急插单"),
FICTIVE(90, "虚拟工单"),
SPARE_PART_PRODUCTION(100, "备件生产"),
REPRODUCTION_RMS(110, "重新生产-报功"),
REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
private int value; private int value;
private String description; private String description;
@ -2407,6 +2412,16 @@ public class MesPcnEnumUtil {
} }
return tmp; 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;
}
} }
@ -4266,8 +4281,8 @@ public class MesPcnEnumUtil {
public enum BAD_HANDLE_TYPE { public enum BAD_HANDLE_TYPE {
BACK_SPRAY(10, "BACK_SPRAY", "返喷"), BACK_SPRAY(10, "BACK_SPRAY", "返喷"),
SCRAPPED(20, "SCRAPPED", "报废"), SCRAPPED(20, "SCRAPPED", "报废"),
POLISH(30, "POLISH", "抛光"), POLISHING(30, "POLISHING", "抛光"),
DETERMINED(40, "DETERMINED", "待定"); DETERMIND(40, "DETERMIND", "待定");
private int value; private int value;
private String code; private String code;

@ -300,6 +300,63 @@ public class WmsEnumUtil {
} }
/** /**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum REC_STATUS_KANBAN {
TO_BE_RECEIVED(10, "TO_BE_RECEIVED", "待收货"),
RECEIVING(20, "RECEIVING", "收货中"),
DELAYED_NON_RECEIPT(30, "DELAYED_NON_RECEIPT", "延迟未收货"),
COMPLETED(40, "COMPLETED", "已完成");
private int value;
private String code;
private String description;
REC_STATUS_KANBAN(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 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);
}
}
/**
* *
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -1367,7 +1424,8 @@ public class WmsEnumUtil {
PART_COVERAGE(110, "物料分类覆盖"), PART_COVERAGE(110, "物料分类覆盖"),
TOUCH(120, "动碰"), TOUCH(120, "动碰"),
ZORE_STOCK(130, "零库存"), ZORE_STOCK(130, "零库存"),
MATERIAL_COVERAGE(140, "物料覆盖"); MATERIAL_COVERAGE(140, "物料覆盖"),
CHECK(150, "点检");
private int value; private int value;
private String description; private String description;
@ -1648,6 +1706,42 @@ public class WmsEnumUtil {
* *
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_STATUS {
INSPECTION_FREE(10, "免检"),
PENDING_QUALITY_INSPECTION(20, "待质检"),
QUALITY_INSPECTION_COMPLETED(30, "质检完成");
private int value;
private String description;
QC_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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QC_INFO_STATUS { public enum QC_INFO_STATUS {
CREATE(10, "新建"), CREATE(10, "新建"),
FINISH(20, "处理中"), FINISH(20, "处理中"),
@ -8146,16 +8240,16 @@ public class WmsEnumUtil {
/** /**
* *
* 10-20-30-40-50-60-70- * 10-20-30-40-50-60-70-
* 80-90- * 80-90-
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STRATEGY_ACTION_TYPE { public enum STRATEGY_ACTION_TYPE {
LOCKING_IN_STOCK(10, "LOCKING_IN_STOCK", "锁定库存"), LOCKING_LOCATE(10, "LOCKING_LOCATE", "锁定库位"),
UNLOCK_IN_STOCK(20, "UNLOCK_IN_STOCK", "锁库存"), LOCKING_IN_STOCK(20, "LOCKING_IN_STOCK", "库存"),
LOCKING_LOCATE(30, "LOCKING_LOCATE", "锁定库位"), LOCKING_FEED_CAR(30, "LOCKING_FEED_CAR", "锁定料车"),
UNLOCK_LOCATE(40, "UNLOCK_LOCATE", "解锁库位"), UNLOCK_IN_STOCK(40, "UNLOCK_IN_STOCK", "解锁库存"),
LOCKING_FEED_CAR(50, "LOCKING_FEED_CAR", "锁定料车"), UNLOCK_LOCATE(50, "UNLOCK_LOCATE", "解锁库位"),
UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"), UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"),
GENERATE_TASK(70, "GENERATE_TASK", "生成任务"), GENERATE_TASK(70, "GENERATE_TASK", "生成任务"),
CANCEL_TASK(80, "CANCEL_TASK", "取消任务"), CANCEL_TASK(80, "CANCEL_TASK", "取消任务"),
@ -8330,7 +8424,7 @@ public class WmsEnumUtil {
/** /**
* * AUTO
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AUTO_FORK_TASK_STATUS { public enum AUTO_FORK_TASK_STATUS {
@ -8374,4 +8468,157 @@ public class WmsEnumUtil {
return tmp; return tmp;
} }
} }
/**
* -
* 10-20-30-40-START50-END60-
*
*/
@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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FREQUENCY {
ORDER_GENERATE(10, "MULTI_FREQUENCY", "多频次"),
STRATEGIC_ACTION(20, "NON_MULTI_FREQUENCY", "非多频次"),
TASK_GENERATE(30, "AMP", "AMP");
private int value;
private String code;
private String description;
FREQUENCY(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 FREQUENCY 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;
}
}
} }

@ -55,8 +55,9 @@ public class LacHqlPack {
} }
public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean) { public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
DdlPreparedPack.getNumEqualPack(bean.getLogTaskId(),"logTaskId",ddlPackBean);
return ddlPackBean; return ddlPackBean;
} }

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

@ -111,4 +111,8 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@Column(name = "CUST_DELIVERY_LOCATION") @Column(name = "CUST_DELIVERY_LOCATION")
@ApiParam("客户发往地") @ApiParam("客户发往地")
private String custDeliveryLocation; private String custDeliveryLocation;
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;
} }

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

@ -79,7 +79,6 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("产品位置") @ApiParam("产品位置")
private String produceCategoryCode; private String produceCategoryCode;
@Column(name = "QUEUE_GROUP_NO") @Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号") @ApiParam("分组队列编号")
private String queueGroupNo; private String queueGroupNo;
@ -109,6 +108,10 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("原材料物料号") @ApiParam("原材料物料号")
private String itemPartNo; private String itemPartNo;
@Column(name = "CUST_PART_NO")
@ApiParam("客户物料号")
private String custPartNo;
@Column(name = "ITEM_PART_NAME") @Column(name = "ITEM_PART_NAME")
@ApiParam("原材料物料名称") @ApiParam("原材料物料名称")
private String itemPartName; private String itemPartName;
@ -121,4 +124,23 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("原材料物料用量") @ApiParam("原材料物料用量")
private String itemUnit; private String itemUnit;
@Column(name = "JIT_SEQ")
@ApiParam("JIT排序号")
private String 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;
} }

@ -32,6 +32,10 @@ import java.io.Serializable;
public class MesCellFeed extends BaseBean implements Serializable { public class MesCellFeed extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971369479107782L; private static final long serialVersionUID = 1947971369479107782L;
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name = "WORK_CENTER_CODE") @Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心") @ApiParam("工作中心")
private String workCenterCode; private String workCenterCode;
@ -69,10 +73,6 @@ public class MesCellFeed extends BaseBean implements Serializable {
private String supplierCode; private String supplierCode;
@Transient @Transient
@ApiParam("工单号")
private String orderNo;
@Transient
@ApiParam(value = "原料类型名称") @ApiParam(value = "原料类型名称")
private String rawTypeName; private String rawTypeName;

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

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/6/27 21:39
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EDI_PARSER_CONFIG")
@Api("EDI解析配置表")
public class MesEdiParserConfig extends BaseBean implements Serializable {
private static final long serialVersionUID = 7225381299744633270L;
@Column(name = "PARSER_CODE")
@ApiParam("解析配置代码")
private String parserCode;
@Column(name = "PARSER_NAME")
@ApiParam("解析配置名称")
private String parserName;
@Column(name = "PARSER_TYPE")
@ApiParam("解析程序集")
private String parserType;
@Column(name = "GETTING_CODE")
@ApiParam("edi抓取程序代码")
private String gettingCode;
@Column(name = "CURRENT_ORDER")
@ApiParam("当前订单号")
private String currentOrder;
}

@ -0,0 +1,57 @@
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:
* @Author: jokelin
* @Date: 2020/7/3 5:06
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_JIT_ISSUE_CFG")
@Api("MES_客户JIT队列下达配置")
public class MesJitIssueCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 1475207048628221791L;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "QTY")
@ApiParam("数量")
private Integer qty;
@Column(name = "THRESHOLD_QTY")
@ApiParam("触发阈值")
private Integer thresholdQty;
@Column(name = "CFG_TYPE")
@ApiParam("缓存类型")
private Integer cfgType;
@Transient
@ApiParam("当前JIT缓存数")
private Integer currentJitCacheNum;
@Transient
@ApiParam("其他工单数")
private Integer otherWorkNum = 0;
}

@ -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;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/3 5:14
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_JIT_LOCK_CACHE")
@Api("MES_JIT队列锁定池")
public class MesJitLockCache extends BaseBean implements Serializable {
private static final long serialVersionUID = -308930683558229105L;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "JIT_ACTUAL_NO")
@ApiParam("队列编号")
private String jitActualNo;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "WO_TYPE")
@ApiParam("工单类型")
private Integer woType;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
}

@ -0,0 +1,55 @@
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:
* @Author: jokelin
* @Date: 2020/7/3 5:11
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_JIT_ORDER_CACHE")
@Api("MES_JIT队列订单池")
public class MesJitOrderCache extends BaseBean implements Serializable {
private static final long serialVersionUID = -613326904053045367L;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "JIT_ACTUAL_NO")
@ApiParam("队列编号")
private String jitActualNo;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "WO_TYPE")
@ApiParam("工单类型")
private Integer woType;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "SEQ")
@ApiParam("序号")
private Integer seq;
}

@ -58,6 +58,14 @@ public class MesObjectCfg extends BaseBean implements Serializable {
@ApiParam("是否保存 1存 2不存") @ApiParam("是否保存 1存 2不存")
private Integer isSave; private Integer isSave;
@Column(name = "SHOW_SEQ")
@ApiParam("显示顺序")
private Integer showSeq;
@Column(name = "IS_SHOW")
@ApiParam("是否显示")
private Integer isShow;
@Transient @Transient
@ApiParam("是否存储名") @ApiParam("是否存储名")
private String isSaveName; private String isSaveName;

@ -123,6 +123,11 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("包装标签模板") @ApiParam("包装标签模板")
private String packageLabelTemplate; private String packageLabelTemplate;
// 二维码
@Column(name = "QR_CODE")
@ApiParam("包装二维码")
private String qrCode;
public MesPackage() { public MesPackage() {
} }

@ -68,4 +68,8 @@ public class MesProdPack extends BaseBean implements Serializable {
@Column(name = "PROD_CFG_TYPE") @Column(name = "PROD_CFG_TYPE")
@ApiParam("项目") @ApiParam("项目")
private String prodCfgType; private String prodCfgType;
@Column(name = "CUST_LABEL_TEMPLATE")
@ApiParam("客户标签模板")
private String custLabelTemplate;
} }

@ -78,6 +78,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable {
@ApiParam("是否执行 1=是 2=否") @ApiParam("是否执行 1=是 2=否")
private Integer isActive; private Integer isActive;
@Column(name = "STEP_DISPLAY_NAME")
@ApiParam("工步展示名称")
private String stepDisplayName;
@Transient @Transient
@Column(name = "PARAM_ATTRIBUTE") @Column(name = "PARAM_ATTRIBUTE")
@ApiParam("参数属性") @ApiParam("参数属性")

@ -185,6 +185,11 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("条码打印状态名称") @ApiParam("条码打印状态名称")
private String printStatusName; private String printStatusName;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public Integer lockVersion;
public MesProduceSn() { public MesProduceSn() {
} }

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

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

@ -89,7 +89,15 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@ApiParam("选项代码") @ApiParam("选项代码")
private String optionCode; private String optionCode;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "ASSY_NO") @Column(name = "ASSY_NO")
@ApiParam("组件编号") @ApiParam("组件编号")
private String assyNo; private String assyNo;
@Transient
@ApiParam("工单类型")
private Integer woType;
} }

@ -10,7 +10,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -53,7 +55,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
@Column(name = "SEQ") @Column(name = "SEQ")
@ApiParam("计划排序号") @ApiParam("计划排序号")
private String seq; private Double seq;
@Column(name = "STATUS") @Column(name = "STATUS")
@ApiParam("状态") @ApiParam("状态")
@ -74,4 +76,44 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
@Column(name = "VERSION") @Column(name = "VERSION")
@ApiParam("版本号") @ApiParam("版本号")
private String version; 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;
} }

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

@ -44,6 +44,18 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
private String partNo; private String partNo;
@Column(name = "PART_NAME") @Column(name = "PART_NAME")
@ApiParam("产品名称") @ApiParam("物料名称")
private String partName; 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;
} }

@ -58,6 +58,10 @@ public class MesRouteProcessStep extends BaseBean implements Serializable {
@ApiParam("工步参数值") @ApiParam("工步参数值")
private String paramValue; private String paramValue;
@Column(name = "STEP_DISPLAY_NAME")
@ApiParam("工步展示名称")
private String stepDisplayName;
@Transient @Transient
@Column(name = "PARAM_ATTRIBUTE") @Column(name = "PARAM_ATTRIBUTE")
@ApiParam("参数属性") @ApiParam("参数属性")

@ -65,6 +65,14 @@ public class MesScrapRecord extends BaseBean implements Serializable {
@ApiParam("工位") @ApiParam("工位")
private String workCellCode; private String workCellCode;
@Column(name = "WORK_ORDER_NO")
@ApiParam("工单编号")
private String workOrderNo;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "MEMO") @Column(name = "MEMO")
@ApiParam("备注") @ApiParam("备注")
private String memo; private String memo;

@ -2,14 +2,12 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import org.springframework.util.StringUtils;
import javax.persistence.*; import javax.persistence.*;
import java.io.Serializable; import java.io.Serializable;
@ -159,7 +157,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@Lob @Lob
@Column(name = "EXTEND") @Column(name = "EXTEND")
@ApiParam("扩展数据") @ApiParam("扩展数据")
private String extend; public String extend;
@Column(name = "RESERVED1") @Column(name = "RESERVED1")
@ApiParam("预留字段1") @ApiParam("预留字段1")
@ -273,10 +271,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
public String comButtonCode; public String comButtonCode;
@Transient @Transient
@ApiParam(value = "扩展数据MAP")
public Map<String, Object> extendMap;
@Transient
@ApiParam("工单源序号") @ApiParam("工单源序号")
private Double srcSeq; private Double srcSeq;
@ -288,6 +282,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
@ApiParam("零件名称集合") @ApiParam("零件名称集合")
private String partNameList; private String partNameList;
@Transient
@ApiParam("客户集合")
private List<String> custList;
public double getQtyVal() { public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty; return this.qty == null ? 0.0d : this.qty;
} }
@ -320,15 +318,4 @@ public class MesWorkOrder extends BaseBean implements Serializable {
return this.approvalStatus == null ? 0 : this.approvalStatus; return this.approvalStatus == null ? 0 : this.approvalStatus;
} }
public Map<String, Object> getExtendMap() {
try {
if (!StringUtils.isEmpty(this.extend)) {
return JSONObject.parseObject(this.extend, Map.class);
} else {
return null;
}
} catch (Exception e) {
return null;
}
}
} }

@ -0,0 +1,21 @@
package cn.estsh.i3plus.pojo.mes.model;
import lombok.Data;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/6/23 15:23
* @desc
*/
@Data
public class EdiFileModel implements Serializable {
private static final long serialVersionUID = 7085611430865514271L;
private String content;
private String fileName;
private String fileUrl;
}

@ -0,0 +1,41 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/6/23 14:51
* @desc
*/
@Data
public class EdiRequestModel implements Serializable {
private static final long serialVersionUID = 7203497485903427292L;
private String organizeCode;
private String sourcePath;
private String fileName;
private String fileUrl;
private String content;
private Integer ediType;
private String ediCode;
private String host;
private String config;
private String programCode;
private String messageType;
private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
}

@ -0,0 +1,51 @@
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 packageQty;
@ApiParam("未打包数量")
private String unPackageQty;
@ApiParam("包装编号")
private String packageNo;
@ApiParam("数量")
private String qty;
@ApiParam("包装时间")
private String createDatetime;
@ApiParam("箱条码状态")
private String printStatusName;
@ApiParam("序号")
private Integer index;
}

@ -0,0 +1,32 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/4 10:26
* @Modify:
*/
@Data
public class JitIssueCfgModel {
@ApiParam("客户工厂代码")
private String custPlantCode;
@ApiParam("数量")
private Integer qty;
@ApiParam("触发阈值")
private Integer thresholdQty;
@ApiParam("当前JIT缓存数")
private Integer currentJitCacheNum;
@ApiParam("其他工单数")
private Integer otherWorkNum = 0;
@ApiParam("缓存类型")
private String cfgType;
}

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import org.springframework.util.StringUtils;
import javax.persistence.Transient;
import java.util.HashMap;
import java.util.Map;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2020-03-30 13:42
* @Modify:
**/
@Data
@Api(value="生产工单扩展",description = "生产工单扩展")
public class MesWorkOrderExtendModel extends MesWorkOrder {
@Transient
@ApiParam(value = "扩展数据MAP")
public Map<String, Object> extendMap;
public Map<String, Object> getExtendMap() {
try {
if (!StringUtils.isEmpty(super.extend)) {
return JSONObject.parseObject(super.extend, Map.class);
} else {
return new HashMap<>();
}
} catch (Exception e) {
return new HashMap<>();
}
}
}

@ -1,12 +1,12 @@
package cn.estsh.i3plus.pojo.mes.model; package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam; import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
import javax.persistence.Column;
import java.util.List; import java.util.List;
/** /**
@ -39,22 +39,21 @@ public class PaintCheckModel {
@ApiParam("界面编号") @ApiParam("界面编号")
private String windowNo; private String windowNo;
@ApiParam("缺陷类型")
private String defectType;
@ApiParam("缺陷描述")
private String defectDesc;
@ApiParam("缺陷标识值") @ApiParam("缺陷标识值")
private String defectFlagValue; private String defectFlagValue;
@ApiParam("不良品处理类型") @ApiParam("不良品处理类型")
private Integer defectActionType; private Integer defectActionType;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码") @ApiParam("项目代码")
private String prodCfgTypeCode; private String prodCfgTypeCode;
@ApiParam("缺陷列表")
private List<MesDefect> defectList;
@ApiParam("界面组件参数数据") @ApiParam("界面组件参数数据")
List<MesWindowModuleParam> windowModuleParamList; List<MesWindowModuleParam> windowModuleParamList;
private String defectType;
private String defectDesc;
} }

@ -29,7 +29,7 @@ public class PaintWorkOrderSnModel extends BaseBean {
private String partNo; private String partNo;
@ApiParam("物料名称") @ApiParam("物料名称")
private String partNameRdd; private String partName;
@ApiParam("颜色代码") @ApiParam("颜色代码")
private String colorCode; private String colorCode;
@ -60,5 +60,10 @@ public class PaintWorkOrderSnModel extends BaseBean {
@ApiParam("父阶物料名称") @ApiParam("父阶物料名称")
private String parentPartName; private String parentPartName;
@ApiParam("实际包装数量")
private Integer compQty;
private List<ProdPackModel> prodPackageList; private List<ProdPackModel> prodPackageList;
private String partNameRdd;
} }

@ -21,6 +21,9 @@ public class ProdPackModel implements Serializable {
@ApiParam("产品条码") @ApiParam("产品条码")
public String productSn; public String productSn;
@ApiParam("过程条码")
private String serialNumber;
// 包装主表--包装编号 // 包装主表--包装编号
@ApiParam("一检箱条码") @ApiParam("一检箱条码")
public String packageNo; public String packageNo;
@ -33,6 +36,9 @@ public class ProdPackModel implements Serializable {
@ApiParam("箱条码状态") @ApiParam("箱条码状态")
public Integer printStatus; public Integer printStatus;
@ApiParam("打印状态")
public String printStatusDesc;
// 涂装客户标签打印 // 涂装客户标签打印
@ApiParam("客户标签") @ApiParam("客户标签")
public String custSn; public String custSn;
@ -43,7 +49,7 @@ public class ProdPackModel implements Serializable {
// 涂装客户标签打印 // 涂装客户标签打印
@ApiParam("更新时间") @ApiParam("更新时间")
public String modifyDateTime; public String modifyDatetime;
@ApiParam("工单号") @ApiParam("工单号")
public String workOrderNo; public String workOrderNo;
@ -57,18 +63,18 @@ public class ProdPackModel implements Serializable {
public ProdPackModel() { public ProdPackModel() {
} }
public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) { public ProdPackModel(String serialNumber, String packageNo, String createDatetime, Integer printStatus) {
this.productSn = productSn; this.serialNumber = serialNumber;
this.packageNo = packageNo; this.packageNo = packageNo;
this.createDatetime = createDatetime; this.createDatetime = createDatetime;
this.printStatus = printStatus; this.printStatus = printStatus;
} }
public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) { public ProdPackModel(String serialNumber, String packageNo, String custSn, Integer printStatus, String modifyDatetime) {
this.productSn = productSn; this.serialNumber = serialNumber;
this.packageNo = packageNo; this.packageNo = packageNo;
this.custSn = custSn; this.custSn = custSn;
this.processCode = processCode; this.printStatus = printStatus;
this.modifyDateTime = modifyDateTime; this.modifyDatetime = modifyDatetime;
} }
} }

@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* @Description: * @Description:
@ -79,6 +81,9 @@ public class ProductInfoManageModel {
@ApiParam("明细队列序列") @ApiParam("明细队列序列")
private Double queDetailSeq; private Double queDetailSeq;
@ApiParam("总队列类型")
private List<Integer> queueTypeList;
public ProductInfoManageModel() { public ProductInfoManageModel() {
} }

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/6/23 17:17
* @desc
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class QueueJitPlanModel {
private MesQueueJitPlan jitPlan;
private List<MesQueueJitPlanDetail> jitPlanDetails;
private List<MesQueueJitPlanBom> jitPlanBoms;
}

@ -203,7 +203,7 @@ public class QueueOrderModel implements Serializable {
//getWaitQueueOrderModelNoSn //getWaitQueueOrderModelNoSn
public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType, Double finsihQty, Double qty,String pptCode) { String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode) {
this.serialNumber = serialNumber; this.serialNumber = serialNumber;
this.id = id; this.id = id;
this.queueSeq = queueSeq; this.queueSeq = queueSeq;
@ -217,10 +217,12 @@ public class QueueOrderModel implements Serializable {
this.finsihQty = finsihQty; this.finsihQty = finsihQty;
this.qty = qty; this.qty = qty;
this.orderNo = orderNo; this.orderNo = orderNo;
this.pptCode=pptCode; this.pptCode = pptCode;
this.produceCategoryCode = produceCategoryCode;
} }
//getAlreadyQueueOrderModelNoSn //getAlreadyQueueOrderModelNoSn
public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
String partNo, String partNameRdd, String workType) { String partNo, String partNameRdd, String workType) {
this.id = id; this.id = id;
this.queueSeq = queueSeq; this.queueSeq = queueSeq;
@ -232,7 +234,7 @@ public class QueueOrderModel implements Serializable {
this.partNameRdd = partNameRdd; this.partNameRdd = partNameRdd;
this.workType = workType; this.workType = workType;
this.orderNo = orderNo; this.orderNo = orderNo;
this.serialNumber=serialNumber; this.serialNumber = serialNumber;
} }
//料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo
@ -250,12 +252,14 @@ public class QueueOrderModel implements Serializable {
this.produceCategoryCode = produceCategoryCode; this.produceCategoryCode = produceCategoryCode;
} }
public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) { // getQueueOrderBySerialNumber
public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) {
this.id = id; this.id = id;
this.queueGroupNo = queueGroupNo; this.queueGroupNo = queueGroupNo;
this.jitLotNo = jitLotNo; this.jitLotNo = jitLotNo;
this.vinCode = vinCode; this.vinCode = vinCode;
this.organizeCode = organizeCode; this.organizeCode = organizeCode;
this.produceCategoryCode = produceCategoryCode; this.produceCategoryCode = produceCategoryCode;
this.workType = workType;
} }
} }

@ -156,6 +156,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("状态机代码") @ApiParam("状态机代码")
private String smCode; private String smCode;
@ApiParam("区域代码")
private String areaCode;
@Override @Override
public String toString() { public String toString() {
return "StationRequestBean{" + return "StationRequestBean{" +

@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -58,4 +59,7 @@ public class StationResultBean<T> implements Serializable {
@ApiParam("特殊展示数据") @ApiParam("特殊展示数据")
private Object specialDisplayData; private Object specialDisplayData;
@ApiParam("工位参数")
private Map<String, String> wcpcMap = new HashMap<>();
} }

@ -73,6 +73,9 @@ public class StepModel implements Serializable {
@ApiParam("参数代码") @ApiParam("参数代码")
private String paramCode; private String paramCode;
@ApiParam("工步展示名称")
private String stepDisplayName;
/** /**
* *
*/ */
@ -83,7 +86,7 @@ public class StepModel implements Serializable {
} }
public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject, public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) { String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) {
this.stepCode = stepCode; this.stepCode = stepCode;
this.stepName = stepName; this.stepName = stepName;
this.stepText = stepText; this.stepText = stepText;
@ -93,6 +96,7 @@ public class StepModel implements Serializable {
this.processCode = processCode; this.processCode = processCode;
this.stepSeq = stepSeq; this.stepSeq = stepSeq;
this.paramCode = paramCode; this.paramCode = paramCode;
this.stepDisplayName = stepDisplayName;
this.workCellCode = workCellCode; this.workCellCode = workCellCode;
} }
} }

@ -0,0 +1,23 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/6/23 12:36
* @desc
*/
@Data
@XStreamAlias("coderule")
public class CodeRule implements Serializable {
private static final long serialVersionUID = 6090471998165282835L;
@XStreamAlias("code")
private String code;
@XStreamAlias("type")
private String type;
}

@ -0,0 +1,23 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/6/23 12:32
* @desc
*/
@Data
@XStreamAlias("document")
public class Document implements Serializable {
private static final long serialVersionUID = 2814403876905527454L;
@XStreamAlias("head")
private Head head;
@XStreamAlias("message")
private Message message;
}

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/6/23 12:32
* @desc
*/
@Data
@XStreamAlias("head")
public class Head implements Serializable {
private static final long serialVersionUID = 7799977037966652535L;
@XStreamAlias("customerno")
private String customerno;
@XStreamAlias("customername")
private String customername;
@XStreamAlias("plantcode")
private String plantcode;
@XStreamAlias("plantname")
private String plantname;
@XStreamAlias("suppliernumber")
private String suppliernumber;
@XStreamAlias("suppliername")
private String suppliername;
@XStreamAlias("status")
private String status;
}

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/6/23 12:33
* @desc
*/
@Data
@XStreamAlias("message")
public class Message implements Serializable {
private static final long serialVersionUID = 8628748312808962449L;
@XStreamImplicit
private List<Pn> pns;
@XStreamAlias("customerno")
private String customerNo;
@XStreamAlias("customername")
private String customerName;
@XStreamAlias("plantcode")
private String plantCode;
@XStreamAlias("plantname")
private String plantName;
@XStreamAlias("suppliernumber")
private String supplierNumber;
@XStreamAlias("suppliername")
private String supplierName;
@XStreamAlias("status")
private String status;
@XStreamAlias("sequenceno")
private String sequenceNo;
@XStreamAlias("vin")
private String vin;
@XStreamAlias("date")
private String date;
}

@ -0,0 +1,78 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author Wynne.Lu
* @date 2020/6/27 15:39
* @desc
*/
@Data
@NoArgsConstructor
public class MgnBjJitPlanModel {
private String org;
private String userInfo;
private List<Part> flPnParts;
private String flPnRecipe;
private List<Part> frPnParts;
private String frPnRecipe;
private List<Part> rlPnParts;
private String rlPnRecipe;
private List<Part> rrPnParts;
private String rrPnRecipe;
private Map<String, List<Part>> groupPartsMap = new HashMap<>();
public void setFlPnParts(List<Part> flPnParts) {
this.groupPartsMap.put("FL", flPnParts);
this.flPnRecipe = getGroupRecipe(flPnParts);
this.flPnParts = flPnParts;
}
public void setFrPnParts(List<Part> frPnParts) {
this.groupPartsMap.put("FR", frPnParts);
this.frPnRecipe = getGroupRecipe(frPnParts);
this.frPnParts = frPnParts;
}
public void setRlPnParts(List<Part> rlPnParts) {
this.groupPartsMap.put("RL", rlPnParts);
this.rlPnRecipe = getGroupRecipe(rlPnParts);
this.rlPnParts = rlPnParts;
}
public void setRrPnParts(List<Part> rrPnParts) {
this.groupPartsMap.put("RR", rrPnParts);
this.rrPnRecipe = getGroupRecipe(rrPnParts);
this.rrPnParts = rrPnParts;
}
public MgnBjJitPlanModel(String org, String userInfo) {
this.org = org;
this.userInfo = userInfo;
}
private String getGroupRecipe(List<Part> groupParts) {
List<String> groupPartsRecipe = groupParts.stream().filter(d -> StringUtils.isNotBlank(d.getRecipeSeq()))
.sorted(Comparator.comparing(Part::getRecipeSeq))
.map(Part::getRecipeItem)
.collect(Collectors.toList());
return String.join("", groupPartsRecipe);
}
}

@ -0,0 +1,20 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import lombok.Data;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/6/30 15:24
* @desc
*/
@Data
public class MgnBjRecipePartsModel {
private String location;
private String recipe;
private List<Part> parts;
}

@ -0,0 +1,22 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/6/23 12:36
* @desc
*/
@Data
@XStreamAlias("optioncode")
public class OptionCode implements Serializable {
private static final long serialVersionUID = -4790746701135990728L;
@XStreamAlias("coderule")
private List<CodeRule> codeRules;
}

@ -0,0 +1,56 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2020/6/23 12:35
* @desc
*/
@Data
@XStreamAlias("part")
public class Part implements Serializable {
private static final long serialVersionUID = -8947770816754458901L;
@XStreamAlias("item")
private String item;
@XStreamAlias("dock")
private String dock;
@XStreamAlias("qty")
private String qty;
@ApiParam("是否是baseModule")
private boolean isBaseModule;
@ApiParam("前左数量")
private String flQty;
@ApiParam("前右数量")
private String frQty;
@ApiParam("后左数量")
private String rlQty;
@ApiParam("后右数量")
private String rrQty;
@ApiParam("产品位置")
private String produceCtgyCode;
@ApiParam("配方")
private String recipeItem;
@ApiParam("配方顺序")
private String recipeSeq;
@ApiParam("Mes物料号")
private String partNo;
}

@ -0,0 +1,21 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/6/23 12:35
* @desc
*/
@Data
@XStreamAlias("parts")
public class Parts implements Serializable {
private static final long serialVersionUID = -7294906162624860932L;
@XStreamAlias("parts")
private List<Part> parts;
}

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.mes.model.mgnbj;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/6/23 12:33
* @desc
*/
@Data
@XStreamAlias("PN")
public class Pn implements Serializable {
private static final long serialVersionUID = 194164925380216505L;
@XStreamAlias("vin")
private String vin;
@XStreamAlias("seqno")
private String seqno;
@XStreamAlias("date")
private String date;
@XStreamAlias("vehicleCode")
private String vehicleCode;
@XStreamAlias("version")
private String version;
@XStreamAlias("parts")
private List<Part> parts;
@XStreamAlias("optioncode")
private List<CodeRule> codeRules;
@ApiParam("新vin号")
private String newVin;
@ApiParam("新vin号")
private Boolean result;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.IfEdiInitialData;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wynne.lu
* @CreateDate : 2019-07-30
* @Modify:
**/
@Repository
public interface IfEdiInitialDataRepository extends BaseRepository<IfEdiInitialData, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesEdiParserConfig;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wynne.lu
* @CreateDate : 2019-07-30
* @Modify:
**/
@Repository
public interface MesEdiParserConfigRepository extends BaseRepository<MesEdiParserConfig, Long> {
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesJitIssueCfg;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/3 5:21
* @Modify:
*/
public interface MesJitIssueCfgRepository extends BaseRepository<MesJitIssueCfg, Long> {
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesJitLockCache;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/3 5:23
* @Modify:
*/
public interface MesJitLockCacheRepository extends BaseRepository<MesJitLockCache, Long> {
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesJitOrderCache;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/3 5:22
* @Modify:
*/
public interface MesJitOrderCacheRepository extends BaseRepository<MesJitOrderCache, Long> {
}

@ -954,6 +954,12 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(qcOrder.getCheckType())) { if (!StringUtils.isEmpty(qcOrder.getCheckType())) {
DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean); DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean);
} }
if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) {
DdlPreparedPack.getNumEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) {
DdlPreparedPack.getNumEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean);
}
// 时间段查询 // 时间段查询
if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) { if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder( DdlPreparedPack.timeBuilder(
@ -3130,4 +3136,89 @@ public class MesHqlPack {
} }
return packBean; return packBean;
} }
/**
* JIT
* @param queueJitPlan
* @param organizeCode
* @return
*/
public static DdlPackBean getMesQueueJitPlan(MesQueueJitPlan queueJitPlan, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlan, organizeCode);
if (!StringUtils.isEmpty(queueJitPlan.getJisPlanNo())) {
DdlPreparedPack.getStringLikerPack(queueJitPlan.getJisPlanNo(), "jisPlanNo", packBean);
}
if (!StringUtils.isEmpty(queueJitPlan.getCustPlantCode())) {
DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustPlantCode(), "custPlantCode", packBean);
}
if (!StringUtils.isEmpty(queueJitPlan.getCustFlagNo())) {
DdlPreparedPack.getStringLikerPack(queueJitPlan.getCustFlagNo(), "custFlagNo", packBean);
}
if (!StringUtils.isEmpty(queueJitPlan.getVinCode())) {
DdlPreparedPack.getStringLikerPack(queueJitPlan.getVinCode(), "vinCode", packBean);
}
if (queueJitPlan.getStatus() != null) {
DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean);
}
if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(),
"createDatetime", packBean, true);
}
return packBean;
}
/**
* JIT
* @param queueJitPlanDetail
* @param organizeCode
* @return
*/
public static DdlPackBean getMesQueueJitPlanDetail(MesQueueJitPlanDetail queueJitPlanDetail, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanDetail, organizeCode);
if (!StringUtils.isEmpty(queueJitPlanDetail.getJisPlanNo())) {
DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getJisPlanNo(), "jisPlanNo", packBean);
}
if (!StringUtils.isEmpty(queueJitPlanDetail.getPartNo())) {
DdlPreparedPack.getStringLikerPack(queueJitPlanDetail.getPartNo(), "partNo", packBean);
}
return packBean;
}
/**
* JITBOM
* @param queueJitPlanBom
* @param organizeCode
* @return
*/
public static DdlPackBean getMesQueueJitPlanBom(MesQueueJitPlanBom queueJitPlanBom, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(queueJitPlanBom, organizeCode);
if (!StringUtils.isEmpty(queueJitPlanBom.getJisPlanNo())) {
DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getJisPlanNo(), "jisPlanNo", packBean);
}
if (!StringUtils.isEmpty(queueJitPlanBom.getPartNo())) {
DdlPreparedPack.getStringLikerPack(queueJitPlanBom.getPartNo(), "partNo", packBean);
}
return packBean;
}
/**
* JIT
* @param jitIssueCfg
* @param organizeCode
* @return
*/
public static DdlPackBean getMesJitIssueCfg(MesJitIssueCfg jitIssueCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(jitIssueCfg, organizeCode);
if (!StringUtils.isEmpty(jitIssueCfg.getCustPlantCode())) {
DdlPreparedPack.getStringLikerPack(jitIssueCfg.getCustPlantCode(), "custPlantCode", packBean);
}
if (jitIssueCfg.getCfgType() != null) {
DdlPreparedPack.getNumEqualPack(jitIssueCfg.getCfgType(), "cfgType", packBean);
}
return packBean;
}
} }

@ -630,6 +630,9 @@ public class MesPcnHqlPack {
if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
} }
if (!CollectionUtils.isEmpty(mesWorkOrder.getCustList())) {
DdlPreparedPack.getInPackList(mesWorkOrder.getCustList(), "custCode", packBean);
}
if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
} }

@ -1,6 +1,5 @@
package cn.estsh.i3plus.pojo.model.lac; package cn.estsh.i3plus.pojo.model.lac;
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data; import lombok.Data;
@ -29,10 +28,4 @@ public class LacSuitRequest implements Serializable {
*/ */
private List<Task> taskList; private List<Task> taskList;
/**
*
*/
@XStreamCDATA
private String paramList;
} }

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.platform.bean; package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -10,7 +9,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Subselect;
import javax.persistence.*; import javax.persistence.*;
import java.util.List; import java.util.List;
@ -32,6 +30,7 @@ import java.util.List;
public class SysMessage extends BaseBean { public class SysMessage extends BaseBean {
private static final long serialVersionUID = -6090909263221993356L; private static final long serialVersionUID = -6090909263221993356L;
@Column(name = "MESSAGE_TITLE") @Column(name = "MESSAGE_TITLE")
@ApiParam(value = "消息标题", access = "消息标题") @ApiParam(value = "消息标题", access = "消息标题")
private String messageTitle; private String messageTitle;
@ -45,7 +44,7 @@ public class SysMessage extends BaseBean {
private Integer messageType; private Integer messageType;
public int getMessageTypeValue() { public int getMessageTypeValue() {
if(this.messageType == null){ if (this.messageType == null) {
return 0; return 0;
} else { } else {
return this.messageType.intValue(); return this.messageType.intValue();

@ -13,7 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import java.text.DecimalFormat; import javax.persistence.Transient;
import java.util.List;
/** /**
* @Description : - * @Description : -
@ -50,10 +51,18 @@ public class SysRefRoleMenu extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long roleId; private Long roleId;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;
@Column(name="ROLE_NAME_Rdd") @Column(name="ROLE_NAME_Rdd")
@ApiParam(value ="角色名称" , access ="角色名称") @ApiParam(value ="角色名称" , access ="角色名称")
private String roleNameRdd; private String roleNameRdd;
@Transient
@ApiParam(value ="权限ID列表" , access ="权限ID列表")
private List<Long> menuIdList;
public SysRefRoleMenu() { public SysRefRoleMenu() {
} }

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table; import javax.persistence.Table;
/** /**
@ -34,6 +35,7 @@ public class BrCssStyle extends BaseBean {
@ApiParam(value ="样式编码") @ApiParam(value ="样式编码")
private String styleCode; private String styleCode;
@Lob
@Column(name="STYLE_CONTENT") @Column(name="STYLE_CONTENT")
@ApiParam(value ="样式内容") @ApiParam(value ="样式内容")
private String styleContent; private String styleContent;

@ -1,8 +1,10 @@
package cn.estsh.i3plus.pojo.wms.bean; package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
@ -91,9 +93,10 @@ public class WmsAutoForkCallBackDetails extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String robotCode; private String robotCode;
//10=新建,20=已处理,30=处理出错 @Column(name = "STATUS", nullable = false, columnDefinition = "default 10")
@Column(name = "STATUS", nullable = false)
@ApiParam("处理标准") @ApiParam("处理标准")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "AUTO_FORK_TASK_STATUS")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true)
public Integer status; public Integer status;
@Column(name = "REMARK", nullable = false) @Column(name = "REMARK", nullable = false)

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean; package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
@ -45,6 +47,11 @@ public class WmsAutoTaskLog extends BaseBean {
@ApiParam("策略动作") @ApiParam("策略动作")
public String strategyAction; public String strategyAction;
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.OPERATE_TYPE.class)
public String operateType;
@Column(name = "ERROR_MSG") @Column(name = "ERROR_MSG")
@ApiParam("错误信息") @ApiParam("错误信息")
public String errorMsg; public String errorMsg;

@ -16,6 +16,7 @@ import javax.persistence.Entity;
import javax.persistence.Index; import javax.persistence.Index;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.util.List;
/** /**
* @Description : * @Description :
@ -154,6 +155,14 @@ public class WmsCSOrderDetails extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description")
public Integer differenceType; public Integer differenceType;
/**
* 102030
*/
@Transient
@ApiParam("差异集合")
@AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description")
public List<Integer> differenceTypeList;
public Integer getDifferenceTypeVal() { public Integer getDifferenceTypeVal() {
return this.differenceType == null ? return this.differenceType == null ?
-1: this.differenceType; -1: this.differenceType;

@ -284,6 +284,13 @@ public class WmsPart extends BaseBean {
public Integer isRecycle; public Integer isRecycle;
@Column(name = "FREQUENCY")
@ApiParam(value = "频次", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FREQUENCY")
@AnnoOutputColumn(refClass = WmsEnumUtil.FREQUENCY.class, refForeignKey = "value", value = "description", hidden = true)
private Integer frequency;
public int getIqcVal() { public int getIqcVal() {
return this.iqc == null ? 0 : this.iqc.intValue(); return this.iqc == null ? 0 : this.iqc.intValue();
} }

@ -13,8 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/** /**
* @Description :线 * @Description :线
@ -123,6 +121,10 @@ public class WmsRoutingRule extends BaseBean {
@ApiParam(value = "目的单据条码状态") @ApiParam(value = "目的单据条码状态")
private Integer destMoveSnStatus; private Integer destMoveSnStatus;
@Column(name = "FILTER_SCRIPT_NO", length = 50)
@ApiParam(value = "过滤条件")
private String filterScriptNo;
public WmsRoutingRule(){} public WmsRoutingRule(){}
} }

@ -499,6 +499,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "检测结果ID") @ApiParam(value = "检测结果ID")
private Long summaryId; private Long summaryId;
@Transient
@ApiParam(value = "颜色")
private String color;
public WmsStockSn() { public WmsStockSn() {
} }
@ -745,7 +749,7 @@ public class WmsStockSn extends BaseBean {
String shippingFlag, String workCenterCode, Integer snType, String shippingFlag, String workCenterCode, Integer snType,
String packagePartNo, Integer useCount, Integer seqNo, String packagePartNo, Integer useCount, Integer seqNo,
String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc, String whNameRdd, String locateNameRdd, String zoneNameRdd, String partTypeDesc,
String prodCfgTypeName, String custNameRdd, String workOrderCode) { String prodCfgTypeName, String custNameRdd, String workOrderCode, String color) {
this.organizeCode = organizeCode; this.organizeCode = organizeCode;
this.id = id; this.id = id;
this.sn = sn; this.sn = sn;
@ -792,6 +796,7 @@ public class WmsStockSn extends BaseBean {
this.prodCfgTypeName = prodCfgTypeName; this.prodCfgTypeName = prodCfgTypeName;
this.custNameRdd = custNameRdd; this.custNameRdd = custNameRdd;
this.workOrderCode = workOrderCode; this.workOrderCode = workOrderCode;
this.color = color;
} }

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient; import javax.persistence.Transient;
@ -24,10 +25,14 @@ import javax.persistence.Transient;
**/ **/
@Data @Data
@Entity @Entity
@Table(name = "WMS_TEST_RESULT_DETAILS", indexes = {
@Index(columnList = "BH_CODE"),
@Index(columnList = "PART_NO"),
@Index(columnList = "WORK_CENTER_CODE")
})
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_TEST_RESULT_DETAILS")
@Api("检测结果明细表") @Api("检测结果明细表")
public class WmsTestResultDetails extends BaseBean { public class WmsTestResultDetails extends BaseBean {
@ -70,6 +75,11 @@ public class WmsTestResultDetails extends BaseBean {
@ApiParam("检测值") @ApiParam("检测值")
public String checkValue; public String checkValue;
@Column(name = "IS_SYNC", nullable = false)
@ApiParam("是否同步")
@AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description")
public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue();
@Transient @Transient
@ApiParam("已检测数") @ApiParam("已检测数")
private Long checkSize; private Long checkSize;

@ -73,6 +73,11 @@ public class WmsTractics extends BaseBean {
searchColumnName = "partGroupNo,partGroupName", listColumnName = "partGroupNo,partGroupName", explicitColumnName = "partGroupNo") searchColumnName = "partGroupNo,partGroupName", listColumnName = "partGroupNo,partGroupName", explicitColumnName = "partGroupNo")
private String tracticsPartGroup; private String tracticsPartGroup;
@Column(name = "TRACTICS_PART_GROUP_NAME")
@ApiParam(value = "策略适用物料组名称")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
private String tracticsPartGroupName;
@Column(name="TRACTICS_ZONE") @Column(name="TRACTICS_ZONE")
@ApiParam(value ="策略适用存储区") @ApiParam(value ="策略适用存储区")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
@ -95,30 +100,29 @@ public class WmsTractics extends BaseBean {
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME) @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME)
private String tracticsEndTime; private String tracticsEndTime;
@Column(name="LEV1_STRATEGY") @Column(name="LEV1_STRATEGY_PUT")
@ApiParam(value ="1级策略上架") @ApiParam(value ="1级策略上架")
@AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_ONE")
private Integer lev1Strategy; private Integer lev1StrategyPut;
// @Column(name="LEV1_STRATEGY") @Column(name="LEV1_STRATEGY_PICKING")
@Transient
@ApiParam(value ="1级策略拣货") @ApiParam(value ="1级策略拣货")
@AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_TRACTICS_ITEM_ONE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "PICKING_TRACTICS_ITEM_ONE")
private Integer lev1StrategyPicking; private Integer lev1StrategyPicking;
@Column(name="LEV2_STRATEGY") @Column(name="LEV2_STRATEGY_PUT")
@ApiParam(value ="2级策略") @ApiParam(value ="2级策略")
@AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_TWO.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_TWO")
private Integer lev2Strategy; private Integer lev2StrategyPut;
@Column(name="LEV3_STRATEGY") @Column(name="LEV3_STRATEGY_PUT")
@ApiParam(value ="3级策略") @ApiParam(value ="3级策略")
@AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.INSTOCK_TRACTICS_ITEM_THREE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isMultiple = 1, dataSrc = "INSTOCK_TRACTICS_ITEM_THREE")
private Integer lev3Strategy; private Integer lev3StrategyPut;
// public String getIev1StrategyPicking (String lev1StrategyPicking) { // public String getIev1StrategyPicking (String lev1StrategyPicking) {
// return this.lev1Strategy = lev1StrategyPicking; // return this.lev1Strategy = lev1StrategyPicking;

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.wms.dto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author :QianHuaSheng
* @CreateDate : 2020-07-09 9:50
* @Modify:
**/
@Data
@Api("静态盘点查询输出实体类")
public class WmsReceiptKanbanDto {
@ApiParam(value = "供应商编号")
private String vendorNo;
@ApiParam(value = "频次")
private String frequency;
@ApiParam(value = "供应商名称")
private String verdorName;
@ApiParam(value = "订单号")
private String orderNo;
@ApiParam(value = "道口")
private String dock;
@ApiParam(value = "项目")
private String prodCfgTypeCode;
@ApiParam(value = "窗口时间")
private String planDate;
@ApiParam(value = "开始收货时间")
private String earliestReceTime;
@ApiParam(value = "结束收货时间")
private String latestReceTime;
@ApiParam(value = "收货状态")
private String receStatus;
@ApiParam(value = "质检状态")
private String qcStatus;
@ApiParam(value = "工厂代码")
private String organizeCode;
}

@ -0,0 +1,24 @@
package cn.estsh.i3plus.pojo.wms.modelbean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 线
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-07-01
* @Modify:
**/
@Data
@Api("自动过滤物流路线")
public class WmsAutoFilterRoutingRuleModel {
@ApiParam("工厂代码")
private String organizeCode;
@ApiParam("料架车")
private String parentSpec;
}

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.wms.modelbean; package cn.estsh.i3plus.pojo.wms.modelbean;
import cn.estsh.i3plus.pojo.wms.bean.WmsAutoTaskLog;
import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@ -64,6 +65,9 @@ public class WmsAutoTaskModel {
@ApiParam("锁定条码") @ApiParam("锁定条码")
private List<WmsStockSn> lockStockSnList; private List<WmsStockSn> lockStockSnList;
@ApiParam("动作日志记录")
private WmsAutoTaskLog wmsAutoTaskLog;
@ApiParam("任务生成数量") @ApiParam("任务生成数量")
private Double taskQty; private Double taskQty;

@ -48,6 +48,9 @@ public class WmsMoveInfoModel {
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus; private Integer itemStatus;
@ApiParam(value = "关联单号")
private String refSrc;
public WmsMoveInfoModel() { public WmsMoveInfoModel() {
} }

@ -1756,13 +1756,13 @@ public class WmsHqlPack {
* @param groupDataAuth * @param groupDataAuth
* @return * @return
*/ */
public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) { /*public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
DdlPackBean result = new DdlPackBean(); DdlPackBean result = new DdlPackBean();
Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet(); Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
//拼sql //拼sql
entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
/*for (Map.Entry<String, List<WmsDataAuth>> map : entries) { *//*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
String key = map.getKey(); String key = map.getKey();
List<WmsDataAuth> valueList = map.getValue(); List<WmsDataAuth> valueList = map.getValue();
@ -1785,22 +1785,24 @@ public class WmsHqlPack {
packMutilConditionHql(mapList, "PART_NO", "partNo", result); packMutilConditionHql(mapList, "PART_NO", "partNo", result);
} }
} }
}*/ }*//*
//转换封装后的hql //转换封装后的hql
/*String packedHql = result.getPackedHql(); *//*String packedHql = result.getPackedHql();
if(packedHql.startsWith(" or")){ if(packedHql.startsWith(" or")){
packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") ";
System.out.println(packedHql); System.out.println(packedHql);
} }
result.setWhereAppend(packedHql);*/ result.setWhereAppend(packedHql);*//*
// 通用数据拼接 // 通用数据拼接
WmsDataAuth wmsDataAuth = new WmsDataAuth(); WmsDataAuth wmsDataAuth = new WmsDataAuth();
wmsDataAuth.setOrganizeCode(organizeCode); wmsDataAuth.setOrganizeCode(organizeCode);
getStringBuilderPack(wmsDataAuth, result); getStringBuilderPack(wmsDataAuth, result);
return result; return result;
} }*/
/** /**
* List<Map> List<String> * List<Map> List<String>
@ -1845,7 +1847,7 @@ public class WmsHqlPack {
* @param orderList * @param orderList
* @return * @return
*/ */
public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) { /*public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) {
DdlPackBean packBean = new DdlPackBean(); DdlPackBean packBean = new DdlPackBean();
Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet(); Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
//拼sql //拼sql
@ -1865,13 +1867,13 @@ public class WmsHqlPack {
} }
} }
//转换封装后的hql //转换封装后的hql
/*String packedHql = packBean.getPackedHql(); *//*String packedHql = packBean.getPackedHql();
if(packedHql.startsWith(" or")){ if(packedHql.startsWith(" or")){
packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") ";
System.out.println(packedHql); System.out.println(packedHql);
} }
packBean.setWhereAppend(packedHql);*/ packBean.setWhereAppend(packedHql);*//*
DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getInPackList(orderList, columnName, packBean);
DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean); DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);
@ -1880,7 +1882,7 @@ public class WmsHqlPack {
DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean);
return packBean; return packBean;
} }*/
/** /**
* dataAuth * dataAuth

Loading…
Cancel
Save