管理ms拉自助平台接口提交

src/main/java/com/glxp/api/controller/auth/LoginController.java

@@ -61,6 +61,10 @@ public class LoginController extends BaseController {
     private AuthLicenseDao authLicenseDao;
     @Resource
     private UserRegisterService userRegisterService;
+    @Resource
+    private DeptService deptService;
+    @Resource
+    WarehouseBussinessTypeService warehouseBussinessTypeService;
 
 
     /**
@@ -197,8 +201,7 @@ public class LoginController extends BaseController {
         return ResultVOUtils.success(map);
     }
 
-    @Resource
-    DeptService deptService;
+
     @Resource
     InvWarehouseService invWarehouseService;
 
@@ -349,13 +352,37 @@ public class LoginController extends BaseController {
             authLicenseDao.romveByCustomerId(authAdmin.getCustomerId() + "");
             authLicenseDao.save(authLicense);
         }
-        FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
+        AuthLicense authLicense1 = new AuthLicense();
+        authLicense1.setAppid(authLicense.getAppid());
+        authLicense1.setApiKey(authLicense.getApiKey());
+        authLicense1.setSecretKey(authLicense.getSecretKey());
+        return ResultVOUtils.success(authLicense1);
+    }
+
+
+    @GetMapping("/spms/inv/warehouse/filterInv/forUdims")
+    public BaseResponse forUdims() {
+        FilterInvWarehouseRequest filterInvWarehouseRequest=new FilterInvWarehouseRequest();
         filterInvWarehouseRequest.setSpUse(true);
-        List<InvWarehouseTreeVo> invList = invWarehouseDao.selectInvListTreeByUser(filterInvWarehouseRequest);
-        Map<String, Object> res = new WeakHashMap<>(2);
-        res.put("license", authLicense);
-        res.put("invList", invList);
-        return ResultVOUtils.success(res);
+        List<DeptEntity> data = deptService.filterInvDept(filterInvWarehouseRequest);
+        return ResultVOUtils.success(data);
+    }
+
+    @GetMapping("/spms/sub/inv/warehouse/getSubInvForUdims")
+    public BaseResponse getSubInvForUdims(String invCode) {
+
+        List<InvWarehouseEntity> data = invWarehouseDao.getByWarePId(invCode);
+        return ResultVOUtils.success(data);
+    }
+
+    @GetMapping("/udiwms/bussinessType/udimsFilter")
+    public BaseResponse udimsFilter(String invSubCode) {
+
+        List<WarehouseBussinessTypeEntity> data = warehouseBussinessTypeService.filterActionList(invSubCode);
+        return ResultVOUtils.success(data);
     }
 
+
+
+
 }

src/main/java/com/glxp/api/dao/auth/DeptDao.java

@@ -77,4 +77,6 @@ public interface DeptDao extends BaseMapperPlus<DeptDao, DeptEntity, DeptEntity>
     List<DeptEntity> selectupDeptAll(@Param("pcode") String pCode);
 
     List<DeptEntity> selectLowDeptAll(@Param("pcode") String pCode);
+
+
 }

src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java

@@ -36,6 +36,9 @@ public interface InvWarehouseDao extends BaseMapperPlus<InvWarehouseDao, InvWare
 
     List<InvWarehouseEntity> getByWarePcode(@Param("parentCode") String parentCode);
 
+    List<InvWarehouseEntity> getByWarePId(@Param("parentId") String parentId);
+
+
     /**
      * 根据parentId和分库名称统计仓库数量
      *

src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java

@@ -40,4 +40,7 @@ public interface WarehouseBussinessTypeDao extends BaseMapperPlus<WarehouseBussi
      * @return
      */
     List<WarehouseBussinessTypeEntity> selectByActions(@Param("subInvCode") String subInvCode, @Param("actions") List<String> actions);
+
+    List<WarehouseBussinessTypeEntity> filterActionList(@Param("code") String code);
+
 }

src/main/java/com/glxp/api/service/auth/DeptService.java

@@ -82,4 +82,6 @@ public interface DeptService {
 
     List<DeptEntity> selectLowDeptAll(String pCode);
 
+    List<DeptEntity> filterInvDept(FilterInvWarehouseRequest filterInvWarehouseRequest);
+
 }

src/main/java/com/glxp/api/service/auth/InvWarehouseService.java

@@ -20,6 +20,7 @@ public interface InvWarehouseService {
 
     List<InvWarehouseEntity> getByWarePcode(@Param("parentCode") String parentCode);
 
+    List<InvWarehouseEntity> getByWarePId(@Param("parentId") String parentId);
 
     List<InvWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
 

src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java

@@ -5,6 +5,7 @@ import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity;
 import com.glxp.api.req.auth.FilterInvBusTypeRequest;
 import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.res.basic.BasicBussinessTypeResponse;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -54,4 +55,6 @@ public interface WarehouseBussinessTypeService {
 
     boolean isExitByAction(String action);
 
+    List<WarehouseBussinessTypeEntity> filterActionList(String code);
+
 }

src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java

@@ -192,5 +192,10 @@ public class DeptServiceImpl implements DeptService {
         return deptDao.selectLowDeptAll(pCode);
     }
 
+    @Override
+    public List<DeptEntity> filterInvDept(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        return deptDao.filterGroupInvWarehouse(filterInvWarehouseRequest);
+    }
+
 
 }

src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java

@@ -65,6 +65,11 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
         return invWarehouseDao.getByWarePcode(parentCode);
     }
 
+    @Override
+    public List<InvWarehouseEntity> getByWarePId(String parentId) {
+        return invWarehouseDao.getByWarePId(parentId);
+    }
+
     @Override
     public List<InvWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
         if (filterInvSubWarehouseRequest == null) {

src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java

@@ -107,4 +107,9 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
     public boolean isExitByAction(String action) {
         return warehouseBussinessTypeDao.exists(new QueryWrapper<WarehouseBussinessTypeEntity>().eq("action", action));
     }
+
+    @Override
+    public List<WarehouseBussinessTypeEntity> filterActionList(String code) {
+        return warehouseBussinessTypeDao.filterActionList(code);
+    }
 }

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -171,6 +171,13 @@
         WHERE parentCode = #{parentCode}
     </select>
 
+    <select id="getByWarePId" resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+        select *
+        FROM auth_warehouse
+        WHERE parentId = #{parentId}
+        and spUse = 1
+    </select>
+
 
     <delete id="deleteByParentCode" parameterType="Map">
         DELETE

src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.auth.WarehouseBussinessTypeDao">
-    <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
+    <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
         <!--@mbg.generated-->
         <!--@Table auth_warehouse_bustype-->
-<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
+        <!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="action" jdbcType="VARCHAR" property="action"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
@@ -183,4 +183,12 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="filterActionList" resultType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
+        SELECT b1.action,
+               b1.`name`
+        FROM auth_warehouse_bustype a1
+                     INNER JOIN basic_bussiness_type b1 ON a1.action = b1.action
+        where b1.spUse=1 and a1.code = #{code}
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -272,6 +272,12 @@
         where action = #{action}
     </select>
 
+    <select id="selectAction" resultType="java.lang.String">
+        select *
+        from basic_bussiness_type
+        where action = #{action}
+    </select>
+
     <select id="selectbyNotAction" parameterType="list"
             resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
         select *