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 7b8dcf8..010ac3e 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 @@ -1731,4 +1731,42 @@ public class WmsEnumUtil { return tmp; } } + /** + * 流程明细动作类型 + * 10=交互动作,20=后台动作,30=提交动作 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_VALUE_TYPE { + + INTERACTIVE_ACTION(10, "交互动作"), + BACKSTAGE_ACTION(20, "后台动作"), + SUBMIT_ACTION(30, "提交动作"); + + private int value; + private String description; + + GROUP_VALUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index da46d9e..ecb479a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.model.wms.OptionModel; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -10,7 +11,6 @@ import lombok.NoArgsConstructor; import java.util.List; import java.util.Map; -import java.util.Set; /** * @Description : PDA传输到后台的实体bean对象 @@ -41,7 +41,7 @@ public class WmsActionResponseBean { public List informations; @ApiParam("可选项") - public Map options; + public List options; @ApiParam("选中的明细数据") public List> details; @@ -58,7 +58,7 @@ public class WmsActionResponseBean { this.message = message; } - public WmsActionResponseBean(Double percent, String message, List informations, List> details, Boolean codeStatus) { + public WmsActionResponseBean(Double percent, String message, List informations, List> details, Boolean codeStatus) { this.percent = percent; this.message = message; this.informations = informations; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java index f3cacaf..78b2135 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallParamRepository.java @@ -2,12 +2,8 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import java.util.List; - /** * @Description : * @Reference : @@ -17,6 +13,6 @@ import java.util.List; **/ @Repository public interface WmsActionStepCallParamRepository extends BaseRepository { - @Query("select ascp from wms_action_step_call_param ascp inner join wms_action_group_details agd on ascp.agdId=agd.id where agd.agId =: agId") - List queryWmsActionStepCallParamsByAgId(@Param("agId") Long agId); +// @Query("select ascp from WMS_ACTION_STEP_CALL_PARAM ascp inner join wms_action_group_details agd on ascp.agdId=agd.id where agd.agId =: agId") +// List queryWmsActionStepCallParamsByAgId(@Param("agId") Long agId); }