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 179e772..f41bf15 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 @@ -69,4 +69,9 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "作业步骤名称") private String asName; + @Transient + @ApiParam(value = "流程名称") + private String agName; + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index 04ab940..6a3b866 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -105,7 +105,8 @@ public class WmsActionLogDetails extends BaseBean { } - public WmsActionLogDetails(String createUser, Long id, Integer seq) { + public WmsActionLogDetails(Long amId,String createUser, Long id, Integer seq) { + this.asId = amId; this.createUser = createUser; this.id = id; this.seq = seq; 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 d051693..1b61f26 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 @@ -30,7 +30,7 @@ public class WmsActionResponseBean { public Map barCode; @ApiParam("进度") - public String percent; + public String percent ="0"; @ApiParam("当前步骤") public Integer currentStep; @@ -71,6 +71,9 @@ public class WmsActionResponseBean { @ApiParam(value = "关键字段列名") public String keyColumn; + @ApiParam(value = "是否完成流程操作") + public Boolean isComplete = false; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; 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 6cc048b..2760420 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 @@ -1066,7 +1066,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); - HqlPack.getNumEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); + HqlPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); getStringBuilderPack(wmsActionModuleParam, result); return result.toString();