Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;
+
+
 }

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;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java

@@ -30,7 +30,7 @@ public class WmsActionResponseBean<Obj> {
     public Map<String, Obj> barCode;
 
     @ApiParam("进度")
-    public String percent;
+    public String percent ="0";
 
     @ApiParam("当前步骤")
     public Integer currentStep;
@@ -71,6 +71,9 @@ public class WmsActionResponseBean<Obj> {
     @ApiParam(value = "关键字段列名")
     public String keyColumn;
 
+    @ApiParam(value = "是否完成流程操作")
+    public Boolean isComplete = false;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;

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();