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

service 层代码优化

Browse Source
dev_drug_dm
qiuyt 4 months ago
parent 83ce4aa677
commit b45822f105
169 changed files with 25 additions and 3873 deletions
Show Stats Download Patch File Download Diff File

57
src/main/java/com/glxp/api/constant/AliConstants.java
Unescape Escape View File

@ -1,66 +1,11 @@
package com.glxp.api.constant;
public class AliConstants {
public static final String APP_KEY = "app_key";
public static final String FORMAT = "format";
public static final String METHOD = "method";
public static final String TIMESTAMP = "timestamp";
public static final String VERSION = "v";
public static final String SIGN = "sign";
public static final String SIGN_METHOD = "sign_method";
public static final String PARTNER_ID = "partner_id";
public static final String SESSION = "session";
public static final String SIMPLIFY = "simplify";
public static final String TARGET_APP_KEY = "target_app_key";
public static final String ERROR_RESPONSE = "error_response";
public static final String ERROR_CODE = "code";
public static final String ERROR_MSG = "msg";
public static final String ERROR_SUB_CODE = "sub_code";
public static final String ERROR_SUB_MSG = "sub_msg";
public static final String QIMEN_CLOUD_ERROR_RESPONSE = "response";
public static final String QM_ROOT_TAG = "request";
public static final String QM_CUSTOMER_ID = "customerId";
public static final String QM_CONTENT_TYPE = "text/xml;charset=utf-8";
public static final String QM_CONTENT_TYPE_JSON = "application/json;charset=utf-8";
public static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
public static final String DATE_TIMEZONE = "GMT+8";
public static final String CHARSET_UTF8 = "UTF-8";
public static final String METHOD_POST = "POST";
public static final String METHOD_GET = "GET";
public static final String CTYPE_FORM_DATA = "application/x-www-form-urlencoded";
public static final String CTYPE_FILE_UPLOAD = "multipart/form-data";
public static final String CTYPE_TEXT_XML = "text/xml";
public static final String CTYPE_APPLICATION_XML = "application/xml";
public static final String CTYPE_TEXT_PLAIN = "text/plain";
public static final String CTYPE_APP_JSON = "application/json";
public static final String CHARSET_GBK = "GBK";
public static final String FORMAT_JSON = "json";
public static final String FORMAT_XML = "xml";
public static final String FORMAT_JSON2 = "json2";
public static final String FORMAT_XML2 = "xml2";
public static final String SIGN_METHOD_MD5 = "md5";
public static final String SIGN_METHOD_HMAC = "hmac";
public static final String SIGN_METHOD_HMAC_SHA256 = "hmac-sha256";
public static final String SDK_VERSION = "top-sdk-java-20201231";
public static final String SDK_VERSION_CLUSTER = "top-sdk-java-cluster-20201231";
public static final String SDK_VERSION_HTTPDNS = "top-sdk-java-httpdns-20201231";
public static final String QIMEN_SDK_VERSION_HTTPDNS = "top-qimen-sdk-java-httpdns";
public static final String ACCEPT_ENCODING = "Accept-Encoding";
public static final String CONTENT_ENCODING = "Content-Encoding";
public static final String CONTENT_ENCODING_GZIP = "gzip";
public static final String MIME_TYPE_DEFAULT = "application/octet-stream";
public static final int READ_BUFFER_SIZE = 4096;
public static final String TOP_HTTP_DNS_HOST = "TOP_HTTP_DNS_HOST";
public static final String CONTENT_TYPE_XML = "xml";
public static final String CONTENT_TYPE_JSON = "json";
public static final String CONTENT_TYPE_FORM = "form";
public static final String RESPONSE_TYPE_TOP = "top";
public static final String RESPONSE_TYPE_QIMEN = "qimen1";
public static final String RESPONSE_TYPE_QIMEN2 = "qimen2";
public static final String RESPONSE_TYPE_DINGTALK_OAPI = "dingtalk";
public static final String CALL_TYPE_TOP = "top";
public static final String CALL_TYPE_OAPI = "oapi";
public AliConstants() {
}
}

19
src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java
Unescape Escape View File

@ -59,24 +59,7 @@ public class DeviceReceiveDetailController {
return detailService.checkCode(code);
}
/**
* 添加领用记录详情
*
* @param addDetailRequest
* @param bindingResult
* @return
*/
@PostMapping("/device/receive/order/detail/addOrderDetail")
@Log(title = "设备领用", businessType = BusinessType.INSERT)
public BaseResponse addOrderDetail(@RequestBody AddDeviceReceiveOrderDetailRequest addDetailRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (null == addDetailRequest || StrUtil.isBlank(addDetailRequest.getOrderIdFk())) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return detailService.addOrderDetail(addDetailRequest);
}
/**
* 更新设备领用记录详情

16
src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java
Unescape Escape View File

@ -118,21 +118,7 @@ public class InvCountOrderController {
return invCountOrderService.submitAudit(id);
}
/**
* 更新盘点单据状态
*
* @param filterInvCountOrderRequest
* @return
*/
@AuthRuleAnnotation("")
@PostMapping("/inv/count/order/updateCountOrderStatus")
@Log(title = "盘点单据", businessType = BusinessType.UPDATE)
public BaseResponse updateCountOrderStatus(@RequestBody FilterInvCountOrderRequest filterInvCountOrderRequest) {
if (null == filterInvCountOrderRequest || StrUtil.isBlank(filterInvCountOrderRequest.getId()) || null == filterInvCountOrderRequest.getStatus()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
return invCountOrderService.updateCountOrderStatus(filterInvCountOrderRequest.getId(), filterInvCountOrderRequest.getStatus());
}
/**
* 校验模板文件

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

@ -22,8 +22,6 @@ public interface AuthAdminService {
AuthAdmin findById(Long id);
AuthAdmin findPwdById(Long id);
boolean insertAuthAdmin(AuthAdmin authAdmin);
boolean updateAuthAdmin(AuthAdmin authAdmin);
@ -49,11 +47,5 @@ public interface AuthAdminService {
void insertUserAuth(Long userId, List<Long> roleIds);
void insertUserAuth1(SysUserRole sysUserRole);
List<AuthAdmin> findByCustomerId(String customerId);
SysUserRole selectByAuthId(Long id);
}

4
src/main/java/com/glxp/api/service/auth/AuthAliUserService.java
Unescape Escape View File

@ -6,12 +6,8 @@ import com.glxp.api.dao.auth.AuthAliUserDao;
import com.glxp.api.entity.auth.AuthAliUser;
import org.springframework.stereotype.Service;
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")

5
src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java
Unescape Escape View File

@ -10,16 +10,11 @@ public interface AuthRoleAdminService {
List<AuthRoleAdmin> listByAdminId(Long adminId);
List<AuthRoleAdmin> listByAdminIdIn(List<Long> adminIds);
List<AuthRoleAdmin> listByRoleId(Long roleId);
int insertAuthRoleAdminAll(List<AuthRoleAdmin> authRoleAdminList);
int insertRolesAdminIdAll(List<Long> roles, Long adminId);
boolean deleteByAdminId(Long adminId);
boolean updateAuthRoleAdmin(AuthRoleAdmin authRoleAdmin);
List<AuthRole> listAdminRole(Long adminId);
}

31
src/main/java/com/glxp/api/service/auth/AuthRoleService.java
Unescape Escape View File

@ -8,40 +8,11 @@ import com.glxp.api.req.auth.AuthRoleQueryRequest;
import java.util.List;
public interface AuthRoleService {
List<AuthRole> listAdminPage(AuthRoleQueryRequest authRoleQueryRequest);
List<AuthRole> listAuthAdminRolePage(Integer page, Integer limit, Integer status);
AuthRole findByName(String name);
boolean insertAuthRole(AuthRole authRole);
boolean updateAuthRole(AuthRole authRole);
List<AuthRole> listCustomerRoles(Integer page, Integer limit, Integer isCustomer);
List<AuthRole> getlistCustomerRoles(Integer page, Integer limit, Integer isCustomer);
List<AuthRole> listAuthRoles2(Integer page, Integer limit);
boolean deleteById(Long id);
/**
* 查询角色扫码单据授权数据
*
* @param roleId
* @return
*/
List<BasicBussinessTypeRoleEntity> getBussinessTypeRole(Long roleId);
/**
* 更新角色扫码单据类型授权数据
*
* @param roleId
* @param actions
*/
void updateBussinessTypeRole(Long roleId, List<String> actions);
}

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

@ -17,7 +17,6 @@ public interface DeptUserService {
List<DeptUserResponse> selectByUserIdKey(Long userId);
List<DeptEntity> getDeptById( List<Integer> ids);
List<DeptUserResponse> selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust);
@ -27,7 +26,6 @@ public interface DeptUserService {
int deleteById(Integer id);
int deleteByList(List<Integer> ids);
int insertBatch(List<DeptUserEntity> list);

10
src/main/java/com/glxp/api/service/auth/ISysDictDataService.java
Unescape Escape View File

@ -15,19 +15,11 @@ public interface ISysDictDataService {
/**
* 根据条件分页查询字典数据
*
* @param dictData 字典数据信息
* @param sysDictDataRequest 字典数据信息
* @return 字典数据集合信息
*/
List<SysDictData> selectDictDataList(SysDictDataRequest sysDictDataRequest);
/**
* 根据字典类型和字典键值查询字典数据信息
*
* @param dictType 字典类型
* @param dictValue 字典键值
* @return 字典标签
*/
String selectDictLabel(String dictType, String dictValue);
/**
* 根据字典数据ID查询信息

25
src/main/java/com/glxp/api/service/auth/ISysDictTypeService.java
Unescape Escape View File

@ -38,14 +38,6 @@ public interface ISysDictTypeService {
*/
SysDictType selectDictTypeById(Long dictId);
/**
* 根据字典类型查询信息
*
* @param dictType 字典类型
* @return 字典类型
*/
SysDictType selectDictTypeByType(String dictType);
/**
* 批量删除字典信息
*
@ -53,10 +45,6 @@ public interface ISysDictTypeService {
*/
void deleteDictTypeByIds(Long[] dictIds);
/**
* 重置字典缓存数据
*/
void resetDictCache();
/**
* 新增保存字典类型信息
@ -81,17 +69,4 @@ public interface ISysDictTypeService {
* @return 结果
*/
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);
}

6
src/main/java/com/glxp/api/service/auth/InvBusUserService.java
Unescape Escape View File

@ -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,10 +25,6 @@ public interface InvBusUserService extends IService<InvBusUserEntity> {
boolean deleteByUnion(String userId, String subInvCode);
boolean deleteByscAction(String subInvCode, List<String> selectedCodes);
boolean isExitByAction(String action);
boolean exitBus(String userId, String action);
}

10
src/main/java/com/glxp/api/service/auth/InvWarehouseService.java
Unescape Escape View File

@ -20,8 +20,6 @@ public interface InvWarehouseService {
List<InvWarehouseEntity> getByWarePcode(@Param("parentCode") String parentCode);
List<InvWarehouseEntity> getByWarePId(@Param("parentId") String parentId);
List<InvWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
List<InvWarehouseEntity> filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
@ -38,9 +36,7 @@ public interface InvWarehouseService {
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);
@ -95,9 +91,5 @@ public interface InvWarehouseService {
List<InvWarehouseEntity> selectInvById(List<String> InvList);
List<InvWarehouseEntity> selectLowWarehouseAll(String pCode);
InvWarehouseEntity findOneLevel(String code);
}

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

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

7
src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java
Unescape Escape View File

@ -27,13 +27,6 @@ public interface WarehouseBussinessTypeService {
*/
void saveWarehouseBussinessType(String code, List<BasicBussinessTypeResponse> bussinessTypResponseList);
/**
* 移除仓库信息关联单据类型
*
* @param id
*/
void deleteWarehouseByssuinessType(Integer id);
boolean deleteByCode(String code);
/**

15
src/main/java/com/glxp/api/service/auth/WarehouseUserService.java
Unescape Escape View File

@ -14,17 +14,15 @@ public interface WarehouseUserService {
/**
* 查询仓库信息关联的用户数据
*
* @param code 仓位码
* @param id 仓位码
* @return
*/
WarehouseUserEntity selectById(Long id);
List<WarehouseUserEntity> getListByCode(String code);
List<String> selectCodeByUser(String userId);
List<WarehouseUserEntity> filterWarehouseUsers(FilterInvUserRequest filterInvUserRequest);
/**
* 新增仓库字典，用户关联数据
@ -34,15 +32,6 @@ public interface WarehouseUserService {
*/
void saveWarehouseUser(String code, List<AuthAdmin> userList);
/**
* 设置主管
*
* @param id
*/
void updateDirector(Long id);
void updateDirector(WarehouseUserEntity warehouseUserEntity);
/**
* 移除关联用户
*
@ -62,8 +51,6 @@ public interface WarehouseUserService {
*/
List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds") List<Long> userIds);
/**
* 根据分仓编码，统计用户数量
*

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

@ -75,17 +75,6 @@ public class AuthAdminServiceImpl implements AuthAdminService {
return authAdmin;
}
/**
* 根据 id 获取密码字段
*
* @param id
* @return
*/
@Override
public AuthAdmin findPwdById(Long id) {
return authAdminDao.findPwdById(id);
}
/**
* 新增
*
@ -192,22 +181,6 @@ public class AuthAdminServiceImpl implements AuthAdminService {
insertUserRole(userId, roleIds);
}
@Override
public void insertUserAuth1(SysUserRole sysUserRole) {
sysUserRoleMapper.insert(sysUserRole);
}
@Override
public List<AuthAdmin> findByCustomerId(String customerId) {
return authAdminDao.findByCustomerId(customerId);
}
@Override
public SysUserRole selectByAuthId(Long id) {
return sysUserRoleMapper.selectByAuthId(id);
}
public void insertUserRole(Long userId, List<Long> roleIds) {
if (ArrayUtil.isNotEmpty(roleIds)) {
// 新增用户与角色管理

44
src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java
Unescape Escape View File

@ -30,31 +30,6 @@ public class AuthRoleAdminServiceImpl implements AuthRoleAdminService {
return authRoleAdminDao.listByAdminId(adminId);
}
/**
* 根据多个 adminId 查询角色列表
*
* @param adminIds
* @return
*/
@Override
public List<AuthRoleAdmin> listByAdminIdIn(List<Long> adminIds) {
if (adminIds.isEmpty()) {
return Collections.emptyList();
}
return authRoleAdminDao.listByAdminIdIn(adminIds);
}
/**
* 根据 roleId 获取 管理员id
*
* @param roleId
* @return
*/
@Override
public List<AuthRoleAdmin> listByRoleId(Long roleId) {
return authRoleAdminDao.listByRoleId(roleId);
}
/**
* 批量插入
*
@ -94,29 +69,10 @@ public class AuthRoleAdminServiceImpl implements AuthRoleAdminService {
return 0;
}
/**
* 根据 adminId 删除对应的权限
*
* @param adminId
* @return
*/
@Override
public boolean deleteByAdminId(Long adminId) {
// // 删除之前缓存权限规则
// String aarKey = String.format(CacheConstant.ADMIN_AUTH_RULES, adminId);
// CacheUtils.delete(aarKey);
return authRoleAdminDao.deleteByAdminId(adminId);
}
@Override
public boolean updateAuthRoleAdmin(AuthRoleAdmin authRoleAdmin) {
return authRoleAdminDao.updateAuthRoleAdmin(authRoleAdmin);
}
@Override
public List<AuthRole> listAdminRole(Long adminId) {
return authRoleAdminDao.listAdminRole(adminId);
}
}

97
src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java
Unescape Escape View File

@ -24,75 +24,6 @@ public class AuthRoleServiceImpl implements AuthRoleService {
@Resource
private BasicBussinessTypeRoleDao basicBussinessTypeRoleDao;
/**
* 查询列表
*
* @return
*/
@Override
public List<AuthRole> listAdminPage(AuthRoleQueryRequest authRoleQueryRequest) {
int offset = (authRoleQueryRequest.getPage() - 1) * authRoleQueryRequest.getLimit();
PageHelper.offsetPage(offset, authRoleQueryRequest.getLimit());
List<AuthRole> list = authRoleDao.listAdminPage(authRoleQueryRequest);
return list;
}
/**
* 查询管理员页面的列表
*
* @param page
* @param limit
* @param status
* @return
*/
@Override
public List<AuthRole> listAuthAdminRolePage(Integer page, Integer limit, Integer status) {
page = page != null && page > 0 ? page : 1;
limit = limit != null && limit > 0 && limit < 100 ? limit : 100;
int offset = (page - 1) * limit;
PageHelper.offsetPage(offset, limit);
List<AuthRole> list = authRoleDao.listAuthAdminRolePage(status);
return list;
}
/**
* 根据名称查询
*
* @param name
* @return
*/
@Override
public AuthRole findByName(String name) {
return authRoleDao.findByName(name);
}
/**
* 插入
*
* @param authRole
* @return
*/
@Override
public boolean insertAuthRole(AuthRole authRole) {
authRole.setCreateTime(new Date());
authRole.setUpdateTime(new Date());
return authRoleDao.insertAuthRole(authRole);
}
/**
* 修改
*
* @param authRole
* @return
*/
@Override
public boolean updateAuthRole(AuthRole authRole) {
authRole.setUpdateTime(new Date());
return authRoleDao.updateAuthRole(authRole);
}
@Override
public List<AuthRole> listCustomerRoles(Integer page, Integer limit, Integer isCustomer) {
page = page != null && page > 0 ? page : 1;
@ -113,15 +44,6 @@ public class AuthRoleServiceImpl implements AuthRoleService {
return list;
}
@Override
public List<AuthRole> listAuthRoles2(Integer page, Integer limit) {
page = page != null && page > 0 ? page : 1;
limit = limit != null && limit > 0 && limit < 100 ? limit : 100;
int offset = (page - 1) * limit;
PageHelper.offsetPage(offset, limit);
List<AuthRole> list = authRoleDao.listAuthRoles2();
return list;
}
/**
* 删除
@ -134,23 +56,4 @@ public class AuthRoleServiceImpl implements AuthRoleService {
return authRoleDao.deleteById(id);
}
@Override
public List<BasicBussinessTypeRoleEntity> getBussinessTypeRole(Long roleId) {
return basicBussinessTypeRoleDao.getListByRoleId(roleId);
}
@Override
public void updateBussinessTypeRole(Long roleId, List<String> actions) {
//删除之前的扫码单据类型授权数据
basicBussinessTypeRoleDao.deleteByRoleId(roleId);
//添加新的扫码单据数据类型
List<BasicBussinessTypeRoleEntity> data = new ArrayList<>(actions.size());
actions.forEach(action -> {
BasicBussinessTypeRoleEntity entity = new BasicBussinessTypeRoleEntity();
entity.setRole_id(roleId);
entity.setAction(action);
data.add(entity);
});
basicBussinessTypeRoleDao.insert(data);
}
}

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

@ -48,11 +48,6 @@ public class DeptUserServiceImpl implements DeptUserService {
return deptUserDao.selectJoinDeptUserKey(filterDeptUserReqeust);
}
@Override
public List<DeptEntity> getDeptById(List<Integer> ids) {
return deptDao.getDeptById(ids);
}
@Override
public List<DeptUserResponse> selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust) {
if (filterDeptUserReqeust.getPage() != null) {
@ -64,9 +59,6 @@ public class DeptUserServiceImpl implements DeptUserService {
@Override
public boolean delete(Long deptId, Long userId) {
return deptUserDao.deleteByDept(deptId, userId);
}
@ -80,11 +72,6 @@ public class DeptUserServiceImpl implements DeptUserService {
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))

24
src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java
Unescape Escape View File

@ -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,21 +86,10 @@ 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 isExitByAction(String action) {
return invBusUserDao.exists(new QueryWrapper<InvBusUserEntity>().eq("scAction", action));
}
@Override
public boolean exitBus(String userId, String action) {
return invBusUserDao.exists(new QueryWrapper<InvBusUserEntity>().eq("userId", userId).eq("scAction", action));
}
}

15
src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
Unescape Escape View File

@ -65,11 +65,6 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
return invWarehouseDao.getByWarePcode(parentCode);
}
@Override
public List<InvWarehouseEntity> getByWarePId(String parentId) {
return invWarehouseDao.getByWarePId(parentId);
}
@Override
public List<InvWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
if (filterInvSubWarehouseRequest == null) {
@ -134,11 +129,6 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
return invWarehouseDao.deleteById(id);
}
@Override
public boolean deleteByParentCode(String code) {
return invWarehouseDao.deleteByParentCode(code);
}
@Override
public boolean checkDuplicateName(String parentId, String name) {
int count = invWarehouseDao.countByParentIdAndName(parentId, name);
@ -256,11 +246,6 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
return invWarehouseDao.selectInvById(InvList);
}
@Override
public List<InvWarehouseEntity> selectLowWarehouseAll(String pCode) {
return invWarehouseDao.selectLowWarehouseAll(pCode);
}
@Override
public InvWarehouseEntity findOneLevel(String code) {
int index = 1;

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

@ -35,19 +35,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);

85
src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java
Unescape Escape View File

@ -73,22 +73,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;
}
/**
* 批量删除字典类型信息
@ -111,12 +95,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
baseMapper.deleteBatchIds(Arrays.asList(dictIds));
}
/**
* 重置字典缓存数据
*/
@Override
public void resetDictCache() {
}
/**
* 新增保存字典类型信息
@ -173,68 +151,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);
}
}

5
src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java
Unescape Escape View File

@ -48,11 +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) {
sysPdaKeyDao.updateDeviceKey(sysPdaKeyEntity);

7
src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java
Unescape Escape View File

@ -74,13 +74,6 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
}
}
@Override
public void deleteWarehouseByssuinessType(Integer id) {
if (null != id) {
warehouseBussinessTypeDao.deleteById(id);
}
}
@Override
public boolean deleteByCode(String code) {
return warehouseBussinessTypeDao.deleteByCode(code);

47
src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java
Unescape Escape View File

@ -38,34 +38,12 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
return null;
}
@Override
public List<WarehouseUserEntity> getListByCode(String code) {
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserDao.selectListByCode(code);
if (CollUtil.isEmpty(warehouseUserEntities)) {
return Collections.emptyList();
}
return warehouseUserEntities;
}
@Override
public List<String> selectCodeByUser(String userId) {
return warehouseUserDao.selectCodeByUser(userId);
}
@Override
public List<WarehouseUserEntity> filterWarehouseUsers(FilterInvUserRequest filterInvUserRequest) {
if (filterInvUserRequest == null) {
return Collections.emptyList();
}
if (filterInvUserRequest.getPage() != null) {
int offset = (filterInvUserRequest.getPage() - 1) * filterInvUserRequest.getLimit();
PageHelper.offsetPage(offset, filterInvUserRequest.getLimit());
}
return warehouseUserDao.filterList(filterInvUserRequest);
}
@Override
public void saveWarehouseUser(String code, List<AuthAdmin> userList) {
if (CollUtil.isNotEmpty(userList)) {
@ -81,25 +59,6 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
warehouseUserDao.insertBatch(warehouseUserEntities);
}
}
@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) {
@ -130,12 +89,6 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
}
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);

147
src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java
Unescape Escape View File

@ -30,149 +30,9 @@ 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);
if (udiProductEntity.getDiType() == ConstantStatus.DI_TYPE_SYDY) {
udiRelevanceEntity1.setIsUseDy(true);
}
udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
udiRelevanceService.insertUdiRelevance(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;
@ -181,7 +41,6 @@ public class BasicBackUpdateProductService {
@Async
public void loadLocal(FilterThrProductsRequest filterThrProductsRequest, String thirdSysId, String onHandUrl, Boolean isEnable) {
if (filterThrProductsRequest == null) {
filterThrProductsRequest = new FilterThrProductsRequest();
}
@ -189,12 +48,6 @@ 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);

6
src/main/java/com/glxp/api/service/basic/BasicCorpService.java
Unescape Escape View File

@ -13,14 +13,10 @@ public interface BasicCorpService extends IService<BasicCorpEntity> {
List<BasicCorpEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
boolean insertBasicUnitMaintain(BasicCorpEntity basicCorpEntity);
boolean updateById(BasicCorpEntity basicCorpEntity);
boolean insert(BasicCorpEntity basicUnitMaintainEntity);
// boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest);
boolean deleteById(String id);
BasicCorpEntity selectByThirdId(String thirdId, String thirdSys);
@ -38,8 +34,6 @@ public interface BasicCorpService extends IService<BasicCorpEntity> {
List<BasicCorpEntity> batchSelectByIds(List<Integer> id);
List<BasicCorpEntity> batchSelectByErpIds(List<String> erpIds);
List<BasicCorpEntity> batchSelectByErpIdsAndName(List<String> erpIds, String name);
/**

3
src/main/java/com/glxp/api/service/basic/BasicNewUploadDiService.java
Unescape Escape View File

@ -8,13 +8,10 @@ import java.util.List;
public interface BasicNewUploadDiService {
List<BasicNewUploadDiEntity> filterNewUploads(FilterBasicNewUploadDiRequest filterBasicNewUploadDiRequest);
boolean deleteById(Integer id);
boolean insertNewUploadDi(BasicNewUploadDiEntity newUploadDiEntity);
boolean updateNewUploadDi(BasicNewUploadDiEntity newUploadDiEntity);
}

2
src/main/java/com/glxp/api/service/basic/BasicProductsImportDetailService.java
Unescape Escape View File

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

6
src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java
Unescape Escape View File

@ -10,24 +10,18 @@ public interface BasicUnitMaintainService {
List<BasicUnitMaintainEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity);
boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity);
boolean updateById(BasicUnitMaintainEntity basicUnitMaintainEntity);
boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity);
// boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest);
boolean deleteById(String id);
BasicUnitMaintainEntity selectByThirdId(String thirdId, String thirdSys);
List<BasicUnitMaintainEntity> batchSelectByIds(List<Integer> id);
List<BasicUnitMaintainEntity> batchSelectByErpIds(List<String> erpIds);
BasicUnitMaintainEntity selectById(String id);
BasicUnitMaintainEntity selectByErpId(String id);

2
src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java
Unescape Escape View File

@ -17,8 +17,6 @@ public interface CompanyProductRelevanceService extends IService<CompanyProductR
boolean deleteById(String id);
boolean deleteByRlId(String id);
boolean isExitByRelId(String relId);
void copyCustomerId(CopyCustomerIdRequest copyCustomerIdRequest);

2
src/main/java/com/glxp/api/service/basic/EntrustReceService.java
Unescape Escape View File

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

2
src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java
Unescape Escape View File

@ -63,8 +63,6 @@ public interface IBasicBusTypePreService extends IService<BasicBusTypePreEntity>
*/
List<BasicBusTypePreEntity> findByAction(String action);
List<BasicBusTypePreEntity> findByOiginActions(String originAction);
/**
* 查询单据流转列表数据
*

23
src/main/java/com/glxp/api/service/basic/ProductInfoService.java
Unescape Escape View File

@ -9,24 +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);
@ -38,20 +22,13 @@ 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);

31
src/main/java/com/glxp/api/service/basic/SyncUdiService.java
Unescape Escape View File

@ -63,8 +63,6 @@ public class SyncUdiService {
return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
}
}
if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals(""))
&& (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals(""))
&& (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals(""))
@ -129,39 +127,10 @@ public class SyncUdiService {
return ResultVOUtils.error(500, "请输入完整的最小销售单元标识！");
}
}
// if (StrUtil.isEmpty(productInfoFilterRequest.getYlqxzcrbarmc()) && StrUtil.isEmpty(productInfoFilterRequest.getNameCode())) {
// if (StrUtil.isNotEmpty(productInfoFilterRequest.getCpmctymc())) {
// return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
// }
// if (productInfoFilterRequest.getGgxh() != null && !productInfoFilterRequest.getGgxh().equals("")) {
// return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
// }
// if (productInfoFilterRequest.getZczbhhzbapzbh() != null && !productInfoFilterRequest.getZczbhhzbapzbh().equals("")) {
// return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
// }
// }
// if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals(""))
// && (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals(""))
// && (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals(""))
//
// ) {
// if (productInfoFilterRequest.getGgxh() != null && !productInfoFilterRequest.getGgxh().equals("")) {
// return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
// }
// if (productInfoFilterRequest.getZczbhhzbapzbh() != null && !productInfoFilterRequest.getZczbhhzbapzbh().equals("")) {
// return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
// }
// }
if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) {
return ResultVOUtils.error(500, "请输入完整的产品通用名称！");
}
productInfoFilterRequest.setIsNewest(1);
// productInfoFilterRequest.setDiType("1");
String keyCache = productInfoFilterRequest.toCacheKey();
if (StrUtil.isEmpty(keyCache)) {
return ResultVOUtils.error(500, "查询条件不能为空！");

6
src/main/java/com/glxp/api/service/basic/UdiCompanyService.java
Unescape Escape View File

@ -8,21 +8,15 @@ 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);
}

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

@ -74,12 +74,6 @@ public class UdiContrastService {
BasicInsMaterialService basicInsMaterialService;
@Resource
YbDrugService ybDrugService;
@Resource
private CustomerService customerService;
@Resource
private CustomerInfoService customerInfoService;
@Resource
private AlihealthUtils alihealthUtils;
@Value("${UDI_SERVER_URL}")
private String udiUrl;
@Resource
@ -232,8 +226,6 @@ public class UdiContrastService {
.orElse(null);
}
@Resource
ThirdAliDrugService thirdAliDrugService;
@Resource
private AlihealthBusController alihealthBusController;
@ -272,7 +264,6 @@ public class UdiContrastService {
} else {
return ResultVOUtils.error(500, "未能查询到此医保编码");
// udiProductEntity.setCpmctymc(thrProductsEntity.getName());
}
if (StrUtil.isEmpty(ybDrug.getApprovalCode()) || StrUtil.isEmpty(ybDrug.getRegisteredProductName())) {
return ResultVOUtils.success();
@ -362,44 +353,6 @@ public class UdiContrastService {
throw new JsonException(500, "系统繁忙,");
}
return ResultVOUtils.success();
// UdiProductEntity udiProductEntity = new UdiProductEntity();
// BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
// if (thrProductsEntity.getProductType() != 2){
// //不是药品就设置namecode
// udiProductEntity.setNameCode(thrProductsEntity.getCode());
// udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
// udiProductEntity.setPackUnit(thrProductsEntity.getMeasname());
// udiProductEntity.setGgxh(basicInsMaterialEntity != null ? basicInsMaterialEntity.getSpecification() : thrProductsEntity.getSpec());
// udiProductEntity.setManufactory(basicInsMaterialEntity != null ? basicInsMaterialEntity.getManufacturerName() : thrProductsEntity.getManufactory());
// }
// udiProductEntity.setBzgg(thrProductsEntity.getSpec());
// udiProductEntity.setCpmctymc(thrProductsEntity.getName());
// udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
//
// //包装单位
// udiProductEntity.setPrepnUnit(thrProductsEntity.getMeasname());
// udiProductEntity.setUuid(udiRelevanceEntity.getUuid());
// udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
// udiProductEntity.setDiType(1);
// udiProductEntity.setScbssfbhph("是");
// udiProductEntity.setScbssfbhscrq("是");
// udiProductEntity.setScbssfbhsxrq("是");
// udiProductEntity.setScbssfbhxlh("否");
//
// udiProductEntity.setProductsType(thrProductsEntity.getProductType());
// if (thrProductsEntity.getProductType() == 2){
// udiProductEntity.setRequireScanCode(1);
// udiProductEntity.setMajorStatus(1);
// }else {
// udiProductEntity.setRequireScanCode(0);
// }
// if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
// udiProductEntity.setPrice(null);
// }
// udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
// udiProductService.insertUdiInfo(udiProductEntity);
// udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, udiProductEntity);
// udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
}
return ResultVOUtils.success();
@ -410,8 +363,6 @@ public class UdiContrastService {
BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
// 数据处理
udiProductEntity.setId(IdUtil.getSnowflakeNextId());
// udiProductEntity.setNameCode(thrProductsEntity.getCode());
udiProductEntity.setUuid(udiRelevanceEntity.getUuid());
udiProductEntity.setDiType(1);
udiProductEntity.setScbssfbhph("是");
@ -429,16 +380,10 @@ public class UdiContrastService {
}
udiProductEntity.setUpdateTime(new Date());
udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
// 数据做处理好查询阿里接口 批准文号现在不做处理了
// if (ybDrug.getApprovalCode().contains("(")) {
// String[] charArr = ybDrug.getRegisteredProductName().split("\\(");
// ybDrug.setApprovalCode(charArr[0]);
// }
udiProductEntity.setPrepnSpec(ybDrug.getRealityOutlook());
udiProductEntity.setZczbhhzbapzbh(ybDrug.getApprovalCode());
udiProductEntity.setCpmctymc(ybDrug.getRegisteredProductName());
udiProductEntity.setSpmc(ybDrug.getGoodsName());
udiProductEntity.setBzgg(String.valueOf(ybDrug.getFactor()) + ybDrug.getMinUnit() + "/" + ybDrug.getUnit());
udiProductEntity.setMatrial(ybDrug.getMaterialName());
udiProductEntity.setPackMatrial(ybDrug.getMaterialName());
@ -516,9 +461,7 @@ public class UdiContrastService {
} else {
udiProductEntity.setDiType(1);
}
// udiProductEntity.setPackUnit(thirdAliDrug.getPackUnitName());
udiProductEntity.setId(IdUtil.getSnowflakeNextId());
// 多码融合表拼接参数
if (basicProductsCreateDto.isAddCodeRelMark()) {
CodeRel codeRel = new CodeRel();
@ -639,66 +582,6 @@ public class UdiContrastService {
}
public List<ThirdAliDrug> disposeYbDrugList(List<ThirdAliDrug> thirdAliDrugList, YbDrug ybDrug, List<String> codeIn) {
List<ThirdAliDrug> list1 = new ArrayList<>();
String result = null;
if (codeIn != null && codeIn.size() > 0) {
result = String.join(", ", codeIn);
}
if (thirdAliDrugList != null && thirdAliDrugList.size() > 0) {
// List<ThirdAliDrug> list2 = new ArrayList<>();
for (ThirdAliDrug thirdAliDrug : thirdAliDrugList) {
String str = drugRulesVerify(ybDrug, thirdAliDrug);
if (StringUtils.isNotEmpty(str)) {
if (str.equals("1")) {
if (StringUtils.isNotEmpty(result)) {
if (!result.contains(thirdAliDrug.getNameCode())) {
list1.add(thirdAliDrug);
}
} else {
list1.add(thirdAliDrug);
}
}
}
}
// if(list1 !=null && list1.size() >0){
// return list1;
// }else if(list2 !=null && list2.size() >0){
// return list2;
// }
}
return list1;
}
public String drugRulesVerify(YbDrug ybDrug, ThirdAliDrug thirdAliDrug) {
try {
Integer bzggInt = DimaUtil.trMinCount(thirdAliDrug.getBzgg());
// 医保规格和阿里制剂规格双方都去除特殊符号和空格之后进行精准匹配
String realityOutlook = DimaUtil.specialCharactersRemover(ybDrug.getRealityOutlook());
String formSpec = DimaUtil.specialCharactersRemover(thirdAliDrug.getFormSpec());
// 按照医保数量与阿里包装规格对比
if ((bzggInt == ybDrug.getFactor()) && realityOutlook.equals(formSpec)) {
return "1";
}
// // 医保的规格与阿里制剂规格完全匹配
// if(thirdAliDrug.getFormSpec().equals(ybDrug.getRealityOutlook())){
// return "3";
// }
} catch (Exception e) {
log.error("药品校验出现错误===" + e.getMessage());
return null;
}
return null;
}
public void createOnlyApply(ThrProductsAddDiEntity thrProductsAddDiEntity) {
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();

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

@ -22,8 +22,6 @@ public interface UdiProductService {
UdiProductEntity findBySptm(String sptm);
List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiRelRequest filterUdiRelRequest);
List<UdiProductEntity> filterAllUdiInfo(FilterUdiRelRequest filterUdiRelRequest);
UdiProductEntity findByNameCode(String nameCode);
@ -63,13 +61,6 @@ public interface UdiProductService {
boolean updateUdiInfoNotAll(UdiInfoRequest udiInfoRequest);
/**
* 根据DI查询此产品是否允许无批次号
*
* @param nameCode
* @return
*/
UdiProductEntity getAllowNoBatch(String nameCode);
AddProductRequest addDrug(AddProductRequest addProductRequest);

17
src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
Unescape Escape View File

@ -20,8 +20,6 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceEntity> filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest);
UdiRelevanceResponse selectByNameCode(String nameCode);
/**
@ -42,7 +40,6 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
List<UdiRelevanceResponse> filterUdiGp(FilterUdiRelRequest filterUdiRelRequest);
boolean isExitByUuid(String uuid);
List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids);
@ -62,8 +59,6 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
UdiRelevanceEntity selectUpdateByThirdId(String thirdId);
UdiRelevanceEntity selectByMainIdLimitOne(String mainId);
List<UdiRelevanceResponse> selectByMainId(String mainId);
UdiRelevanceResponse selectByMainIdOne(String mainId);
@ -76,8 +71,6 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity);
boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
boolean deleteById(String id);
@ -86,14 +79,6 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
boolean deleteByUuid(String uuid);
/**
* 查询产品的uuid
*
* @param relId
* @return
*/
String findUuidById(String relId);
List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode, Boolean isDisable);
@ -105,8 +90,6 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
*/
String getRelIdByUdiCode(String code);
Integer findPurType(Long relId);
UdiRelevanceEntity insertDefaultLevel(UdiRelevanceEntity udiRelevanceEntity, UdiProductEntity udiProductEntity);
UdiProductEntity getDiProduct(List<UdiProductEntity> udiInfoEntities);

6
src/main/java/com/glxp/api/service/basic/UdiRlSupService.java
Unescape Escape View File

@ -16,8 +16,6 @@ public interface UdiRlSupService {
UdiRlSupEntity findCompanyProductRelevance(String CustomerId);
UdiRlSupEntity findCompanyProductRelevanceByProductId(String productId);
UdiRlSupEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId);
UdiRlSupEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk);
@ -30,14 +28,10 @@ public interface UdiRlSupService {
int updateCompanyProductRelevance(UdiRlSupEntity companyCertEntity);
int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity);
boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity);
boolean deleteById(String id);
boolean deleteByRlId(String id);
/**
* 查询供应商是否存在此配送产品
*

5
src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java
Unescape Escape View File

@ -65,11 +65,6 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl<BasicBusTypePreDao,
return basicBusTypePreDao.findByAction(action, null);
}
@Override
public List<BasicBusTypePreEntity> findByOiginActions(String originAction) {
return basicBusTypePreDao.findByAction(null, originAction);
}
@Override
public List<BasicBusTypePreResponse> filterBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest) {
if (null == filterBusTypePreRequest) {

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

@ -44,11 +44,6 @@ public class BasicCorpServiceImpl extends ServiceImpl<BasicCorpDao, BasicCorpEnt
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 ? false : true;
@ -89,11 +84,6 @@ public class BasicCorpServiceImpl extends ServiceImpl<BasicCorpDao, BasicCorpEnt
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);

19
src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java
Unescape Escape View File

@ -18,20 +18,6 @@ public class BasicNewUploadDiServiceImpl implements BasicNewUploadDiService {
@Resource
BasicNewUploadDiDao newUploadDiDao;
@Override
public List<BasicNewUploadDiEntity> filterNewUploads(FilterBasicNewUploadDiRequest filterNewUploadDiRequest) {
if (filterNewUploadDiRequest == null) {
return Collections.emptyList();
}
if (filterNewUploadDiRequest.getPage() != null) {
int offset = (filterNewUploadDiRequest.getPage() - 1) * filterNewUploadDiRequest.getLimit();
PageHelper.offsetPage(offset, filterNewUploadDiRequest.getLimit());
}
List<BasicNewUploadDiEntity> data = newUploadDiDao.filterNewUploads(filterNewUploadDiRequest);
return data;
}
@Override
public boolean deleteById(Integer id) {
return newUploadDiDao.deleteById(id);
@ -41,9 +27,4 @@ public class BasicNewUploadDiServiceImpl implements BasicNewUploadDiService {
public boolean insertNewUploadDi(BasicNewUploadDiEntity newUploadDiEntity) {
return newUploadDiDao.insertNewUploadDi(newUploadDiEntity);
}
@Override
public boolean updateNewUploadDi(BasicNewUploadDiEntity newUploadDiEntity) {
return newUploadDiDao.updateNewUploadDi(newUploadDiEntity);
}
}

11
src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java
Unescape Escape View File

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

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

@ -33,11 +33,6 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService {
return data;
}
@Override
public boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity) {
return basicUnitMaintainDao.insertBasicUnitMaintainignore(basicUnitMaintainEntity);
}
@Override
public boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity) {
return basicUnitMaintainDao.insertBasicUnitMaintain(basicUnitMaintainEntity);
@ -83,11 +78,6 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService {
return basicUnitMaintainDao.batchSelectByIds(ids);
}
@Override
public List<BasicUnitMaintainEntity> batchSelectByErpIds(List<String> erpIds) {
return basicUnitMaintainDao.batchSelectByErpIds(erpIds);
}
@Override
public BasicUnitMaintainEntity selectById(String id) {
return basicUnitMaintainDao.selectById(id);

6
src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java
Unescape Escape View File

@ -59,12 +59,6 @@ public class CompanyProductRelevanceServiceImpl extends ServiceImpl<CompanyProdu
public boolean deleteById(String id) {
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));

5
src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java
Unescape Escape View File

@ -96,11 +96,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);

95
src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java
Unescape Escape View File

@ -22,31 +22,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) {
@ -61,61 +36,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) {
@ -177,26 +97,11 @@ public class ProductInfoServiceImpl implements ProductInfoService {
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 ProductInfoEntity findByNameCode(String nameCode) {

14
src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java
Unescape Escape View File

@ -18,11 +18,6 @@ public class UdiCompanyServiceImpl implements UdiCompanyService {
@Resource
UdiCompanyDao udiCompanyDao;
@Override
public List<UdiCompanyEntity> selectAllTyshxyh() {
return udiCompanyDao.selectAllTyshxyh();
}
@Override
public List<UdiCompanyEntity> syncDlCompany(UdiCompanyRequest udiCompanyRequest) {
int offset = (udiCompanyRequest.getPage() - 1) * udiCompanyRequest.getLimit() + 1;
@ -40,11 +35,6 @@ public class UdiCompanyServiceImpl implements UdiCompanyService {
return udiCompanyDao.filterUdiCompany(udiCompanyRequest);
}
@Override
public boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity) {
return udiCompanyDao.insertUdiCompany(udiCompanyEntity);
}
@Override
public boolean insertUdiCompanys(List<UdiCompanyEntity> udiCompanyEntities) {
return udiCompanyDao.insertUdiCompanys(udiCompanyEntities);
@ -60,8 +50,4 @@ public class UdiCompanyServiceImpl implements UdiCompanyService {
return udiCompanyDao.deleteAll(ids);
}
@Override
public boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity) {
return udiCompanyDao.updateUdiCompany(udiCompanyEntity);
}
}

20
src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
Unescape Escape View File

@ -89,20 +89,6 @@ public class UdiProductServiceImpl implements UdiProductService {
return null;
}
@Override
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;
}
@Override
public List<UdiProductEntity> filterAllUdiInfo(FilterUdiRelRequest filterUdiRelRequest) {
if (filterUdiRelRequest == null) {
@ -265,12 +251,6 @@ public class UdiProductServiceImpl implements UdiProductService {
return udiProductDao.updateUdiInfoNotAll(udiInfoRequest);
}
@Override
public UdiProductEntity getAllowNoBatch(String nameCode) {
String di = FilterUdiUtils.getDiStr(nameCode);
return udiProductDao.selectAllowNoBatch(di);
}
@Value("${UDI_SERVER_URL}")
private String udiUrl;

45
src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
Unescape Escape View File

@ -74,14 +74,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
return data;
}
@Override
public List<UdiRelevanceEntity> filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest) {
List<UdiRelevanceEntity> data = udiRelevanceDao.filterEntity(filterUdiRelRequest);
return data;
}
@Override
public List<UdiRelevanceResponse> selectAllByNameCode(String nameCode) {
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
@ -161,16 +153,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest);
return data;
}
@Override
public boolean isExitByUuid(String uuid) {
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByUuid(uuid);
if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) {
return true;
}
return false;
}
@Override
public List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids) {
return udiRelevanceDao.batchSelectByUuid(uuids);
@ -256,17 +238,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
return data.get(0);
return null;
}
@Override
public UdiRelevanceEntity selectByMainIdLimitOne(String mainId) {
if (mainId == null)
return null;
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
filterUdiRelRequest.setMainId(mainId);
return udiRelevanceDao.selectByThirdId(filterUdiRelRequest);
}
@Override
public List<UdiRelevanceResponse> selectByMainId(String mainId) {
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
@ -359,10 +330,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
return udiRelevanceDao.insertUdiRelevance(udiRelevanceEntity);
}
@Override
public boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity) {
return udiRelevanceDao.insertUdiRelevanceignore(udiRelevanceEntity);
}
@Override
public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) {
@ -396,12 +363,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
public boolean deleteByUuid(String uuid) {
return udiRelevanceDao.deleteByUuid(uuid);
}
@Override
public String findUuidById(String relId) {
return udiRelevanceDao.selectUuidById(relId);
}
@Override
public List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode, Boolean isDisable) {
return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable);
@ -417,12 +378,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
}
@Override
public Integer findPurType(Long relId) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectOne(new QueryWrapper<UdiRelevanceEntity>().select("purType").eq("id", relId).last("limit 1"));
return IntUtil.value(udiRelevanceEntity.getPurType());
}
@Override
public UdiRelevanceEntity insertDefaultLevel(UdiRelevanceEntity udiRelevanceEntity, UdiProductEntity udiProductEntity) {
if (udiProductEntity != null) {

17
src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java
Unescape Escape View File

@ -64,11 +64,6 @@ public class UdiRlSupServiceImpl implements UdiRlSupService {
return companyEntities;
}
@Override
public UdiRlSupEntity findCompanyProductRelevanceByProductId(String productId) {
return udiRlSupDao.findCompanyProductRelevanceByProductId(productId);
}
@Override
public UdiRlSupEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId) {
return udiRlSupDao.findCompanyProductRelevanceByUdiRlIdFk(udiRlIdFk, customerId);
@ -104,12 +99,6 @@ public class UdiRlSupServiceImpl implements UdiRlSupService {
return udiRlSupDao.updateById(udiRlSupEntity);
}
@Override
public int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity) {
QueryWrapper<UdiRlSupEntity> ew = new QueryWrapper<>();
ew.eq("udiRlIdFk", companyCertEntity.getUdiRlIdFk());
return udiRlSupDao.update(companyCertEntity, ew);
}
@Override
public boolean insertCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity) {
@ -120,12 +109,6 @@ public class UdiRlSupServiceImpl implements UdiRlSupService {
public boolean deleteById(String id) {
return udiRlSupDao.deleteById(id);
}
@Override
public boolean deleteByRlId(String id) {
return udiRlSupDao.deleteByRlId(id);
}
@Override
public boolean findExist(CompanyProductRelevanceRequest companyProductRelevanceRequest) {
Long count = udiRlSupDao.selectSupRlCount(companyProductRelevanceRequest);

2
src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
Unescape Escape View File

@ -705,8 +705,6 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
@Resource
private AlihealthYljgUtils alihealthYljgUtils;
@Resource
private RedisDelayedQueue redisDelayedQueue;
// 处理阿里新增关联关系

2
src/main/java/com/glxp/api/service/dev/DeviceCheckDetailItemService.java
Unescape Escape View File

@ -27,5 +27,5 @@ public interface DeviceCheckDetailItemService extends IService<DeviceCheckDetail
void finish(DeviceCheckDetailItemFinishParam param, AuthAdmin user);
public void finishAll(DeviceCheckDetailParam param, AuthAdmin user);
void finishAll(DeviceCheckDetailParam param, AuthAdmin user);
}

14
src/main/java/com/glxp/api/service/dev/DeviceInfoService.java
Unescape Escape View File

@ -16,16 +16,6 @@ import java.util.List;
*/
public interface DeviceInfoService extends IService<DeviceInfoEntity> {
/**
* 变更设备归属，同时将状态改为正常
*
* @param deviceCode 设备码
* @param oldDeptCode 原部门
* @param toDeptCode 目标部门
* @param orderId 变更单id
*/
void changeDept(String deviceCode, String oldDeptCode, String toDeptCode, Long orderId);
/**
* 修改设备状态
*
@ -94,12 +84,8 @@ public interface DeviceInfoService extends IService<DeviceInfoEntity> {
List<DeviceInfoVo> detail(DeviceInfoDetailByDeptCodeQuery query);
List<DeviceInfoVo> listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status);
List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, List<DeviceStatusEnum> status);
boolean exitOrder(Long orderId, String deviceCode);
String genDeviceCode();
boolean updateOrderItem(DeviceInfoEntity entity);

10
src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java
Unescape Escape View File

@ -33,14 +33,4 @@ public interface DeviceUpkeepService extends IService<DeviceUpkeepEntity> {
List<DeviceUpkeepDetailVo> pageListDetail(DeviceUpkeepQuery query);
/**
* 完成一个保养设备
*
* @param taskId 任务id
* @param deviceCode 设备编码
* @return
*/
// void finishDevice(Long taskId, String deviceCode);
// void finishUpkeep(String deviceCode, String deptCode, Long taskId, AuthAdmin user);
}

32
src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java
Unescape Escape View File

@ -30,24 +30,6 @@ import java.util.List;
public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceInfoEntity>
implements DeviceInfoService {
@Override
@Transactional
public void changeDept(String deviceCode, String oldDeptCode, String toDeptCode, Long orderId) throws JsonException {
boolean updated = super.update(Wrappers.lambdaUpdate(DeviceInfoEntity.class)
.setSql("changeCount = changeCount +1")
.set(DeviceInfoEntity::getDeptCode, toDeptCode)
.set(DeviceInfoEntity::getLastChangeOrderId, orderId)
.set(DeviceInfoEntity::getStatus, DeviceStatusEnum.NORMAL)
.set(DeviceInfoEntity::getUpdateTime,LocalDateTime.now())
.eq(DeviceInfoEntity::getDeptCode, oldDeptCode)
.eq(DeviceInfoEntity::getDeviceCode, deviceCode)
.eq(DeviceInfoEntity::getStatus, DeviceStatusEnum.CHANGE)
);
if (!updated) {
throw new JsonException(String.format("设备[%s]变更归属失败，变更需要设备状态为[%s]且部门信息通过验证", deviceCode, DeviceStatusEnum.CHANGE.getDesc()));
}
}
@Override
@Transactional
public void changeStatus(String deviceCode, String deptCode, DeviceStatusEnum oldStatus, DeviceStatusEnum toStatus) throws JsonException {
@ -177,16 +159,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
return super.baseMapper.detail(query);
}
@Override
public List<DeviceInfoVo> listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status) {
List<DeviceInfoVo> list = super.baseMapper.listVoByProductIdAndStatus(productId, status);
// List<DeviceInfoEntity> list = super.list(Wrappers.lambdaQuery(DeviceInfoEntity.class)
// .eq(DeviceInfoEntity::getProductId, productId)
// .eq(DeviceInfoEntity::getStatus, status)
// );
return list;
}
@Override
public List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, List<DeviceStatusEnum> status) {
@ -195,10 +167,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
return list;
}
@Override
public boolean exitOrder(Long orderId, String deviceCode) {
return super.baseMapper.exists(new QueryWrapper<DeviceInfoEntity>().eq("deviceCode", deviceCode).ne("lastChangeOrderId", orderId));
}
@Override
public String genDeviceCode() {

3
src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java
Unescape Escape View File

@ -45,8 +45,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
@Resource
DeviceCheckDetailService deviceCheckDetailService;
@Resource
DeviceRepairApplyDetailMapper deviceRepairApplyDetailMapper;
@Autowired
@Lazy

27
src/main/java/com/glxp/api/service/info/impl/SetupServiceImpl.java
Unescape Escape View File

@ -1,27 +0,0 @@
package com.glxp.api.service.info.impl;//package com.glxp.api.service.info.impl;
//
//import com.glxp.api.dao.system.SetupDao;
//import org.springframework.stereotype.Service;
//
//import javax.annotation.Resource;
//
//@Service
//public class SetupServiceImpl implements SetupService {
// @Resource
// SetupDao setupDao;
//
// @Override
// public SetupEntity findSetup(String customerId) {
// return setupDao.findSetup(customerId);
// }
//
// @Override
// public boolean modifySetup(SetupEntity setupEntity) {
// return setupDao.modifySetup(setupEntity);
// }
//
// @Override
// public boolean insertSetup(SetupEntity setupEntity) {
// return setupDao.insertSetup(setupEntity);
// }
//}

2
src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
Unescape Escape View File

@ -62,8 +62,6 @@ public class IoAddInoutService {
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
InvProductServiceNew invProductServiceNew;
@Resource
BasicCorpService basicCorpService;
@Resource
@Lazy

26
src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java
Unescape Escape View File

@ -57,8 +57,6 @@ public class IoChangeInoutService {
@Resource
InvWarehouseService invWarehouseService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
IoCodeTempService codeTempService;
@Resource
IoOrderInvoiceService ioOrderInvoiceService;
@ -77,11 +75,6 @@ public class IoChangeInoutService {
//结束，不生成库存，
}
//后续做修改
public void changeBusOrder(IoOrderEntity orderEntity) {
}
//TODO 120241022 之前关于详情表的删除修改操作去了
// //普通出入库单据流转
public void genNewOrder(IoOrderEntity orderEntity) {
@ -94,24 +87,6 @@ public class IoChangeInoutService {
}
//计算当前库存数量
public int getInvCount(IoCodeEntity codeEntity) {
List<InvProductNewVo> resultLists = invProductServiceNew.selectByUnique(codeEntity.getRelId(), codeEntity.getBatchNo(), codeEntity.getSupId(), codeEntity.getDeptCode(), codeEntity.getInvCode());
int invCount = 0;
if (CollUtil.isNotEmpty(resultLists)) {
for (InvProductNewVo invProductDetailEntity : resultLists) {
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
invCount = invCount - invProductDetailEntity.getReCount();
} else {
invCount = invCount + invProductDetailEntity.getReCount();
}
}
}
return invCount;
}
//生成单据
public void buildInOrder(BasicBusTypePreEntity bussinessChangeTypeEntity, List<IoCodeEntity> useInList, IoOrderEntity orderEntity, boolean isGenInovice) {
@ -141,7 +116,6 @@ public class IoChangeInoutService {
} else {
// 原先单据流程
filterSupMaps.put("test", useInList);
// filterSupMaps.put(bussinessChangeTypeEntity.getDefaultInvCode(), useInList);
}
//根据往来单位生成入库单
for (String corpName : filterSupMaps.keySet()) {

39
src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
Unescape Escape View File

@ -80,8 +80,6 @@ public class IoCheckInoutService {
@Resource
IoOrderDetailCodeDao orderDetailCodeDao;
@Resource
InvPreinDetailService invPreinDetailService;
@Resource
IoGenInvService genInvService;
@Resource
@ -229,39 +227,6 @@ public class IoCheckInoutService {
}
}
/**
* code列表中 有序列号的 进行唯一校验
* 1、查找出临时code中 有 序列号的 code集合
* 2、在正式code表里 对code分组sum库存 前提是 在待校验code集合中 校验出库存大于0抛出异常
*/
private void serialNoUniquenessVerification(List<IoCodeTempEntity> codeTempEntities) {
if (CollUtil.isNotEmpty(codeTempEntities)) {
List<String> codes = new ArrayList<>(codeTempEntities.size());
codeTempEntities.stream().forEach(x -> {
if (StrUtil.isNotBlank(x.getSerialNo())) {
codes.add(x.getCode());
}
});
if (CollUtil.isNotEmpty(codes)) {
//正式code表里 对code分组sum实际库存数量
List<IoCodeResponse> codeSumReCountList = codeService.findByCodeSumReCount(codes);
if (codeSumReCountList.size() > 0) {
StringBuilder msg = new StringBuilder();
codeSumReCountList.forEach(x -> {
if (x.getReCount() > 0) {
msg.append(x.getCode() + ",");
}
});
if (StrUtil.isNotEmpty(msg)) {
msg.deleteCharAt(msg.length() - 1);
throw new JsonException(500, "产品UDI码：" + msg + "存库唯一性校验不通过！");
}
}
}
}
}
@Resource
IoCodeLostService codeLostService;
@ -490,10 +455,6 @@ public class IoCheckInoutService {
checkThird(orderEntity);
}
@Resource
IoOrderInvoiceService orderInvoiceService;
//一次校验完成
public void checkFirstFinish(IoOrderEntity orderEntity, List<IoCodeTempEntity> codeTempEntities) {
List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderEntity.getBillNo());

24
src/main/java/com/glxp/api/service/inout/IoGenInvService.java
Unescape Escape View File

@ -28,8 +28,6 @@ public class IoGenInvService {
@Resource
InvProductService invProductService;
@Resource
InvProductServiceNew invProductServiceNew;
@Resource
InvPreinOrderService invPreinOrderService;
@Resource
InvPreinDetailService invPreinDetailService;
@ -92,31 +90,11 @@ public class IoGenInvService {
invProductEntity.setUpdateTime(new Date());
invProductService.update(invProductEntity);
}
//TODO 120241022 之前关于详情表的删除修改操作去了
// //生成库存码详情
// List<InvProductNewVo> invProductDetailEntities = new ArrayList<>();
// for (IoCodeEntity codeEntity : codeEnttities) {
// InvProductNewVo invProductDetailEntity = new InvProductNewVo();
// BeanUtils.copyProperties(codeEntity, invProductDetailEntity);
// invProductDetailEntity.setRelIdFk(codeEntity.getRelId());
// invProductDetailEntity.setUpdateTime(new Date());
// invProductDetailEntity.setId(null);
// invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
// if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
// invProductDetailEntity.setInCount(invProductDetailEntity.getReCount());
// } else if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
// invProductDetailEntity.setOutCount(invProductDetailEntity.getReCount());
// }
//
// invProductDetailEntities.add(invProductDetailEntity);
// }
BasicBusTypePreEntity basicBusTypePreEntity = basicBusTypePreService.findByOriginAction(orderEntity.getAction());
if (basicBusTypePreEntity != null) { //进行单据流转
ioChangeInoutService.genNewOrder(orderEntity);
}
// else { //生成库存结束
// invProductDetailService.insertList(invProductDetailEntities);
// }
}

4
src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
Unescape Escape View File

@ -43,8 +43,6 @@ public interface IoOrderDetailBizService {
List<IoOrderDetailBizResponse> filterDrugList(FilterOrderDetailBizRequest orderDetailBizRequest);
List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
List<IoOrderDetailResultResponse> getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest);
IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk);
@ -53,8 +51,6 @@ public interface IoOrderDetailBizService {
List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
List<IoOrderInvoiceResponse> selectByorderIdFk(String orderIdFk);
IoOrderInvoiceResponse selectByinvoiceId(Long id);
Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity);

2
src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java
Unescape Escape View File

@ -39,7 +39,7 @@ public interface IoOrderDetailCodeService {
*/
int deleteByOrderId(String orderId);
public List<IoOrderDetailCodeEntity> checkOrderList(String orderId);
List<IoOrderDetailCodeEntity> checkOrderList(String orderId);
boolean isExit(String orderId);

4
src/main/java/com/glxp/api/service/inout/IoOrderService.java
Unescape Escape View File

@ -14,8 +14,6 @@ import java.util.List;
public interface IoOrderService {
List<IoOrderEntity> selectAll();
List<IoOrderEntity> findAll(FilterOrderRequest filterOrderRequest);
List<IoOrderEntity> isExitRepeat(String corpOrderId, String billNo);
@ -55,8 +53,6 @@ public interface IoOrderService {
*/
List<IoOrderResponse> filterList(FilterOrderRequest filterOrderRequest);
List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest);
List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest);
/**

11
src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java
Unescape Escape View File

@ -96,21 +96,10 @@ public class IoCodeService extends ServiceImpl<IoCodeDao, IoCodeEntity> {
public boolean isExitByRelId(String relId) {
// return ioCodeDao.selectList(new QueryWrapper<IoCodeEntity>().eq("relId", relId).last("limit 1"));
return ioCodeDao.exists(new QueryWrapper<IoCodeEntity>().eq("relId", relId));
}
public List<IoCodeEntity> filterCodeList(FilterCodeRequest filterCodeRequest) {
if (null == filterCodeRequest) {
return Collections.emptyList();
}
if (null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) {
PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit());
}
return ioCodeDao.filterCodeList(filterCodeRequest);
}
public List<IoCodeResponse> filterList(FilterCodeRequest filterCodeRequest) {
if (null == filterCodeRequest) {

34
src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java
Unescape Escape View File

@ -250,10 +250,6 @@ public class IoCodeTempService {
AlihealthYljgUtils alihealthYljgUtils;
@Resource
AuthCompanyMapper authCompanyMapper;
@Resource
IoOrderDetailBizDao ioOrderDetailBizDao;
public BaseResponse addDrugOrderWeb(AddOrderRequest addOrderRequest) {
AddCodeResult addCodeResult = new AddCodeResult();
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
@ -322,7 +318,6 @@ public class IoCodeTempService {
}
}
//批次号校验
//判断此产品是否开启允许无批次号
UdiProductEntity udiInfoEntity = udiProductService.findByNameCode(udiEntity.getUdi());
@ -659,34 +654,6 @@ public class IoCodeTempService {
relCodeBatchService.threadUpdateIoCodeTempEntity(code);
}
}
// if(relCodeBatchOne!=null){
// String mabeDate = relCodeBatchOne.getMadeDate();
// String validateDate = relCodeBatchOne.getValidateDate();
//
//
// if(mabeDate.length() > 10){
// mabeDate =mabeDate.replace("-","").substring(2,8);
//
// }
// if(validateDate.length() > 10){
// validateDate = validateDate.replace("-","").substring(2,8);
//
// }
// genDetaiEntity.setBatchNo(relCodeBatchOne.getBatchNo());
// genDetaiEntity.setProduceDate(mabeDate);
// genDetaiEntity.setExpireDate(validateDate);
//
// IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
// ioOrderDetailBizEntity.setBatchNo(relCodeBatchOne.getBatchNo());
// ioOrderDetailBizEntity.setProductDate( mabeDate);
// ioOrderDetailBizEntity.setExpireDate(validateDate);
//
// ioOrderDetailBizDao.update(ioOrderDetailBizEntity,
// new QueryWrapper<IoOrderDetailBizEntity>().eq("orderIdFk",orderEntity.getBillNo())
// );
//// genDetaiEntity.setExpireDate(relCodeBatchOne.getValidateDate());
// }
addCodeResult.setOrderId(orderId);
transInoutService.genOrderDetailCode(orderEntity, genDetaiEntity);
return ResultVOUtils.success(addCodeResult);
@ -779,7 +746,6 @@ public class IoCodeTempService {
return drugCodeSelectEntity;
}
}
// UdiEntity originUdiEntity = FilterUdiUtils.getUdi(drugCodeSelectEntity.getCode());
if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getNameCode()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) {
continue;
}

26
src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
Unescape Escape View File

@ -65,10 +65,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
@Resource
IoOrderDetailBizDao ioOrderDetailBizDao;
@Resource
IoOrderInvoiceMapper ioOrderInvoiceMapper;
@Resource
IoOrderDetailCodeDao orderDetailCodeDao;
@Override
public IoOrderDetailBizEntity selectById(Long id) {
@ -86,9 +82,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
if (StrUtil.isNotEmpty(orderId)) {
ew.eq("orderIdFk", orderId);
}
// if(chack){
// ew.isNull("nameCode");
// }
List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList = ioOrderDetailBizDao.selectList(ew);
return ioOrderDetailBizEntityList;
}
@ -174,17 +167,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
return ioOrderDetailBizDao.filterDrugList(orderDetailBizRequest);
}
@Override
public List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
if (null == OrderDetailCodeRequest) {
return Collections.emptyList();
}
if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) {
PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit());
}
return ioOrderDetailBizDao.getfilterList(OrderDetailCodeRequest);
}
@Override
public List<IoOrderDetailResultResponse> getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
if (null == OrderDetailCodeRequest) {
@ -255,12 +237,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
}
return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest);
}
@Override
public List<IoOrderInvoiceResponse> selectByorderIdFk(String orderIdFk) {
return ioOrderDetailBizDao.selectByorderIdFk(orderIdFk);
}
@Override
public IoOrderInvoiceResponse selectByinvoiceId(Long id) {
return ioOrderDetailBizDao.selectByinvoiceId(id);
@ -301,8 +277,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
@Resource
SupProductService supProductService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
SupCertService supCertService;
@Resource
IoOrderInvoiceService ioOrderInvoiceService;

4
src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java
Unescape Escape View File

@ -109,10 +109,6 @@ public class IoOrderInvoiceService extends ServiceImpl<IoOrderInvoiceMapper, IoO
}
public boolean findRegStausByProduct(String billNo) {
return false;
}
public List<IoOrderInvoiceResponse> filterGroupBy(IoOrderInvoiceRequest orderInvoiceRequest) {
if (orderInvoiceRequest.getPage() != null) {
int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit();

17
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -105,12 +105,6 @@ public class IoOrderServiceImpl implements IoOrderService {
private HttpOkClient httpOkClient;
@Resource
private BasicCorpDao basicCorpDao;
@Override
public List<IoOrderEntity> selectAll() {
return orderDao.selectList();
}
@Override
public List<IoOrderEntity> findAll(FilterOrderRequest filterOrderRequest) {
QueryWrapper<IoOrderEntity> queryWrapper = new QueryWrapper<IoOrderEntity>()
@ -558,17 +552,6 @@ public class IoOrderServiceImpl implements IoOrderService {
return orderDao.filterList(filterOrderRequest);
}
@Override
public List<IoOrderResponse> getfilterList(FilterOrderRequest filterOrderRequest) {
if (null == filterOrderRequest) {
return Collections.emptyList();
}
if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) {
PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit());
}
return orderDao.getfilterList(filterOrderRequest);
}
@Override
public List<IoOrderResponse> getfilterOrderList(FilterOrderRequest filterOrderRequest) {
if (null == filterOrderRequest) {

4
src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java
Unescape Escape View File

@ -26,10 +26,6 @@ public class DeviceInspectTaskDetailService extends ServiceImpl<DeviceInspectTas
return true;
}
public Boolean addDeviceInspectTaskDelectList(List<DeviceInspectTaskDetailEntity> deviceInspectTaskDetailEntityList) {
deviceInspectTaskDetailMapper.insertBatch(deviceInspectTaskDetailEntityList);
return true;
}
public List<DeviceInspectTaskDetailEntity> selectDeviceInspectTakeDetail(DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity) {

7
src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java
Unescape Escape View File

@ -22,13 +22,6 @@ public interface DeviceReceiveOrderDetailService {
*/
List<DeviceReceiveOrderDetailResponse> filterList(FilterDeviceReceiveOrderDetailRequest detailRequest);
/**
* 添加设备领用记录详情
*
* @param addDetailRequest
* @return
*/
BaseResponse addOrderDetail(AddDeviceReceiveOrderDetailRequest addDetailRequest);
/**
* 更新设备领用记录详情

9
src/main/java/com/glxp/api/service/inv/InvCountOrderService.java
Unescape Escape View File

@ -43,15 +43,6 @@ public interface InvCountOrderService {
*/
BaseResponse submitAudit(String id);
/**
* 更新盘点单据状态
*
* @param id
* @param status
* @return
*/
BaseResponse updateCountOrderStatus(String id, Integer status);
/**
* 手持终端保存盘点单据
*

1
src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java
Unescape Escape View File

@ -11,7 +11,6 @@ import java.util.List;
public interface InvInnerOrderPrintService {
List<InvInnerOrderPrintEntity> filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest);
Boolean addOrderList(String orderIdFk);

7
src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java
Unescape Escape View File

@ -37,13 +37,6 @@ public interface InvMAOrderDetailService {
*/
BaseResponse delete(Integer id);
// /**
// * 根据库存详情批量添加养护详情记录
// *
// * @param addMAOrderDetailRequest
// * @return
// */
// BaseResponse batchAddDetail(AddInvMAOrderDetailRequest addMAOrderDetailRequest);
/**
* 更新养护记录详情

7
src/main/java/com/glxp/api/service/inv/InvPreProductService.java
Unescape Escape View File

@ -29,13 +29,6 @@ public interface InvPreProductService {
*/
List<InvPreProductResponse> filterList(FilterInvPreProductRequest invPreProductRequest);
/**
* 查询寄售库存列表
*
* @param invPreProductRequest
* @return
*/
List<InvPreProductEntity> filterPreProductList(FilterInvPreProductRequest invPreProductRequest);
/**
* 根据ID查询寄售库存信息

6
src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java
Unescape Escape View File

@ -21,9 +21,6 @@ public interface InvPreinDetailService {
List<InvPreinDetailEntity> findByCode(String code);
// InvPreinDetailEntity findOneByCode(String code);
List<InvPreinDetailEntity> findUseByCode(String code);
InvPreinDetailEntity findUseOneByCode(String code);
@ -38,7 +35,4 @@ public interface InvPreinDetailService {
int update(InvPreinDetailEntity invPreinDetailEntity);
int updateBack(String orderId);
int findCountByCode(String code);
}

2
src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java
Unescape Escape View File

@ -13,7 +13,7 @@ public interface InvPreinOrderService {
List<InvPreinOrderResponse> filterList(FilterInvPreinRequest filterInvPreinRequest);
public void insert(InvPreinOrderEntity invPreinOrderEntity);
void insert(InvPreinOrderEntity invPreinOrderEntity);
int deleteByOrderId(String orderId);

7
src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java
Unescape Escape View File

@ -46,13 +46,6 @@ public interface InvPreinProductDetailService {
*/
void setOrderInfo(InvPreProductDetailResponse response);
/**
* 删除寄售库存详情
*
* @param detailRequest
*/
boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest);
int findCountByCode(String code);
InvPreInProductDetailEntity findUseOneByCode(String code);

8
src/main/java/com/glxp/api/service/inv/InvPreinProductService.java
Unescape Escape View File

@ -30,14 +30,6 @@ public interface InvPreinProductService {
*/
List<InvPreinProductResponse> filterList(FilterInvPreinProductRequest filterInvPreinDetailRequest);
/**
* 查询寄售库存列表
*
* @param invPreProductRequest
* @return
*/
List<InvPreinProductEntity> filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest);
/**
* 根据ID查询寄售库存信息
*

134
src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java
Unescape Escape View File

@ -38,8 +38,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
private DeviceReceiveOrderDetailDao deviceReceiveOrderDetailDao;
@Resource
private InvProductNewDao invProductNewDao;
@Resource
private InvProductDao invProductDao;
@Override
public List<DeviceReceiveOrderDetailResponse> filterList(FilterDeviceReceiveOrderDetailRequest detailRequest) {
@ -56,137 +55,6 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
});
return list;
}
//TODO 120241022 添加设备领用记录详情先注释 因为逻辑里面很多用码进行处理
@Override
public BaseResponse addOrderDetail(AddDeviceReceiveOrderDetailRequest addDetailRequest) {
return null;
// if (null == addDetailRequest || StrUtil.isBlank(addDetailRequest.getOrderIdFk())) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
// }
// if (StrUtil.isBlank(addDetailRequest.getCode()) && CollUtil.isEmpty(addDetailRequest.getInvProductIds())) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请添加领用设备！");
// }
// if (StrUtil.isNotBlank(addDetailRequest.getCode())) {
// //通过条码添加
// //解析此条码，判断此条码是否已经存在
// UdiEntity udi = FilterUdiUtils.getUdi(addDetailRequest.getCode());
// if (StrUtil.isNotBlank(udi.getSerialNo())) {
// //条码为完整码，查询此条码在当前领用记录中是否存在，如果存在则无法添加
// FilterDeviceReceiveOrderDetailRequest detailRequest = new FilterDeviceReceiveOrderDetailRequest();
// detailRequest.setOrderIdFk(addDetailRequest.getOrderIdFk());
// detailRequest.setCode(addDetailRequest.getCode());
// List<DeviceReceiveOrderDetailResponse> list = deviceReceiveOrderDetailDao.filterList(detailRequest);
// if (CollUtil.isNotEmpty(list)) {
// return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "条码重复！");
// }
// }
//
// //设置库存详情查询参数
// FilterInvProductDetailRequest invProductDetailRequest = new FilterInvProductDetailRequest();
// invProductDetailRequest.setCode(addDetailRequest.getCode());
//
// //判断是否有选入的仓库信息，如果没有，说明此条码仅存在一条仓库信息，直接使用即可
// if (StrUtil.isNotBlank(addDetailRequest.getInvCode())) {
// invProductDetailRequest.setDeptCode(addDetailRequest.getDeptCode());
// invProductDetailRequest.setInvCode(addDetailRequest.getInvCode());
// invProductDetailRequest.setInvSpaceCode(addDetailRequest.getInvSpaceCode());
// }
// //查询库存详情
// List<InvProductNewVo> invProductDetailEntities = invProductNewDao.filterInvProductDetailList(invProductDetailRequest);
// InvProductNewVo invProductNewVo = invProductDetailEntities.get(0);
// DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), addDetailRequest.getCode(), invProductNewVo);
// deviceReceiveOrderDetailDao.insert(orderDetail);
// } else {
// //通过选库存添加
// //查询选中的库存信息
// for (String invProductId : addDetailRequest.getInvProductIds()) {
// InvProductEntity invProductEntity = invProductDao.selectById(invProductId);
// //查询库存详情
// FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
// filterInvProductDetailRequest.setRelId(String.valueOf(invProductEntity.getRelIdFk()));
// filterInvProductDetailRequest.setBatchNo(invProductEntity.getBatchNo());
// filterInvProductDetailRequest.setDeptCode(invProductEntity.getDeptCode());
// filterInvProductDetailRequest.setInvCode(invProductEntity.getInvCode());
// List<InvProductNewVo> invProductDetailEntities = invProductNewDao.filterInvProductDetailList(filterInvProductDetailRequest);
// //计算出在仓库中的设备
// //提取库存详情中不同的码
// List<String> codesList = invProductDetailEntities.stream().map(InvProductNewVo::getCode).distinct().collect(Collectors.toList());
// //初始化所有码数量集合
// Map<String, Integer> codeMap = new HashMap<>(codesList.size());
// codesList.forEach(code -> codeMap.put(code, 0));
// //计算库存详情中的码明细，得出所有存在于库存中的码
// for (InvProductNewVo invProductNewVo : invProductDetailEntities) {
// Integer count = codeMap.get(invProductNewVo.getCode());
// if (invProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT)) {
// //入库，数量 +1
// count = count + 1;
// } else {
// //出库， 数量 -1
// count = count - 1;
// }
// codeMap.put(invProductNewVo.getCode(), count);
// }
//
// //根据计算得出的，所有存在于库存中的码明细，生成设备领用记录详情
// for (String code : codeMap.keySet()) {
// if (codeMap.get(code) > 0) {
// //查找此条码对应的库存详情数据，根据此库存详情数据，查找仓库货位等信息
// InvProductNewVo invProductNewVo = new InvProductNewVo();
// for (InvProductNewVo detailEntity : invProductDetailEntities) {
// if (detailEntity.getCode().equals(code)) {
// invProductNewVo = detailEntity;
// break;
// }
// }
//
// //此条码存在于库存中,解析条码生成设备领用记录详情
// Integer count = codeMap.get(code);
// if (count > 1) {
// for (int i = 0; i < count; i++) {
// DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), code, invProductNewVo);
// //插入设备领用记录详情
// deviceReceiveOrderDetailDao.insert(orderDetail);
// }
// } else {
// DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), code, invProductNewVo);
// deviceReceiveOrderDetailDao.insert(orderDetail);
// }
// }
// }
// }
// }
// return ResultVOUtils.success("添加成功！");
}
/**
* 构造设备领用记录详情
*
* @param orderIdFk 设备领用记录号
* @param code 码
* @param invProductNewVo 库存详情
* @return
*/
private static DeviceReceiveOrderDetailEntity getDeviceReceiveOrderDetailEntity(String orderIdFk, String code, InvProductNewVo invProductNewVo) {
//此条码数量为多个，生成多条养护记录
UdiEntity udi = FilterUdiUtils.getUdi(code);
DeviceReceiveOrderDetailEntity orderDetail = new DeviceReceiveOrderDetailEntity();
orderDetail.setOrderIdFk(orderIdFk);
orderDetail.setOriginCode(code);
orderDetail.setRelId(invProductNewVo.getRelIdFk());
orderDetail.setNameCode(udi.getUdi());
orderDetail.setBatchNo(udi.getBatchNo());
orderDetail.setProductionDate(udi.getProduceDate());
orderDetail.setExpireDate(udi.getExpireDate());
//判断有无序列号，如果有序列号，则可以通过udi码来判定唯一，直接使用udi码做唯一码
if (StrUtil.isNotBlank(udi.getSerialNo())) {
orderDetail.setSerialNo(udi.getSerialNo());
orderDetail.setCode(code);
}
Date date = new Date();
orderDetail.setCreateTime(date);
orderDetail.setUpdateTime(date);
return orderDetail;
}
@Override
public BaseResponse updateOrderDetail(DeviceReceiveOrderDetailEntity detailEntity) {

2
src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java
Unescape Escape View File

@ -34,8 +34,6 @@ public class InvCountCodesServiceImpl implements InvCountCodesService {
@Resource
private InvCountOrderDetailDao invCountOrderDetailDao;
@Resource
private UdiRelevanceDao udiRelevanceDao;
@Resource
private UdiCalCountUtil udiCalCountUtil;
@Override

211
src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java
Unescape Escape View File

@ -77,16 +77,12 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
@Resource
private BasicBussinessTypeDao bussinessTypeDao;
@Resource
private BasicCorpDao corpDao;
@Resource
private IoOrderDao orderDao;
@Resource
private IoCodeTempDao codesTempDao;
@Resource
private InvCountCodesService invCountCodesService;
@Resource
private IoCodeDao codesDao;
@Resource
private UdiRlSupDao udiRlSupDao;
@Resource
private UdiCalCountUtil udiCalCountUtil;
@ -219,61 +215,6 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
return ResultVOUtils.success();
}
@Override
public BaseResponse updateCountOrderStatus(String id, Integer status) {
InvCountOrderEntity invCountOrder = invCountOrderDao.selectById(Integer.valueOf(id));
invCountOrder.setStatus(status);
invCountOrder.setAuditUser(customerService.getUserBean().getUserName());
invCountOrder.setAuditTime(new Date());
invCountOrder.setUpdateTime(new Date());
if (status == 0) {
//审核不通过
//查询盘点单据详情，清空盘盈/盘亏数值
invCountOrderDetailDao.resetCountFiledValue(invCountOrder.getOrderId());
} else {
//审核通过
//根据单据详情生成相关单据
log.info("单据审核通过，开始生成扫码单据");
ThreadUtil.execAsync(() -> {
countOrderTransfer(invCountOrder);
});
}
invCountOrderDao.updateById(invCountOrder);
return ResultVOUtils.success();
}
/**
* 盘点单据转扫码单据
*
* @param invCountOrder 盘点单据
*/
private void countOrderTransfer(InvCountOrderEntity invCountOrder) {
//查询单据生成设置，是否已经配置对应单据类型，若未配置则结束转单流程
List<BasicBussinessTypeEntity> transferOrderSettings = getOrderSettings();
if (CollUtil.isEmpty(transferOrderSettings)) {
log.error("未配置盘点转单设置，无法转单！");
return;
}
/**
* 生成盘盈和盘亏单据逻辑
* 盘盈单据：1、找出盘点单据码详情比库存码详情多的产品
* 2、判断条码是否包含批次号和序列号，如果不包含，根据 盘盈数量 / 实际数量 = 多出的条码数量 ，计算出盘盈单据此条码的扫码数量
* 3、生成条码，保存单据
*
* 盘亏单据：1、找出库存有，而盘点不存在的条码
* 2、判断此库存详情是否包含批次号，如果不包含，盘亏数量 / 实际数量 = 少的条码数量，计算出盘亏单据扫码数量
* 3、生成条码，保存单据
*/
//获取出入库码明细
List<IoCodeTempEntity> inCodes = getOrderCodes(invCountOrder, "in");
List<IoCodeTempEntity> outCodes = getOrderCodes(invCountOrder, "out");
//生成盘盈/盘亏单据
createNewOrder(invCountOrder, inCodes, outCodes, transferOrderSettings);
log.info("盘点转单完成");
}
/**
* 生成盘盈/盘亏单据
@ -356,160 +297,8 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
}
return null;
}
//TODO 120241022 获取入库或出库的条码列表 要用code做逻辑处理
/**
* 获取入库或出库的条码列表
*
* @param invCountOrder 盘点单据
* @param type 出入库类型 in/out
* @return
*/
private List<IoCodeTempEntity> getOrderCodes(InvCountOrderEntity invCountOrder, String type) {
return null;
// //构造库存详情查询参数
// FilterInvProductDetailRequest invProductDetailRequest = new FilterInvProductDetailRequest();
// invProductDetailRequest.setDeptCode(invCountOrder.getDeptCode());
// invProductDetailRequest.setInvCode(invCountOrder.getInvCode());
// //锁库存，查询库存更新时间早于或等于盘点单创建时间的数据
// invProductDetailRequest.setUpdateTime(DateUtil.toDateStr(invCountOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
// //判断是否是按货位盘点的单据，如果是，则查询库存详情的参数需要添加货位
// invProductDetailRequest.setInvSpaceCode(invCountOrder.getInvSpaceCode());
//
// //查询盘点单据详情
// FilterInvCountOrderDetailRequest countOrderDetailRequest = new FilterInvCountOrderDetailRequest();
// countOrderDetailRequest.setOrderIdFk(invCountOrder.getOrderId());
// countOrderDetailRequest.setStatus(type.equals("in") ? 1 : 0);
// List<InvCountOrderDetailEntity> detailList = invCountOrderDetailDao.filterList(countOrderDetailRequest);
//
// List<IoCodeTempEntity> codeList = new ArrayList<>();
// //查找条码列表
// if (type.equals("in")) {
// log.info("开始生成盘盈单据码明细");
// //查找盘盈条码列表
// detailList.forEach(invCountOrderDetailEntity -> {
// invProductDetailRequest.setRelId(String.valueOf(invCountOrderDetailEntity.getRelId()));
// invProductDetailRequest.setBatchNo(invProductDetailRequest.getBatchNo());
// List<InvProductNewVo> invProductDetailEntities = invProductNewDao.filterInvProductDetailList(invProductDetailRequest);
// //查询盘点码明细
// FilterInvCountCodesRequest countCodesRequest = new FilterInvCountCodesRequest();
// countCodesRequest.setOrderIdFk(invCountOrder.getOrderId());
// countCodesRequest.setRelId(String.valueOf(invCountOrderDetailEntity.getRelId()));
// countCodesRequest.setBatchNo(invCountOrderDetailEntity.getBatchNo());
// List<String> countCodeList = invCountCodesDao.selectCodes(countCodesRequest);
// List<String> invProductDetailCodes = invProductDetailEntities.stream().map(InvProductNewVo::getCode).collect(Collectors.toList());
// List<String> profitCodes = CollUtil.subtractToList(countCodeList, invProductDetailCodes);
// if (CollUtil.isNotEmpty(invProductDetailCodes) && CollUtil.isEmpty(profitCodes)) {
// /**
// * 盘点条码不为空，且库存条码也不为空，但是计算的条码差集为空
// * 说明盘点的条码和库存的条码是相同的条码，直接根据盘盈数量计算出扫码数量，生成一个条码即可
// */
// IoCodeTempEntity codeTempEntity = buildCodeTempEntity(invCountOrder, countCodeList.get(0), invCountOrderDetailEntity);
// codeList.add(codeTempEntity);
// } else {
// for (String code : profitCodes) {
// if (!verifyCodeExist(codeList, code)) {
// //生成码明细
// IoCodeTempEntity codeTempEntity = buildCodeTempEntity(invCountOrder, code, invCountOrderDetailEntity);
// codeList.add(codeTempEntity);
// }
// }
// }
// });
// log.info("盘盈单据码明细生成成功");
// } else {
// log.info("开始生成盘亏单据码明细");
//
// detailList.forEach(invCountOrderDetailEntity -> {
// invProductDetailRequest.setRelId(String.valueOf(invCountOrderDetailEntity.getRelId()));
// invProductDetailRequest.setBatchNo(invCountOrderDetailEntity.getBatchNo());
// //查询库存详情
// List<InvProductNewVo> invProductDetailEntities = invProductNewDao.filterInvProductDetailList(invProductDetailRequest);
// //查询盘点码明细
// FilterInvCountCodesRequest countCodesRequest = new FilterInvCountCodesRequest();
// countCodesRequest.setOrderIdFk(invCountOrder.getOrderId());
// countCodesRequest.setRelId(String.valueOf(invCountOrderDetailEntity.getRelId()));
// countCodesRequest.setBatchNo(invCountOrderDetailEntity.getBatchNo());
// List<String> countCodeList = invCountCodesDao.selectCodes(countCodesRequest);
// List<String> invProductDetailCodes = invProductDetailEntities.stream().map(InvProductNewVo::getCode).collect(Collectors.toList());
// List<String> lossCodes = CollUtil.subtractToList(invProductDetailCodes, countCodeList);
// if (CollUtil.isNotEmpty(countCodeList) && CollUtil.isEmpty(lossCodes)) {
// //盘点的码不为空，但是盘点数量和库存数量不一样，比对差集结果为空，说明是同一个条码，数量不同，直接根据盘亏数量计算生成一个扫码单据的码明细
// //生成码详情
// IoCodeTempEntity codeTempEntity = buildCodeTempEntity(invCountOrder, countCodeList.get(0), invCountOrderDetailEntity);
// codeList.add(codeTempEntity);
// } else {
// for (InvProductNewVo invProductNewVo : invProductDetailEntities) {
// if (!countCodeList.contains(invProductNewVo.getCode()) && !verifyCodeExist(codeList, invProductNewVo.getCode())) {
// InvCountOrderDetailEntity orderDetailEntity = new InvCountOrderDetailEntity();
// orderDetailEntity.setRelId(invCountOrderDetailEntity.getRelId());
// orderDetailEntity.setStatus(0);
// IoCodeTempEntity codeTempEntity = buildCodeTempEntity(invCountOrder, invProductNewVo.getCode(), orderDetailEntity);
// codeList.add(codeTempEntity);
// }
// }
// }
// });
// log.info("盘亏单据码名称生成成功");
// }
// return codeList;
}
/**
* 比对码在集合中是否存在
*
* @param codeList
* @param code
* @return
*/
private boolean verifyCodeExist(List<IoCodeTempEntity> codeList, String code) {
for (IoCodeTempEntity codeTempEntity : codeList) {
if (codeTempEntity.getCode().equals(code)) {
return true;
}
}
return false;
}
/**
* 构造扫码单据码明细数据
*
* @param invCountOrder 盘点单据
* @param code 码
* @param invCountOrderDetailEntity 盘点单据详情
* @return
*/
private IoCodeTempEntity buildCodeTempEntity(InvCountOrderEntity invCountOrder, String code, InvCountOrderDetailEntity invCountOrderDetailEntity) {
IoCodeTempEntity codeTemp = new IoCodeTempEntity();
codeTemp.setCode(code);
codeTemp.setRelId(invCountOrderDetailEntity.getRelId());
codeTemp.setMainAction(invCountOrderDetailEntity.getStatus() == 0 ? ConstantType.TYPE_OUT : ConstantType.TYPE_PUT);
codeTemp.setDeptCode(invCountOrder.getDeptCode());
codeTemp.setInvCode(invCountOrder.getInvCode());
UdiEntity udi = FilterUdiUtils.getUdi(code);
codeTemp.setBatchNo(udi.getBatchNo());
codeTemp.setNameCode(udi.getUdi());
codeTemp.setProduceDate(udi.getProduceDate());
codeTemp.setExpireDate(udi.getExpireDate());
codeTemp.setSerialNo(udi.getSerialNo());
//计算码数量
int actCount = udiCalCountUtil.getActCount(codeTemp.getNameCode());
//判断此码有无批次号和序列号
if ((StrUtil.isBlank(codeTemp.getBatchNo()) && StrUtil.isBlank(codeTemp.getSerialNo())) || (StrUtil.isBlank(codeTemp.getSerialNo()) && StrUtil.isNotBlank(codeTemp.getBatchNo()))) {
//根据盘点盈亏状态取盘点数量值
int countNum = invCountOrderDetailEntity.getStatus() == 0 ? invCountOrderDetailEntity.getLossNum() : invCountOrderDetailEntity.getProfitNum();
int codeNum = countNum / actCount;
codeTemp.setCount(codeNum);
codeTemp.setReCount(codeNum);
} else {
codeTemp.setCount(actCount);
codeTemp.setReCount(actCount);
}
//获取盘点盈亏状态值
String countStatus = invCountOrderDetailEntity.getStatus() == 0 ? "loss" : "profit";
//设置供应商信息
setSupInfo(codeTemp, countStatus);
return codeTemp;
}
/**
* 设置条码供应商信息

11
src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java
Unescape Escape View File

@ -74,17 +74,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
@Resource
IoOrderDetailBizService ioOrderDetailBizService;
@Override
public List<InvInnerOrderPrintEntity> filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest) {
if (filterinnerOrderprintRequest == null) {
return Collections.emptyList();
}
int offset = (filterinnerOrderprintRequest.getPage() - 1) * filterinnerOrderprintRequest.getLimit();
PageHelper.offsetPage(offset, filterinnerOrderprintRequest.getLimit());
List<InvInnerOrderPrintEntity> data = invInnerOrderPrintDao.filterOrderPrintList(filterinnerOrderprintRequest);
return data;
}
@Override
public Boolean addOrderList(String orderIdFk) {
//先删除数据

77
src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java
Unescape Escape View File

@ -126,83 +126,6 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
}
return ResultVOUtils.success();
}
// @Override
// public BaseResponse batchAddDetail(AddInvMAOrderDetailRequest addMAOrderDetailRequest) {
// //查询库存养护记录说明
// InvMAExplanationEntity invMAExplanationEntity = invMAExplanationDao.selectByStatus(1);
// //遍历库存ID，查找库存详情的条码信息，生成库存养护记录详情
// addMAOrderDetailRequest.getInvProductIds().forEach(invProductId -> {
// //查询库存信息
// InvProductEntity invProductEntity = invProductDao.selectById(invProductId);
// //查询库存详情码信息
// FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest();
// detailRequest.setRelId(String.valueOf(invProductEntity.getRelIdFk()));
// detailRequest.setBatchNo(invProductEntity.getBatchNo());
// detailRequest.setDeptCode(invProductEntity.getDeptCode());
// detailRequest.setInvCode(invProductEntity.getInvCode());
// List<InvProductNewVo> invProductDetailEntities = invProductNewDao.filterInvProductDetailList(detailRequest);
// //提取去重后的码集合
// List<String> codeList = invProductDetailEntities.stream().map(InvProductNewVo::getCode).distinct().collect(Collectors.toList());
// //初始化码数量计算集合数据
// Map<String, Integer> codeMap = new HashMap<>(codeList.size());
// codeList.forEach(code -> codeMap.put(code, 0));
// //计算当前在库存中的码明细
// for (InvProductNewVo invProductNewVo : invProductDetailEntities) {
// UdiEntity udi = FilterUdiUtils.getUdi(invProductNewVo.getCode());
// if (StrUtil.isNotBlank(udi.getSerialNo())) {
// //有序列号产品，根据产品数量计算即可
// Integer count = codeMap.get(invProductNewVo.getCode());
// if (invProductNewVo.getMainAction().equals(ConstantType.TYPE_OUT)) {
// //出库
// count = count - 1;
// } else {
// //入库
// count = count + 1;
// }
// codeMap.put(invProductNewVo.getCode(), count);
// } else {
// //无序列号产品条码，直接查询库存，使用此库存信息计算出养护数量
// int count = invProductEntity.getInCount() - invProductEntity.getOutCount();
// codeMap.put(invProductNewVo.getCode(), count);
// }
// }
//
// //根据库存中的码明细，生成库存养护记录详情
// for (String code : codeMap.keySet()) {
// if (codeMap.get(code) > 0) {
// //获取库存详情
// InvProductNewVo invProductNewVo = null;
// for (InvProductNewVo detailEntity : invProductDetailEntities) {
// if (detailEntity.getCode().equals(code)) {
// invProductNewVo = detailEntity;
// break;
// }
// }
// //生成库存养护记录详情
// InvMAOrderDetailEntity maOrderDetail = new InvMAOrderDetailEntity();
// maOrderDetail.setOrderIdFk(addMAOrderDetailRequest.getOrderIdFk());
// maOrderDetail.setCode(invProductNewVo.getCode());
// maOrderDetail.setRelId(invProductNewVo.getRelId());
// UdiEntity udi = FilterUdiUtils.getUdi(invProductNewVo.getCode());
// maOrderDetail.setNameCode(udi.getUdi());
// maOrderDetail.setProductionDate(udi.getProduceDate());
// maOrderDetail.setExpireDate(udi.getExpireDate());
// maOrderDetail.setBatchNo(udi.getBatchNo());
// maOrderDetail.setCount(codeMap.get(code));
// maOrderDetail.setMaStatus(0);
// maOrderDetail.setDeviceStatus(1);
// maOrderDetail.setCreateTime(new Date());
// if (null != invMAExplanationEntity) {
// maOrderDetail.setRemark(invMAExplanationEntity.getText());
// }
// invMAOrderDetailDao.insert(maOrderDetail);
// }
// }
// });
// return ResultVOUtils.success("添加成功");
// }
@Override
public BaseResponse update(InvMAOrderDetailEntity invMAOrderDetailEntity) {
invMAOrderDetailEntity.setUpdateTime(new Date());

5
src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java
Unescape Escape View File

@ -151,11 +151,6 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
// response.setOrderTime(DateUtil.toDateStr(new DateTime(), "yyyy-MM-dd HH:mm:ss"));
}
@Override
public boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest) {
return invPreInProductDetailDao.deleteInvPreProductDetail(detailRequest);
}
@Override
public int findCountByCode(String code) {
List<InvPreInProductDetailEntity> invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>().eq("code", code));

11
src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java
Unescape Escape View File

@ -60,17 +60,6 @@ public class InvPreProductServiceImpl implements InvPreProductService {
return invPreProductDao.filterList(invPreProductRequest);
}
@Override
public List<InvPreProductEntity> filterPreProductList(FilterInvPreProductRequest invPreProductRequest) {
if (null == invPreProductRequest) {
return Collections.emptyList();
}
if (null != invPreProductRequest.getPage() && null != invPreProductRequest.getLimit()) {
PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit());
}
return invPreProductDao.filterPreProductList(invPreProductRequest);
}
@Override
public InvPreProductEntity findById(String id) {
return invPreProductDao.selectById(id);

25
src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java
Unescape Escape View File

@ -92,29 +92,4 @@ public class InvPreinDetailServiceImpl implements InvPreinDetailService {
return invPreinDetailDao.updateById(invPreinDetailEntity);
}
@Override
public int updateBack(String orderId) {
InvPreinDetailEntity invPreinDetailEntity = new InvPreinDetailEntity();
invPreinDetailEntity.setStatus(ConstantStatus.INVIN_BACK);
invPreinDetailDao.update(invPreinDetailEntity, new QueryWrapper<InvPreinDetailEntity>().eq("orderId", orderId).ne("status", ConstantStatus.INVIN_USE));
return 1;
}
@Override
public int findCountByCode(String code) {
List<InvPreinDetailEntity> invPreinDetailEntities = invPreinDetailDao.selectList(new QueryWrapper<InvPreinDetailEntity>().eq("code", code));
int count = 0;
if (CollUtil.isNotEmpty(invPreinDetailEntities)) {
for (InvPreinDetailEntity invProductDetailEntity : invPreinDetailEntities) {
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT))
count = count + invProductDetailEntity.getReCount();
else {
count = count - invProductDetailEntity.getReCount();
}
}
}
return count;
}
}

11
src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java
Unescape Escape View File

@ -59,17 +59,6 @@ public class InvPreinProductServiceImpl implements InvPreinProductService {
return invPreinProductDao.filterList(invPreProductRequest);
}
@Override
public List<InvPreinProductEntity> filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest) {
if (null == invPreProductRequest) {
return Collections.emptyList();
}
if (null != invPreProductRequest.getPage() && null != invPreProductRequest.getLimit()) {
PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit());
}
return invPreinProductDao.filterPreProductList(invPreProductRequest);
}
@Override
public InvPreinProductEntity findById(String id) {
return invPreinProductDao.selectById(id);

138
src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java
Unescape Escape View File

@ -49,16 +49,6 @@ public class InvProductServiceNew extends ServiceImpl<InvProductNewDao, InvProdu
private UdiProductDao udiProductDao;
// public int insert(InvProductNewVo InvProductNewVo) {
// InvProductNewVo.setId(null);
// if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT)) {
// InvProductNewVo.setInCount(InvProductNewVo.getReCount());
// } else if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_OUT)) {
// InvProductNewVo.setOutCount(InvProductNewVo.getReCount());
// }
// return invProductNewDao.insert(InvProductNewVo);
// }
public List<InvProductNewVo> selectByOrderIdFk(String billNo) {
if (StrUtil.isEmpty(billNo))
return null;
@ -80,49 +70,12 @@ public class InvProductServiceNew extends ServiceImpl<InvProductNewDao, InvProdu
return null;
}
//
// public int deleteByOrderId(String billNo) {
// return invProductNewDao.delete(new QueryWrapper<InvProductNewVo>().eq("orderId", billNo));
// }
// public int deleteById(Integer id) {
// return invProductNewDao.deleteById(id);
// }
//
//
// public int update(InvProductNewVo InvProductNewVo) {
//
// if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT)) {
// InvProductNewVo.setInCount(InvProductNewVo.getReCount());
// } else if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_OUT)) {
// InvProductNewVo.setOutCount(InvProductNewVo.getReCount());
// }
//
// return invProductNewDao.updateById(InvProductNewVo);
// }
public List<InvProductNewVo> selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode) {
return invProductNewDao.selectList(new QueryWrapper<InvProductNewVo>().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
.isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(supId != null, "supId", supId).eq(deptCode != null, "deptCode", deptCode).eq(invCode != null, "invCode", invCode));
}
//TODO 120241022 之前是code去查库存详情 现在没有码了先注释逻辑 看下引用的地方要不要注释了
public InvProductNewVo sortFindByCode(String code) {
return null;
// List<InvProductNewVo> invProductDetailEntities = invProductNewDao.selectList(new QueryWrapper<InvProductNewVo>().eq("code", code).orderByDesc("id"));
// if (CollUtil.isNotEmpty(invProductDetailEntities))
// return invProductDetailEntities.get(0);
// else
// return null;
}
// public boolean insertList(List<InvProductNewVo> invProductDetailEntities) {
// return invProductNewDao.insertBatch(invProductDetailEntities);
// }
public List<InvProductNewVo> filterInvProductDetailList(FilterInvProductDetailRequest filterInvProductDetailRequest) {
if (null == filterInvProductDetailRequest) {
@ -135,10 +88,6 @@ public class InvProductServiceNew extends ServiceImpl<InvProductNewDao, InvProdu
}
// public boolean deleteInvProductDetail(FilterInvProductDetailRequest detailRequest) {
// return invProductNewDao.deleteInvProductDetail(detailRequest);
// }
@Resource
InvSpaceService invSpaceService;
@ -210,98 +159,11 @@ public class InvProductServiceNew extends ServiceImpl<InvProductNewDao, InvProdu
if (CollUtil.isNotEmpty(datas)) {
for (InvProductNewVo invProductNewVo : datas) {
count += invProductNewVo.getReCount();
// if (invProductEntity.getMainAction().equals(ConstantType.TYPE_PUT))
// count = count + invProductEntity.getReCount();
// else {
// count = count - invProductEntity.getReCount();
// }
}
}
return count;
}
// public int vailStockCountByCode(String deptCode, String invCode, String invSpaceCode, String code) {
// List<InvProductNewVo> datas =
// invProductNewDao.selectList(new QueryWrapper<InvProductNewVo>().eq("deptCode", deptCode).eq("invCode", invCode)
// .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode)
// .eq("code", code)
// );
//
// int count = 0;
// if (CollUtil.isNotEmpty(datas)) {
// for (InvProductNewVo InvProductNewVo : datas) {
// if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT))
// count = count + InvProductNewVo.getReCount();
// else {
// count = count - InvProductNewVo.getReCount();
// }
// }
// }
// return count;
// }
public List<InvPlaceDetailResponse> findByGroupCode(String invCode, String code, Boolean isCheckSpace) {
if (StrUtil.isNotEmpty(invCode) && StrUtil.isNotEmpty(code)) {
List<InvPlaceDetailResponse> datas =
invProductNewDao.findByGroupCode(invCode, code, isCheckSpace);
return datas;
}
return null;
}
@Resource
InvPreInProductDetailDao invPreInProductDetailDao;
@Resource
InvPreProductDetailDao invPreProductDetailDao;
public InvProductNewVo selectLastInBatch(BasicBussinessTypeEntity bussinessTypeEntity, String relId, String batchNo, String invCode, String mainAction) {
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
return invPreInProductDetailDao.selectLastInBatch(relId, batchNo, mainAction);
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
return invPreProductDetailDao.selectLastInBatch(relId, batchNo, mainAction);
} else {
return invProductNewDao.selectLastInBatch(relId, batchNo, invCode, mainAction);
}
}
public InvProductNewVo selectFirstInBatch(BasicBussinessTypeEntity bussinessTypeEntity, String relId, String batchNo, String invCode, String mainAction) {
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
return invPreInProductDetailDao.selectFirstInBatch(relId, batchNo, mainAction);
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
return invPreProductDetailDao.selectFirstInBatch(relId, batchNo, mainAction);
} else {
return invProductNewDao.selectFirstInBatch(relId, batchNo, invCode, mainAction);
}
}
public Integer selectCountByInBatch(String relId, String batchNo, BasicBussinessTypeEntity bussinessTypeEntity, String inBatchNo, String invCode, String mainAction) {
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
return invPreInProductDetailDao.selectCountByInBatch(relId, batchNo, inBatchNo, mainAction);
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
return invPreProductDetailDao.selectCountByInBatch(relId, batchNo, inBatchNo, mainAction);
} else {
return invProductNewDao.selectCountByInBatch(relId, batchNo, invCode, inBatchNo, mainAction);
}
}
public InvProductNewVo selectNextInBatch(BasicBussinessTypeEntity bussinessTypeEntity, String relId, String batchNo, String invCode, String mainAction, String inBatchNo) {
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
return invPreInProductDetailDao.selectNextInBatch(relId, batchNo, mainAction, inBatchNo);
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
return invPreProductDetailDao.selectNextInBatch(relId, batchNo, mainAction, inBatchNo);
} else {
return invProductNewDao.selectNextInBatch(relId, batchNo, invCode, mainAction, inBatchNo);
}
}
}

2
src/main/java/com/glxp/api/service/monitor/ISysOperLogService.java
Unescape Escape View File

@ -22,7 +22,7 @@ public interface ISysOperLogService {
/**
* 查询系统操作日志集合
*
* @param operLog 操作日志对象
* @param filterOperLogRequest 操作日志对象
* @return 操作日志集合
*/
List<SysOperLog> selectOperLogList(FilterOperLogRequest filterOperLogRequest);

2
src/main/java/com/glxp/api/service/purchase/CustomerContactService.java
Unescape Escape View File

@ -11,7 +11,6 @@ import java.util.List;
public interface CustomerContactService {
List<CustomerContactEntity> filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest);
boolean insertCustomerContact(CustomerContactEntity customerContactEntity);
@ -19,7 +18,6 @@ public interface CustomerContactService {
boolean deleteById(String id);
boolean deleteContact(DeleteRequest deleteRequest);
CustomerContactEntity selectById(Long emailId);
}

2
src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java
Unescape Escape View File

@ -12,7 +12,7 @@ public interface PurApplyDetailService {
List<PurApplyDetailEntity> queryPageList(PurApplyDetailRequest purApplyRequest);
public List<PurApplyDetailEntity> findByOrderId(String orderId);
List<PurApplyDetailEntity> findByOrderId(String orderId);
List<PurOrderDetailResponse> joinQueryList(PurApplyDetailRequest purApplyRequest);

2
src/main/java/com/glxp/api/service/purchase/PurArrivalDetailService.java
Unescape Escape View File

@ -15,8 +15,6 @@ public interface PurArrivalDetailService {
List<PurArrivalDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest);
List<PurArrivalDetailEntity> getPurArrivalDetailEntityList(PurOrderDetailRequest purOrderDetailRequest);
Boolean insert(PurArrivalDetailEntity purReturnedDetailEntity);
Boolean update(PurArrivalDetailEntity purReturnedDetailEntity);

1
src/main/java/com/glxp/api/service/purchase/PurArrivalService.java
Unescape Escape View File

@ -14,7 +14,6 @@ public interface PurArrivalService {
Boolean update(PurArrivalEntity purArrivalEntity);
Boolean deleteByIds(List<Integer> ids);
Boolean deleteById(long id);

2
src/main/java/com/glxp/api/service/purchase/PurDeliveryCodeService.java
Unescape Escape View File

@ -21,7 +21,7 @@ public interface PurDeliveryCodeService {
/**
* 判断码是否是此单产品
*
* @param codeList
* @param orderIdFk
* @param relId
* @return
*/

2
src/main/java/com/glxp/api/service/purchase/PurDeliveryDetailService.java
Unescape Escape View File

@ -15,8 +15,6 @@ public interface PurDeliveryDetailService {
List<PurDeliveryDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest);
List<PurDeliveryDetailEntity> getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest);
Boolean insert(PurDeliveryDetailEntity purDeliveryDetailEntity);
Boolean update(PurDeliveryDetailEntity purDeliveryDetailEntity);

2
src/main/java/com/glxp/api/service/purchase/PurReturnedDetailService.java
Unescape Escape View File

@ -16,7 +16,6 @@ public interface PurReturnedDetailService {
List<PurReturnedDetailEntity> queryPageList(PurOrderDetailRequest purOrderDetailRequest);
List<PurReturnedDetailEntity> getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest);
Boolean insert(PurReturnedDetailEntity purReturnedDetailEntity);
@ -26,7 +25,6 @@ public interface PurReturnedDetailService {
Boolean deleteByOrderId(String orderIdfK);
boolean insertPurReturnedDetailEntity(List<PurReturnedDetailEntity> purReturnedDetailEntity);
BasicProductsEntity selectIoOrderDetailBiz(long id);

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save