diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 1c06c4d35..8494106db 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -450,6 +450,8 @@ public class InvWarehouseController extends BaseController { if (StrUtil.isEmpty(relBusRequset.getInvCode())) return ResultVOUtils.error(500, "仓库编码不能为空!"); boolean b = warehouseBussinessTypeService.deleteByCode(relBusRequset.getInvCode()); + //同时对用户关联的单据类型尽心那个删除 + invBusUserService.deleteByscAction(relBusRequset.getInvCode(),relBusRequset.getSelectActions()); if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { List basicBussinessTypeResponses = new ArrayList<>(); relBusRequset.getSelectActions().forEach(action -> diff --git a/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java b/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java index 265c1f758..44fbf78cc 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java @@ -28,4 +28,7 @@ public interface InvBusUserDao extends BaseMapperPlus selectedCodes); + } diff --git a/src/main/java/com/glxp/api/service/auth/InvBusUserService.java b/src/main/java/com/glxp/api/service/auth/InvBusUserService.java index 69d04bc0b..05b82be2b 100644 --- a/src/main/java/com/glxp/api/service/auth/InvBusUserService.java +++ b/src/main/java/com/glxp/api/service/auth/InvBusUserService.java @@ -5,7 +5,6 @@ import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusUserRequest; import com.glxp.api.res.auth.InvBusUserResponse; - import java.util.List; public interface InvBusUserService { @@ -25,5 +24,6 @@ public interface InvBusUserService { boolean deleteById(String id); boolean deleteByUnion(String userId, String subInvCode); + boolean deleteByscAction( String subInvCode, List selectedCodes); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java index dc9b4c4e4..fe433be5d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.req.auth.FilterInvBusUserRequest; import com.glxp.api.res.auth.InvBusUserResponse; import com.glxp.api.service.auth.InvBusUserService; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.Collections; @@ -93,4 +94,12 @@ public class InvBusUserServiceImpl implements InvBusUserService { } return invBusUserDao.deleteByUnion(userId, subInvCode); } + + @Override + public boolean deleteByscAction(String subInvCode,List selectedCodes) { + if (CollectionUtils.isEmpty(selectedCodes) || StrUtil.isEmpty(subInvCode)) { + return false; + } + return invBusUserDao.deleteByscAction(subInvCode,selectedCodes); + } } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index 226bbf9ba..8c3aa4c01 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -19,7 +19,6 @@ public interface IBasicBusTypePreService { * @return */ List filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest); - /** * 根据ID删除补单单据类型 * diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java index 164a54a21..bc031d578 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java @@ -11,7 +11,6 @@ public interface ThrDeptService { ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault); - List filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); List filterGroupInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); diff --git a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml index bb92fd43c..2ed0fc0cd 100644 --- a/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvBusUserDao.xml @@ -94,6 +94,21 @@ WHERE subInvCode = #{subInvCode} and userId = #{userId} + + DELETE + FROM auth_user_bustype + + + AND subInvCode = #{subInvCode} + + + and scAction in + + #{item} + + + + UPDATE auth_user_bustype