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 b241d49..7928693 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 @@ -181,7 +181,7 @@ public class AndonManageQueue extends BaseBean { @Column(name = "EC_DESC") @ApiParam(value = "事件具体原因") - private String ec_desc; + private String ecDesc; @Column(name = "EM_CODE") @ApiParam(value = "事件方法代码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java index 38e3bbd..bdc2403 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java @@ -181,7 +181,7 @@ public class AndonManageRecord extends BaseBean { @Column(name = "EC_DESC") @ApiParam(value = "事件具体原因") - private String ec_desc; + private String ecDesc; @Column(name = "EM_CODE") @ApiParam(value = "事件方法代码") 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 ae88bf0..8bccd4e 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 @@ -71,4 +71,16 @@ public class AndonPLC extends BaseBean { @Column(name = "GROUP_NO") @ApiParam(value = "分组号") private String groupNo; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "TAG_BUSINESS_TYPE") + @ApiParam(value = "标签业务类型") + private String tagBusinessType; + + @Column(name = "IS_ALARM_STATUS") + @ApiParam(value = "是否按灯状态", example = "1") + private Integer isAlarmStatus; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java index 43cfce1..533c56a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java @@ -28,6 +28,11 @@ import javax.persistence.Table; @Table(name="MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name="SHIFT_CODE") @ApiParam("班次代码") private String shiftCode; @@ -43,4 +48,12 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") private String workTimes; + + public MesShift() { + } + + public MesShift(String workCenterCode,String organizeCode) { + this.workCenterCode = workCenterCode; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventMethodRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventMethodRepository.java new file mode 100644 index 0000000..78273af --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventMethodRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonEventMethod; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_事件处理方法） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-14 11:34 + * @Modify: + **/ +@Repository +public interface IAndonEventMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java similarity index 80% rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java index e4027cc..4300b50 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface IAndonManagetQueueRepository extends BaseRepository { +public interface IAndonManageQueueRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java similarity index 80% rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java index 13623d0..42bb09c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface IAndonManagetRecordRepository extends BaseRepository { +public interface IAndonManageRecordRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index db59c17..60667d8 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -1,9 +1,14 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; -import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import org.apache.commons.lang3.StringUtils; + +import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -40,6 +45,30 @@ public class AndonHqlPack { } /** + * 按灯PLC查询条件 + * + * @param andonPLC plc实体 + * @return + */ + public static DdlPackBean packHqlAndonPLCInfo(AndonPLC andonPLC) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getNodeIP(), "nodeIP", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagName(), "tagName", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getGroupNo(), "groupNo", result); + + getStringBuilderPack(andonPLC, result); + return result; + } + + /** * 按条件查询工作中心 * @param mesWorkCenter * @return @@ -82,6 +111,20 @@ public class AndonHqlPack { } /** + * 按条件查询班次 + * @param mesShift + * @return + */ + public static DdlPackBean packHqlMesShift(MesShift mesShift){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesShift.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(mesShift, result); + + return result; + } + + /** * 按条件查询ANDON呼叫原因 * @param andonAlarmCause * @return @@ -94,4 +137,51 @@ public class AndonHqlPack { return result; } + + /** + * 按条件查询ANDON事件处理方法 + * @param andonEventMethod + * @return + */ + public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonEventMethod, result); + + return result; + } + + /** + * 按条件查询ANDON事件原因 + * @param andonEventCause + * @return + */ + public static DdlPackBean packHqlAndonEventCause(AndonEventCause andonEventCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonEventCause, result); + + return result; + } + + /** + * 按条件查询按灯队列信息 + * @param andonManageQueue + * @return + */ + public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getInPackArray(obj, "statusCode", result); + + getStringBuilderPack(andonManageQueue, result); + + return result; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java new file mode 100644 index 0000000..da0802d --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -0,0 +1,188 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : + * @Reference : + * @Author : silliter + * @CreateDate : 2019-05-13 15:53 + * @Modify: + **/ +public class AndonEnumUtil { + /** + * 按灯状态 + * 10-是，20-否 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_ALARM_STATUS{ + + YES(10,"需要按灯"), + ON(20,"不需要按灯"); + + private int value; + private String description; + + IS_ALARM_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; + } + } + + /** + * 按灯业务状态 + * 安灯状态=10，工号 =20 ，读取状态=30 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_BUSI_FLAG{ + + ALARM_FLAG("10","按灯状态"), + USER_CODE("20","工号"), + READ_FLAG("30", "读取状态"); + + private String value; + private String description; + + ALARM_BUSI_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 按灯标识 + * 1-呼叫，2-签到，3-解决 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_FLAG{ + + CALL(1,"10","呼叫"), + SIGN(2,"20","签到"), + RESOLVE(3,"30","解决"), + CANCEL(4,"40", "撤销"); + + private int value; + private String code; + private String description; + + ALARM_FLAG(int value,String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode(){ return code; } + + public String getDescription() { + return description; + } + + public static String 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; + } + } + + /** + * 按灯动作标志 + * 呼叫=10，签到 =20 ，撤销=30，40-解决，50-转呼 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_ACTION_FLAG{ + + CALL_ACTION("10","呼叫动作"), + SIGN_ACTION("20","签到动作"), + CANCEL_ACTION("30", "撤销动作"), + RESOLVE_ACTION("40", "解决动作"), + SHIFG_CALL_ACTION("50", "转呼动作"); + + private String value; + private String description; + + ANDON_ACTION_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 优先级别 + * 10 - 一级，20 - 二级，30 - 三级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_PRIORITY{ + + FIRST(10,"一级"), + SECOND(20,"二级"), + THIRD(30,"三级"); + + private int value; + private String description; + + ALARM_PRIORITY(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; + } + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index bc9b23c..437d602 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -571,4 +571,42 @@ public class MesEnumUtil { } } + /** + * 组织模型树形菜单level + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROD_ORG_LEVEL{ + + LEVEL_ONE(1,"一级目录"), + LEVEL_TWO(2,"二级目录"), + LEVEL_THREE(3,"三级目录"), + LEVEL_FOUR(4,"四级目录"); + + private int value; + private String description; + + PROD_ORG_LEVEL(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; + } + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index 32e27cb..26675f7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -33,7 +33,7 @@ public class MesQueueOrder extends BaseBean { @Column(name="VIN_CODE") @ApiParam("Vin") - private Integer vinCode; + private String vinCode; @Column(name="CUST_FLAG_NO") @ApiParam("客户标识号") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index 5b4c453..91149c5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -28,12 +28,16 @@ import javax.persistence.Table; @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name="ORDER_NO") - @ApiParam("工单号") + @ApiParam("主队列编号") private String orderNo; @Column(name="PART_NO") @ApiParam("物料号") - private Integer partNo; + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; @Column(name="SERIAL_NUMBER") @ApiParam("产品条码") @@ -53,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean { @Column(name="WORK_TYPE") @ApiParam("生产类型") - private String workType; + private String workOrderType; @Column(name="PRODUCE_CATEGORY") @ApiParam("产品类型") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java new file mode 100644 index 0000000..94ef1a2 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class AndonOpcModel { + + /** + * 通常为localhost + */ + @ApiParam("opcserver地址-ip") + private String host; + + /** + * opcserver的名称 + */ + @ApiParam("opcserver名称") + private String serverProgId; + + /** + * 一般为channel + */ + @ApiParam("第一层路径") + private String accessPath; + + /** + * 一般为device.tag + */ + @ApiParam("剩余路径名称") + private String itemName; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java new file mode 100644 index 0000000..984c8a4 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class AndonResultBean { + + @ApiParam("是否成功") + private boolean success; + + @ApiParam("处理信息") + private String msg; + + @ApiParam("处理结果") + private String result; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index df3f6d5..28139af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -52,42 +52,25 @@ public class WmsActionGroup extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; -// @Transient -// @ApiParam(value = "初始化组件名称") -// private String initAmName; - @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; -// @Transient -// @ApiParam(value = "明细处理组件名称") -// private String detailsAmName; - - @Column(name = "SUBMIT_AM_ID") - @ApiParam(value = "提交组件编号", example = "0") - @JsonSerialize(using = ToStringSerializer.class) - private Long submitAmId; - -// @Transient -// @ApiParam(value = "提交组件名称") -// private String submitAmName; - @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; -// -// @Transient -// @ApiParam(value = "结束组件名称") -// private String endAmName; // 1=true, 2 = false @Column(name = "AUTO_INIT") @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; + @Column(name = "POSITION") + @ApiParam(value = "GOJS位置") + private String position; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 54a9528..beb6129 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -27,7 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_GROUP_DETAILS") +@Table(name = "WMS_ACTION_GROUP_DETAILS") @Api("作业流程明细") public class WmsActionGroupDetails extends BaseBean {