解决冲突

6 years ago · dadd0a2f30
parent e31440345c
commit dadd0a2f30
2 changed files with 2 additions and 2 deletions
--- 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<Obj> {
    public Map<String, Obj> barCode;
    @ApiParam("进度")
-    public String percent;
+    public String percent ="0";
    @ApiParam("当前步骤")
    public Integer currentStep;
--- 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();