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

yun-zuoyi
crish 6 years ago
commit fd5c6b2c9d

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE;
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-22
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_ASSIST_RESOURCE_SET_TIME")
@Api("副资源设置时间")
public class AssistResourceSetTime extends BaseAPS {
@Column(name="RES_CODE")
@ApiParam(value ="资源编码")
private String resCode;
@Column(name="TYPE")
@ApiParam(value ="副资源使用类型")
private USE_TYPE type;
@Column(name="PREV_RESOURCE")
@ApiParam(value ="前资源编码")
private String prevResource;
@Column(name="POST_RESOURCE")
@ApiParam(value ="后资源编码")
private String postResource;
@Column(name="TIME")
@ApiParam(value ="设置时间")
private String time;
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
private int priority;
}

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_CALC;
import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_TYPE;
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-22
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_DYNAMIC_SET_TIME")
@Api("动态设置时间")
public class DynamicSetTime extends BaseAPS {
@Column(name="RES_CODE")
@ApiParam(value ="资源代码")
private String resCode;
@Column(name="TYPE")
@ApiParam(value ="应用工作计划类型")
private DYNAMIC_SET_TYPE type;
@Column(name="CONSIDER_ASS_RES")
@ApiParam(value ="是否启用副资源动态设置时间")
private Boolean considerAssRes;
@Column(name="CONSIDER_MATERIAL")
@ApiParam(value ="是否启用物料动态设置时间")
private Boolean considerMaterial;
@Column(name="ASS_RES_CALC")
@ApiParam(value ="副资源动态设置计算方式")
private DYNAMIC_SET_CALC assResCalc;
@Column(name="MATERIAL_CALC")
@ApiParam(value ="物料动态设置时间计算方式")
private DYNAMIC_SET_CALC materialCalc;
@Column(name="STATIC_CALC")
@ApiParam(value ="与静态设置时间计算方式")
private DYNAMIC_SET_CALC staticCalc;
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
private int priority;
}

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-10-22
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="APS_FURNACE_PLAN")
@Api("炉资源计划")
public class FurnacePlan extends BaseAPS {
}

@ -0,0 +1,43 @@
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-22
* @Modify:
**/
@Data
@Entity
@Table(name = "APS_MATERIAL_SET_TIME")
@Api("物料设置时间")
public class MaterialSetTime extends BaseAPS {
@Column(name="RES_CODE")
@ApiParam(value ="资源编码")
private String resCode;
@Column(name="PREV_MATERIAL")
@ApiParam(value ="前物料编码")
private String prevMaterial;
@Column(name="POST_MATERIAL")
@ApiParam(value ="后物料编码")
private String postMaterial;
@Column(name="TIME")
@ApiParam(value ="设置时间")
private String time;
@Column(name="PRIORITY")
@ApiParam(value ="优先级")
private int priority;
}

@ -35,9 +35,9 @@ public class OperResource extends BaseAPS {
@ApiParam(value ="前设置时间")
private String prevTime;
@Column(name="MANUF_TIME")
@Column(name="PRODUCE_TIME")
@ApiParam(value ="生产时间")
private String manufTime;
private String produceTime;
@Column(name="POST_TIME")
@ApiParam(value ="后设置时间")
@ -47,9 +47,9 @@ public class OperResource extends BaseAPS {
@ApiParam(value ="最大前设置中断时间")
private String maxPrevSdTime;
@Column(name="MAX_MANUF_SD_TIME")
@Column(name="MAX_PRODUCE_SD_TIME")
@ApiParam(value ="最大生产中断时间")
private String maxManufSdTime;
private String maxProduceSdTime;
@Column(name="MAX_POST_SD_TIME")
@ApiParam(value ="最大后设置中断时间")

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
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 io.swagger.annotations.Api;
@ -48,37 +49,37 @@ public class Resource extends BaseCode {
@ApiParam(value ="后缓冲时间")
private String postBuffer;
@Column(name="MAX_MANUF_BATCH")
@Column(name="MAX_PRODUCE_BATCH")
@ApiParam(value ="最大生产批量")
private Double maxManufBatch;
private Double maxProduceBatch;
@Column(name="MANUF_ADJ_UNIT_TM")
@ApiParam(value ="生产时间尾数调整")
private String manufAdjUnitTm;
@Column(name="TIME_TAIL_ADJUST")
@ApiParam(value ="时间尾数调整")
private String timeTailAdjust;
@Column(name="MANUF_ADJ_UNIT")
@ApiParam(value ="生产时刻尾数调整")
private String manufAdjUnit;
@Column(name="TIME_ADJUST")
@ApiParam(value ="时间调整")
private String timeAdjust;
@Column(name="MAX_PREV_SD_TIME")
@ApiParam(value ="最大前设置中断时间")
private String maxPrevSdTime;
@Column(name="MAX_MANUF_SD_TIME")
@Column(name="MAX_PRODUCE_SD_TIME")
@ApiParam(value ="最大生产中断时间")
private String maxManufSdTime;
private String maxProduceSdTime;
@Column(name="MAX_POST_SD_TIME")
@ApiParam(value ="最大后设置中断时间")
private String maxPostSdTime;
@Column(name="ROUND_TYPE")
@ApiParam(value ="时间圆整类型")
@ApiParam(value ="时间与时间尾数圆整类型")
private TIME_ROUND_TYPE roundType;
@Column(name="MANUF_EFFECT")
@ApiParam(value ="生产效率影响")
private Integer manufEffect;
@Column(name="EFFICIENCY_EFFECT")
@ApiParam(value ="效率影响类型")
private Integer EfficiencyEffect;
@Column(name="TIME_ROUND")
@ApiParam(value ="时间圆整影响")
@ -88,4 +89,11 @@ public class Resource extends BaseCode {
@ApiParam(value ="时间尾数影响")
private Integer timeTailRound;
@Column(name="LOCK_TYPE")
@ApiParam(value ="锁定类型")
private RESOURCE_LOCK_TYPE lockType;
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间长度")
private String lockTime;
}

@ -5,14 +5,17 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
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.util.Date;
import java.util.List;
/**
* @Description :
@ -29,24 +32,70 @@ import java.util.Date;
@Table(name="APS_WORK_PLAN")
@Api("工作计划")
public class WorkPlan extends BaseAPS {
private Date prevSetStart;
@Column(name="PREV_SET_BEGIN")
@ApiParam(value ="前设置开始时间")
private Date prevSetBegin;
@Column(name="PREV_SET_END")
@ApiParam(value ="前设置结束时间")
private Date prevSetEnd;
private String prevSetTime;
private Date produceStart;
@Column(name="PREV_SET_TIME")
@ApiParam(value ="前设置时间")
private Long prevSetTime;
@Column(name="PRODUCE_BEGIN")
@ApiParam(value ="生产开始时间")
private Date produceBegin;
@Column(name="PRODUCE_END")
@ApiParam(value ="生产结束时间")
private Date produceEnd;
private String produceTime;
private Date postSetStart;
@Column(name="PRODUCE_TIME")
@ApiParam(value ="生产时间")
private Long produceTime;
@Column(name="POST_SET_BEGIN")
@ApiParam(value ="后设置开始时间")
private Date postSetBegin;
@Column(name="POST_SET_END")
@ApiParam(value ="后设置结束时间")
private Date postSetEnd;
private String postSetTime;
private Date lockStart;
@Column(name="POST_SET_TIME")
@ApiParam(value ="后设置时间")
private Long postSetTime;
@Column(name="LOCK_BEGIN")
@ApiParam(value ="锁定开始时间")
private Date lockBegin;
@Column(name="LOCK_END")
@ApiParam(value ="锁定结束时间")
private Date lockEnd;
private String lockTime;
private Date edgeTime;
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间")
private Long lockTime;
@Column(name="WORK_ID")
@ApiParam(value ="工作对象id")
private Long workId;
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源对象id")
private Long resourceId;
@Column(name="WORK_RESOURCE_ID")
@ApiParam(value ="工作资源对象id")
private Long workResourceId;
@Column(name="MAIN_PLAN_ID")
@ApiParam(value ="主计划对象id")
private Long mainPlanId;
public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
public void setWork(Work work) {
@ -60,4 +109,20 @@ public class WorkPlan extends BaseAPS {
this.resourceId = resource != null ? resource.getId() : 0l;
BeanRelation.set(this, EWorkPlan.Resource, resource);
}
public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); }
public void setWorkResource(WorkResource workResource) {
this.workResourceId = workResource != null ? workResource.getId() : 0l;
BeanRelation.set(this, EWorkPlan.WorkResource, workResource);
}
public WorkPlan getMainPlan() { return BeanRelation.get(this, EWorkPlan.MainPlan); }
public void setMainPlan(WorkPlan plan) {
this.mainPlanId = plan != null ? plan.getId() : 0l;
BeanRelation.set(this, EWorkPlan.MainPlan, plan);
}
public List<WorkPlan> getAssPlans() { return BeanRelation.list(this, EWorkPlan.AssPlans); }
}

@ -34,9 +34,9 @@ public class WorkResource extends BaseAPS {
@ApiParam(value ="前设置时间")
private Long prevTime;
@Column(name="MANUF_TIME")
@Column(name="PRODUCE_TIME")
@ApiParam(value ="制造时间")
private Long manufTime;
private Long produceTime;
@Column(name="POST_TIME")
@ApiParam(value ="后设置时间")
@ -50,9 +50,9 @@ public class WorkResource extends BaseAPS {
@ApiParam(value ="最大前设置中断时间")
private String maxPrevSdTime;
@Column(name="MAX_MANUF_SD_TIME")
@Column(name="MAX_PRODUCE_SD_TIME")
@ApiParam(value ="最大制造中断时间")
private String maxManufSdTime;
private String maxProduceSdTime;
@Column(name="MAX_POST_SD_TIME")
@ApiParam(value ="最大后设置中断时间")

@ -69,6 +69,13 @@ public class BeanRelation {
return temp;
}
/**
*
* @param bean
* @param holder
* @param <T>
* @return
*/
public static <T extends BaseBean> T get(BaseBean bean, Enum<?> holder) {
List<T> beans = (List<T>)get(bean).get(holder);
if (beans == null || beans.isEmpty()) {
@ -77,10 +84,27 @@ public class BeanRelation {
return beans.get(0);
}
/**
*
* @param bean
* @param holder
* @param args
* @param <T>
* @return
*/
public static <T extends BaseBean> T get(BaseBean bean, Enum<?> holder, Enum<?>... args) {
return get(bean, null, holder, args);
}
/**
*
* @param bean
* @param pred Lambdatrue
* @param holder
* @param args
* @param <T>
* @return
*/
public static <T extends BaseBean> T get(BaseBean bean, Predicate<T> pred, Enum<?> holder, Enum<?>... args) {
List<BaseBean> nextBeans = list(bean, holder);
for (BaseBean nextEntity : nextBeans) {
@ -111,6 +135,13 @@ public class BeanRelation {
return null;
}
/**
*
* @param bean
* @param holder
* @param <T>
* @return List
*/
public static <T extends BaseBean> List<T> list(BaseBean bean, Enum<?> holder) {
List<T> beans = (List<T>)get(bean).get(holder);
if (beans == null) {
@ -119,10 +150,27 @@ public class BeanRelation {
return beans;
}
/**
*
* @param bean
* @param holder
* @param args
* @param <T>
* @return List
*/
public static <T extends BaseBean> List<T> list(BaseBean bean, Enum<?> holder, Enum<?>... args) {
return list(bean, null, holder, args);
}
/**
*
* @param bean
* @param pred Lambdatrue
* @param holder
* @param args
* @param <T>
* @return List
*/
public static <T extends BaseBean> List<T> list(BaseBean bean, Predicate<T> pred, Enum<?> holder, Enum<?>... args) {
List<T> result = new ArrayList<>();
List<BaseBean> nextBeans = list(bean, holder);
@ -157,6 +205,38 @@ public class BeanRelation {
}
}
public static <T extends BaseBean> List<T> lastList(BaseBean entity, Enum<?>... args) {
List<T> result = new ArrayList<T>();
lastListImpl(result, entity, null, args, 0);
return result;
}
public static <T extends BaseBean> List<T> lastList(BaseBean entity, Predicate<T> filter, Enum<?>... args) {
List<T> result = new ArrayList<T>();
lastListImpl(result, entity, filter, args, 0);
return result;
}
@SuppressWarnings("unchecked")
private final static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean entity, Predicate<T> filter,
Enum<?>[] args, int index) {
if (index >= args.length) {
index = 0;
}
boolean bNotLast = true;
List<BaseBean> relaEntities = list(entity, args[index]);
for (BaseBean relaEntity : relaEntities) {
if (lastListImpl(result, relaEntity, filter, args, index + 1)) {
result.add((T)relaEntity);
bNotLast = false;
}
}
return index == 0 && bNotLast;
}
/**
*
*
@ -282,4 +362,42 @@ public class BeanRelation {
}
}
}
/**
* lambdalambdafalse退
* @param bean
* @param fun
* @param holders
* @param <T>
*/
public static <T extends BaseBean> void recursion(BaseBean bean, Predicate<T> fun, Enum<?>... holders) {
if (holders.length == 0) {
return;
}
recursionImpl(bean, fun, holders, 0);
}
/**
* 广
* @param bean
* @param fun
* @param holders
* @param index
* @param <T>
*/
@SuppressWarnings("unchecked")
private final static <T extends BaseBean> void recursionImpl(BaseBean bean, Predicate<T> fun,
Enum<?>[] holders, int index) {
if (index >= holders.length) {
if (!fun.test((T) bean)) {
return;
}
index = 0;
}
List<BaseBean> relaBeans = list(bean, holders[index]);
for (BaseBean relaBean : relaBeans) {
recursionImpl(relaBean, fun, holders, index + 1);
}
}
}

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum DYNAMIC_SET_CALC {
MIN, // 取最小值
MAX, // 取最大值
SUM // 求和
}

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum DYNAMIC_SET_TYPE {
PREV_SET, // 只对前设置影响
POST_SET, // 只对后设置影响
ALL // 对前后设置都产生影响
}

@ -0,0 +1,18 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum EFFICIENCY_EFFECT {
NONE(0),
PREV_SET(1),
PRODUCE(2),
POST_SET(4);
private int _value;
EFFICIENCY_EFFECT(int value){
_value = value;
}
public int value() {
return this._value;
}
}

@ -0,0 +1,7 @@
package cn.estsh.i3plus.pojo.aps.enums;
public enum RESOURCE_LOCK_TYPE {
NONE, // 不锁定
PRODUCE_BEGIN, // 与后工序生产开始时刻有关
PRODUCE_END // 与后工序生产结束时刻有关
}

@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums;
* @Modify:
**/
public enum TIME_ROUND_TYPE {
NONE, // 不圆整
UP, // 向上
DOWN, // 向下
ROUNDING // 四舍五入

@ -15,7 +15,6 @@ public enum WORK_SORT_RULE {
ORDER_COUNT, // 订单数量
ORDER_RECEIVE_DATE,// 订单接单日期
ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差
ORDER_PRESSURE, // 订单紧迫程度
ORDER_SURPLUS, // 订单余裕度
NOPLAN_OPERATION_SIZE,// 残留工序数
REMAIN_PRODUCE_TIME, // 残留生产时间

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

@ -3,5 +3,10 @@ package cn.estsh.i3plus.pojo.aps.holders;
public enum EWorkPlan {
Work,
Resource,
AssPlans // 关联的为副资源的工作计划
WorkResource,
MainPlan, // 关联的为主资源的工作计划
AssPlans, // 关联的为副资源的工作计划
PrevPlan,
PostPlan,
FurnacePlan,
}

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

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

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

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

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

@ -12,6 +12,8 @@
</Relation>
<Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="WorkPlan" name="WorkPlan" reverse="Work" type="ONE_TO_ONE" owner="true">
</Relation>
<Relation field="PlanFeedbacks" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
</Class>

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="WorkPlan">
<Relation field="Work" name="Work" reverse="WorkPlan" type="ONE_TO_ONE" owner="true">
</Relation>
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="AssPlans" name="WorkPlan" type="ONE_TO_MULTI" owner="false">
<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">
</Relation>
<Relation field="PrevPlan" name="WorkPlan" reverse="PostPlan" type="MULTI_TO_MULTI" owner="false">
</Relation>
</Class>

@ -31,7 +31,7 @@ public class CommonEnumUtil {
JOBFLOW(23,"block-jobflow","智能作业流"),
SOFTSWITCH(24,"block-softswitch","软件适配器"),
HARDSWITCH(25,"block-hardswitch","硬件适配器"),
LAC(26,"link-connect","连接适配器"),
LAC(26,"lac","连接适配器"),
ANDON(27,"andon","安灯"),
CENTER(99,"icloud-server","注册中心"),
SURFACE(98,"i3surface","对外服务"),

@ -330,7 +330,7 @@ public class MesEnumUtil {
public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN {
EMAIL(10, "邮件"),
USERPHONE(10, "手机号");
USERPHONE(20, "手机号");
private int value;
private String description;

@ -13,5 +13,11 @@
<artifactId>i3plus-pojo-lac</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
</dependencies>
</project>

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.lac.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-18 6:04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_COMMAND_STACK_RECORD")
@Api(value="适配记录",description = "适配记录")
public class LacCommandStackRecord extends BaseBean {
private static final long serialVersionUID = -2775980024345181459L;
@Column(name="commandStackId")
@ApiParam(value ="指令集ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackId;
@Column(name="COMMAND_STACK_NAME_RDD")
@ApiParam(value ="指令集名称")
private String commandStackNameRdd;
@Column(name="COMMAND_STACK_CODE_RDD")
@ApiParam(value ="指令集代码")
private String commandStackCodeRdd;
@Column(name="COMMAND_STACK_TYPE_ID")
@ApiParam(value ="指令集类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackTypeId;
@Column(name="STEP_INDEX")
@ApiParam(value ="当前步骤")
private Integer stepIndex;
@Column(name="STEP_NUM")
@ApiParam(value ="步骤总数")
private Integer stepNum;
@Column(name="TASK_COMPLETE_NUM")
@ApiParam(value ="任务完成数量")
private Integer taskCompleteNum;
@Column(name="TASK_NUM")
@ApiParam(value ="任务总数")
private Integer taskNum;
@Lob
@Column(name="INPUT_PARAMETER")
@ApiParam(value ="执行入参")
private String inputParameter;
@Column(name="STACK_START_TIME")
@ApiParam(value ="执行开始时间")
private String stackStartTime;
@Column(name="STACK_END_TIME")
@ApiParam(value ="执行结束时间")
private String stackEndTime;
@Column(name="STACK_SPEND")
@ApiParam(value ="执行耗时")
private Integer stackSpend;
@Column(name="STACK_STATUS")
@ApiParam(value ="执行状态")
private Integer stackStatus;
}

@ -0,0 +1,44 @@
package cn.estsh.i3plus.pojo.lac.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 3:29
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_COMMAND_STACK_TYPE")
@Api(value="指令集类型",description = "指令集类型")
public class LacCommandStackType extends BaseBean {
@Column(name="TYPE_NAME")
@ApiParam(value ="类型名称")
private String typeName;
@Column(name="TYPE_REF_NUM")
@ApiParam(value ="适配器使用数量")
private Integer typeRefNum;
@Column(name="TYPE_DESCRIPTION")
@ApiParam(value ="类型描述")
private String typeDescription;
}

@ -0,0 +1,106 @@
package cn.estsh.i3plus.pojo.lac.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-18 6:04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_LOG_TASK")
@Api(value="适配任务记录",description = "适配任务记录")
public class LacLogTask extends BaseBean {
private static final long serialVersionUID = 674009105885048131L;
@Column(name="commandStackId")
@ApiParam(value ="指令集ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackId;
@Column(name="COMMAND_STACK_NAME_RDD")
@ApiParam(value ="指令集名称")
private String commandStackNameRdd;
@Column(name="COMMAND_STACK_CODE_RDD")
@ApiParam(value ="指令集代码")
private String commandStackCodeRdd;
@Column(name="COMMAND_STACK_TYPE_ID")
@ApiParam(value ="指令集类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackTypeId;
@Column(name="STEP_ID")
@ApiParam(value ="步骤ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long stepId;
@Column(name="STEP_NAME_RDD")
@ApiParam(value ="步骤名称")
private String stepNameRdd;
@Column(name="STEP_SEQUENCE")
@ApiParam(value ="步骤顺序")
private String stepSequence;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId;
@Column(name="TASK_NAME_RDD")
@ApiParam(value ="任务名称")
private String taskNameRdd;
@Column(name="TASK_NAME_TYPE")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskNameType;
@Column(name="adapterId")
@ApiParam(value ="适配器ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long adapterId;
@Lob
@Column(name="INPUT_PARAMETER")
@ApiParam(value ="任务入参")
private String inputParameter;
@Column(name="TASK_START_TIME")
@ApiParam(value ="任务开始时间")
private String taskStartTime;
@Column(name="TASK_END_TIME")
@ApiParam(value ="任务结束时间")
private String taskEndTime;
@Column(name="TASK_SPEND")
@ApiParam(value ="任务耗时")
private Integer taskSpend;
@Column(name="TASK_STATUS")
@ApiParam(value ="任务状态")
private Integer taskStatus;
}

@ -0,0 +1,94 @@
package cn.estsh.i3plus.pojo.lac.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-18 6:04
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_LOG_TASK_DETAIL")
@Api(value="适配任务记录明细",description = "适配任务记录明细")
public class LacLogTaskDetail extends BaseBean {
private static final long serialVersionUID = -4918694502072594064L;
@Column(name="commandStackId")
@ApiParam(value ="指令集ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackId;
@Column(name="COMMAND_STACK_TYPE_ID")
@ApiParam(value ="指令集类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long commandStackTypeId;
@Column(name="STEP_ID")
@ApiParam(value ="步骤ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long stepId;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskId;
@Column(name="TASK_NAME_TYPE")
@ApiParam(value ="任务类型")
@JsonSerialize(using = ToStringSerializer.class)
private Long taskNameType;
@Column(name="adapterId")
@ApiParam(value ="适配器ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long adapterId;
@Column(name="TASK_START_TIME")
@ApiParam(value ="任务开始时间")
private String taskStartTime;
@Column(name="TASK_END_TIME")
@ApiParam(value ="任务结束时间")
private String taskEndTime;
@Lob
@Column(name="INPUT_PARAMETER")
@ApiParam(value ="任务入参")
private String inputParameter;
@Lob
@Column(name="INPUT_PARAMETER_BODY")
@ApiParam(value ="任务入参处理完成后")
private String inputParameterBody;
@Lob
@Column(name="OUTPUT_PARAMETER")
@ApiParam(value ="任务出参")
private String outputParameter;
@Lob
@Column(name="OUTPUT_PARAMETER_BODY")
@ApiParam(value ="任务出参处理后")
private String outputParameterBody;
}

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.lac.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 3:32
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_TASK_TYPE")
@Api(value="任务类型",description = "任务类型")
public class LacTaskType extends BaseBean {
@Column(name="TYPE_NAME")
@ApiParam(value ="类型名称")
private String typeName;
@Column(name="TYPE_REF_NUM")
@ApiParam(value ="适配器使用数量")
private Integer typeRefNum;
@Column(name="TYPE_DESCRIPTION")
@ApiParam(value ="类型描述")
private String typeDescription;
}

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 5:19
* @Modify:
**/
public interface LacCommandStackRecordRepository extends BaseRepository<LacCommandStackRecord, Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 5:19
* @Modify:
**/
public interface LacCommandStackTypeRepository extends BaseRepository<LacCommandStackType, Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 5:19
* @Modify:
**/
public interface LacLogTaskDetailRepository extends BaseRepository<LacLogTaskDetail, Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacLogTask;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 5:19
* @Modify:
**/
public interface LacLogTaskRepository extends BaseRepository<LacLogTask, Long> {
}

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.lac.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.lac.bean.LacTaskType;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 5:19
* @Modify:
**/
public interface LacTaskTypeRepository extends BaseRepository<LacTaskType, Long> {
}

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.lac.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.lac.bean.*;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-10-22 5:34
* @Modify:
**/
public class LacHqlPack {
private LacHqlPack() {
}
public static DdlPackBean packHqlLacTaskType(LacTaskType bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacLogTask(LacLogTask bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
return ddlPackBean;
}
}

@ -40,7 +40,7 @@ public class MesEquTask extends BaseBean {
private Integer taskType;
@Column(name = "TASK_STATUS")
@ApiParam("作业状态")
@ApiParam("任务状态")
private Integer taskStatus;
@Column(name = "WORK_CENTER_CODE")
@ -80,6 +80,10 @@ public class MesEquTask extends BaseBean {
private String planTimeEnd;
@Transient
@ApiParam(value = "用于设备点检保养维修作业页面开窗查询任务,点检保养=1维修=2")
private String pageType;
@Transient
@ApiParam(value ="明细列表")
private List<MesEquTaskDetail> mesEquTaskDetailList;

@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :
@ -57,5 +59,28 @@ public class MesEquTaskDetail extends BaseBean {
@ApiParam("维修标识")
private Integer repairFlag;
@Transient
@ApiParam(value = "点检保养记录")
private List<MesEquTaskStandardRecord> equTaskStandardRecordList;
@Transient
@ApiParam(value = "工位")
private String workCellCode;
@Transient
@ApiParam(value = "生产线")
private String workCenterCode;
@Transient
@ApiParam(value = "故障现象")
private String fpCode;
@Transient
@ApiParam(value = "故障原因")
private String fcCode;
@Transient
@ApiParam(value = "处理方法")
private String fmCode;
}

@ -0,0 +1,68 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-10-11
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_TASK_REPAIR_RECORD")
@Api("设备维修作业记录")
public class MesEquTaskRepairRecord extends BaseBean {
@Column(name = "TASK_NO")
@ApiParam("作业任务编号")
private String taskNo;
@Column(name = "TASK_TYPE")
@ApiParam("作业类型")
private Integer taskType;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Column(name = "EQUIPMENT_NAME")
@ApiParam("设备名称")
private String equipmentName;
@Column(name = "FP_CODE")
@ApiParam("故障现象")
private String fpCode;
@Column(name = "FC_CODE")
@ApiParam("故障原因")
private String fcCode;
@Column(name = "FM_CODE")
@ApiParam("处理方法")
private String fmCode;
@Column(name = "FINAL_RESULT")
@ApiParam("整体结果")
private Integer finalResult;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
}

@ -0,0 +1,73 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-10-11
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQU_TASK_STANDARD_RECORD")
@Api("设备点检保养作业记录")
public class MesEquTaskStandardRecord extends BaseBean {
@Column(name = "TASK_NO")
@ApiParam("作业任务编号")
private String taskNo;
@Column(name = "TASK_TYPE")
@ApiParam("作业类型")
private Integer taskType;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Column(name = "EQUIPMENT_NAME")
@ApiParam("设备名称")
private String equipmentName;
@Column(name = "ACTION_ITEM")
@ApiParam("操作项")
private String actionItem;
@Column(name = "ACTION_STANDARD")
@ApiParam("操作标准")
private String actionStandard;
@Column(name = "ACTION_GUIDE")
@ApiParam("操作指导")
private String actionGuide;
@Column(name = "CHECK_RESULT")
@ApiParam("判定结果")
private Integer checkResult;
@Column(name = "FINAL_RESULT")
@ApiParam("整体结果")
private Integer finalResult;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
}

@ -31,7 +31,7 @@ import java.util.List;
@Api("用户信息model")
public class EquTaskNotifyUserModel extends BaseBean {
@ApiParam(value ="人员ID")
@ApiParam(value ="账户ID")
private Long userId;
@Column(name="USER_NAME_RDD")

@ -1,9 +1,11 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskStandardRecord;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class MesEquTaskDetailModel implements Serializable {
@ -70,6 +72,12 @@ public class MesEquTaskDetailModel implements Serializable {
@ApiParam("作业类型")
private String taskTypeName;
@ApiParam("设备点检保养记录修改标识")
private Boolean isUpdate;
@ApiParam("设备点检保养记录")
private List<MesEquTaskStandardRecord> equTaskStandardRecordList;
public MesEquTaskDetailModel() {

@ -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.MesEquTaskRepairRecord;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-10-11
* @Modify:
**/
@Repository
public interface MesEquTaskRepairRecordRepository extends BaseRepository<MesEquTaskRepairRecord, 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.MesEquTaskStandardRecord;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-10-11
* @Modify:
**/
@Repository
public interface MesEquTaskStandardRecordRepository extends BaseRepository<MesEquTaskStandardRecord, Long> {
}

@ -1530,4 +1530,27 @@ public class MesHqlPack {
}
return packBean;
}
/**
* mes
* @param mesEquTaskDetail
* @param organizeCode
* @return
*/
public static DdlPackBean getMesEquTaskDetailByTaskNo(MesEquTaskDetail mesEquTaskDetail, String organizeCode) {
DdlPackBean packBean = getMesAllData(organizeCode);
if (!StringUtils.isEmpty(mesEquTaskDetail.getTaskNo())) {
DdlPreparedPack.getStringEqualPack(mesEquTaskDetail.getTaskNo(), "taskNo", packBean);
}
if (!StringUtils.isEmpty(mesEquTaskDetail.getEquipmentCode())) {
DdlPreparedPack.getStringLikerPack(mesEquTaskDetail.getEquipmentCode(), "equipmentCode", packBean);
}
if (!StringUtils.isEmpty(mesEquTaskDetail.getActionStatus())) {
DdlPreparedPack.getNumEqualPack(mesEquTaskDetail.getActionStatus(), "actionStatus", packBean);
}
if (!StringUtils.isEmpty(mesEquTaskDetail.getFinalResult())) {
DdlPreparedPack.getNumEqualPack(mesEquTaskDetail.getFinalResult(), "finalResult", packBean);
}
return packBean;
}
}

@ -1,6 +1,6 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails;
import lombok.Data;
import java.io.Serializable;
@ -18,5 +18,6 @@ public class WmsWriteOffModel implements Serializable {
private static final long serialVersionUID = -5490167040159056107L;
private String locateNo;
private List<String> snList;
private List<WmsMoveSn> summaryList;
private List<WmsMoveDetails> summaryList;
private String organizeCode;
}

@ -0,0 +1,71 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @author: jessica.chen
* @date: 2019/10/22 17:10
* @Modify:
*/
@Data
@Api(value="领料单模板",description = "领料单模板")
public class WmsBomTemplate extends BaseBean {
private static final long serialVersionUID = 2167743108452607611L;
@ApiParam(value = "父物料号")
@AnnoOutputColumn
private String partNo;
@ApiParam(value = "父物料描述")
@AnnoOutputColumn
private String partName;
@ApiParam(value = "父计量单位")
@AnnoOutputColumn
private String unit;
@ApiParam(value = "父级数量")
@AnnoOutputColumn
private Double qty;
@ApiParam(value = "子物料号")
@AnnoOutputColumn
private String itemPartNo;
@ApiParam(value = "子物料描述")
@AnnoOutputColumn
private String itemPartName;
@ApiParam(value = "子计量单位")
@AnnoOutputColumn
private String itemUnit;
@ApiParam(value = "子用量")
@AnnoOutputColumn
private Double itemQty;
@ApiParam(value = "BOM编号")
@AnnoOutputColumn
private String bomNum;
@ApiParam(value = "BOM版本号")
@AnnoOutputColumn
private String bomVersion;
@ApiParam(value = "有效起始日期")
@AnnoOutputColumn
private String effStartTime;
@ApiParam(value = "有效截止日期")
@AnnoOutputColumn
private String effEndTime;
}

@ -107,6 +107,10 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("是否范围内")
public Integer isScope;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编码")
public String vendorNo;
@Transient
@ApiParam(value = "实盘箱数", example = "1")
public Long countBoxQty;
@ -163,9 +167,9 @@ public class WmsCSFactTrans extends BaseBean {
this.zoneNo = zoneNo;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
}
}

@ -101,6 +101,10 @@ public class WmsCSOrderDetails extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.CS_TRANS_STATUS.class,refForeignKey = "value",value = "description")
public Integer transStatus;
@Column(name = "VENDOR_NO")
@ApiParam(value = "供应商编码")
public String vendorNo;
@Transient
@ApiParam(value = "实盘数量", example = "1")
public Double factQty;

@ -225,7 +225,12 @@ 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;

@ -202,14 +202,6 @@ public class WmsMoveSn extends BaseBean {
public WmsMoveSn() {
}
public WmsMoveSn(String partNo, String partNameRdd, String unit, String lotNo, Double qty) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.lotNo = lotNo;
this.qty = qty;
}
public Long getWaitingCounts() {
return waitingCounts == null ? 0L : this.waitingCounts;
}

@ -116,6 +116,10 @@ public class WmsPOMaster extends BaseBean {
@ApiParam("集装箱号")
public String containerNo;
@Column(name = "PRIOR_RC")
@ApiParam("预收货")
public Integer priorRC;
@Transient
@ApiParam(value = "工厂名称")
public String organizeName;

@ -34,9 +34,15 @@ public class WmsCSOrderDetailsModel implements Serializable {
@ApiParam("仓库编码")
public String whNo;
@ApiParam("源仓库编码")
public String srcWhNo;
@ApiParam("区域编码")
public String zoneNo;
@ApiParam("源存储区编码")
public String srcZoneNo;
@ApiParam("状态")
public String wmStatus;

@ -2383,8 +2383,8 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result);
DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
getStringBuilderPack(wmsRouting, result);

Loading…
Cancel
Save