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

yun-zuoyi
汪云昊 6 years ago
commit 86a18d730a

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.aps.annotation;
import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@ -22,4 +24,6 @@ public @interface FieldAnnotation {
boolean mainkey() default false; // 是否为主键
String defaultValue() default ""; // 字段的默认值
boolean popSearch() default false; // 弹出选择对象时是否显示
EDIT_TYPE editType() default EDIT_TYPE.NONE; // 定义字段的编辑类型
String typeName() default ""; // 定义字段类型的简单名称,对于多选关联对象时有用。
}

@ -32,6 +32,7 @@ public class BaseOrder extends BaseCode {
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
@FieldAnnotation(defaultValue = "10")
private Integer priority;
@Column(name="LET")
@ -40,18 +41,22 @@ public class BaseOrder extends BaseCode {
@Column(name="CALC_EST")
@ApiParam(value ="最早开始时刻计算值")
@FieldAnnotation(modify = false)
private Date calcEst;
@Column(name="CALC_LET")
@ApiParam(value ="最晚结束时刻计算值")
@FieldAnnotation(modify = false)
private Date calcLet;
@Column(name="PLAN_BEGIN")
@ApiParam(value ="计划开始")
@FieldAnnotation(modify = false)
private Date planBegin;
@Column(name="PLAN_END")
@ApiParam(value ="计划结束")
@FieldAnnotation(modify = false)
private Date planEnd;
@Column(name="RECEIVE_DATE")

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonIgnore;
@ -92,6 +93,10 @@ public class FieldInfo extends BaseCode {
@ApiParam(value ="弹出选择时是否显示")
private Boolean popSearch;
@Column(name="EDIT_TYPE")
@ApiParam(value ="字段编辑类型")
private EDIT_TYPE editType;
@ApiParam(value ="枚举项内容")
private transient Enum<?>[] enumItems;

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonIgnore;
@ -33,10 +34,12 @@ public class Inventory extends BaseOrder {
@Column(name="ASSIGN_COUNT")
@ApiParam(value ="已分配量")
@FieldAnnotation(modify = false)
private Double assignCount;
@Column(name="EXCESS_COUNT")
@ApiParam(value ="多余量")
@FieldAnnotation(modify = false)
private Double excessCount;
@JsonIgnore

@ -70,7 +70,7 @@ public class Material extends BaseCode {
@Column(name="LEVEL")
@ApiParam(value ="低阶码")
@RippleAnnotation(dependence = {"OperOutputs.Operation.ProductRouting.Material"}, method = "calcLevel")
@RippleAnnotation(dependence = {"OperInputs.Operation.ProductRouting.Material.level"}, method = "calcLevel")
@FieldAnnotation(modify = false)
private Integer level;

@ -77,14 +77,17 @@ public class ProductOrder extends BaseOrder {
@Column(name="CALC_LEAD_TIME")
@ApiParam(value ="提前期计算值")
@FieldAnnotation(modify = false)
private String calcLeadTime;
@Column(name="EXCESS_COUNT")
@ApiParam(value ="多余量")
@FieldAnnotation(modify = false)
private Double excessCount;
@Column(name="LACK_COUNT")
@ApiParam(value ="缺少量")
@FieldAnnotation(modify = false)
private Double lackCount;
@Column(name="AUTO_SUPPLY")

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonIgnore;
@ -41,10 +42,12 @@ public class PurchaseOrder extends BaseOrder {
@Column(name="CALC_LEAD_TIME")
@ApiParam(value ="提前期计算值")
@FieldAnnotation(modify = false)
private String calcLeadTime;
@Column(name="EXCESS_COUNT")
@ApiParam(value ="多余量")
@FieldAnnotation(modify = false)
private Double excessCount;
@Column(name="AUTO_SUPPLY")

@ -1,7 +1,9 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EResCalendar;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
@ -27,6 +29,7 @@ import java.util.List;
public class ResCalendar extends BaseAPS {
@Column(name="RES_CODES")
@ApiParam(value ="资源代码")
@FieldAnnotation(editType = EDIT_TYPE.MULTI_OBJECT, typeName = "Resource")
private String resCodes;
@Column(name="WEEKS")

@ -1,10 +1,13 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EResource;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -12,6 +15,7 @@ import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.List;
/**
* @Description :
@ -96,4 +100,7 @@ public class Resource extends BaseCode {
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间长度")
private String lockTime;
@JsonBackReference
public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); }
}

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import com.fasterxml.jackson.annotation.JsonIgnore;
@ -42,6 +43,7 @@ public class SalesOrder extends BaseOrder {
@Column(name="CALC_LEAD_TIME")
@ApiParam(value ="提前期计算值")
@FieldAnnotation(modify = false)
private String calcLeadTime;
@JsonIgnore

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_SHIPPING_TIME")
@Api("运输时间")
public class ShippingTime extends BaseAPS {
@Column(name="PREV_RES_CODE")
@ApiParam(value ="前资源编码")
private String prevResCode;
@Column(name="POST_RES_CODE")
@ApiParam(value ="后资源编码")
private String postResCode;
@Column(name="PREV_STAND_CODE")
@ApiParam(value ="前标准工序编码")
private String prevStandCode;
@Column(name="POST_STAND_CODE")
@ApiParam(value ="后标准工序编码")
private String postStandCode;
@Column(name="TIME")
@ApiParam(value ="运输时间")
private String time;
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
private Integer priority;
}

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.ROUTING_VALID_TYPE;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -31,6 +32,10 @@ public class SysParam extends BaseAPS {
@ApiParam(value ="最大中断次数")
private Integer maxInterruptCount;
@Column(name="TYPE")
@ApiParam(value ="工艺路径有效判断类型")
private ROUTING_VALID_TYPE type;
@Column(name="RULE_GROUP_ID")
@ApiParam(value ="规则组id")
@FieldAnnotation(display = false)

@ -31,10 +31,12 @@ import java.util.List;
public class Work extends BaseCode {
@Column(name="WORK_TYPE")
@ApiParam(value ="工作类型")
@FieldAnnotation(modify = false)
private WORK_TYPE workType;
@Column(name="count")
@ApiParam(value ="数量")
@FieldAnnotation(modify = false)
private Double count;
@Column(name="SPECIFY_COUNT")
@ -75,10 +77,12 @@ public class Work extends BaseCode {
@Column(name="CALC_EST")
@ApiParam(value ="最早开始时间计算值")
@FieldAnnotation(modify = false)
private Date calcEst;
@Column(name="CALC_LET")
@ApiParam(value ="最晚结束时间计算值")
@FieldAnnotation(modify = false)
private Date calcLet;
@Column(name="WORK_STATUS")
@ -87,14 +91,17 @@ public class Work extends BaseCode {
@Column(name="PLAN_BEGIN")
@ApiParam(value ="计划开始时间")
@FieldAnnotation(modify = false)
private Date planBegin;
@Column(name="PLAN_END")
@ApiParam(value ="计划结束时间")
@FieldAnnotation(modify = false)
private Date planEnd;
@Column(name="PLAN_RESOURCE")
@ApiParam(value ="计划主资源")
@FieldAnnotation(modify = false)
private String planResource;
@Column(name="FIX_SPLIT")
@ -103,14 +110,17 @@ public class Work extends BaseCode {
@Column(name="NEED_PREV_COUNT")
@ApiParam(value ="需要的前工作数量")
@FieldAnnotation(display = false, modify = false)
private Double needPrevCount;
@Column(name="SCH_FAILED")
@ApiParam(value ="是否排程失败")
@FieldAnnotation(modify = false)
private Boolean schFailed;
@Column(name="FAILED_REASON")
@ApiParam(value ="排程失败原因")
@FieldAnnotation(modify = false)
private String failedReason;
@Column(name="ORDER_ID")

@ -29,14 +29,17 @@ import java.util.List;
public class WorkInput extends BaseAPS {
@Column(name="INPUT_TIME")
@ApiParam(value ="输入时间")
@FieldAnnotation(modify = false)
private Date inputTime;
@Column(name="INPUT_COUNT")
@ApiParam(value ="输入数量")
@FieldAnnotation(modify = false)
private Double inputCount;
@Column(name="SHORT_COUNT")
@ApiParam(value ="短缺数量")
@FieldAnnotation(modify = false)
private Double shortCount;
@Column(name="WORK_ID")

@ -30,14 +30,17 @@ import java.util.List;
public class WorkOutput extends BaseAPS {
@Column(name="OUTPUT_TIME")
@ApiParam(value ="输出时间")
@FieldAnnotation(modify = false)
private Date outputTime;
@Column(name="OUTPUT_COUNT")
@ApiParam(value ="输出数量")
@FieldAnnotation(modify = false)
private Double outputCount;
@Column(name="REMAIN_COUNT")
@ApiParam(value ="多余数量")
@FieldAnnotation(modify = false)
private Double remainCount;
@Column(name="WORK_ID")

@ -1,7 +1,10 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.WORK_PLAN_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
import io.swagger.annotations.Api;
@ -32,68 +35,92 @@ import java.util.List;
@Table(name="APS_WORK_PLAN")
@Api("工作计划")
public class WorkPlan extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="工作计划类型")
@FieldAnnotation(modify = false, display = false)
private WORK_PLAN_TYPE type;
@Column(name="PREV_SET_BEGIN")
@ApiParam(value ="前设置开始时间")
@FieldAnnotation(modify = false)
private Date prevSetBegin;
@Column(name="PREV_SET_END")
@ApiParam(value ="前设置结束时间")
@FieldAnnotation(modify = false)
private Date prevSetEnd;
@Column(name="PREV_SET_TIME")
@ApiParam(value ="前设置时间")
@FieldAnnotation(modify = false)
private Integer prevSetTime;
@Column(name="PRODUCE_BEGIN")
@ApiParam(value ="生产开始时间")
@FieldAnnotation(modify = false)
@RippleAnnotation(dependence = {"Work.PrevRelations.PrevWork.WorkPlan.produceBegin",
"PrevPlan.produceBegin"}, method = "calcPositive")
private Date produceBegin;
@Column(name="PRODUCE_END")
@ApiParam(value ="生产结束时间")
@FieldAnnotation(modify = false)
private Date produceEnd;
@Column(name="PRODUCE_TIME")
@ApiParam(value ="生产时间")
@FieldAnnotation(modify = false)
private Integer produceTime;
@Column(name="POST_SET_BEGIN")
@ApiParam(value ="后设置开始时间")
@FieldAnnotation(modify = false)
private Date postSetBegin;
@Column(name="POST_SET_END")
@ApiParam(value ="后设置结束时间")
@FieldAnnotation(modify = false)
private Date postSetEnd;
@Column(name="POST_SET_TIME")
@ApiParam(value ="后设置时间")
@FieldAnnotation(modify = false)
private Integer postSetTime;
@Column(name="LOCK_BEGIN")
@ApiParam(value ="锁定开始时间")
@FieldAnnotation(modify = false)
@RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin"}, method = "calcPositiveLockBegin")
private Date lockBegin;
@Column(name="LOCK_END")
@ApiParam(value ="锁定结束时间")
@FieldAnnotation(modify = false)
private Date lockEnd;
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间")
@FieldAnnotation(modify = false)
private Integer lockTime;
@Column(name="WORK_ID")
@ApiParam(value ="工作对象id")
@FieldAnnotation(property = false)
private Long workId;
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源对象id")
@FieldAnnotation(property = false)
private Long resourceId;
@Column(name="WORK_RESOURCE_ID")
@ApiParam(value ="工作资源对象id")
@FieldAnnotation(property = false)
private Long workResourceId;
@Column(name="MAIN_PLAN_ID")
@ApiParam(value ="主计划对象id")
@FieldAnnotation(property = false)
private Long mainPlanId;
public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }

@ -29,22 +29,27 @@ import javax.persistence.Table;
public class WorkRelation extends BaseAPS {
@Column(name="TYPE")
@ApiParam(value ="关联类型")
@FieldAnnotation(modify = false)
private WORK_RELATION_TYPE type;
@Column(name="CONS_TYPE")
@ApiParam(value ="接续方式")
@FieldAnnotation(modify = false)
private CONSTRAINT_TYPE consType;
@Column(name="MAX_SPACE_TIME")
@ApiParam(value ="最大间隔时间")
@FieldAnnotation(modify = false)
private String maxSpaceTime;
@Column(name="MIN_SPACE_TIME")
@ApiParam(value ="最小间隔时间")
@FieldAnnotation(modify = false)
private String minSpaceTime;
@Column(name="COUNT")
@ApiParam(value ="关联数量")
@FieldAnnotation(modify = false)
private Double count;
@Column(name="FIX_RELATION")

@ -28,38 +28,47 @@ import javax.persistence.Table;
public class WorkResource extends BaseAPS {
@Column(name="USE_TYPE")
@ApiParam(value ="使用类型")
@FieldAnnotation(modify = false)
private USE_TYPE useType;
@Column(name="PREV_TIME")
@ApiParam(value ="前设置时间")
private Long prevTime;
@FieldAnnotation(modify = false)
private Integer prevTime;
@Column(name="PRODUCE_TIME")
@ApiParam(value ="制造时间")
private Long produceTime;
@FieldAnnotation(modify = false)
private Integer produceTime;
@Column(name="POST_TIME")
@ApiParam(value ="后设置时间")
private Long postTime;
@FieldAnnotation(modify = false)
private Integer postTime;
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
@FieldAnnotation(modify = false)
private Integer priority;
@Column(name="MAX_PREV_SD_TIME")
@ApiParam(value ="最大前设置中断时间")
@FieldAnnotation(modify = false)
private String maxPrevSdTime;
@Column(name="MAX_PRODUCE_SD_TIME")
@ApiParam(value ="最大制造中断时间")
@FieldAnnotation(modify = false)
private String maxProduceSdTime;
@Column(name="MAX_POST_SD_TIME")
@ApiParam(value ="最大后设置中断时间")
@FieldAnnotation(modify = false)
private String maxPostSdTime;
@Column(name="USER_MATCH_NUMBER")
@ApiParam(value ="资源使用配套号")
@FieldAnnotation(modify = false)
private String userMatchNumber;
@Column(name="WORK_ID")

@ -1,10 +1,14 @@
package cn.estsh.i3plus.pojo.aps.common;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Transient;
import java.util.HashMap;
import java.util.Map;
@ -22,6 +26,12 @@ public abstract class BaseAPS extends BaseBean {
@JsonIgnore
private transient Map<String, Object> customFields = new HashMap<>();
@Column(name="KEY")
@ApiParam(value ="主键值")
@FieldAnnotation(display = false, modify = false)
@Transient
private String key;
public Object getCustomField(String code) {
return customFields.get(code);
}

@ -19,7 +19,7 @@ import javax.persistence.MappedSuperclass;
public abstract class BaseCode extends BaseAPS {
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true)
@FieldAnnotation(popSearch = true, mainkey = true)
private String code;
@Column(name="NAME")

@ -2,10 +2,7 @@ package cn.estsh.i3plus.pojo.aps.common;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
@ -51,7 +48,7 @@ public class BeanRelation {
return result;
}
for (Enum<?> holder : beanInfo.getAllHolders()) {
result.put(holder, new ArrayList<>());
result.put(holder, new LinkedList<>());
}
return result;
}
@ -235,6 +232,34 @@ public class BeanRelation {
return index == 0 && bNotLast;
}
/**
*
* @param bean
* @param holder
* @param args
* @param <T>
* @return List
*/
public static <T extends BaseBean> Set<T> listUnique(BaseBean bean, Enum<?> holder, Enum<?>... args) {
Set<T> result = new HashSet<>();
List<BaseBean> nextBeans = list(bean, holder);
for (BaseBean nextBean : nextBeans) {
listUniqueImpl(result, nextBean, args, 0);
}
result.remove(bean);
return result;
}
private static <T extends BaseBean> void listUniqueImpl(Set<T> result, BaseBean bean, Enum<?>[] holders, int index) {
if (index >= holders.length) {
result.add((T)bean);
} else {
List<BaseBean> nextBeans = list(bean, holders[index]);
for (BaseBean nextBean : nextBeans) {
listUniqueImpl(result, nextBean, holders, index + 1);
}
}
}
/**
@ -400,4 +425,38 @@ public class BeanRelation {
recursionImpl(relaBean, fun, holders, index + 1);
}
}
/**
* targetbeanholders
* @param bean
* @param target
* @param holders
* @return
*/
public static boolean recursionContains(BaseBean bean, BaseBean target, Enum<?>... holders) {
if (holders.length == 0) {
return false;
}
return recursionContainsImpl(bean, target, holders, 0);
}
private final static boolean recursionContainsImpl(BaseBean bean, BaseBean target,
Enum<?>[] holders, int index) {
if (index >= holders.length) {
if (target == bean) {
return true;
}
index = 0;
}
List<BaseBean> relaBeans = list(bean, holders[index]);
for (BaseBean relaBean : relaBeans) {
if (recursionContainsImpl(relaBean, target, holders, index + 1)) {
return true;
}
}
return false;
}
}

@ -25,7 +25,7 @@ public class DateDuration {
public static final double PRECISION = 0.00001;
private String value;
private long time = 0;
private int time = 0;
private double rate = 0.0;
private boolean bValid = false;
@ -60,7 +60,7 @@ public class DateDuration {
* 0
* @return
*/
public long getTime() {
public int getTime() {
return this.time;
}
@ -68,7 +68,7 @@ public class DateDuration {
*
* @return
*/
public void setTime(long time) {
public void setTime(int time) {
this.time = time;
}
@ -139,12 +139,12 @@ public class DateDuration {
* @param amount
* @return
*/
public long getTime(double amount) {
public int getTime(double amount) {
if (amount < PRECISION)
return getTime();
double result = (amount * this.rate) + this.time;
return (long)Math.ceil(result);
return (int)Math.ceil(result);
}
/**

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
public enum EDIT_TYPE {
NONE,
BOOLEAN, // 布尔, 开关编辑
CHAR, // 字符, 文本框编辑
SHORT, // 短整型, 数字编辑
INTEGER, // 整型, 数字编辑
LONG, // 长整型, 数字编辑
DOUBLE, // 浮点型, 文本框编辑
DATE, // 日期类型(2019-09-16)
TIME, // 时间类型(17:35:30)
DATE_TIME, // 日期时间类型(2019-09-16 17:35:30)
DURATION, // 时间段(1H),文本框编辑
ENUM, // 枚举,下拉选择
MULTI_ENUM, // 多选枚举, 下拉多选
STRING, // 字符串,文本框编辑
OBJECT, // 关联对象下来选择关联对象的Code值
LIST, // 对象集合,不可编辑。
MULTI_OBJECT // 多选对象,弹出框选择,可以选择全部对象,以*表示选择全部
}

@ -8,6 +8,7 @@ package cn.estsh.i3plus.pojo.aps.enums;
* @Modify:
**/
public enum RESOURCE_CLASS {
MAIN, // 主资源
ASS // 副资源
LIMITLESS, // 无限能力
SINGLE, // 单能力
BATCH // 炉资源
}

@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums;
* @Modify:
**/
public enum RESOURCE_TYPE {
LIMITLESS, // 无限能力
SINGLE, // 单能力
BATCH // 炉资源
MAIN, // 主资源
ASS // 副资源
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-10-29
* @Modify:
**/
public enum ROUTING_VALID_TYPE {
ORDER_CALC_LET, // 与订单的最晚结束时刻计算值做比较
CALC_LET_LT, // 与最晚结束时刻计算值-提前期做比较
BASE_TIME // 与基准时刻做比较
}

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum WORK_PLAN_TYPE {
MAIN_PLAN, // 主资源计划
ASS_PLAN, // 副资源计划
BATCH_PLAN // 炉资源计划
}

@ -1,4 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
public enum EResource {
WorkPlans
}

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

@ -1,3 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="Resource">
<Relation field="WorkPlans" name="WorkPlan" reverse="Resource" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="WorkPlan">
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="WorkResource" name="WorkResource" type="ONE_TO_ONE" owner="false">
</Relation>
<Relation field="AssPlans" name="WorkPlan" reverse="MainPlan" type="ONE_TO_MULTI" owner="false">

@ -33,6 +33,7 @@ public class CommonEnumUtil {
HARDSWITCH(25,"block-hardswitch","硬件适配器"),
LAC(26,"lac","连接适配器"),
ANDON(27,"andon","安灯"),
APS(28,"APS","高级计划与排程"),
CENTER(99,"icloud-server","注册中心"),
SURFACE(98,"i3surface","对外服务"),
CLOUD(97,"i3cloud","微服务"),

@ -12,6 +12,155 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* MesRepair
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_REPAIR_TYPE {
SCRATCH(10, "划痕"),
FRACTURE(20, "破碎"),
SCRAP_TYPE3(30, "缺失");
private int value;
private String description;
MES_REPAIR_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EQUIPMENT_REPORT_TYPE {
TASK(10, "作业任务"),
PLAN(20, "周期计划"),
REPAIR(30, "维修记录"),
CHECK(40, "点检记录"),
MAINTAIN(50, "保养记录");
private int value;
private String description;
EQUIPMENT_REPORT_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesScrap
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCRAP_TYPE {
SCRAP_TYPE(10, "过期"),
SCRAP_TYPE2(20, "不合格"),
SCRAP_TYPE3(30, "缺失");
private int value;
private String description;
SCRAP_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PRODUCE_SN_TYPE {
NORMAL(10, "正常件"),
FIRST_INSPECTION(20, "首检件");
private int value;
private String description;
MES_PRODUCE_SN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

@ -12,6 +12,155 @@ import org.apache.commons.lang3.StringUtils;
**/
public class MesPcnEnumUtil {
/**
* MesScrap
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SCRAP_TYPE {
SCRAP_TYPE(10, "过期"),
SCRAP_TYPE2(20, "不合格"),
SCRAP_TYPE3(30, "缺失");
private int value;
private String description;
SCRAP_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* MesProduceSnqcStatus
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_SN_QC_STATUS {
QUALIFIED(10, "合格"),
DEFECTED(20, "不合格"),
SCRAPED(30, "报废"),
DISMANTLED(40, "已拆解");
private int value;
private String description;
PRODUCE_SN_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 valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_WORK_CELL_TYPE {
NORMAL(10, "正常"),
REWORK(20, "返修");
private int value;
private String description;
MES_WORK_CELL_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* mes
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_PRODUCE_SN_RESULT {
OK(10, "OK");
private int value;
private String description;
MES_PRODUCE_SN_RESULT(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;
}
}
/**
* mes
*/

@ -25,7 +25,7 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GROUP_COMMIT_CHECK {
DISABLE(1, "禁止提交"), CHECK_MOVE(2, "校验移动单"),
NO_CHECK(3, "不校验"),CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单");
NO_CHECK(3, "不校验"), CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单");
private int value;
private String description;
@ -285,6 +285,7 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -860,7 +861,7 @@ public class WmsEnumUtil {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (StringUtils.equalsIgnoreCase(values()[i].value,value)) {
if (StringUtils.equalsIgnoreCase(values()[i].value, value)) {
return values()[i];
}
}
@ -917,7 +918,7 @@ public class WmsEnumUtil {
INIT(20, "INIT", "初始化"),
IS_GENERAL(30, "IS_GENERAL", "已生成"),
NO_GENERAL(40, "NO_GENERAL", "不生成"),
CANCEL(50,"CANCEL","撤销");
CANCEL(50, "CANCEL", "撤销");
private int value;
private String code;
@ -1098,7 +1099,7 @@ public class WmsEnumUtil {
MONTH_INVENTORY(20, "月度盘点"),
SEASON_INVENTORY(30, "季度盘点"),
YEAR_INVENTORY(40, "年度盘点"),
AJUST_INVENTORY(50, "库存调整盘点");
AJUST_INVENTORY(50, "库存调整盘点");
private int value;
private String description;
@ -3435,12 +3436,13 @@ public class WmsEnumUtil {
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum REC_STATUS{
public enum REC_STATUS {
UNRECEIVED("UNRECEIVED", "未收货"),
COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"),
PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"),
OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"),
OTHER("ELSE", "其他"),;
OTHER("ELSE", "其他"),
;
private String value;
private String description;
@ -3476,7 +3478,7 @@ public class WmsEnumUtil {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val) ) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@ -3523,7 +3525,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ETC_PRINT_STATUS {
NOT_HIT (10, "未打"),
NOT_HIT(10, "未打"),
ALREADY_HIT(20, "已打");
private int value;
@ -3681,8 +3683,8 @@ public class WmsEnumUtil {
public enum ROUTING_RULE_MODE {
CREATE_TASK(10, "CREATE_TASK", "生成任务"),
AUTO_OPT(20, "AUTO_OPT", "自动操作"),
MENU_OPT(30, "MENU_OPT", "手工操作"),
AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易");
MENU_OPT(30, "MENU_OPT", "手工操作"),
AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易");
private int value;
private String code;
private String description;
@ -3729,13 +3731,14 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTING_RULE_TYPE {
PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"),
REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则");
PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"),
REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则");
private int value;
private String code;
private String description;
@ -3782,12 +3785,13 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTING_DELAY_UNIT {
M(10, "M", "分"),
M(10, "M", "分"),
D(20, "D", "天");
private int value;
private String code;
@ -3836,4 +3840,37 @@ public class WmsEnumUtil {
}
}
/**
* MOVE_TO_ERP
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MOVE_TO_ERP_IS_SYNC {
SYNCHRONIZED(1, "已同步"), UN_SYNCHRONIZED(2, "未同步"), NON_SYNCHRONIZED(3, "不同步");
private int value;
private String description;
MOVE_TO_ERP_IS_SYNC(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;
}
}
}

@ -42,7 +42,7 @@ public class MesConfig extends BaseBean {
@Column(name = "CFG_KEY")
@ApiParam("配置key")
private String cfgkey;
private String cfgKey;
@Column(name = "CFG_VALUE")
@ApiParam("配置value")

@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean {
@ApiParam("对象代码")
private String objectCode;
@Column(name = "OBJECT_NAME")
@ApiParam("对象名称")
private String objectName;
@ -43,4 +42,28 @@ public class MesDataObject extends BaseBean {
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@Column(name = "FIELD_PK")
@ApiParam("主键")
private String fieldPk;
@Column(name = "READ_FLAG_VALUE")
@ApiParam("读取标志值")
private String readFlagValue;
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "SELF_ADDITION")
@ApiParam("自增列")
private String selfAddition;
@Column(name = "SELF_ADDITION_VALUE")
@ApiParam("自增列值")
private Long selfAdditionValue;
}

@ -53,6 +53,10 @@ public class MesDefectRecord extends BaseBean {
@ApiParam("缺陷位置")
private String defectLocation;
@Column(name = "SIDE_LOCATION")
@ApiParam("面位")
private String sideLocation;
@Column(name="REPAIR_STATUS")
@ApiParam("维修状态")
private Integer repairStatus;

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
@ -83,4 +84,7 @@ public class MesDismantleRecord extends BaseBean {
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
private String serialNumber;
}

@ -41,5 +41,5 @@ public class MesFiCfg extends BaseBean {
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private String fiQty;
private Double fiQty;
}

@ -27,7 +27,6 @@ import javax.persistence.Table;
@Api("对象结构")
public class MesObjectCfg extends BaseBean {
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@ -48,18 +47,6 @@ public class MesObjectCfg extends BaseBean {
@ApiParam("列长度")
private String fieldLength;
@Column(name = "FIELD_PK")
@ApiParam("主键标记")
private String fieldPk;
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "POJO_ATTR")
@ApiParam("对应的pojo属性")
private String pojoAttr;

@ -27,6 +27,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLC_CONFIGURE")
@Api("PLC设备信息配置表")
@Deprecated
public class MesPLCConfigure extends BaseBean {
@Column(name = "IP")
@ApiParam("设备ip")

@ -82,6 +82,9 @@ public class MesPackage extends BaseBean {
@ApiParam("备注")
private String memo;
public MesPackage() {
}
public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) {
this.packageNo = packageNo;
this.partNo = partNo;

@ -23,7 +23,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE")
@Table(name = "MES_PACKAGE_DETAIL")
@Api("包装规格")
public class MesPackageDetail extends BaseBean {

@ -28,7 +28,6 @@ import javax.persistence.Transient;
@Api("PLC配置表")
public class MesPlc extends BaseBean {
@Column(name = "PLC_CODE")
@ApiParam("PLC代码")
private String plcCode;
@ -65,6 +64,10 @@ public class MesPlc extends BaseBean {
@ApiParam("分组名称")
private String groupName;
@Column(name = "DEVICE")
@ApiParam("驱动")
private String device;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;

@ -95,6 +95,14 @@ public class MesProcessBom extends BaseBean {
@ApiParam("显示颜色")
private String color;
@Transient
@ApiParam("关键件代码")
private String keyBarCode;
@Transient
@ApiParam("产品条码")
private String serialNumber;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;

@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean {
@Column(name = "PICTURE_NAME")
@ApiParam("图片名称")
private String pictureName;
@Column(name = "FILE_ORIGIN_NAME")
@ApiParam("FILE_ORIGIN_NAME")
private String fileOriginName;
@Column(name = "FILE_SIZE")
@ApiParam("FILE_SIZE")
private String fileSize;
@Column(name = "FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
}

@ -12,6 +12,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description:
@ -27,7 +28,9 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_SN")
@Api("产品条码表")
public class MesProduceSn extends BaseBean {
public class MesProduceSn extends BaseBean implements Serializable {
private static final long serialVersionUID = 6641051790330191326L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
@ -62,11 +65,11 @@ public class MesProduceSn extends BaseBean {
private Integer printStatus;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
@ApiParam("工")
private String workCellCode;
@Column(name = "ROUTE_CODE")
@ -115,7 +118,7 @@ public class MesProduceSn extends BaseBean {
@Column(name = "SN_TYPE")
@ApiParam("条码类型 10=正常 20=首检件")
private String snType;
private Integer snType;
@Column(name = "TRAY")
@ApiParam("托盘号")
@ -149,6 +152,10 @@ public class MesProduceSn extends BaseBean {
return this.printStatus == null ? 0 : this.printStatus;
}
public int getSnTypeVal() {
return this.snType == null ? 0 : this.snType;
}
@Override
public String toString() {
return "MesProduceSn{" +
@ -172,6 +179,8 @@ public class MesProduceSn extends BaseBean {
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", packageSn='" + packageSn + '\'' +
", snType='" + snType + '\'' +
", tray='" + tray + '\'' +
", resultMsg='" + resultMsg + '\'' +
'}';
}

@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean {
@ApiParam("包装条码")
private String packageSn;
@Column(name="OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@Transient
@ApiParam("返回信息")
private String resultMsg;

@ -95,6 +95,10 @@ public class MesQcCheckData extends BaseBean {
private String custCode;
@Transient
@ApiParam("产品条码")
private String serialNumber;
@Transient
@ApiParam("过程质量检测数据")
private List<MesQcCheckStandard> mesQcCheckStandardList;

@ -73,4 +73,15 @@ public class MesQcCheckStandard extends BaseBean {
@ApiParam("检测值")
private String checkValue;
public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) {
this.partNo = partNo;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.checkType = checkType;
this.checkItem = checkItem;
this.checkStandard = checkStandard;
this.checkGuide = checkGuide;
this.checkFrequency = checkFrequency;
this.partName = partName;
}
}

@ -36,4 +36,8 @@ public class MesScrap extends BaseBean {
@ApiParam("报废名称")
private String scrapName;
@Column(name = "SCRAP_TYPE")
@ApiParam("报废类型")
private String scrapType;
}

@ -60,10 +60,6 @@ public class MesScrapRecord extends BaseBean {
@ApiParam("工位")
private String workCellCode;
@Column(name = "SCRAP_REASON")
@ApiParam("报废原因")
private String scrapReason;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;

@ -139,15 +139,15 @@ public class MesWorkOrder extends BaseBean {
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private Long fiQty;
private Double fiQty;
@Column(name = "FI_COMPLETE_QTY")
@ApiParam("首检完成数量")
private Long fiCompleteQty;
private Double fiCompleteQty;
@Column(name = "FI_GENERATE_QTY")
@ApiParam("首检生成数量")
private Long fiGenerateQty;
private Double fiGenerateQty;
/********************** 冗余字段 *********************************/
@Transient

@ -136,6 +136,18 @@ public class MesWorkOrderLog extends BaseBean {
@ApiParam("客户订单号")
private String custOrderNo;
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private Double fiQty;
@Column(name = "FI_COMPLETE_QTY")
@ApiParam("首检完成数量")
private Double fiCompleteQty;
@Column(name = "FI_GENERATE_QTY")
@ApiParam("首检生成数量")
private Double fiGenerateQty;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value = "工作中心名称")

@ -36,6 +36,16 @@ public class MesProdBindRecordModel {
private Integer missQty;
@ApiParam("报废数")
private Integer scrapQty;
@ApiParam("创建时间")
private String createUser;
@ApiParam("创建时间")
private String createDatetime;
@ApiParam("修改人")
private String modifyUser;
@ApiParam("修改时间")
private String modifyDatetime;
@ApiParam("产品条码")
private String serialNumber;
public MesProdBindRecordModel() {
}
@ -72,4 +82,26 @@ public class MesProdBindRecordModel {
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
this.qty = qty;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.organizeCode = organizeCode;
this.isFeed = isFeed;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.kpSn = kpSn;
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.serialNumber = serialNumber;
}
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFiCfg;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesFiCfgRepository extends BaseRepository<MesFiCfg, Long> {
}

@ -220,4 +220,64 @@ public class MesHqlPack {
return packBean;
}
/**
* MES PCN
*
* @param mesRepair
* @return
*/
public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean);
}
if (StringUtils.isNotEmpty(mesRepair.getRepairName())) {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean);
}
if (mesRepair.getRepairType() != null) {
DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean);
}
return packBean;
}
/**
* MES PCN
*
* @param mesScrap
* @return
*/
public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean);
}
if (StringUtils.isNotEmpty(mesScrap.getScrapName())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean);
}
if (StringUtils.isNotEmpty(mesScrap.getScrapType())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean);
}
return packBean;
}
/**
* MES PCN
*
* @param mesDefectCause
* @return
*/
public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesDefectCause.getDcCode())) {
DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean);
}
if (StringUtils.isNotEmpty(mesDefectCause.getDcName())) {
DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean);
}
if (mesDefectCause.getDcType() != null) {
DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean);
}
return packBean;
}
}

@ -42,7 +42,7 @@ public class MesConfig extends BaseBean {
@Column(name = "CFG_KEY")
@ApiParam("配置key")
private String cfgkey;
private String cfgKey;
@Column(name = "CFG_VALUE")
@ApiParam("配置value")

@ -43,4 +43,28 @@ public class MesDataObject extends BaseBean {
@Column(name = "OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@Column(name = "FIELD_PK")
@ApiParam("主键")
private String fieldPk;
@Column(name = "READ_FLAG_VALUE")
@ApiParam("读取标志值")
private String readFlagValue;
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "SELF_ADDITION")
@ApiParam("自增列")
private String selfAddition;
@Column(name = "SELF_ADDITION_VALUE")
@ApiParam("自增列值")
private Long selfAdditionValue;
}

@ -41,6 +41,10 @@ public class MesEquNotifyObjectCfg extends BaseBean {
@ApiParam("对象值")
private String notifyObjectValue;
@Column(name="NOTIFY_OBJECT_VALUE_RDD")
@ApiParam("对象值")
private String notifyObjectValueRdd;
@Column(name="NOTIFY_OBJECT_TYPE")
@ApiParam("对象类型")
private Integer notifyObjectType;

@ -83,4 +83,8 @@ public class MesEquTaskDetail extends BaseBean {
@ApiParam(value = "处理方法")
private String fmCode;
@Transient
@ApiParam(value = "任务类型")
private Integer taskType;
}

@ -53,6 +53,10 @@ public class MesEquTaskPlan extends BaseBean {
@ApiParam("创建提前天数")
private Integer daysInAdvance;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Transient
@ApiParam(value = "生产线")
private String workCenterCode;

@ -41,5 +41,5 @@ public class MesFiCfg extends BaseBean {
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private String fiQty;
private Double fiQty;
}

@ -27,7 +27,6 @@ import javax.persistence.Table;
@Api("对象结构")
public class MesObjectCfg extends BaseBean {
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@ -48,19 +47,6 @@ public class MesObjectCfg extends BaseBean {
@ApiParam("列长度")
private String fieldLength;
@Column(name = "FIELD_PK")
@ApiParam("主键标记")
private String fieldPk;
@Column(name = "FEED_FIELD")
@ApiParam("反馈字段")
private String feedField;
@Column(name = "FEED_VALUE")
@ApiParam("反馈值")
private String feedValue;
@Column(name = "POJO_ATTR")
@ApiParam("对应的pojo属性")
private String pojoAttr;

@ -27,6 +27,7 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLC_CONFIGURE")
@Api("PLC设备信息配置表")
@Deprecated
public class MesPLCConfigure extends BaseBean {
@Column(name = "IP")
@ApiParam("设备ip")

@ -66,6 +66,10 @@ public class MesPlc extends BaseBean {
@ApiParam("分组名称")
private String groupName;
@Column(name = "DEVICE")
@ApiParam("驱动")
private String device;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;

@ -30,7 +30,7 @@ public class MesProduceCtgyPicture extends BaseBean {
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCtgyCode;
private String produceCategoryCode;
@Column(name = "SIDE_LOCATION")
@ApiParam("面位")
@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean {
@Column(name = "PICTURE_NAME")
@ApiParam("图片名称")
private String pictureName;
@Column(name = "FILE_SIZE")
@ApiParam("FILE_SIZE")
private String fileSize;
@Column(name = "FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
@Column(name = "FILE_TYPE_NAME")
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
}

@ -115,12 +115,16 @@ public class MesProduceSn extends BaseBean {
@Column(name = "SN_TYPE")
@ApiParam("条码类型")
private String snType;
private Integer snType;
@Column(name = "TRAY")
@ApiParam("托盘号")
private String tray;
@Column(name="OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@Transient
@ApiParam("返回信息")
private String resultMsg;
@ -145,6 +149,10 @@ public class MesProduceSn extends BaseBean {
return this.printStatus == null ? 0 : this.printStatus;
}
public int getSnTypeVal() {
return this.snType == null ? 0 : this.snType;
}
@Override
public String toString() {
return "MesProduceSn{" +
@ -168,6 +176,8 @@ public class MesProduceSn extends BaseBean {
", custSn='" + custSn + '\'' +
", custPartNo='" + custPartNo + '\'' +
", packageSn='" + packageSn + '\'' +
", snType='" + snType + '\'' +
", tray='" + tray + '\'' +
", resultMsg='" + resultMsg + '\'' +
'}';
}

@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean {
@ApiParam("包装条码")
private String packageSn;
@Column(name="OPERATE_TYPE")
@ApiParam("操作类型")
private Integer operateType;
@Transient
@ApiParam("返回信息")
private String resultMsg;

@ -139,15 +139,15 @@ public class MesWorkOrder extends BaseBean {
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private String fiQty;
private Double fiQty;
@Column(name = "FI_COMPLETE_QTY")
@ApiParam("首检完成数量")
private String fiCompleteQty;
private Double fiCompleteQty;
@Column(name = "FI_GENERATE_QTY")
@ApiParam("首检生成数量")
private String fiGenerateQty;
private Double fiGenerateQty;
/********************** 冗余字段 *********************************/
@Transient

@ -136,6 +136,18 @@ public class MesWorkOrderLog extends BaseBean {
@ApiParam("客户订单号")
private String custOrderNo;
@Column(name = "FI_QTY")
@ApiParam("首检数量")
private Double fiQty;
@Column(name = "FI_COMPLETE_QTY")
@ApiParam("首检完成数量")
private Double fiCompleteQty;
@Column(name = "FI_GENERATE_QTY")
@ApiParam("首检生成数量")
private Double fiGenerateQty;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value = "工作中心名称")

@ -28,6 +28,9 @@ public class MesEquTaskPlanModel implements Serializable {
@ApiParam("创建提前天数")
private Integer daysInAdvance;
@ApiParam("备注")
private String memo;
@ApiParam("生产线")
private String workCenterCode;
@ -66,7 +69,7 @@ public class MesEquTaskPlanModel implements Serializable {
}
public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -74,6 +77,7 @@ public class MesEquTaskPlanModel implements Serializable {
this.taskCycle = taskCycle;
this.lastTime = lastTime;
this.daysInAdvance = daysInAdvance;
this.memo = memo;
this.workCenterCode = workCenterCode;
this.equipmentCategory = equipmentCategory;
this.organizeCode = organizeCode;

@ -0,0 +1,23 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : Model
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-10-28
* @Modify:
**/
@Data
public class NormalityModel {
@ApiParam("节点")
double node;
@ApiParam("发生频次")
int times;
@ApiParam("开始节点")
double from;
@ApiParam("结束节点")
double to;
}

@ -8,7 +8,9 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Transient;
/**
* @Description:
@ -60,4 +62,8 @@ public class ProdOrgModel extends BaseBean {
@ApiParam("当前级")
private Integer level;
@Transient
@ApiParam("工位类型")
private Integer workCellType;
}

@ -0,0 +1,43 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-10-28
* @Modify:
**/
@Data
public class XrSampleModel {
@ApiParam("样本数量")
private int sampleCount;
@ApiParam("样本组数")
private int groupCount;
@ApiParam("每组个数")
private int preGroupCount;
@ApiParam("A2值")
private double a2;
@ApiParam("D3值")
private double d3;
@ApiParam("D4值")
private double d4;
@ApiParam("均值平均数")
private double xAver;
@ApiParam("均值控制上限")
private double xUcl;
@ApiParam("均值控制下限")
private double xLcl;
@ApiParam("极差平均数")
private double rAver;
@ApiParam("极差控制上限")
private double rUcl;
@ApiParam("极差控制下限")
private double rLcl;
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesFiCfg;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesFiCfgRepository extends BaseRepository<MesFiCfg, Long> {
}

@ -459,7 +459,7 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean);
}
if (mesRepair.getRepairType() != null) {
DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean);
DdlPreparedPack.getStringEqualPack(mesRepair.getRepairType(), "repairType", packBean);
}
if (mesRepair.getIsValid() != null) {
DdlPreparedPack.getNumEqualPack(mesRepair.getIsValid(), "isValid", packBean);
@ -1428,8 +1428,8 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode);
if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCtgyCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean);
if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) {
DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean);
}
if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) {
DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean);
@ -1454,8 +1454,8 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectName())) {
DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectName(), "notifyObjectName", packBean);
}
if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValue())) {
DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValue", packBean);
if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValueRdd())) {
DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValueRdd", packBean);
}
if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectType())) {
DdlPreparedPack.getNumEqualPack(mesEquNotifyObjectCfg.getNotifyObjectType(), "notifyObjectType", packBean);
@ -1553,4 +1553,55 @@ public class MesHqlPack {
}
return packBean;
}
/**
*
* @param mesFiCfg
* @param organizeCode
* @return
*/
public static DdlPackBean getMesFiCfg(MesFiCfg mesFiCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesFiCfg, organizeCode);
if (!StringUtils.isEmpty(mesFiCfg.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesFiCfg.getWorkCenterCode(), "workCenterCode", packBean);
}
if (!StringUtils.isEmpty(mesFiCfg.getPartNo())) {
DdlPreparedPack.getStringEqualPack(mesFiCfg.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesFiCfg.getCustCode())) {
DdlPreparedPack.getStringLikerPack(mesFiCfg.getCustCode(), "custCode", packBean);
}
return packBean;
}
/**
*
* @param mesEquTaskRepairRecord
* @param organizeCode
* @return
*/
public static DdlPackBean getMesEquTaskRepairRecord(MesEquTaskRepairRecord mesEquTaskRepairRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskRepairRecord, organizeCode);
if (!StringUtils.isEmpty(mesEquTaskRepairRecord.getEquipmentCode())) {
DdlPreparedPack.getStringEqualPack(mesEquTaskRepairRecord.getEquipmentCode(), "equipmentCode", packBean);
}
return packBean;
}
/**
*
* @param mesEquTaskStandardRecord
* @param organizeCode
* @return
*/
public static DdlPackBean getMesEquTaskStandardRecord(MesEquTaskStandardRecord mesEquTaskStandardRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskStandardRecord, organizeCode);
if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getEquipmentCode())) {
DdlPreparedPack.getStringEqualPack(mesEquTaskStandardRecord.getEquipmentCode(), "equipmentCode", packBean);
}
if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getTaskType())) {
DdlPreparedPack.getNumEqualPack(mesEquTaskStandardRecord.getTaskType(), "taskType", packBean);
}
return packBean;
}
}

@ -18,6 +18,8 @@ import java.util.List;
@Data
public class StationRequestBean implements Serializable {
private static final long serialVersionUID = -8597212451891803174L;
@ApiParam("扫描信息")
private String scanInfo;

@ -7,6 +7,9 @@ import java.io.Serializable;
@Data
public class StepModel implements Serializable {
private static final long serialVersionUID = -5772746720347236465L;
@ApiParam("工步代码")
private String stepCode;

@ -171,6 +171,7 @@ public class UserDetailModel extends BaseBean {
user.setUserPhone(this.userPhone);
user.setUserLoginPassword(this.userLoginPassword);
user.setLanguageCode(this.userLanguageCode);
user.setOrganizeCode(this.organizeCode);
return user;
}
@ -204,6 +205,7 @@ public class UserDetailModel extends BaseBean {
info.setUserPoliticalStatus(this.infoPoliticalStatus);
info.setUserGrade(this.infoGrade);
info.setUserEmployeeType(this.infoEmployeeType);
info.setOrganizeCode(this.organizeCode);
return info;
}

@ -185,6 +185,10 @@ public class WmsMoveDetails extends BaseBean {
@Transient
private Integer isSnapshot;
@Transient
@ApiParam(value = "车号")
private String carNo;
public Integer getIsSnapshot() {
return isSnapshot == null ? 0 : isSnapshot.intValue();
}
@ -225,12 +229,14 @@ public class WmsMoveDetails extends BaseBean {
public Long getFinishedCounts() {
return finishedCounts == null ? 0L : this.finishedCounts;
}
public WmsMoveDetails(String partNo, String partNameRdd, String unit, Double transQty) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.transQty = transQty;
}
public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty,
String createDateTime, String sn, String srcZoneNo) {
this.organizeCode = organizeCode;

@ -26,6 +26,7 @@ import javax.persistence.*;
@Table(name = "WMS_MOVE_TO_ERP", indexes = {
@Index(columnList = "TRANS_TYPE_CODE"),
@Index(columnList = "ORDER_NO"),
@Index(columnList = "ITEM"),
@Index(columnList = "ORGANIZE_CODE"),
@Index(columnList = "PART_NO")
})

@ -182,11 +182,12 @@ public class WmsPart extends BaseBean {
public WmsPart() {
}
public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty) {
public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) {
this.partNo = partNo;
this.partName = partName;
this.max = maxQty;
this.min = minQty;
this.qty = cqty;
this.partType = partType;
}
}

@ -89,6 +89,10 @@ public class WmsPoSn extends BaseBean {
@ApiParam(value = "收货数量", example = "0")
public Double recQty;
@Column(name = "ERP_AREA_NO_ADD")
@ApiParam("默认收货库存地")
private String erpAreaNoAdd;
@ApiParam(value = "供应商名称")
@Transient
public String vendorNameRdd;

@ -262,6 +262,14 @@ public class WmsStockSn extends BaseBean {
@Transient
private Integer isSnapshot;
@Transient
@ApiParam("临保天数")
private String qualityDay;
@Transient
@ApiParam("筛选(>=)或<")
private String choose;
public WmsStockSn() {
}

@ -889,6 +889,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result);
if (wmsStockSn.getSnStatus() == null) {
DdlPreparedPack.getInPackArray(new Integer[]{
WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
@ -1509,6 +1511,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result);
DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result);
DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result);
getStringBuilderPack(wmsPoSn, result);
@ -1964,6 +1967,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result);
DdlPreparedPack.getStringNotNullPack("locateNo", result);
result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''");

Loading…
Cancel
Save