Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.util.List;
+
+/**
+ * @Description : 单据Model
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-03-07 19:18
+ * @Modify:
+ **/
+@Data
+@Api("数据权限Model")
+public class WmsDataAuthModel extends BaseBean {
+
+    @ApiParam("角色编号")
+    private String roleCode;
+
+    @ApiParam("数据对象")
+    private String dataObj;
+
+    @ApiParam("数据对象值")
+    private String dataObjValue;
+
+    @ApiParam("物料列表")
+    private List<String> partList;
+
+    @ApiParam("库位列表")
+    private List<String> locateList;
+
+    @ApiParam("仓库列表")
+    private List<String> whList;
+
+    @ApiParam("存储区列表")
+    private List<String> zoneList;
+
+    @ApiParam(
+            value = "新增操作",
+            example = "0"
+    )
+    private Integer addOp;
+
+    @ApiParam(
+            value = "删除操作",
+            example = "0"
+    )
+    private Integer delOp;
+
+    @ApiParam(
+            value = "修改操作",
+            example = "0"
+    )
+    private Integer updOp;
+
+    @ApiParam(
+            value = "查询操作",
+            example = "0"
+    )
+    private Integer queryOp;
+}

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

@@ -1400,4 +1400,27 @@ public class WmsHqlPack {
         getStringBuilderPack(bean, result);
         return result.toString();
     }
+
+    /**
+     * 根据条件查询dataAuth
+     * @param wmsDataAuth
+     * @return
+     */
+    public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) {
+        StringBuffer result = new StringBuffer();
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getOrganizeCode())){
+            HqlPack.getStringEqualPack(wmsDataAuth.getOrganizeCode(),"organizeCode",result);
+        }
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){
+            HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result);
+        }
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObj())){
+            HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(),"dataObj",result);
+        }
+        if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())){
+            HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(),"dataObjValue",result);
+        }
+        getStringBuilderPack(wmsDataAuth, result);
+        return result.toString();
+    }
 }