service 优化代码 alihealth auth basic 包

dev_2.5_ocean
qiuyt 4 months ago
parent 60a56a0e3d
commit b12c952de3

@ -64,15 +64,6 @@ public class SysWorkplaceDocumentController extends BaseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/udiwms/sysWorkplace/workBindBusType")
public BaseResponse workBindBusType(@RequestBody WorkBindBusTypeRequest request) {
Long userId = this.getUserId();
Boolean save = sysWorkplaceDocumentService.bindBusType(request, userId);
if (!save) {
return ResultVOUtils.error("该工位已经绑定该单据类型");
}
return ResultVOUtils.success("绑定成功");
}
@PostMapping("/udiwms/sysWorkplace/workplaceBindBusType")
public BaseResponse workplaceBindBusType(@RequestBody WorkBindBusTypeRequest request) {

@ -10,8 +10,6 @@ import java.util.List;
public interface AlihealthBusService {
List<AliYljgSearchbill> aliYljgSearchbillPage(AliYljgSearchbillReqeust aliYljgSearchbillReqeust);
AliYljgBillDetail aliYljgBillDetail(AliYljgSearchbillReqeust aliYljgSearchbillReqeust);
void ycFileUpload(String billNo, MultipartFile file);

@ -59,40 +59,8 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
@Resource
IoOrderService ioOrderService;
@Resource
IoOrderDao ioOrderDao;
@Resource
CompanyProductRelevanceDao companyProductRelevanceDao;
@Override
public List<AliYljgSearchbill> aliYljgSearchbillPage(AliYljgSearchbillReqeust aliYljgSearchbillReqeust) {
if (aliYljgSearchbillReqeust == null) {
return Collections.emptyList();
}
AlihealthYljgListupoutReqeust alihealthYljgListupoutReqeust1 = new AlihealthYljgListupoutReqeust();
alihealthYljgListupoutReqeust1.setBegin_date(aliYljgSearchbillReqeust.getBeginDate());
alihealthYljgListupoutReqeust1.setEnd_date(aliYljgSearchbillReqeust.getEnsDate());
if (StringUtils.isNotEmpty(aliYljgSearchbillReqeust.getBillCode())) {
alihealthYljgListupoutReqeust1.setBill_code(aliYljgSearchbillReqeust.getBillCode());
}
if (aliYljgSearchbillReqeust.getPage() != null) {
alihealthYljgListupoutReqeust1.setPage(aliYljgSearchbillReqeust.getPage());
alihealthYljgListupoutReqeust1.setPage_size(aliYljgSearchbillReqeust.getLimit());
} else {
alihealthYljgListupoutReqeust1.setPage(1);
alihealthYljgListupoutReqeust1.setPage_size(20);
}
BaseResponse<List<AliYljgSearchbill>> listBaseResponse = alihealthYljgUtils.listupout(alihealthYljgListupoutReqeust1, aliYljgSearchbillReqeust.getErpId());
if (listBaseResponse.getCode() == 20000) {
List<AliYljgSearchbill> data = listBaseResponse.getData();
return data;
} else {
throw new JsonException(listBaseResponse.getMessage());
}
}
@Override
public AliYljgBillDetail aliYljgBillDetail(AliYljgSearchbillReqeust aliYljgSearchbillReqeust) {
AlihealthYljgListupoutDetailReqeust alihealthYljgListupoutDetailReqeust = new AlihealthYljgListupoutDetailReqeust();

@ -13,12 +13,8 @@ public interface AuthAdminService extends IService<AuthAdmin> {
AuthAdmin findByUserName(String userName);
AuthAdmin findById(Long id);
AuthAdmin findPwdById(Long id);
boolean insertAuthAdmin(AuthAdmin authAdmin);
boolean updateAuthAdmin(AuthAdmin authAdmin);
@ -38,18 +34,11 @@ public interface AuthAdminService extends IService<AuthAdmin> {
List<AuthAdmin> selectAllocatedList(FilterAuthUserRequest filterAuthUserRequest);
List<AuthAdmin> selectUnallocatedList(FilterAuthUserRequest filterAuthUserRequest);
void insertUserAuth(Long userId, List<Long> roleIds);
List<AuthAdmin> companyUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
List<AuthAdmin> getUserByIds(SysWorkplaceRequest request);
List<AuthAdmin> getUserByDeptCode(String deptCode);
List<AuthAdmin> getDepts(FilterAuthUserRequest filterAuthUserRequest);
}

@ -11,8 +11,6 @@ import javax.annotation.Resource;
@Service
public class AuthAliUserService extends ServiceImpl<AuthAliUserDao, AuthAliUser> {
@Resource
private AuthAliUserDao authAliUserDao;
public AuthAliUser getOne(){
AuthAliUser authAliUser = this.getOne(new QueryWrapper<AuthAliUser>()
.last("limit 1")

@ -12,8 +12,6 @@ import java.util.List;
public interface DeptService extends IService<DeptEntity> {
List<String> selectByIdCode(List<String> list);
DeptEntity findDefault(Boolean advaceType, Boolean isDefault);
DeptEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest);
List<DeptEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
@ -30,8 +28,6 @@ public interface DeptService extends IService<DeptEntity> {
DeptEntity selectByCode(String code);
DeptEntity selectByName(String name);
Long getIdByCode( Long fromCorpId);
boolean deleteById(String id);
@ -40,27 +36,6 @@ public interface DeptService extends IService<DeptEntity> {
List<DeptEntity> selectByNameList(String name);
/**
*
*
* @param invWarehouseEntities
*/
void importInvWarehouse(List<DeptEntity> invWarehouseEntities);
/**
*
*
* @param id
* @param thridWarehouseId
*/
boolean bindThrWarehouse(String id, String thridWarehouseId, String sysId);
/**
*
*/
boolean unbindThrWarehouse(String id, String sysId);
/**
*
*
@ -69,15 +44,8 @@ public interface DeptService extends IService<DeptEntity> {
*/
String getInvName(String code);
/**
* code*
*/
DeptEntity selectByCodeAll(String code);
boolean updateTime(String code, Date updateTime);
List<DeptEntity> getDeptById( List<Integer> ids);
List<DeptEntity> selectupDeptAll(String pCode);
List<DeptEntity> selectLowDeptAll(String pCode);

@ -24,8 +24,6 @@ public interface DeptUserService extends IService<DeptUserEntity> {
int deleteById(Integer id);
int deleteByList(List<Integer> ids);
int insertBatch(List<DeptUserEntity> list);

@ -19,16 +19,6 @@ public interface ISysDictDataService {
* @return
*/
List<SysDictData> selectDictDataList(SysDictDataRequest sysDictDataRequest);
/**
*
*
* @param dictType
* @param dictValue
* @return
*/
String selectDictLabel(String dictType, String dictValue);
/**
* ID
*

@ -38,14 +38,6 @@ public interface ISysDictTypeService {
*/
SysDictType selectDictTypeById(Long dictId);
/**
*
*
* @param dictType
* @return
*/
SysDictType selectDictTypeByType(String dictType);
/**
*
*
@ -53,11 +45,6 @@ public interface ISysDictTypeService {
*/
void deleteDictTypeByIds(Long[] dictIds);
/**
*
*/
void resetDictCache();
/**
*
*
@ -82,16 +69,4 @@ public interface ISysDictTypeService {
*/
String checkDictTypeUnique(SysDictType dictType);
String getDictLabel(String dictType, String dictValue, String separator);
/**
*
*
* @param dictType
* @param dictLabel
* @param separator
* @return
*/
String getDictValue(String dictType, String dictLabel, String separator);
}

@ -134,14 +134,6 @@ public interface ISysRoleService {
*/
int authDataScope(SysRole role);
/**
* ID
*
* @param roleId ID
* @return
*/
int deleteRoleById(Long roleId);
/**
*
*

@ -15,8 +15,6 @@ public interface InvBusUserService extends IService<InvBusUserEntity> {
List<WarehouseBussinessTypeEntity> filterUnSelect(FilterInvBusUserRequest filterInvBusUserRequest);
List<InvBusUserResponse> filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
List<InvBusUserEntity> selectByUnion(String userId, String subInvCode);
boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity);
@ -27,8 +25,6 @@ public interface InvBusUserService extends IService<InvBusUserEntity> {
boolean deleteByUnion(String userId, String subInvCode);
boolean deleteByscAction(String subInvCode, List<String> selectedCodes);
boolean exitBus(String userId, String action);
}

@ -42,9 +42,7 @@ public interface InvWarehouseService extends IService<InvWarehouseEntity> {
boolean deleteById(String id);
boolean deleteByParentCode(String code);
public boolean checkDuplicateName(String parentId, String name);
boolean checkDuplicateName(String parentId, String name);
boolean updateCheckExit(InvWarehouseEntity invWarehouseEntity);
@ -101,8 +99,6 @@ public interface InvWarehouseService extends IService<InvWarehouseEntity> {
List<InvWarehouseEntity> findByLastTime(Date lastUpdateTime);
List<InvWarehouseEntity> selectLowWarehouseAll(String pCode);
InvWarehouseEntity findNoInvTypeInv(Integer noInvType, String invCode);

@ -16,8 +16,6 @@ public interface SysPdaKeyService {
void insertDeviceKey(SysPdaKeyEntity sysPdaKeyEntity);
void updateDeviceKeyByImei(SysPdaKeyEntity sysPdaKeyEntity);
void updateDeviceKey(SysPdaKeyEntity sysPdaKeyEntity);
void deleteDeviceKey(DeleteRequest deleteRequest);

@ -39,9 +39,6 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
@Resource
SysWorkplaceDao sysWorkplaceDao;
@Resource
private SysWorkplaceDocumentService sysWorkplaceDocumentService;
@Resource
private SysWorkplaceFreightService sysWorkplaceFreightService;
@ -71,24 +68,12 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
public List<SysWorkplaceResponse> getAllByBusType(String code) {
return sysWorkplaceDao.getAllByBusType(code); //切换成单据类型关联的
// return super.baseMapper.selectList(
// new LambdaQueryWrapper<SysWorkplace>().eq(SysWorkplace::getOrderId, code));
}
@Transactional(rollbackFor = Exception.class)
public boolean updateWorkplace(SysWorkplace sysWorkplace) {
// if (sysWorkplace.getWorkplaceStatus() == 0 ){
// //更改停用 判断是否含有业务类型
// WorkBindBusTypeRequest request = new WorkBindBusTypeRequest();
// request.setWorkplaceCode(sysWorkplace.getWorkplaceId());
// List<SysWorkplaceDocumentResponse> page = sysWorkplaceDocumentService.filterListByWorkplace(request);
// if (page.size() >0 ){
// throw new JsonException(500,"当前工位已作业,请解绑之后暂停工位");
// }
// }
boolean b = this.updateById(sysWorkplace);
if (!b){
return false;

@ -30,12 +30,6 @@ public interface WarehouseBussinessTypeService extends IService<WarehouseBussine
*/
void saveWarehouseBussinessType(String code, List<BasicBussinessTypeResponse> bussinessTypResponseList);
/**
*
*
* @param id
*/
void deleteWarehouseByssuinessType(Integer id);
boolean deleteByCode(String code);

@ -34,14 +34,6 @@ public interface WarehouseUserService extends IService<WarehouseUserEntity> {
*/
void saveWarehouseUser(String code, List<AuthAdmin> userList);
/**
*
*
* @param id
*/
void updateDirector(Long id);
void updateDirector(WarehouseUserEntity warehouseUserEntity);
/**
*
@ -62,8 +54,6 @@ public interface WarehouseUserService extends IService<WarehouseUserEntity> {
*/
List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds") List<Long> userIds);
/**
*
*

@ -128,15 +128,6 @@ public class AuthAdminServiceImpl extends ServiceImpl<AuthAdminDao, AuthAdmin> i
return authAdminDao.updateUser(updateUserRequset);
}
// @Override
// public boolean updateAuthAdmin(UpdateUserRequset updateUserRequset) {
//
// if (updateUserRequset.getId() == null) {
// return false;
// }
// return authAdminDao.updateUser(updateUserRequset);
// }
/**
* id
*
@ -194,19 +185,6 @@ public class AuthAdminServiceImpl extends ServiceImpl<AuthAdminDao, AuthAdmin> i
return authAdminDao.companyUserList(filterInvLinkDataRequest);
}
@Override
public List<AuthAdmin> getUserByIds(SysWorkplaceRequest request) {
if (request == null) {
return Collections.emptyList();
}
if (request.getPage() != null) {
int offset = (request.getPage() - 1) * request.getLimit();
PageHelper.offsetPage(offset, request.getLimit());
}
return authAdminDao.getUserByIds(request.getIds(), request.getKey());
}
@Resource
DeptService deptService;
@Resource
@ -227,18 +205,6 @@ 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) {

@ -28,17 +28,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
return deptDao.selectByIdCode(list);
}
@Override
public DeptEntity findDefault(Boolean advaceType, Boolean isDefault) {
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
filterInvWarehouseRequest.setIsDefault(isDefault);
// filterInvWarehouseRequest.setAdvanceType(advaceType);
List<DeptEntity> invWarehouseEntities = deptDao.filterInvWarehouse(filterInvWarehouseRequest);
if (invWarehouseEntities != null && invWarehouseEntities.size() > 0)
return invWarehouseEntities.get(0);
return null;
}
@Override
public DeptEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest) {
DeptEntity deptEntity = deptDao.selectMaxCode(filterInvWarehouseRequest);
@ -114,16 +103,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
return null;
}
@Override
public DeptEntity selectByName(String name) {
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
filterInvWarehouseRequest.setName(name);
List<DeptEntity> invWarehouseEntities = deptDao.filterInvWarehouse(filterInvWarehouseRequest);
if (invWarehouseEntities != null && invWarehouseEntities.size() > 0)
return invWarehouseEntities.get(0);
return null;
}
@Override
public Long getIdByCode(Long fromCorpId) {
return deptDao.getIdByCode(fromCorpId);
@ -149,24 +128,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
return deptDao.selectByPcode(pcode);
}
@Override
public void importInvWarehouse(List<DeptEntity> invWarehouseEntities) {
if (CollUtil.isNotEmpty(invWarehouseEntities)) {
deptDao.importInvWarehouse(invWarehouseEntities);
}
}
@Override
public boolean bindThrWarehouse(String id, String thridWarehouseId, String sysId) {
return deptDao.updateThridId(id, thridWarehouseId, sysId);
}
@Override
public boolean unbindThrWarehouse(String id, String sysId) {
return deptDao.updateThridId(id, null, sysId);
}
@Override
public String getInvName(String code) {
if (StrUtil.isBlank(code)) {
@ -174,22 +135,10 @@ public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements
}
return deptDao.getNameByCode(code);
}
@Override
public DeptEntity selectByCodeAll(String code) {
return deptDao.selectByCodeAll(code);
}
@Override
public boolean updateTime(String code, Date updateTime) {
return deptDao.updateTime(code, updateTime);
}
@Override
public List<DeptEntity> getDeptById(List<Integer> ids) {
return deptDao.getDeptById(ids);
}
@Override
public List<DeptEntity> selectupDeptAll(String pCode) {
return deptDao.selectupDeptAll(pCode);

@ -69,11 +69,6 @@ public class DeptUserServiceImpl extends ServiceImpl<DeptUserDao, DeptUserEntity
return deptUserDao.deleteById(id);
}
@Override
public int deleteByList(List<Integer> ids) {
return deptUserDao.deleteByList(ids);
}
@Override
public int insertBatch(List<DeptUserEntity> list) {
if (CollUtil.isNotEmpty(list))

@ -50,19 +50,6 @@ public class InvBusUserServiceImpl extends ServiceImpl<InvBusUserDao, InvBusUser
return invBusUserDao.filterUnSelect(filterInvBusUserRequest);
}
@Override
public List<InvBusUserResponse> filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest) {
if (filterInvBusUserRequest == null) {
return Collections.emptyList();
}
if (filterInvBusUserRequest.getPage() != null) {
int offset = (filterInvBusUserRequest.getPage() - 1) * filterInvBusUserRequest.getLimit();
PageHelper.offsetPage(offset, filterInvBusUserRequest.getLimit());
}
return invBusUserDao.filterJoinInvBusUser(filterInvBusUserRequest);
}
@Override
public List<InvBusUserEntity> selectByUnion(String userId, String subInvCode) {
@ -99,14 +86,6 @@ public class InvBusUserServiceImpl extends ServiceImpl<InvBusUserDao, InvBusUser
return invBusUserDao.deleteByUnion(userId, subInvCode);
}
@Override
public boolean deleteByscAction(String subInvCode, List<String> selectedCodes) {
if (CollectionUtils.isEmpty(selectedCodes) || StrUtil.isEmpty(subInvCode)) {
return false;
}
return invBusUserDao.deleteByscAction(subInvCode, selectedCodes);
}
@Override
public boolean exitBus(String userId, String action) {
return invBusUserDao.exists(new QueryWrapper<InvBusUserEntity>().eq("userId", userId).eq("scAction", action));

@ -107,21 +107,6 @@ public class InvSpaceServiceImpl extends ServiceImpl<InvSpaceDao, InvSpace> impl
public BaseResponse deleteSpace(String id) {
//校验此货位是否已经被使用,如果已经被使用,不能删除
Long spaceId = Long.valueOf(id);
InvSpace invSpace = invSpaceDao.selectById(spaceId);
//todo 代码迁移,后面记得修改
// //判断此货位是否与库存绑定,如果与库存绑定,则无法删除
// Long detailCount = invProductServiceNew.countBySpaceCode(invSpace.getInvStorageCode(), invSpace.getInvWarehouseCode(), invSpace.getCode());
// if (detailCount > 0) {
// return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "此货位已被使用,无法删除!");
// }
//
// //判断此货位是否已经被盘点单使用,如果有,则无法删除
// Integer count = invCountOrderDao.countBySpaceCode(invSpace.getInvStorageCode(), invSpace.getInvWarehouseCode(), invSpace.getCode());
// if (count > 0) {
// return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "此货位已被使用,无法删除!");
// }
invSpaceDao.deleteById(spaceId);
return ResultVOUtils.success();
}

@ -157,11 +157,6 @@ public class InvWarehouseServiceImpl extends ServiceImpl<InvWarehouseDao, InvWar
return invWarehouseDao.deleteById(Long.parseLong(id)) > 0;
}
@Override
public boolean deleteByParentCode(String code) {
return invWarehouseDao.deleteByParentCode(code);
}
@Override
public boolean checkDuplicateName(String parentId, String name) {
int count = invWarehouseDao.countByParentIdAndName(parentId, name);
@ -282,12 +277,6 @@ public class InvWarehouseServiceImpl extends ServiceImpl<InvWarehouseDao, InvWar
public List<InvWarehouseEntity> findByLastTime(Date lastUpdateTime) {
return invWarehouseDao.selectList(new QueryWrapper<InvWarehouseEntity>().gt("updateTime", lastUpdateTime));
}
@Override
public List<InvWarehouseEntity> selectLowWarehouseAll(String pCode) {
return invWarehouseDao.selectLowWarehouseAll(pCode);
}
@Override
public InvWarehouseEntity findNoInvTypeInv(Integer noInvType, String invCode) {
InvWarehouseEntity invWarehouseEntity = findByInvSubByCode(invCode);

@ -41,19 +41,6 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
}
@Override
public String selectDictLabel(String dictType, String dictValue) {
SysDictDataRequest sysDictDataRequest = new SysDictDataRequest();
sysDictDataRequest.setDictType(dictType);
sysDictDataRequest.setDictValue(dictValue);
List<SysDictData> dictData = baseMapper.selectDictDataList(sysDictDataRequest);
if (CollUtil.isNotEmpty(dictData))
return dictData.get(0).getDictLabel();
else
return null;
}
@Override
public SysDictData selectDictDataById(Long dictCode) {
return baseMapper.selectById(dictCode);

@ -79,23 +79,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
return baseMapper.selectById(dictId);
}
/**
*
*
* @param dictType
* @return
*/
@Override
public SysDictType selectDictTypeByType(String dictType) {
SysDictTypeRequest sysDictTypeRequest = new SysDictTypeRequest();
sysDictTypeRequest.setDictType(dictType);
List<SysDictType> sysDictTypes = baseMapper.selectDictTypeList(sysDictTypeRequest);
if (CollUtil.isNotEmpty(sysDictTypes)) {
return sysDictTypes.get(0);
} else
return null;
}
/**
*
*
@ -160,10 +143,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
String userName = authAdmin.getUserName();
dict.setUpdateBy(userName);
dict.setUpdateTime(date);
// SysDictType oldDict = baseMapper.selectById(dict.getDictId());
// dictDataMapper.updateByType(null, new LambdaUpdateWrapper<SysDictData>()
// .set(SysDictData::getDictType, dict.getDictType())
// .eq(SysDictData::getDictType, oldDict.getDictType()));
int row = baseMapper.updateById(dict);
if (row > 0) {
SysDictDataRequest sysDictDataRequest = new SysDictDataRequest();
@ -192,68 +171,5 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
return Constant.UNIQUE;
}
/**
*
*
* @param dictType
* @param dictValue
* @param separator
* @return
*/
@Override
public String getDictLabel(String dictType, String dictValue, String separator) {
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = selectDictDataByType(dictType);
if (StringUtils.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas)) {
for (SysDictData dict : datas) {
for (String value : dictValue.split(separator)) {
if (value.equals(dict.getDictValue())) {
propertyString.append(dict.getDictLabel() + separator);
break;
}
}
}
} else {
for (SysDictData dict : datas) {
if (dictValue.equals(dict.getDictValue())) {
return dict.getDictLabel();
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
}
/**
*
*
* @param dictType
* @param dictLabel
* @param separator
* @return
*/
@Override
public String getDictValue(String dictType, String dictLabel, String separator) {
StringBuilder propertyString = new StringBuilder();
List<SysDictData> datas = selectDictDataByType(dictType);
if (StringUtils.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas)) {
for (SysDictData dict : datas) {
for (String label : dictLabel.split(separator)) {
if (label.equals(dict.getDictLabel())) {
propertyString.append(dict.getDictValue() + separator);
break;
}
}
}
} else {
for (SysDictData dict : datas) {
if (dictLabel.equals(dict.getDictLabel())) {
return dict.getDictValue();
}
}
}
return StringUtils.stripEnd(propertyString.toString(), separator);
}
}

@ -48,10 +48,6 @@ public class SysPdaKeyServiceImpl implements SysPdaKeyService {
sysPdaKeyDao.insertDeviceKey(sysPdaKeyEntity);
}
@Override
public void updateDeviceKeyByImei(SysPdaKeyEntity sysPdaKeyEntity) {
sysPdaKeyDao.updateDeviceKeyByImei(sysPdaKeyEntity);
}
@Override
public void updateDeviceKey(SysPdaKeyEntity sysPdaKeyEntity) {

@ -158,8 +158,6 @@ public class SysRoleServiceImpl implements ISysRoleService {
*/
@Override
public String checkRoleKeyUnique(SysRole role) {
FilterRoleRequest filterRoleRequest = new FilterRoleRequest();
filterRoleRequest.setRoleKey(role.getRoleKey());
filterRoleRequest.setNeRoleId(role.getRoleId());
@ -169,8 +167,6 @@ public class SysRoleServiceImpl implements ISysRoleService {
} else {
return Constant.UNIQUE;
}
}
/**
@ -271,10 +267,6 @@ public class SysRoleServiceImpl implements ISysRoleService {
public int authDataScope(SysRole role) {
// 修改角色信息
sysRoleMapper.updateById(role);
// 删除角色与部门关联
// roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().eq(SysRoleDept::getRoleId, role.getRoleId()));
// // 新增角色和部门信息(数据权限)
// return insertRoleDept(role);
return 0;
}
@ -299,22 +291,6 @@ public class SysRoleServiceImpl implements ISysRoleService {
return rows;
}
/**
* ID
*
* @param roleId ID
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int deleteRoleById(Long roleId) {
// 删除角色与菜单关联
roleMenuMapper.deleteById(roleId);
// 删除角色与部门关联
return sysRoleMapper.deleteById(roleId);
}
/**
*
*

@ -66,8 +66,6 @@ public class WarehouseBussinessTypeServiceImpl extends ServiceImpl<WarehouseBuss
@Override
public void saveWarehouseBussinessType(String code, List<BasicBussinessTypeResponse> bussinessTypResponseList) {
if (CollUtil.isNotEmpty(bussinessTypResponseList)) {
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = new ArrayList<>(bussinessTypResponseList.size());
bussinessTypResponseList.forEach(bussinessTypeEntity -> {
@ -83,13 +81,6 @@ public class WarehouseBussinessTypeServiceImpl extends ServiceImpl<WarehouseBuss
}
}
@Override
public void deleteWarehouseByssuinessType(Integer id) {
if (null != id) {
warehouseBussinessTypeDao.deleteByPrimaryKey(id);
}
}
@Override
public boolean deleteByCode(String code) {
return warehouseBussinessTypeDao.deleteByCode(code);

@ -83,24 +83,6 @@ public class WarehouseUserServiceImpl extends ServiceImpl<WarehouseUserDao, Ware
}
}
@Override
public void updateDirector(Long id) {
if (null != id) {
WarehouseUserEntity warehouseUserEntity = warehouseUserDao.selectByPrimaryKey(id);
warehouseUserDao.updateDirector(warehouseUserEntity.getCode(), 0);
warehouseUserDao.updateDirectorById(id, 1);
}
}
@Override
public void updateDirector(WarehouseUserEntity warehouseUserEntity) {
int value = 0;
if (warehouseUserEntity.isDirector()) {
value = 1;
}
warehouseUserDao.updateDirectorById(warehouseUserEntity.getId(), value);
}
@Override
public void deleteWarehouseUser(Long id) {
if (null != id) {
@ -132,11 +114,6 @@ public class WarehouseUserServiceImpl extends ServiceImpl<WarehouseUserDao, Ware
return warehouseUserDao.selectListkey(filterInvLinkDataRequest);
}
@Override
public List<WarehouseUserEntity> selectNotSelectUserid(List<Long> userIds) {
return warehouseUserDao.selectNotSelectUserid(userIds);
}
@Override
public Integer countUserBySubInvCode(String subInvCode) {
return warehouseUserDao.countByCode(subInvCode);

@ -1,6 +1,8 @@
package com.glxp.api.service.basic;
import com.glxp.api.exception.JsonException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.beans.BeanUtils;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.constant.ConstantStatus;
@ -25,152 +27,14 @@ import javax.annotation.Resource;
import java.util.*;
@Service
@Slf4j
public class BasicBackUpdateProductService {
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
UdiProductService udiProductService;
@Resource
ThrProductsService thrProductsService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
ThrSystemService thrSystemService;
@Resource
private ErpBasicClient erpBasicClient;
@Resource
RedisUtil redisUtil;
@Resource
GennerOrderUtils gennerOrderUtils;
//定时或一键下载更新全部线上产品信息
@Async
public void addAllProducts(FilterThrProductsRequest filterThrProductsRequest, String productUrl, String onHandUrl, String thirdSysId, Boolean isEnable) {
int page = 1;
if (filterThrProductsRequest == null) {
filterThrProductsRequest = new FilterThrProductsRequest();
}
filterThrProductsRequest.setPage(1);
filterThrProductsRequest.setLimit(100);
while (page != -1) {
page = getAllProducts(filterThrProductsRequest, productUrl, onHandUrl, thirdSysId, isEnable);
}
}
//定时或一键下载更新全部线上产品信息
public int getAllProducts(FilterThrProductsRequest filterThrProductsRequest, String productUrl, String
onHandUrl, String thirdSysId, Boolean isEnable) {
BaseResponse<PageSimpleResponse<ThrProductsResponse>> erpProducts = erpBasicClient.getErpProducts(filterThrProductsRequest);
List<ThrProductsResponse> invmandocResponses = erpProducts.getData().getList();
SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData_type");
if (isEnable == null || isEnable == false) {
isUpdate.setParamValue("1");
}
Map<String, ThrProductsResponse> erpProductsMap = new HashMap<>();
if (invmandocResponses != null && invmandocResponses.size() > 0) {
List<String> inventoryCodes = new ArrayList<>();
// if (filterThrProductsRequest.getCode() != null) {
// inventoryCodes.add(filterThrProductsRequest.getCode());
// erpProductsMap.put(filterThrProductsRequest.getCode(), invmandocResponses.get(0));
// } else {
for (ThrProductsResponse invmandocResponse : invmandocResponses) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode(), thirdSysId);
if (udiRelevanceEntity == null) {
inventoryCodes.add(invmandocResponse.getCode());
erpProductsMap.put(invmandocResponse.getCode(), invmandocResponse);
if (isUpdate.getParamValue().equals("1")) {//不根据库存信息过滤
UdiProductEntity udiProductEntity = new UdiProductEntity();
udiProductEntity.setNameCode(invmandocResponse.getCode());
udiProductEntity.setCpmctymc(invmandocResponse.getName());
udiProductEntity.setGgxh(invmandocResponse.getSpec());
udiProductEntity.setUuid(CustomUtil.getUUId());
udiProductEntity.setDiType(1);
udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiProductEntity.setManufactory(invmandocResponses.get(0).getManufactory());
udiProductEntity.setYlqxzcrbarmc(invmandocResponses.get(0).getManufactory());
udiProductEntity.setZczbhhzbapzbh(invmandocResponses.get(0).getRegisterNo());
udiProductService.insertUdiInfo(udiProductEntity);
UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
udiRelevanceEntity1.setUuid(udiProductEntity.getUuid());
if ("thirdId".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId(invmandocResponse.getCode());
} else if ("thirdId1".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId1(invmandocResponse.getCode());
} else if ("thirdId2".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId4(invmandocResponse.getCode());
} else if ("thirdId3".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId3(invmandocResponse.getCode());
} else if ("thirdId4".equals(thirdSysId)) {
udiRelevanceEntity1.setThirdId4(invmandocResponse.getCode());
}
ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys();
String mainSys = thrSystemEntity.getThirdId();
if (mainSys.equals("thirdId")) {
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId());
} else if (mainSys.equals("thirdId1")) {
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1());
} else if (mainSys.equals("thirdId2")) {
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2());
} else if (mainSys.equals("thirdId3")) {
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3());
} else if (mainSys.equals("thirdId4")) {
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4());
}
udiRelevanceEntity1.setThirdId(invmandocResponse.getCode());
udiRelevanceEntity1.setUpdateTime(new Date());
udiRelevanceEntity.setModifyTime(new Date());
udiRelevanceEntity.setIsDisable(false);
udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
udiRelevanceEntity1 = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity1, udiProductEntity);
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1);
udiProductService.updateLevelCount(udiRelevanceEntity1);
}
}
// }
}
//若需要对照库存信息
if (!isUpdate.getParamValue().equals("1")) {
// if (inventoryCodes.size() > 0) {
// ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest();
// erpOnhandRequest.setInventoryCodes(inventoryCodes);
// List<ErpInvProductResponse> erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, onHandUrl);
// if (erpOnHandResponses != null) {
// Map<String, List<ErpInvProductResponse>> map = erpOnHandResponses.stream().collect(Collectors.groupingBy(ErpInvProductResponse::getCode));
// for (List<ErpInvProductResponse> onHandResponses : map.values()) {
// if (onHandResponses != null && onHandResponses.size() > 0) {
// ErpInvProductResponse onhandQueryResponse = onHandResponses.get(0);
// if (isUpdate.getParamValue().equals("2")) {
// addRl(onhandQueryResponse, thirdSysId, erpProductsMap);
// } else if (isUpdate.getParamValue().equals("3")) {
// if (onhandQueryResponse.getCount() != null && onhandQueryResponse.getCount() > 0) {
// addRl(onhandQueryResponse, thirdSysId, erpProductsMap);
// }
// } else if (isUpdate.getParamValue().equals("4")) {
// if (onhandQueryResponse.getCount() == null || onhandQueryResponse.getCount() <= 0) {
// addRl(onhandQueryResponse, thirdSysId, erpProductsMap);
// }
// }
//
// }
// }
// }
// }
}
filterThrProductsRequest.setPage(filterThrProductsRequest.getPage() + 1);
if (filterThrProductsRequest.getPage() * filterThrProductsRequest.getLimit() < erpProducts.getData().getTotal()) {
return filterThrProductsRequest.getPage();
}
} else {
return -1;
}
return -1;
}
@Resource
UdiContrastService udiContrastService;
@ -178,8 +42,6 @@ public class BasicBackUpdateProductService {
//定时或一键下载更新本地所有产品信息
@Async
public void loadLocal(FilterThrProductsRequest filterThrProductsRequest, String thirdSysId, String onHandUrl, Boolean isEnable) {
if (filterThrProductsRequest == null) {
filterThrProductsRequest = new FilterThrProductsRequest();
}
@ -187,73 +49,14 @@ public class BasicBackUpdateProductService {
BeanUtils.copyProperties(filterThrProductsRequest, filterThrInvProductsRequest);
filterThrInvProductsRequest.setPage(null);
List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts(filterThrInvProductsRequest);
// SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData_type");
// if (isEnable == null || isEnable == false) {
// isUpdate.setParamValue("1");
// }
if (thrProductsEntities != null && thrProductsEntities.size() > 0) {
for (ThrProductsEntity thrProductsEntity : thrProductsEntities) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrProductsEntity.getCode(), thirdSysId);
if (udiRelevanceEntity == null) {
// if (isUpdate.getParamValue().equals("1")) {
//
// UdiProductEntity udiProductEntity = new UdiProductEntity();
// udiProductEntity.setNameCode(thrProductsEntity.getCode());
// udiProductEntity.setCpmctymc(thrProductsEntity.getName());
// udiProductEntity.setGgxh(thrProductsEntity.getSpec());
// udiProductEntity.setUuid(CustomUtil.getUUId());
// udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
// udiProductEntity.setDiType(1);
// udiProductEntity.setManufactory(thrProductsEntity.getManufactory());
// udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
// udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
// udiProductEntity.setRequireScanCode(0);
// udiProductService.insertUdiInfo(udiProductEntity);
// UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
// udiRelevanceEntity1.setUuid(udiProductEntity.getUuid());
// udiRelevanceEntity1.setIsDisable(false);
// udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName());
//
// if ("thirdId".equals(thirdSysId)) {
// udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
// } else if ("thirdId1".equals(thirdSysId)) {
// udiRelevanceEntity1.setThirdId1(thrProductsEntity.getCode());
// } else if ("thirdId2".equals(thirdSysId)) {
// udiRelevanceEntity1.setThirdId4(thrProductsEntity.getCode());
// } else if ("thirdId3".equals(thirdSysId)) {
// udiRelevanceEntity1.setThirdId3(thrProductsEntity.getCode());
// } else if ("thirdId4".equals(thirdSysId)) {
// udiRelevanceEntity1.setThirdId4(thrProductsEntity.getCode());
// }
//
//
// ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys();
// String mainSys = thrSystemEntity.getThirdId();
// if (mainSys.equals("thirdId")) {
// udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId());
// } else if (mainSys.equals("thirdId1")) {
// udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1());
// } else if (mainSys.equals("thirdId2")) {
// udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2());
// } else if (mainSys.equals("thirdId3")) {
// udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3());
// } else if (mainSys.equals("thirdId4")) {
// udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4());
// }
//
// udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
// udiRelevanceEntity1.setUpdateTime(new Date());
// udiRelevanceEntity1.setModifyTime(new Date());
// udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
// udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
// }
try {
// Thread.sleep(2000);
udiContrastService.createOnlyMainId(thrProductsEntity.getCode());
} catch (Exception e) {
log.error("拉取基础数据==="+ ExceptionUtils.getStackTrace(e));
}
}

@ -40,39 +40,4 @@ public class BasicCollectBustypeService extends ServiceImpl<BasicCollectBustypeM
return basicCollectBustypeMapper.selectOne(new LambdaQueryWrapper<BasicCollectBustypeEntity>().eq(BasicCollectBustypeEntity::getCode, code).last("limit 1 "));
}
public BasicCollectBustypeEntity findByFromCode(String code) {
return basicCollectBustypeMapper.selectOne(new LambdaQueryWrapper<BasicCollectBustypeEntity>().eq(BasicCollectBustypeEntity::getFromBusTypeCode, code).last("limit 1 "));
}
public BasicCollectBustypeEntity findByAddr(String addr) {
return basicCollectBustypeMapper.selectOne(new LambdaQueryWrapper<BasicCollectBustypeEntity>().eq(BasicCollectBustypeEntity::getFromInterAddress, addr).last("limit 1 "));
}
public BasicCollectBustypeEntity findByName(String name) {
return basicCollectBustypeMapper.selectOne(new LambdaQueryWrapper<BasicCollectBustypeEntity>().eq(BasicCollectBustypeEntity::getName, name).last("limit 1 "));
}
public String genCode() {
String code = this.getCode();
return code;
}
private String getCode() {
long workerId = IdUtil.getSnowflakeNextId();
String s = String.valueOf(workerId);
Random random = new Random();
int startRange = Math.max(0, s.length() - 6);
int randomStart = random.nextInt(startRange + 1);
String randomNumber = "SP" + s.substring(randomStart, randomStart + 6);
BasicCollectBustypeEntity basicCollectBustypeEntity = basicCollectBustypeMapper.selectOne(new LambdaQueryWrapper<BasicCollectBustypeEntity>().eq(BasicCollectBustypeEntity::getCode, randomNumber));
if (basicCollectBustypeEntity != null) {
String code1 = this.getCode();
return code1;
}
return randomNumber;
}
}

@ -33,7 +33,7 @@ public class BasicCollectPointCategoryService extends ServiceImpl<BasicCollectPo
}
public Boolean checkName(BasicCollectgoryRequest request, int type) {
Long sum = null;
Long sum;
//1添加
if (type == 1) {
//查看名字是不是重复

@ -20,8 +20,6 @@ public interface BasicCorpImportLogService {
boolean deleteById(@Param("id") String id);
void importJsonData(BasicCorpExportLogResponse importData,String genKey);

@ -14,15 +14,12 @@ public interface BasicCorpService {
List<BasicCorpEntity> filterList2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
boolean insertBasicUnitMaintain(BasicCorpEntity basicCorpEntity);
boolean updateById(BasicCorpEntity basicCorpEntity);
boolean updateByErpId(BasicCorpEntity basicCorpEntity);
boolean insert(BasicCorpEntity basicUnitMaintainEntity);
// boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest);
boolean deleteById(String id);
@ -42,10 +39,6 @@ public interface BasicCorpService {
boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse);
List<BasicCorpEntity> batchSelectByIds(List<Integer> id);
List<BasicCorpEntity> batchSelectByErpIds(List<String> erpIds);
List<BasicCorpEntity> batchSelectByErpIdsAndName(List<String> erpIds, String name);
/**

@ -13,7 +13,6 @@ public interface BasicProductSetService {
Map<String, BasicProductSetEntity> filterAllEnable();
boolean updateSetup(BasicProductSetEntity basicProductSetEntity);
}

@ -18,8 +18,6 @@ public interface BasicProductsImportDetailService {
boolean updateUdiInfoImport(BasicProductsImportDetailEntity udiInfoImportEntity);
boolean insertUdiInfoImports(List<BasicProductsImportDetailEntity> udiInfoImportEntities);
boolean deleteById(String id);
boolean deleteByGenkey(String genKey);

@ -113,53 +113,10 @@ public class BasicSkPrescribeService extends ServiceImpl<BasicSkPrescribeMapper,
}
return ResultVOUtils.success("下载成功!");
}
@Resource
ThrProductsService thrProductsService;
@Resource
UdiRelevanceService udiRelevanceService;
/**
* 使(
*
* @return
*/
public void trSkPrescribeDi2(BasicSkPrescribeItemEntity skPrescribeItemEntity) {
if (skPrescribeItemEntity.getItemCode() != null) {
List<ThrProductsEntity> thrProductsEntities = thrProductsService.list(new QueryWrapper<ThrProductsEntity>().eq("prcitmcode", skPrescribeItemEntity.getItemCode()));
if (CollUtil.isNotEmpty(thrProductsEntities)) {
for (ThrProductsEntity thrProductsEntity : thrProductsEntities) {
BasicSkPrescribeDiEntity basicSkPrescribeDiEntity = basicSkPrescribeDiService.findByThrCode(skPrescribeItemEntity.getAdNum(), thrProductsEntity.getCode());
if (basicSkPrescribeDiEntity == null) {
basicSkPrescribeDiEntity.setPrescribeCode(skPrescribeItemEntity.getPrescribeCode());
basicSkPrescribeDiEntity.setSickerCode(skPrescribeItemEntity.getSickerCode());
basicSkPrescribeDiEntity.setCount(IntUtil.value(skPrescribeItemEntity.getMeasureCount()));
basicSkPrescribeDiEntity.setMeasureCount(basicSkPrescribeDiEntity.getCount() + "");
basicSkPrescribeDiEntity.setMeasureUnit(skPrescribeItemEntity.getMeasureUnit());
basicSkPrescribeDiEntity.setPId(thrProductsEntity.getPrcitmcode());
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrProductsEntity.getCode(), "thirdId");
basicSkPrescribeDiEntity.setAmount(skPrescribeItemEntity.getAmount());
basicSkPrescribeDiEntity.setRelId(udiRelevanceEntity.getId());
basicSkPrescribeDiEntity.setThrCode(thrProductsEntity.getCode());
basicSkPrescribeDiEntity.setThrName(thrProductsEntity.getName());
basicSkPrescribeDiEntity.setCategory(thrProductsEntity.getCplb());
basicSkPrescribeDiEntity.setGgxh(thrProductsEntity.getStandard());
basicSkPrescribeDiEntity.setAdNum(skPrescribeItemEntity.getAdNum());
basicSkPrescribeDiEntity.setUpdateTime(new Date());
basicSkPrescribeDiService.save(basicSkPrescribeDiEntity);
} else {
basicSkPrescribeDiEntity.setCount(IntUtil.value(basicSkPrescribeDiEntity.getCount()) + IntUtil.value(skPrescribeItemEntity.getMeasureCount()));
basicSkPrescribeDiEntity.setAmount(basicSkPrescribeDiEntity.getAmount().multiply(skPrescribeItemEntity.getAmount()));
basicSkPrescribeDiService.updateById(basicSkPrescribeDiEntity);
}
}
}
}
}
/**
* 使/

@ -32,8 +32,6 @@ public class BasicSkProjectService extends ServiceImpl<BasicSkProjectMapper, Bas
@Resource
BasicSkProjectMapper basicSkProjectMapper;
@Resource
BasicDestinyRelMapper basicDestinyRelMapper;
@Resource
UdiProductService udiProductService;
@Resource
BasicDestinyRelService basicDestinyRelService;
@ -72,10 +70,4 @@ public class BasicSkProjectService extends ServiceImpl<BasicSkProjectMapper, Bas
return true;
}
public List<BasicSkProjectDetailEntity> selectListByPId(String pId) {
QueryWrapper<BasicSkProjectDetailEntity> qw = new QueryWrapper<>();
qw.eq("pId", pId);
List<BasicSkProjectDetailEntity> basicSkPrescribeItemEntities = basicDestinyRelMapper.selectList(qw);
return basicSkPrescribeItemEntities;
}
}

@ -56,11 +56,6 @@ public class BasicSkSickerService extends ServiceImpl<BasicSkSickerMapper, Basic
}
public List<BasicSkSickerEntity> findBySickCode(String sickCode) {
return basicSkSickerMapper.selectList(new QueryWrapper<BasicSkSickerEntity>().eq("code", sickCode));
}
public BasicSkSickerEntity findByAdNum(String adNum) {
return basicSkSickerMapper.selectOne(new QueryWrapper<BasicSkSickerEntity>().eq("adNum", adNum).last("limit 1"));
}

@ -16,8 +16,6 @@ public interface CompanyProductRelevanceService extends IService<CompanyProductR
boolean deleteById(String id);
boolean deleteByRlId(String id);
boolean isExitByRelId(String relId);
String insertOrReadId(Long udiRlIdFk, String unitId);

@ -39,22 +39,6 @@ public class CompanyProductsRelService {
boolean b = udiRlSupService.insertCompanyProductRelevance(udiRlSupEntity);
}
} else {//一键导出 //todo暂时去掉
// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
// BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest);
// filterUdiInfoRequest.setPage(null);
// List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
// for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
// CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
// companyProductRelevanceEntity.setCreate_time(new Date());
// companyProductRelevanceEntity.setUpdate_time(new Date());
// companyProductRelevanceEntity.setAuditStatus("3");
// companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
// companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceResponse.getId());
// companyProductRelevanceEntity.setProductUuid(udiRelevanceResponse.getUuid());
// companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId());
// boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
// }
}
}

@ -23,8 +23,6 @@ public interface EntrustReceService extends IService<EntrustReceEntity> {
int insertEntrustRec(EntrustReceEntity entrustReceEntity);
boolean replaceEntrustRec(EntrustReceEntity entrustReceEntity);
boolean deleteById(String id);
boolean deleteAll();

@ -9,25 +9,8 @@ import java.util.List;
public interface ProductInfoService {
//赋码用
//获取产品名称通用名称
List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> findAllByUuid(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest);
Long filterUdiNoPageCount(ProductInfoFilterRequest productInfoFilterRequest);
@ -39,20 +22,12 @@ public interface ProductInfoService {
List<ProductInfoEntity> findAll(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> selectByUpdateTime(String startDate, String endDate);//按更新时间查询
boolean insertProductInfo(ProductInfoEntity productInfoEntity);
boolean insertProductInfos(List<ProductInfoEntity> productInfoEntities);
boolean updateProductByUuid(ProductInfoEntity productInfoEntity);
boolean deleteById(String id);
boolean deleteAll(List<String> ids);
boolean updateProductInfo(ProductInfoEntity productInfoEntity);
ProductInfoEntity findByNameCode(String nameCode);

@ -81,46 +81,6 @@ public class SysWorkplaceDocumentService extends ServiceImpl<SysWorkplaceDocumen
return null;
}
//独占库存
public Boolean isOnlyInv(Long workPlaceCode, String busType) {
SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = findByWorkplaceCode(workPlaceCode, busType);
if (IntUtil.value(sysWorkplaceDocumentEntity.getMonopoly()) == 0) {
return false;
} else
return true;
}
public Boolean bindBusType(WorkBindBusTypeRequest request, Long userId) {
// List<String> documentTypeCodes = request.getDocumentTypeCode();
// for (String documentTypeCode: documentTypeCodes) {
// SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentDao.selectOne(new LambdaQueryWrapper<SysWorkplaceDocumentEntity>()
// .eq(SysWorkplaceDocumentEntity::getWorkplaceCode, request.getWorkplaceCode())
// .eq(SysWorkplaceDocumentEntity::getDocumentTypeCode,documentTypeCode));
// if (sysWorkplaceDocumentEntity != null){
// //该用户已经绑定改工位
// return false;
// }
// }
// for (String documentTypeCode: documentTypeCodes) {
// SysWorkplaceDocumentEntity entity = new SysWorkplaceDocumentEntity();
// entity.setId(IdUtil.getSnowflakeNextId());
//// String workplaceCode = request.getWorkplaceCode();
//// entity.getWorkplaceCode(Long.valueOf(request.getWorkplaceCode()));
// entity.setDocumentTypeCode(documentTypeCode);
// entity.setCreateTime(new Date());
// entity.setUpdateTime(new Date());
// entity.setUpdateUser(userId.toString());
// entity.setCreateUser(userId.toString());
// int insert = sysWorkplaceDocumentDao.insert(entity);
// if (insert == 0){
// return false;
// }
// }
return true;
}
public boolean addBusType(SysWorkplaceDocumentEntity entity, Long userId) {
entity.setId(IdUtil.getSnowflakeNextId());
entity.setCreateTime(new Date());

@ -93,11 +93,8 @@ public class SysWorkplaceFreightService extends ServiceImpl<SysWorkplaceFreightM
public List<SysWorkplaceFreightViewResponse> getListView(SysWorkplaceFreightRequest request) {
List<SysWorkplaceFreightResponse> list = sysWorkplaceFreightMapper.filterList(request);
List<SysWorkplaceFreightViewResponse> respList = new ArrayList<>();
List<SysWorkplaceFreightViewResponse> sortedRespList = new ArrayList<>();
if (CollUtil.isNotEmpty(list)){
for (int i = 0; i < list.size(); i++) {
SysWorkplaceFreightResponse sysWorkplaceFreightResponse = list.get(i);

@ -35,9 +35,6 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
@Resource
SysWorkplaceLayerService sysWorkplaceLayerService;
@Resource
SysWorkplaceFreightService sysWorkplaceFreightService;
public String createQueueCode() {
String code;
@ -113,18 +110,6 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
return code;
}
private String createGrid(String freightCode, Integer layer) {
Integer grid = sysWorkplaceQueueMapper.selectMaxGrid(freightCode, layer);
if (grid == null) {
grid = 1;
} else {
grid += 1;
}
String result = String.format("%02d", grid);
return result;
}
public Integer getLayer(String freightCode) {
Integer layer = sysWorkplaceQueueMapper.selectMaxLayer(freightCode);
if (layer == null) {
@ -135,19 +120,6 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
return layer;
}
/**
*
*
* @param freightCode
* @return
*/
public String createLayer(String freightCode) {
//编号 自动生成四位数 + 层号 + 格号
Integer layer = getLayer(freightCode);
String result = String.format("%02d", layer);
return result;
}
public List<SysWorkplaceQueueResponse> filterList(SysWorkplaceQueueRequest request) {
if (null == request) {
@ -157,9 +129,6 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
}
List<SysWorkplaceQueueResponse> sysWorkplaceQueueResponses = sysWorkplaceQueueMapper.filterList(request);
// for (SysWorkplaceQueueResponse sysWorkplaceQueueResponse : sysWorkplaceQueueResponses){
// sysWorkplaceQueueResponse.setCode(sysWorkplaceQueueResponse.getFreightCode() +sysWorkplaceQueueResponse.getCode());
// }
return sysWorkplaceQueueResponses;
}
@ -171,9 +140,6 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
}
List<SysWorkplaceQueueResponse> sysWorkplaceQueueResponses = sysWorkplaceQueueMapper.filterBindList(request);
// for (SysWorkplaceQueueResponse sysWorkplaceQueueResponse : sysWorkplaceQueueResponses){
// sysWorkplaceQueueResponse.setCode(sysWorkplaceQueueResponse.getFreightCode() +sysWorkplaceQueueResponse.getCode());
// }
return sysWorkplaceQueueResponses;
}
@ -254,9 +220,5 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
return sortedRespList;
}
public String selectMaxCodeByLayerCode(String layerCode) {
return sysWorkplaceQueueMapper.selectMaxCode(layerCode);
}
}

@ -16,11 +16,6 @@ import java.util.List;
@Service
public class SysWorkplaceRegionService extends ServiceImpl<SysWorkplaceRegionMapper, SysWorkplaceRegion> {
@Resource
SysWorkplaceRegionMapper sysWorkplaceRegionMapper;
public List<SysWorkplaceRegionResponse> filterList(SysWorkplaceRegionRequest request) {
if (null == request) {
return Collections.emptyList();

@ -8,21 +8,12 @@ import java.util.List;
public interface UdiCompanyService {
List<UdiCompanyEntity> selectAllTyshxyh();
List<UdiCompanyEntity> syncDlCompany(UdiCompanyRequest udiCompanyRequest);
List<UdiCompanyEntity> filterUdiCompany(UdiCompanyRequest udiCompanyRequest);
boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity);
boolean insertUdiCompanys(List<UdiCompanyEntity> udiCompanyEntities);
boolean deleteById(String id);
boolean deleteAll(List<String> ids);
boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity);
}

@ -68,9 +68,6 @@ public class UdiContrastService {
@Resource
NmpaUdiClient udiDlHttpClient;
@Resource
BasicInsDrugService basicInsDrugService;
@Resource
BasicInsMaterialService basicInsMaterialService;
@Resource

@ -96,19 +96,6 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
return null;
}
public List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiRelRequest filterUdiRelRequest) {
if (filterUdiRelRequest == null) {
return Collections.emptyList();
}
if (filterUdiRelRequest.getPage() != null) {
int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
}
List<UdiRelevanceResponse> data = udiProductDao.filterUdiInfo2(filterUdiRelRequest);
return data;
}
public UdiRelevanceResponse filterUdiInfoById(String id) {
return udiProductDao.filterUdiInfoById(id);
}
@ -122,14 +109,6 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
}
public UdiProductEntity findByNameCode(String nameCode) {
// String prefix = FilterUdiUtils.getDiStr(nameCode);
// if (nameCode.length() > 13) {
// UdiEntity udiEntity = FilterUdiUtils.getUdi(nameCode);
// if (udiEntity != null) {
// nameCode = udiEntity.getUdi();
// }
// }
return udiProductDao.findByNameCode(nameCode);
}

@ -57,11 +57,6 @@ public class BasicCorpServiceImpl implements BasicCorpService {
return basicCorpDao.insertThrUnitMaintainignore(thrUnitMaintainResponse);
}
@Override
public boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity) {
return basicCorpDao.insertBasicUnitMaintain(basicUnitMaintainEntity);
}
@Override
public boolean insert(BasicCorpEntity basicUnitMaintainEntity) {
return basicCorpDao.insert(basicUnitMaintainEntity) > 0 ? true : false;
@ -105,16 +100,6 @@ public class BasicCorpServiceImpl implements BasicCorpService {
return basicCorpDao.selectByThirdId(filterUdiInfoRequest);
}
@Override
public List<BasicCorpEntity> batchSelectByIds(List<Integer> ids) {
return basicCorpDao.batchSelectByIds(ids);
}
@Override
public List<BasicCorpEntity> batchSelectByErpIds(List<String> erpIds) {
return basicCorpDao.batchSelectByErpIds(erpIds);
}
@Override
public List<BasicCorpEntity> batchSelectByErpIdsAndName(List<String> erpIds, String name) {
return basicCorpDao.batchSelectByErpIdsAndName(erpIds, name);

@ -40,8 +40,6 @@ public class BasicDestinyRelService extends ServiceImpl<BasicDestinyRelMapper, B
@Resource
ErpBasicClient erpBasicClient;
@Resource
UdiRelevanceDao udiRelevanceDao;
@Resource
BasicSkProjectMapper basicSkProjectMapper;
public Boolean addModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) {

@ -31,12 +31,6 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport
@Resource
BasicProductsImportDetailDao udiInfoImportDao;
@Resource
UdiProductDao udiProductDao;
@Resource
UdiRelevanceDao udiRelevanceDao;
@Resource
ThrProductsDao thrProductsDao;
@Resource
SqlSessionFactory sqlSessionFactory;
@Override
@ -64,11 +58,6 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport
return udiInfoImportDao.updateUdiInfoImport(udiInfoImportEntity);
}
@Override
public boolean insertUdiInfoImports(List<BasicProductsImportDetailEntity> udiInfoImportEntities) {
return udiInfoImportDao.insertUdiInfoImports(udiInfoImportEntities);
}
@Override
public boolean deleteById(String id) {
return udiInfoImportDao.deleteById(id);
@ -95,7 +84,6 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport
batchSession.commit();
}
batchSession.close();
// udiInfoDao.importUdiInfo(udiRelevanceExportJsonResponse.getUdiInfoEntities());
}
@ -109,7 +97,6 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport
}
batchSession.commit();
batchSession.close();
// udiRelevanceDao.importUdiRelevance(udiRelevanceExportJsonResponse.getUdiRelevanceEntities());
}
//第三方产品信息导入
@ -123,7 +110,6 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport
}
batchSession.commit();
batchSession.close();
// thrProductsDao.importThrProductss(udiRelevanceExportJsonResponse.getThrProductsEntities());
}
//供应商关联表导入

@ -52,11 +52,6 @@ public class CompanyProductRelevanceServiceImpl extends ServiceImpl<CompanyProdu
return companyProductRelevanceDao.deleteById(id);
}
@Override
public boolean deleteByRlId(String id) {
return companyProductRelevanceDao.deleteByRlId(id);
}
@Override
public boolean isExitByRelId(String relId) {
return companyProductRelevanceDao.exists(new QueryWrapper<CompanyProductRelevanceEntity>().eq("udiRlIdFk", relId));

@ -98,11 +98,6 @@ public class EntrustReceServiceImpl extends ServiceImpl<EntrustReceDao,EntrustRe
return entrustReceDao.insert(entrustReceEntity);
}
@Override
public boolean replaceEntrustRec(EntrustReceEntity entrustReceEntity) {
return entrustReceDao.insertEntrustRec(entrustReceEntity);
}
@Override
public boolean deleteById(String id) {
return entrustReceDao.deleteById(id);

@ -23,31 +23,6 @@ public class ProductInfoServiceImpl implements ProductInfoService {
@Resource
ProductInfoDao productInfoDao;
@Override
public List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest) {
if (productInfoFilterRequest == null) {
return Collections.emptyList();
}
int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
List<ProductInfoEntity> data = productInfoDao.filterCpmctymc(productInfoFilterRequest);
return data;
}
@Override
public List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest) {
if (productInfoFilterRequest == null) {
return Collections.emptyList();
}
if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
}
List<ProductInfoEntity> data = productInfoDao.filterProductInfo(productInfoFilterRequest);
return data;
}
@Override
public List<ProductInfoEntity> filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest) {
if (productInfoFilterRequest == null) {
@ -62,62 +37,6 @@ public class ProductInfoServiceImpl implements ProductInfoService {
return data;
}
@Override
public List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest) {
if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
}
return productInfoDao.filterUdiByTyshxydm(productInfoFilterRequest);
}
@Override
public List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest) {
if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
}
return productInfoDao.filterUdiByCreditNo(productInfoFilterRequest);
}
@Override
public List<ProductInfoEntity> filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest) {
if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
}
return productInfoDao.filterUdiByNewest(productInfoFilterRequest);
}
@Override
public List<ProductInfoEntity> findAllByUuid(ProductInfoFilterRequest productInfoFilterRequest) {
if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
}
List<String> uuids = productInfoDao.filterUuidByCreditNo(productInfoFilterRequest);
if (uuids != null && uuids.size() > 0)
return productInfoDao.selectAllByUuid(uuids);
else
return null;
}
@Override
public List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest) {
if (productInfoFilterRequest == null) {
return Collections.emptyList();
}
if (productInfoFilterRequest.getPage() != null) {
int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
}
List<ProductInfoEntity> data = productInfoDao.filterUdi(productInfoFilterRequest);
return data;
}
@Override
public List<ProductInfoEntity> filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest) {
if (productInfoFilterRequest == null) {
@ -174,30 +93,11 @@ public class ProductInfoServiceImpl implements ProductInfoService {
return data;
}
public List<ProductInfoEntity> selectByUpdateTime(String startDate, String endDate) {
return productInfoDao.selectByUpdateTime(startDate, endDate);
}
@Override
public boolean insertProductInfo(ProductInfoEntity productInfoEntity) {
return productInfoDao.insertProductInfo(productInfoEntity);
}
@Override
public boolean insertProductInfos(List<ProductInfoEntity> productInfoEntities) {
return productInfoDao.insertProductInfos(productInfoEntities);
}
@Override
public boolean updateProductByUuid(ProductInfoEntity productInfoEntity) {
return productInfoDao.updateProductByUuid(productInfoEntity);
}
@Override
public boolean updateProductInfo(ProductInfoEntity productInfoEntity) {
return productInfoDao.updateProductInfo(productInfoEntity);
}
@Override
public boolean deleteById(String id) {
return productInfoDao.deleteById(id);

@ -186,11 +186,6 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl<SysApprovalFlowMappe
return false;
}
}else if (approvalNodeType == 2){
// SysUserPost userPost = sysPostService.getUserPost(userId);
// Long postId = userPost.getPostId();
// if (!approvalPostId.equals(String.valueOf(postId))){
// return false;
// }
}
return true;
}

Loading…
Cancel
Save