diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index d79eb4b..9d9df79 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.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 : ANDON_工作单元呼叫原因配置 @@ -45,4 +46,12 @@ public class AndonCellAlarmCause extends BaseBean { @Column(name = "AC_CODE") @ApiParam(value = "事件描述") private String acCode; + + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "呼叫原因描述") + private String acName; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index 4f04613..1be0a94 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.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 : ANDON_工作单元事件原因配置 @@ -47,5 +48,12 @@ public class AndonCellEventCause extends BaseBean { @ApiParam(value = "事件原因") private String ecCode; + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "事件原因描述") + private String ecName; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index b2f933c..00dea5f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.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 : ANDON_工作单元处理方法配置 @@ -45,4 +46,12 @@ public class AndonCellEventMethod extends BaseBean { @Column(name = "EM_CODE") @ApiParam(value = "处理方法") private String emCode; + + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "处理方法描述") + private String emName; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 5f6df39..f2be38c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -266,6 +266,10 @@ public class AndonManageQueue extends BaseManageQueue { @ApiParam(value ="生产累计件数") private Integer totalProdNum; + @Transient + @ApiParam(value ="安灯类型名称") + private String alarmCodeName; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index 828a12a..e9bbc29 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_PLC控制 @@ -82,6 +83,22 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "是否安灯") private Integer isAlarmStatus; + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "生产线名称") + private String workCenterName; + + @Transient + @ApiParam(value = "标签业务类型名称") + private String tagBusinessTypeName; + + @Transient + @ApiParam(value = "是否安灯名称") + private String isAlarmStatusName; + public int getIsAlarmStatusVal(){ if(isAlarmStatus == null){ return 0; 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 1e07422..f1d43e0 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 @@ -363,10 +363,10 @@ public class WmsEnumUtil { } /** - * PO条码状态 + * 单据条码状态（PO/DOC_MOVE） */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PO_SN_STATUS { + public enum ORDER_SN_STATUS { CREATE(10, "N", "创建"), RECEIPTED(20, "R", "已完成"), CANCEL(30, "C", "行取消"), @@ -376,7 +376,7 @@ public class WmsEnumUtil { private String code; private String description; - PO_SN_STATUS(int value, String code, String description) { + ORDER_SN_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java new file mode 100644 index 0000000..be4145b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class QueueJisModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("作业任务编号") + private String taskNo; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam("作业状态") + private Integer taskStatus; + + @ApiParam(value="生产线") + private String workCenterCode; + + @ApiParam("计划日期") + private String planTime; + + @ApiParam("任务来源") + private Integer taskSource; + + @ApiParam("备注") + private String memo; + + @ApiParam("通知标识") + private Integer notifyFlag; + + @ApiParam("关联任务") + private String relateTask; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("有效性") + public Integer isValid; + + @ApiParam("是否已删除") + public Integer isDeleted; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("作业状态") + private String taskStatusName; + + @ApiParam("任务来源") + private String taskSourceName; + + @ApiParam("通知标识") + private String notifyFlagName; + + @ApiParam("mes设备作业任务页面按钮控制") + private MesButtonFlagModel mesButtonFlagModel; + + + public QueueJisModel() { + + } + + public QueueJisModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.taskNo = taskNo; + this.taskType = taskType; + this.taskStatus = taskStatus; + this.workCenterCode = workCenterCode; + this.planTime = planTime; + this.taskSource = taskSource; + this.memo = memo; + this.notifyFlag = notifyFlag; + this.relateTask = relateTask; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java new file mode 100644 index 0000000..1c4fdfe --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description SAP DB操作参数Model + * @Reference + * @Author dragon + * @CreateDate 2020/1/2 11:23 + * @Modify + */ +@Data +public class WmsSapDbParamModel implements Serializable { + private static final long serialVersionUID = 5784492509251527816L; + private String organizeCode;//工厂代码 + private String orderNo;//单号 + private String partNo;//物料号 + private String masterTableName;//单据主表名 + private String masterStatusName;//单据状态名 + private String detailsTableName;//单据明细表名 + private String snTableName;//单据条码表名 +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 22fe9f5..3e57d16 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -67,7 +67,7 @@ public class WmsDocMovementSn extends BaseBean { */ @Column(name="SN_STATUS") @ApiParam(value = "操作状态", example = "10") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; @Column(name="SN") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 370667a..0f31d20 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -171,7 +171,7 @@ public class WmsPart extends BaseBean { private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") - @ApiParam(value = "贵重物料") + @ApiParam(value = "是否贵重") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; 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 44b26b2..215fb1b 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 @@ -351,7 +351,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); - + DdlPreparedPack.getNumEqualPack(wmsPart.getIsValuable(), "isValuable",result); getStringBuilderPack(wmsPart, result); return result; @@ -2677,4 +2677,19 @@ public class WmsHqlPack { return result; } + /** + * 根据条件查询dataAuth + * + * @param wmsSnOperateRecord + * @return + */ + public static DdlPackBean packHqlWmsSnOperateRecord(WmsSnOperateRecord wmsSnOperateRecord) { + DdlPackBean result = new DdlPackBean(); + if (!Strings.isNullOrEmpty(wmsSnOperateRecord.getSn())) { + DdlPreparedPack.getStringEqualPack(wmsSnOperateRecord.getSn(), "sn", result); + } + getStringBuilderPack(wmsSnOperateRecord, result); + return result; + } + }