1.调整设备领用功能

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java

@@ -79,21 +79,21 @@ public class InvSubWarehouseController {
         AuthAdmin authAdmin = customerService.getUserBean();
         if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) {
             if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) {
-                if (authAdmin.getCustomerId()==110) {
+                if (authAdmin.getCustomerId() == 110) {
                     filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue());
-                }else {
+                } else {
                     filterInvWarehouseRequest.setSpUse(true);
                 }
             }
-        } else{
+        } else {
-            if(filterInvWarehouseRequest.getFilter()==3 && filterInvWarehouseRequest.getFilter()!=null){
+            if (filterInvWarehouseRequest.getFilter() == 3 && filterInvWarehouseRequest.getFilter() != null) {
 
-                if (authAdmin.getCustomerId()==110)
+                if (authAdmin.getCustomerId() == 110)
                     filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue());
                 else {
                     filterInvWarehouseRequest.setSpUse(true);
                 }
-            }else{
+            } else {
                 //走这边表示单据选择的是往来单位里面调出调入的库
                 //判断单据类型是1就是设置单据需要需要查询除自己以外的分库
                 SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
@@ -102,13 +102,13 @@ public class InvSubWarehouseController {
                     // 查询总库信息
                     InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
                     //查询仓库信息
-                    if(invSubWarehouseEntity!=null){
+                    if (invSubWarehouseEntity != null) {
                         InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId());
                         filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode());
                         filterInvWarehouseRequest.setSuperiorPcode(invWarehouseEntity.getPcode());
                         filterInvWarehouseRequest.setCode(null);
-                    }else {
+                    } else {
-                        return  ResultVOUtils.error(999,"分库编号为空！");
+                        return ResultVOUtils.error(999, "分库编号为空！");
                     }
 
 
@@ -134,7 +134,7 @@ public class InvSubWarehouseController {
 //            return ResultVOUtils.error(500, "用户或仓库不能未空！");
 //        }
         AuthAdmin authAdmin = customerService.getUserBean();
-        InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
+        InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
         filterInvWarehouseRequest.setSubordinateCode(invSubWarehouseEntity.getParentId());
         filterInvWarehouseRequest.setCode(null);
         List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSubDown(filterInvWarehouseRequest);
@@ -289,4 +289,17 @@ public class InvSubWarehouseController {
         return ResultVOUtils.success();
     }
 
+    /**
+     * 查询分仓列表
+     *
+     * @param filterInvWarehouseRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/spms/sub/inv/warehouse/filterSubInvList")
+    public BaseResponse filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        List<InvSubWarehouseResponse> responses = invSubWarehouseService.filterSubInvList(filterInvWarehouseRequest);
+        return ResultVOUtils.success(responses);
+    }
+
 }

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java

@@ -64,5 +64,11 @@ public interface InvSubWarehouseDao {
 
     List<InvSubWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
 
+    /**
+     * 查询分仓列表
+     * @param filterInvWarehouseRequest
+     * @return
+     */
+    List<InvSubWarehouseResponse> filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest);
 
 }

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInvProductRequest.java

@@ -44,4 +44,9 @@ public class FilterInvProductRequest extends ListPageRequest {
     private String supName;
 
     private String orderIdFk;
+
+    /**
+     * 产品类别
+     */
+    private String cplb;
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java

@@ -60,4 +60,12 @@ public interface InvSubWarehouseService {
     /** 查询仓库下级*/
     List<InvSubWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
 
+    /**
+     * 查询分仓列表
+     *
+     * @param filterInvWarehouseRequest
+     * @return
+     */
+    List<InvSubWarehouseResponse> filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest);
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java

@@ -202,4 +202,9 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
     public List<InvSubWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) {
         return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest);
     }
+
+    @Override
+    public List<InvSubWarehouseResponse> filterSubInvList(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        return invSubWarehouseDao.filterSubInvList(filterInvWarehouseRequest);
+    }
 }

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml

@@ -442,6 +442,8 @@
             <if test="invSpaceCode != null and invSpaceCode != ''">
                 AND ipd.invSpaceCode = #{invSpaceCode}
             </if>
+            <if test="cplb != null and cplb != ''"></if>
+            AND bp.cplb = #{cplb}
         </where>
         group by ip.id
     </select>

api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml

@@ -230,4 +230,27 @@
         group by inv_warehouse_sub.id
 
     </select>
+
+    <select id="filterSubInvList" resultType="com.glxp.api.admin.res.inventory.InvSubWarehouseResponse">
+        select a.id,
+               a.code,
+               a.name,
+               a.parentId,
+               a.remark,
+               a.defaultInv,
+               a.thirdId,
+               a.thirdId1,
+               a.thirdId2,
+               a.thirdId3,
+               a.thirdId4,
+               b.name parentName
+        from inv_warehouse_sub a
+                 left join inv_warehouse b on a.parentId = b.code
+                 left join inv_warehouse_user c on a.code = c.code
+        <where>
+            <if test="userId != null">
+                AND c.userId = #{userId}
+            </if>
+        </where>
+    </select>
 </mapper>

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -4,11 +4,11 @@ CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ',
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
 
-INSERT ignore INTO   scheduled(id, cronName, cron, customerId, remark)
+INSERT ignore INTO   sys_scheduled(id, cronName, cron, customerId, remark)
 VALUES
 (16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据');
 
-INSERT  ignore INTO system_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain )
+INSERT  ignore INTO sys_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain )
 VALUES
  ( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' );