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

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

@@ -61,6 +61,26 @@ public class InvBusUserController {
         return ResultVOUtils.success(warehouseBussinessTypeEntities);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/bus/user/selectEnable/filter")
+    public BaseResponse filterSelectInvUserEnable(FilterInvBusUserRequest filterInvBusUserRequest) {
+        filterInvBusUserRequest.setEnable("1");
+        List<InvBusUserEntity> responses = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
+        List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities =
+                warehouseBussinessTypeService.getListEnableByCode(filterInvBusUserRequest);
+
+        warehouseBussinessTypeEntities.forEach(warehouseBussinessTypeEntity ->
+        {
+            for (InvBusUserEntity invBusUserEntity : responses) {
+                if (invBusUserEntity.getScAction().equals(warehouseBussinessTypeEntity.getAction())) {
+                    warehouseBussinessTypeEntity.setSelect(true);
+                    break;
+                }
+            }
+        });
+        return ResultVOUtils.success(warehouseBussinessTypeEntities);
+    }
+
 
     //查询用户未关联单据类型
     @AuthRuleAnnotation("")

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -80,7 +80,7 @@ public class BasicBussinessTypeController extends BaseController {
     @GetMapping("/udiwms/busType/findByInvUser")
     public BaseResponse findByInvUser(FilterBussinessTypeRequest bussinessTypeFilterRequest,
                                       BindingResult bindingResult) {
-
+        bussinessTypeFilterRequest.setEnable(true);
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
@@ -167,6 +167,7 @@ public class BasicBussinessTypeController extends BaseController {
             BasicBussinessTypeEntity basicBussinessTypeEntity = new BasicBussinessTypeEntity();
             BeanUtil.copyProperties(bussinessTypeSaveRequest, basicBussinessTypeEntity);
             basicBussinessTypeService.updateBussinessType(basicBussinessTypeEntity);
+
         } else {
             ResultVOUtils.error(999, "参数错误");
         }

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -277,12 +277,15 @@ public class UdiRlSupController extends BaseController {
         }
         //查询本企业有没有选择该产品有选择不能选择
         CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
-        companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId() + "");
-        List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
+//        companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId() + "");
+        companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getUnitFk() + "");
+//        List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
+        List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
         companyProductRelevanceRequest.setDiType(1);
-        basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
+//        basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
+        basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
         String rlidStr = udiInfoExportRequest.getRlIds().get(0);
-        for (CompanyProductRelevanceResponse obj : basicInstrumentMaintainRelevanceResponses) {
+        for (UdiRlSupResponse obj : basicInstrumentMaintainRelevanceResponses) {
             String rlid = String.valueOf(obj.getRlId());
             if (rlid.equals(rlidStr)) {
                 return ResultVOUtils.error(999, "该企业已选择该产品，请勿重复选择！");

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

@@ -3,6 +3,7 @@ package com.glxp.api.dao.auth;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity;
 import com.glxp.api.req.auth.FilterInvBusTypeRequest;
+import com.glxp.api.req.auth.FilterInvBusUserRequest;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -32,6 +33,8 @@ public interface WarehouseBussinessTypeDao extends BaseMapperPlus<WarehouseBussi
 
     List<WarehouseBussinessTypeEntity> selectListByCode(@Param("code") String code);
 
+    List<WarehouseBussinessTypeEntity> selectListByCodeEnable(FilterInvBusUserRequest filterInvBusUserRequest);
+
     List<WarehouseBussinessTypeEntity> filterList(FilterInvBusTypeRequest filterInvBusTypeRequest);
 
     boolean deleteByCode(@Param("code") String code);

src/main/java/com/glxp/api/req/auth/FilterInvBusUserRequest.java

@@ -12,6 +12,8 @@ public class FilterInvBusUserRequest extends ListPageRequest {
     private String userId;
     private String subInvCode;
     private String scAction;
+    private String enable;
+    private String code;
 
     private List<String> selectedCodes;
 }

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

@@ -4,6 +4,7 @@ package com.glxp.api.service.auth;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity;
 import com.glxp.api.req.auth.FilterInvBusTypeRequest;
+import com.glxp.api.req.auth.FilterInvBusUserRequest;
 import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.res.basic.BasicBussinessTypeResponse;
 
@@ -20,6 +21,8 @@ public interface WarehouseBussinessTypeService extends IService<WarehouseBussine
      */
     List<WarehouseBussinessTypeEntity> getListByCode(String code);
 
+    List<WarehouseBussinessTypeEntity> getListEnableByCode(FilterInvBusUserRequest filterInvBusUserRequest);
+
     List<WarehouseBussinessTypeEntity> filterList(FilterInvBusTypeRequest filterInvBusTypeRequest);
 
     /**

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

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.auth.WarehouseBussinessTypeDao;
 import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity;
 import com.glxp.api.req.auth.FilterInvBusTypeRequest;
+import com.glxp.api.req.auth.FilterInvBusUserRequest;
 import com.glxp.api.req.auth.FilterInvLinkDataRequest;
 import com.glxp.api.res.basic.BasicBussinessTypeResponse;
 import com.glxp.api.service.auth.WarehouseBussinessTypeService;
@@ -41,6 +42,15 @@ public class WarehouseBussinessTypeServiceImpl extends ServiceImpl<WarehouseBuss
         return warehouseBussinessTypeEntities;
     }
 
+    @Override
+    public List<WarehouseBussinessTypeEntity> getListEnableByCode(FilterInvBusUserRequest filterInvBusUserRequest) {
+        List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeDao.selectListByCodeEnable(filterInvBusUserRequest);
+        if (CollUtil.isEmpty(warehouseBussinessTypeEntities)) {
+            return Collections.emptyList();
+        }
+        return warehouseBussinessTypeEntities;
+    }
+
     @Override
     public List<WarehouseBussinessTypeEntity> filterList(FilterInvBusTypeRequest filterInvBusTypeRequest) {
         if (filterInvBusTypeRequest == null) {

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

@@ -25,6 +25,33 @@
         </where>
     </select>
 
+    <select id="filterInvBusUserEnable" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest"
+            resultType="com.glxp.api.entity.auth.InvBusUserEntity">
+        select *
+        FROM auth_user_bustype aub
+        inner join basic_bussiness_type bbt on aub.scAction = bbt.action
+        <where>
+            <if test="userId != '' and userId != null">
+                AND userId = #{userId}
+            </if>
+            <if test="subInvCode != '' and subInvCode != null">
+                AND subInvCode = #{subInvCode}
+            </if>
+            <if test="scAction != '' and scAction != null">
+                AND scAction = #{scAction}
+            </if>
+            <if test="enable != '' and enable != null">
+                AND enable = #{enable}
+            </if>
+            <if test="selectedCodes != null and selectedCodes.size() != 0">
+                and scAction not in
+                <foreach collection="selectedCodes" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 
     <select id="filterUnSelect" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest"
             resultType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">

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

@@ -226,6 +226,23 @@
         where code = #{code}
     </select>
 
+    <select id="selectListByCodeEnable" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest" resultMap="BaseResultMap">
+        select awb.id,
+               awb.code,
+               awb.action,
+               bbt.name
+        from auth_warehouse_bustype awb
+                 inner join basic_bussiness_type bbt on awb.action = bbt.action
+        <where>
+            <if test="subInvCode != '' and subInvCode != null">
+                AND awb.code = #{subInvCode}
+            </if>
+            <if test="enable != '' and enable != null">
+                AND enable = #{enable}
+            </if>
+        </where>
+    </select>
+
 
     <select id="filterList" parameterType="com.glxp.api.req.auth.FilterInvBusTypeRequest"
             resultType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">

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

@@ -23,6 +23,7 @@
           basic_products.ylqxzcrbarmc,
           basic_products.manufactory,
           basic_products.qxlb,
+          basic_products.versionNumber,
           basic_udirel.id,
     basic_product_category_rel.id as bpcrid
         FROM basic_product_category_rel