From a068acd71a6ac5e0593310564973669f7eaf5803 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 4 Sep 2024 17:23:19 +0800 Subject: [PATCH] =?UTF-8?q?9/4=20bug=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/DeptController.java | 12 +++++ .../controller/auth/SysUserController.java | 1 + .../basic/UdiRelevanceController.java | 3 ++ .../com/glxp/api/dao/auth/AuthAdminDao.java | 2 + .../api/service/auth/AuthAdminService.java | 2 + .../auth/impl/AuthAdminServiceImpl.java | 13 +++++ .../api/service/basic/UdiContrastService.java | 12 ++++- .../api/service/basic/UdiProductService.java | 10 ++-- .../mybatis/mapper/auth/AuthAdminDao.xml | 52 ++++++++++++++++++- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 6 ++- src/main/resources/schemas/schema_v2.4.sql | 7 ++- 11 files changed, 111 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 65106d494..2b8de05dc 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -369,6 +369,18 @@ public class DeptController { return ResultVOUtils.success(list); } + @AuthRuleAnnotation("") + @GetMapping("spms/inv/dept/filter") + public BaseResponse filterDeptsByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { + List invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest); + PageInfo pageInfo = new PageInfo<>(invWarehouseEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(invWarehouseEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } + public String isCheckStatus(Integer status, DeptEntity deptEntity) { //启用的时候需要判断上级是不是被禁用 if (status == 1) { diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 1ffa4772c..3366cbd7f 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -67,6 +67,7 @@ public class SysUserController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List authAdminList = userService.listAdminPage(filterAuthUserRequest); +// List authAdminList1 = userService.getDepts(filterAuthUserRequest); //查询对应角色和部门 List authAdminResponseList = authAdminList.stream().map(item -> { AuthAdminResponse authAdminResponse = new AuthAdminResponse(); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 88813fcf0..3050ce53d 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -364,6 +364,9 @@ public class UdiRelevanceController extends BaseController { udiRelevanceEntity.setDistributeLevelCount(udiRelevanceSaveRequest.getDistributeLevelCount()); udiRelevanceEntity.setDistributeLevel(udiRelevanceSaveRequest.getDistributeLevel()); udiRelevanceEntity.setPayFeeCode(udiRelevanceSaveRequest.getPayFeeCode()); + udiRelevanceEntity.setSplitEnable(udiRelevanceSaveRequest.getSplitEnable()); + udiRelevanceEntity.setAutoCode(udiRelevanceSaveRequest.getAutoCode()); + udiRelevanceEntity.setPayFeeCode(udiRelevanceSaveRequest.getPayFeeCode()); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); //关联更新 diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index 04c7e2a29..7a2f27a36 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -89,4 +89,6 @@ public interface AuthAdminDao extends BaseMapperPlus companyUserList(@Param("param")FilterInvLinkDataRequest filterInvLinkDataRequest); List getUserByIds(@Param("userIds") List ids,@Param("key") String key); + + List getDepts(FilterAuthUserRequest filterAuthUserRequest); } diff --git a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java index 008aea75f..2775152c9 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java @@ -50,4 +50,6 @@ public interface AuthAdminService extends IService { List getUserByIds(SysWorkplaceRequest request); List getUserByDeptCode(String deptCode); + + List getDepts(FilterAuthUserRequest filterAuthUserRequest); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index 1d34c9743..037837cbf 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -224,6 +224,19 @@ public class AuthAdminServiceImpl extends ServiceImpl i return authAdmins; } + @Override + public List getDepts(FilterAuthUserRequest filterAuthUserRequest) { + if (filterAuthUserRequest == null) { + return Collections.emptyList(); + } + if (filterAuthUserRequest.getPage() != null) { + int offset = (filterAuthUserRequest.getPage() - 1) * filterAuthUserRequest.getLimit(); + PageHelper.offsetPage(offset, filterAuthUserRequest.getLimit()); + } + + return authAdminDao.getDepts(filterAuthUserRequest); + } + public void insertUserRole(Long userId, List roleIds) { if (ArrayUtil.isNotEmpty(roleIds)) { diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index b6a75dfe9..589444e14 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -245,6 +245,8 @@ public class UdiContrastService { udiRelevanceEntity.setUuid(CustomUtil.getUUId()); udiRelevanceEntity.setSupName(thrProductsEntity.getSupName()); udiRelevanceEntity.setId(gennerOrderUtils.getRelId()); + udiRelevanceEntity.setSplitEnable(true); + udiRelevanceEntity.setAutoCode(true); udiRelevanceEntity.setIsDisable(false); UdiProductEntity udiProductEntity = new UdiProductEntity(); @@ -257,7 +259,15 @@ public class UdiContrastService { udiProductEntity.setManufactory(thrProductsEntity.getManufactory()); udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); udiProductEntity.setGgxh(thrProductsEntity.getSpec()); - udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); + if (thrProductsEntity.getProductType() == 2){ + //不是药品就设置namecode + udiProductEntity.setBzgg(thrProductsEntity.getSpec()); + } + if (thrProductsEntity.getProductType() != 2){ + //不是药品就设置namecode + udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); + } + udiProductEntity.setUuid(udiRelevanceEntity.getUuid()); udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); udiProductEntity.setDiType(1); diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index edfc13e5a..40468f531 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -267,7 +267,10 @@ public class UdiProductService { if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) { udiProductEntity.setDiType(1); } - udiProductDao.updateUdiInfo(udiProductEntity); + int i = udiProductDao.updateById(udiProductEntity); + if (i == 0){ + throw new JsonException(500,"更新错误"); + } } //修改关联表 @@ -291,8 +294,8 @@ public class UdiProductService { udiRelevanceEntity.setIsUseDy(false); udiRelevanceEntity.setUuid(IdUtil.getSnowflakeNextId() + ""); udiRelevanceEntity.setNeedCert(false); - udiRelevanceEntity.setSplitEnable(false); - udiRelevanceEntity.setAutoCode(false); + udiRelevanceEntity.setSplitEnable(true); + udiRelevanceEntity.setAutoCode(true); udiRelevanceEntity.setPurType(1); udiRelevanceEntity.setProductsType(2); udiRelevanceEntity.setAttributeType(addProductRequest.getAttributeType()); @@ -346,6 +349,7 @@ public class UdiProductService { udiProductEntity.setZczbhhzbapzbh(addProductRequest.getRegisterNo()); udiProductEntity.setPackLevel(updateLevelDrugRequest.getPackLevel() + ""); udiProductEntity.setUuid(udiProductEntity.getUuid()); + udiProductEntity.setPrice(udiProductEntity.getPrice()); if (IntUtil.value(udiProductEntity.getPackLevel()) == 1 || addProductRequest.getDrugLevelLists().size() == 1) { udiProductEntity.setDiType(1); if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) { diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index bbd39adf9..52a57de40 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -6,7 +6,8 @@ resultType="com.glxp.api.entity.auth.AuthAdmin"> SELECT auth_user.*, auth_dept.name deptName,aw.name invName FROM auth_user - left join auth_dept on auth_user.locDeptCode = auth_dept.code + left join auth_dept_user adu on adu.userId = auth_user.id + left join auth_dept on adu.deptId = auth_dept.id left join auth_warehouse aw on aw.code = auth_user.locInvCode @@ -43,9 +44,11 @@ ) - AND auth_user.locDeptCode = #{deptCode} + AND auth_dept.code = #{deptCode} + GROUP BY + auth_user.userName ORDER BY id DESC @@ -295,5 +298,50 @@ order by u.createTime desc + diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 03d248093..954062b71 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1283,7 +1283,7 @@ updateUser, remark, useExpireTime, `dispatch`, groupBuy, needCert, isStack,distributeLevelDi, - distributeLevelUnit,distributeLevelCount,useLevelDi,useLevelUnit,useLeverCount,useLevel,distributeLevel) + distributeLevelUnit,distributeLevelCount,useLevelDi,useLevelUnit,useLeverCount,useLevel,distributeLevel,splitEnable,autoCode) values ( #{id}, #{uuid}, @@ -1324,7 +1324,9 @@ #{useLevelUnit}, #{useLeverCount}, #{useLevel}, - #{distributeLevel} + #{distributeLevel}, + #{splitEnable}, + #{autoCode} ) diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 0095048b8..ca17f9ec8 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4315,6 +4315,7 @@ CALL Pro_Temp_ColumnWork('sys_workplace_document', 'autoTag', ' tinyint NULL DEFAULT b''0'' COMMENT ''管理设备（是否自动赋码）:： 1:是; 0:否''', 1); + CALL Pro_Temp_ColumnWork('io_collect_order', 'uploadStatus', ' tinyint NULL DEFAULT 1 COMMENT ''上传状态(1.未上传,2.已上传,3.上传失败)''', 1); @@ -4323,7 +4324,11 @@ CALL Pro_Temp_ColumnWork('io_collect_order', 'uploadError', ' varchar(1024) NULL COMMENT ''上传错误信息''', 1); +CALL Pro_Temp_ColumnWork('sys_workplace_document', 'monopoly', + ' tinyint NULL DEFAULT b''0'' COMMENT ''独占工位库存:： 0:否; 1:是''', + 1); + CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'autoTagStatus', 'tinyint NULL DEFAULT 1 COMMENT ''自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足''', - 1); \ No newline at end of file + 1);