解决冲突

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java

@@ -18,4 +18,9 @@ public class TransSnModle extends BaseComponetsParam{
 
     @ApiParam(value = "交易类型代码")
     public String transTypeCode;
+
+    // 1:是，2：否
+    @ApiParam(value = "是否分组")
+    public int isGroup;
+
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -88,6 +89,6 @@ public class SysMenu extends BaseBean {
 
     @Transient
     @ApiParam(value ="子集列表")
-    private List<SysMenu> childList;
+    private List<SysMenu> childList = new ArrayList<>();
 
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -100,8 +100,4 @@ public class SysUser extends BaseBean {
     @Transient
     @ApiParam(value ="用户所有权限信息")
     private List<SysMenu> menuList;
-
-    @Transient
-    @ApiParam(value ="用户所有权限信息树数据")
-    private List<SysMenu> menuListTree;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -853,9 +853,12 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result);
         HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result);
         HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"whNo",result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"zoneNo",result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"locateNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(),"srcWhNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(),"destWhNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(),"srcZoneNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(),"destZoneNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(),"srcLocateNo",result);
+        HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(),"destLocateNo",result);
         HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(),"itemStatus",result);
         HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(),"refType",result);
         HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(),"refSrc",result);
@@ -1063,7 +1066,7 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result);
-        HqlPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result);
+        HqlPack.getNumEqualPack(wmsActionModuleParam.getParamType(), "paramType", result);
         getStringBuilderPack(wmsActionModuleParam, result);
 
         return result.toString();