|
|
@ -5,6 +5,8 @@ import com.dreamchaser.depository_manage.config.PublicConfig; |
|
|
import com.dreamchaser.depository_manage.entity.*; |
|
|
import com.dreamchaser.depository_manage.entity.*; |
|
|
import com.dreamchaser.depository_manage.exception.MyException; |
|
|
import com.dreamchaser.depository_manage.exception.MyException; |
|
|
import com.dreamchaser.depository_manage.depository_mapper.*; |
|
|
import com.dreamchaser.depository_manage.depository_mapper.*; |
|
|
|
|
|
import com.dreamchaser.depository_manage.hrNew_mapper.AdministrativeMapper; |
|
|
|
|
|
import com.dreamchaser.depository_manage.hrNew_mapper.UserMapper; |
|
|
import com.dreamchaser.depository_manage.pojo.*; |
|
|
import com.dreamchaser.depository_manage.pojo.*; |
|
|
import com.dreamchaser.depository_manage.security.pool.RedisPool; |
|
|
import com.dreamchaser.depository_manage.security.pool.RedisPool; |
|
|
import com.dreamchaser.depository_manage.security.pool.SendQyWxMessageThreadPool; |
|
|
import com.dreamchaser.depository_manage.security.pool.SendQyWxMessageThreadPool; |
|
|
@ -27,38 +29,44 @@ import java.util.concurrent.*; |
|
|
public class GroupServiceImpl implements GroupService { |
|
|
public class GroupServiceImpl implements GroupService { |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
GroupMapper groupMapper; |
|
|
private GroupMapper groupMapper; |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
MaterialMapper materialMapper; |
|
|
private MaterialMapper materialMapper; |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
DepositoryRecordMapper depositoryRecordMapper; |
|
|
private DepositoryRecordMapper depositoryRecordMapper; |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
DepositoryRecordService depositoryRecordService; |
|
|
private DepositoryRecordService depositoryRecordService; |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
DepositoryMapper depositoryMapper; |
|
|
private DepositoryMapper depositoryMapper; |
|
|
@Autowired |
|
|
@Autowired |
|
|
RedissonClient redissonClient; |
|
|
private RedissonClient redissonClient; |
|
|
@Autowired |
|
|
@Autowired |
|
|
RedisPool redisPool; |
|
|
private RedisPool redisPool; |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
SplitUnitMapper splitUnitMapper; |
|
|
private SplitUnitMapper splitUnitMapper; |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
SplitUnitService splitUnitService; |
|
|
private SplitUnitService splitUnitService; |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
PlaceMapper placeMapper; |
|
|
private PlaceMapper placeMapper; |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
RoleMapper roleMapper; |
|
|
private RoleMapper roleMapper; |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
QyWxOperationService qyWxOperationService; |
|
|
private QyWxOperationService qyWxOperationService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private UserMapper userMapper; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private AdministrativeMapper administrativeMapper; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 用于查找所有组合 |
|
|
* 用于查找所有组合 |
|
|
@ -711,7 +719,7 @@ public class GroupServiceImpl implements GroupService { |
|
|
paramForOut.put("state", "待部门负责人审核"); |
|
|
paramForOut.put("state", "待部门负责人审核"); |
|
|
paramForOut.put("applyRemark", map.get("applyRemark")); |
|
|
paramForOut.put("applyRemark", map.get("applyRemark")); |
|
|
// 获取当前部门名称
|
|
|
// 获取当前部门名称
|
|
|
Administration company = PublicConfig.getCompany(userToken.getMaindeparment(), userKey, token); |
|
|
Administration company = administrativeMapper.findAdministrationById(userToken.getMaindeparment()); |
|
|
// 构造出库订单编码
|
|
|
// 构造出库订单编码
|
|
|
String code = createOutCode("outOrderNumber", company.getName()); |
|
|
String code = createOutCode("outOrderNumber", company.getName()); |
|
|
paramForOut.put("code", code); |
|
|
paramForOut.put("code", code); |
|
|
@ -860,7 +868,7 @@ public class GroupServiceImpl implements GroupService { |
|
|
for (RoleAndMaterialType mt : materialTypeIdForIn |
|
|
for (RoleAndMaterialType mt : materialTypeIdForIn |
|
|
) { |
|
|
) { |
|
|
// 获取管理员数据
|
|
|
// 获取管理员数据
|
|
|
UserByPort userByPort = PublicConfig.FindUserById(mt.getUid(), userKey, token); |
|
|
UserByPort userByPort = userMapper.findUserById(mt.getUid()); |
|
|
// 获取用户的用工关系
|
|
|
// 获取用户的用工关系
|
|
|
int emptype = userByPort.getEmptype(); |
|
|
int emptype = userByPort.getEmptype(); |
|
|
if(emptype > 10){ |
|
|
if(emptype > 10){ |
|
|
|