修复资质功能问题以及取消仓库功能代码更新

3 years ago · 4ab695be08
parent b09b2f1f11
commit 4ab695be08
15 changed files with 103 additions and 1 deletions
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java
@ -9,6 +9,7 @@ import com.glxp.sale.admin.entity.auth.AuthRoleAdmin;
 import com.glxp.sale.admin.entity.auth.CustomerInfoEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseUserEntity;
 import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
+import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
 import com.glxp.sale.admin.req.auth.AuthAdminSaveRequest;
@ -25,6 +26,7 @@ import com.glxp.sale.admin.service.auth.CustomerInfoService;
 import com.glxp.sale.admin.service.basic.BussinessTypeService;
 import com.glxp.sale.admin.service.inout.WarehouseUserService;
 import com.glxp.sale.admin.service.inventory.InvBusUserService;
+import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.admin.util.PasswordUtils;
 import com.glxp.sale.common.enums.ResultEnum;
@ -65,6 +67,9 @@ public class AuthAdminController {
    @Resource
    private InvBusUserService invBusUserService;

+    @Resource
+    private InvSubWarehouseService invSubWarehouseService;
+
    /**
     * 获取管理员列表
     */
@ -303,6 +308,10 @@ public class AuthAdminController {
        if (authAdminSaveRequest.getId() == null) {
            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！");
        }
+        InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(authAdminSaveRequest.getLocSubInvCode());
+        if(invSubWarehouseEntity!=null){
+            authAdminSaveRequest.setLocInvCode(invSubWarehouseEntity.getParentId());
+        }
        AuthAdmin authAdmin = new AuthAdmin();
        BeanUtils.copyProperties(authAdminSaveRequest, authAdmin);
        authAdmin.setLastModifyTime(new Date());
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java
@ -8,6 +8,7 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin;
 import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
 import com.glxp.sale.admin.req.basic.FilterBasicThirdSysRequest;
 import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest;
@ -21,6 +22,7 @@ import com.glxp.sale.admin.service.inout.WarehouseUserService;
 import com.glxp.sale.admin.service.inventory.InvProductService;
 import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.sale.admin.service.inventory.InvWarehouseService;
+import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
@ -50,6 +52,8 @@ public class InvSubWarehouseController {
    private InvProductService invProductService;
    @Resource
    private WarehouseUserService warehouseUserService;
+    @Resource
+    SystemParamConfigService systemParamConfigService;

    @AuthRuleAnnotation("")
    @GetMapping("spms/sub/inv/warehouse/filter")
@ -75,6 +79,27 @@ public class InvSubWarehouseController {
            else{
                filterInvWarehouseRequest.setSpUse(true);
            }
+        }else{
+            //走这边表示单据选择的是往来单位里面调出调入的库
+            //判断单据类型是1就是设置单据需要需要查询除自己以外的分库
+            SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
+            if(systemParamConfigEntity.getParamValue().equals("0")){
+              //不允许调拨
+              // 查询总库信息
+              InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getPcode());
+              //查询仓库信息
+                InvWarehouseEntity invWarehouseEntity=invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId());
+                filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode());
+                filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode());
+                filterInvWarehouseRequest.setPcode(null);
+
+            }else {
+              //允许调拨
+                //查询总库信息
+              InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getPcode());
+              filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId());
+              filterInvWarehouseRequest.setPcode(null);
+            }
        }

        List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java
@ -110,6 +110,7 @@ public class SupCompanyController {
            //提交审核
            FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
            filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);
+            filterCertSetsRequest.setNeed(1);
            List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
            List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId());
            //验证
--- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java
@ -60,4 +60,8 @@ public interface InvSubWarehouseDao {
     */
    List<InvSubWarehouseResponse> filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);

+    /** 查询分仓和总仓信息     ...*/
+    InvSubWarehouseEntity filterGroupInvSubAndcode(@Param("code") String code);
+
+
 }
--- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java
@ -48,5 +48,9 @@ public interface InvWarehouseDao {

    boolean updateTime(@Param("code") String code, @Param("updateTime") Date updateTime);

+    /**  根据code查询*  */
+    InvWarehouseEntity selectByCodeAll(@Param("code") String code);
+
+

 }
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvSubWarehouseEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvSubWarehouseEntity.java
@ -22,5 +22,8 @@ public class InvSubWarehouseEntity {
    private String thirdName3;
    private String thirdId4;
    private String thirdName4;
+    private String warehouseName;//仓库名字
+
+

 }
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java
@ -25,4 +25,8 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
    private List<Integer> ids;
    private Boolean spUse;
    private Integer filter;
+    private int billType;//判断是否是单据类型需要的分库
+    private String warehouseCode;
+    private String superiorCode;//上级
+    private String subordinateCode;//下级
 }
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterCertSetsRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterCertSetsRequest.java
@ -8,5 +8,6 @@ public class FilterCertSetsRequest extends ListPageRequest {

    private String name;
    private Integer type;
+    private Integer need;

 }
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java
@ -54,4 +54,7 @@ public interface InvSubWarehouseService {
     */
    List<InvSubWarehouseResponse> filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);

+    /** 查询分仓和总仓信息     ...*/
+    InvSubWarehouseEntity filterGroupInvSubAndcode( String code);
+
 }
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java
@ -79,4 +79,7 @@ public interface InvWarehouseService {
     */
    List<InvWarehouseEntity> getInvWarehouseForUdims();

+    /**  根据code查询*  */
+    InvWarehouseEntity selectByCodeAll(String code);
+
 }
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java
@ -190,4 +190,9 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
        List<InvSubWarehouseResponse> data = invSubWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
        return data;
    }
+
+    @Override
+    public InvSubWarehouseEntity filterGroupInvSubAndcode(String code) {
+        return invSubWarehouseDao.filterGroupInvSubAndcode(code);
+    }
 }
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java
@ -254,4 +254,9 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
        List<InvWarehouseEntity> invWarehouseEntities = invWarehouseDao.filterInvWarehouse(filterInvWarehouseRequest);
        return invWarehouseEntities;
    }
+
+    @Override
+    public InvWarehouseEntity selectByCodeAll(String code) {
+        return invWarehouseDao.selectByCodeAll(code);
+    }
 }
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml
@ -30,9 +30,11 @@

    <select id="filterGroupInvSub" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
            resultType="com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity">
-        select inv_warehouse_sub.* from inv_warehouse_sub INNER JOIN inv_warehouse
+        select inv_warehouse_sub.*,	inv_warehouse.`name` AS warehouseName from inv_warehouse_sub INNER JOIN inv_warehouse
        on inv_warehouse_sub.parentId = inv_warehouse.code
+        <if test="userId != '' and userId != null">
        INNER JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.code
+        </if>
        <where>
            <if test="userId != '' and userId != null">
                AND inv_warehouse_user.userId = #{userId}
@ -40,11 +42,35 @@
            <if test="pcode != '' and pcode != null">
                AND inv_warehouse.code = #{pcode}
            </if>
+            <if test="warehouseCode != '' and warehouseCode != null">
+                AND inv_warehouse.code &lt;&gt; #{warehouseCode}
+            </if>
+            <if test="spUse != '' and spUse != null">
+                AND inv_warehouse.spUse = #{spUse}
+            </if>
+            <if test="superiorCode != '' and superiorCode != null">
+                AND (inv_warehouse.code = #{subordinateCode}
+                OR  inv_warehouse.pcode = #{superiorCode})
+            </if>
        </where>
        group by inv_warehouse_sub.id

    </select>

+    <select id="filterGroupInvSubAndcode" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
+            resultType="com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity">
+        select inv_warehouse_sub.* from inv_warehouse_sub
+        <where>
+            <if test="code != '' and code != null">
+                AND inv_warehouse_sub.code = #{code}
+            </if>
+        </where>
+        group by inv_warehouse_sub.id
+
+    </select>
+
+
+

    <select id="selectMaxCode" parameterType="com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest"
            resultType="com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity">
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml
@ -259,4 +259,10 @@
        SET updateTime = #{updateTime}
        where code = #{code}
    </update>
+
+    <select id="selectByCodeAll" resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
+        select *
+        from inv_warehouse
+        where code = #{code}
+    </select>
 </mapper>
--- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml
@ -13,6 +13,9 @@
            <if test="type != '' and type!=null">
                and `type` = #{type}
            </if>
+            <if test="need != '' and need!=null">
+                and `need` = #{need}
+            </if>
        </where>
        ORDER BY id DESC
    </select>