diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 08be72e..95b5a20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -42,7 +42,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PREV_SET_TIME") @ApiParam(value ="前设置时间") - private Long prevSetTime; + private Integer prevSetTime; @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") @@ -54,7 +54,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - private Long produceTime; + private Integer produceTime; @Column(name="POST_SET_BEGIN") @ApiParam(value ="后设置开始时间") @@ -66,7 +66,7 @@ public class WorkPlan extends BaseAPS { @Column(name="POST_SET_TIME") @ApiParam(value ="后设置时间") - private Long postSetTime; + private Integer postSetTime; @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @@ -78,7 +78,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间") - private Long lockTime; + private Integer lockTime; @Column(name="WORK_ID") @ApiParam(value ="工作对象id") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java new file mode 100644 index 0000000..8218c5b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :工作计划包含的时间类型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +public enum PLAN_TYPE { + PREV_SET, + PRODUCE, + POST_SET, + LOCK +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java index 2cc398b..97f2c22 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java @@ -3,8 +3,32 @@ package cn.estsh.i3plus.pojo.aps.model; import cn.estsh.i3plus.pojo.base.common.Pager; import lombok.Data; +import java.util.List; + @Data public class APSPager extends Pager { + public static class SortData { + // 排序对象 + private String name; + // 排序类型，1为升序，0为降序 + private int orderType; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getOrderType() { + return orderType; + } + + public void setOrderType(int orderType) { + this.orderType = orderType; + } + } private String filter; - private String sort; + private List sorts; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 457b27d..5ed2462 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -67,7 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID") @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 822a771..9546754 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -797,7 +797,9 @@ public class WmsEnumUtil { VDAREPORT("VDAREPORT", "VDA生产报工"), VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"), VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"), - VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"); + VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"), + VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"), + VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"); private String value; private String description; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java index 4a864be..7a42440 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -88,4 +88,8 @@ public class LacCommandStackRecord extends BaseBean { @ApiParam(value ="执行状态") private Integer stackStatus; + @Column(name="EXECUTION_DESCRIPTION") + @ApiParam(value ="执行说明") + private String executionDescription; + } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39a7704..7f12b9c 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -36,6 +36,11 @@ i3plus.pojo + i3plus-pojo-andon + + + + i3plus.pojo i3plus-pojo-wms diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java new file mode 100644 index 0000000..cf2a454 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: mes定时获取安灯安灯任务信息请求DTO + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-25-14:40 + * @Modify: + **/ +@Data +public class AndonManageQueueSyncModel{ + + @ApiParam("同步时间") + private String syscTime; + + @ApiParam("安灯状态") + private List statusList; + + @ApiParam("组织代码") + private String organizeCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index dfdad1f..01b1fea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : @@ -84,6 +85,18 @@ public class WmsBom extends BaseBean { @Column(name = "EFF_END_TIME") private String effEndTime; + @ApiParam(value = "目标存储区") + @Transient + public String destZoneNo; + + @ApiParam(value = "交易类型") + @Transient + public String transTypeCode; + + @ApiParam(value = "线路代码") + @Transient + public String routingCode; + public Double getQty() { return this.qty == null ? 0 : this.qty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index ac86f7e..33e46a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -30,12 +30,12 @@ public class WmsInterfaceDataMapper extends BaseBean { * 排序编号 */ @Column(name = "SEQ") - public int seq; + public Integer seq; /** * 来源表的每次查询记录数，防止大量数据造成内存溢出 */ @Column(name = "SRC_GET_LIMIT") - public int srcGetLimit; + public Integer srcGetLimit; /** * 接口数据源编号（在动态表单中配置） */ @@ -132,23 +132,23 @@ public class WmsInterfaceDataMapper extends BaseBean { * 调用脚本方法获取数据 */ @Column(name = "USE_SCRIPT_PULL") - public int useScriptPull; + public Integer useScriptPull; /** * 调用脚本方法保存数据 */ @Column(name = "USE_SCRIPT_PUSH") - public int useScriptPush; + public Integer useScriptPush; /** * 调用脚本方法更新同步标志 */ @Column(name = "USE_SCRIPT_MARK") - public int useScriptMark; + public Integer useScriptMark; /** * 调用脚本方法过滤数据（查询来源数据后过滤） */ @Column(name = "USE_SCRIPT_FILTER") - public int useScriptFilter; + public Integer useScriptFilter; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 46d6355..d30e639 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2460,4 +2460,20 @@ public class WmsHqlPack { return result; } + + /** + * 根据父物料查询子物料的bom信息 + * + * @param wmsBom + * @return + */ + public static DdlPackBean packHqlWmsBomByItemPartNo(WmsBom wmsBom) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsBom.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsBom, result); + + return result; + } }