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 1126543..768dc10 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 @@ -1426,9 +1426,10 @@ public class WmsEnumUtil { PROCESS_HANDLING(10, "流程处理组件,"), PROCESS_INITIALIZATION(20, "流程初始化组件"), - PROCESS_END(30, "流程结束组件"), + PROCESS_COMMIT(30, "流程提交组件"), DETAIL_PROCESS(40, "明细处理组件"), - BACK_DISPLAY(50, "回显方法"); + BACK_DISPLAY(50, "回显方法"), + PROCESS_END(60, "流程结束组件"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java index 2f06b5a..f62516b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java @@ -1,10 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam; +import cn.estsh.i3plus.pojo.wms.bean.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -25,6 +22,8 @@ public class WmsActionGroupDetailsModel { public WmsActionGroupDetails wmsActionGroupDetails; @ApiParam("作业步骤") public WmsActionStep wmsActionStep; + @ApiParam("作业组件参数(可选列表)") + public List wmsActionModuleParamList; @ApiParam("作业步骤调用") public List wmsActionStepCallList; @ApiParam("作业步骤调用参数") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index 3e6ecc4..feba777 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -13,38 +13,42 @@ import javax.persistence.Entity; import javax.persistence.Table; /** -* @Description : 作业步骤处理组件 -* @Reference : -* @Author : dragon.xu -* @CreateDate : 2018-11-22 16:53 -* @Modify: -**/ + * @Description : 作业步骤处理组件 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-22 16:53 + * @Modify: + **/ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_MODULE") -@Api("作业步骤处理组") +@Table(name = "WMS_ACTION_MODULE") +@Api("作业步骤处理组件") public class WmsActionModule extends BaseBean { - @Column(name="AM_NAME") + @Column(name = "AM_NAME") @ApiParam("组件名称") public String amName; - @Column(name="AM_DESC") + @Column(name = "AM_DESC") @ApiParam("组件描述") public String amDesc; - @Column(name="CALL_CLASS") + @Column(name = "CALL_CLASS") @ApiParam("实现类") public String callClass; - @Column(name="AM_TYPE") + @Column(name = "AM_TYPE") @ApiParam(value = "组件类型", example = "0") public Integer amType; - @Column(name="OP_TYPE_CODE") + @Column(name = "OP_TYPE_CODE") @ApiParam(value = "作业类型", example = "0") public Integer opTypeCode; + + @Column(name = "IS_SHOW_INFO") + @ApiParam(value = "是否实现回显", example = "0") + public Integer isShowInfo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index 90358a4..c60aad8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -33,7 +33,7 @@ public class WmsActionModuleParam extends BaseBean { @Column(name = "AM_ID") @ApiParam(value = "组件ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) - public Long amID; + public Long amId; @Column(name = "METHOD_NAME") @ApiParam("组件执行方法名称") 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 6191b78..c429b53 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 @@ -1272,7 +1272,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + DdlPreparedPack.getNumEqualPack(wmsActionModuleParam.getAmId(), "amId", result); DdlPreparedPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); getStringBuilderPack(wmsActionModuleParam, result); return result; @@ -1291,6 +1291,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); getStringBuilderPack(wmsActionModule, result);