UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
workplace
yewj 10 months ago
parent b00841f3bf a99bbe942e
commit 8b76c7d458
11 changed files with 111 additions and 9 deletions
Show Stats Download Patch File Download Diff File

12
src/main/java/com/glxp/api/controller/auth/DeptController.java
Unescape Escape View File

@ -369,6 +369,18 @@ public class DeptController {
return ResultVOUtils.success(list);
}
@AuthRuleAnnotation("")
@GetMapping("spms/inv/dept/filter")
public BaseResponse filterDeptsByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
List<DeptEntity> invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest);
PageInfo<DeptEntity> pageInfo = new PageInfo<>(invWarehouseEntities);
PageSimpleResponse<DeptEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(invWarehouseEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
public String isCheckStatus(Integer status, DeptEntity deptEntity) {
//启用的时候需要判断上级是不是被禁用
if (status == 1) {

1
src/main/java/com/glxp/api/controller/auth/SysUserController.java
Unescape Escape View File

@ -67,6 +67,7 @@ public class SysUserController extends BaseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<AuthAdmin> authAdminList = userService.listAdminPage(filterAuthUserRequest);
// List<AuthAdmin> authAdminList1 = userService.getDepts(filterAuthUserRequest);
//查询对应角色和部门
List<AuthAdminResponse> authAdminResponseList = authAdminList.stream().map(item -> {
AuthAdminResponse authAdminResponse = new AuthAdminResponse();

3
src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -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);
//关联更新

2
src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java
Unescape Escape View File

@ -89,4 +89,6 @@ public interface AuthAdminDao extends BaseMapperPlus<AuthAdminDao, AuthAdmin, Au
List<AuthAdmin> companyUserList(@Param("param")FilterInvLinkDataRequest filterInvLinkDataRequest);
List<AuthAdmin> getUserByIds(@Param("userIds") List<Long> ids,@Param("key") String key);
List<AuthAdmin> getDepts(FilterAuthUserRequest filterAuthUserRequest);
}

2
src/main/java/com/glxp/api/service/auth/AuthAdminService.java
Unescape Escape View File

@ -50,4 +50,6 @@ public interface AuthAdminService extends IService<AuthAdmin> {
List<AuthAdmin> getUserByIds(SysWorkplaceRequest request);
List<AuthAdmin> getUserByDeptCode(String deptCode);
List<AuthAdmin> getDepts(FilterAuthUserRequest filterAuthUserRequest);
}

13
src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java
Unescape Escape View File

@ -224,6 +224,19 @@ public class AuthAdminServiceImpl extends ServiceImpl<AuthAdminDao, AuthAdmin> i
return authAdmins;
}
@Override
public List<AuthAdmin> 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<Long> roleIds) {
if (ArrayUtil.isNotEmpty(roleIds)) {

12
src/main/java/com/glxp/api/service/basic/UdiContrastService.java
Unescape Escape View File

@ -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);

10
src/main/java/com/glxp/api/service/basic/UdiProductService.java
Unescape Escape View File

@ -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) {

52
src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
Unescape Escape View File

@ -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
<where>
<if test="ids != null and ids.size > 0">
@ -43,9 +44,11 @@
)
</if>
<if test="deptCode != null and deptCode != ''">
AND auth_user.locDeptCode = #{deptCode}
AND auth_dept.code = #{deptCode}
</if>
</where>
GROUP BY
auth_user.userName
ORDER BY id DESC
</select>
@ -295,5 +298,50 @@
</where>
order by u.createTime desc
</select>
<select id="getDepts" resultType="com.glxp.api.entity.auth.AuthAdmin">
SELECT auth_user.*, auth_dept.name deptName
FROM auth_dept_user adu
left join auth_user on adu.userId = auth_user.id
left join auth_dept on adu.deptId = auth_dept.id
<where>
<if test="ids != null and ids.size > 0">
AND auth_user.id IN
<foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
<if test="userFlag != null">
AND auth_user.userFlag = #{userFlag}
</if>
<if test="userName != null and '' != userName">
AND auth_user.userName LIKE CONCAT('%', #{userName}, '%')
</if>
<if test="neUserName != null and '' != neUserName">
AND auth_user.userName != #{neUserName}
</if>
<if test="invCode != null and '' != invCode">
AND auth_user.locInvCode = #{invCode}
</if>
<if test="deptName != null and '' != deptName">
AND auth_dept.name LIKE CONCAT('%', #{deptName}, '%')
</if>
<if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[
and DATE_FORMAT(auth_user.lastModifyTime
, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}
, '%Y-%m-%d %H:%i:%S')
]]>
</if>
<if test="userKey != null and userKey != ''">
AND (auth_user.userName like concat('%', #{userKey}, '%')
or auth_user.employeeName like concat('%', #{userKey}, '%')
)
</if>
<if test="deptCode != null and deptCode != ''">
AND auth_user.locDeptCode = #{deptCode}
</if>
</where>
ORDER BY auth_user.id DESC
</select>
</mapper>

6
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -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}
)
</insert>

7
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -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);
1);

Write Preview
Loading…
Cancel
Save