diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 868bc268..b21835c1 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1019,10 +1019,7 @@ public class IoCodeTempController extends BaseController { IoCodeEntity ioCodeEntity = new IoCodeEntity(); BeanUtils.copyProperties(codeEnttity, ioCodeEntity); - String supId = transInoutService.checkInvExitSup(ioCodeEntity); - if (supId == null) { - supId = transInoutService.checkExitSup(codeEnttity.getRelId()); - } + String supId = transInoutService.checkExitSup(codeEnttity.getRelId()); if (supId == null) { codeEnttity.setSupId(null); BaseResponse baseResponse = ResultVOUtils.error(503, "该产品未绑定供应商,请指定对应的供应商"); diff --git a/src/main/java/com/glxp/api/service/auth/DeptService.java b/src/main/java/com/glxp/api/service/auth/DeptService.java index 28c59cff..5db11152 100644 --- a/src/main/java/com/glxp/api/service/auth/DeptService.java +++ b/src/main/java/com/glxp/api/service/auth/DeptService.java @@ -10,9 +10,6 @@ import java.util.List; public interface DeptService { List selectByIdCode(List list); - - DeptEntity findDefault(Integer advaceType, Boolean isDefault); - DeptEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest); List filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); @@ -37,27 +34,6 @@ public interface DeptService { List selectByNameList(String name); - /** - * 批量导入仓库信息 - * - * @param invWarehouseEntities - */ - void importInvWarehouse(List invWarehouseEntities); - - /** - * 绑定第三方仓库 - * - * @param id - * @param thridWarehouseId - */ - boolean bindThrWarehouse(String id, String thridWarehouseId, String sysId); - - /** - * 解绑第三方仓库 - */ - boolean unbindThrWarehouse(String id, String sysId); - - /** * 通过仓库编码，查询仓库名称 * @@ -66,10 +42,6 @@ public interface DeptService { */ String getInvName(String code); - /** - * 根据code查询* - */ - DeptEntity selectByCodeAll(String code); boolean updateTime(String code, Date updateTime); diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java index 6031ac2e..3e7b2c03 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.auth.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.AuthRoleDao; -import com.glxp.api.dao.basic.BasicBussinessTypeRoleDao; import com.glxp.api.entity.auth.AuthRole; import com.glxp.api.service.auth.AuthRoleService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java index 58b97b30..0415fd71 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java @@ -26,16 +26,6 @@ public class DeptServiceImpl implements DeptService { return deptDao.selectByIdCode(list); } - @Override - public DeptEntity findDefault(Integer advaceType, Boolean isDefault) { - FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); - filterInvWarehouseRequest.setIsDefault(isDefault); - List invWarehouseEntities = deptDao.filterInvWarehouse(filterInvWarehouseRequest); - if (invWarehouseEntities != null && invWarehouseEntities.size() > 0) - return invWarehouseEntities.get(0); - return null; - } - @Override public DeptEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest) { return deptDao.selectMaxCode(filterInvWarehouseRequest); @@ -129,22 +119,6 @@ public class DeptServiceImpl implements DeptService { return deptDao.deleteById(id); } - @Override - public void importInvWarehouse(List invWarehouseEntities) { - if (CollUtil.isNotEmpty(invWarehouseEntities)) { - deptDao.importInvWarehouse(invWarehouseEntities); - } - } - - @Override - public boolean bindThrWarehouse(String id, String thridWarehouseId, String sysId) { - return deptDao.updateThridId(id, thridWarehouseId, sysId); - } - - @Override - public boolean unbindThrWarehouse(String id, String sysId) { - return deptDao.updateThridId(id, null, sysId); - } @Override @@ -155,10 +129,6 @@ public class DeptServiceImpl implements DeptService { return deptDao.getNameByCode(code); } - @Override - public DeptEntity selectByCodeAll(String code) { - return deptDao.selectByCodeAll(code); - } @Override public boolean updateTime(String code, Date updateTime) { diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java index b69e5b01..a97d44bd 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; -import com.glxp.api.dao.auth.DeptDao; import com.glxp.api.dao.auth.DeptUserDao; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.req.auth.FilterDeptUserReqeust; @@ -19,9 +18,6 @@ public class DeptUserServiceImpl implements DeptUserService { @Resource DeptUserDao deptUserDao; - @Resource - DeptDao deptDao; - @Override public List selectDeptUser(FilterDeptUserReqeust filterDeptUserReqeust) { diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java index 7f97029a..345bc6b2 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -66,7 +65,6 @@ public class InvSpaceServiceImpl implements InvSpaceService { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, result); } - //获取当前仓库下的最大货位编码 String maxSpaceCode = invSpaceDao.getMaxSpaceCode(null); if (StrUtil.isBlank(maxSpaceCode)) { @@ -106,21 +104,6 @@ public class InvSpaceServiceImpl implements InvSpaceService { public BaseResponse deleteSpace(String id) { //校验此货位是否已经被使用，如果已经被使用，不能删除 Long spaceId = Long.valueOf(id); - InvSpace invSpace = invSpaceDao.selectById(spaceId); - - //todo 代码迁移，后面记得修改 - -// //判断此货位是否与库存绑定，如果与库存绑定，则无法删除 -// Long detailCount = invProductDetailDao.countBySpaceCode(invSpace.getInvStorageCode(), invSpace.getInvWarehouseCode(), invSpace.getCode()); -// if (detailCount > 0) { -// return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "此货位已被使用，无法删除！"); -// } -// -// //判断此货位是否已经被盘点单使用，如果有，则无法删除 -// Integer count = invCountOrderDao.countBySpaceCode(invSpace.getInvStorageCode(), invSpace.getInvWarehouseCode(), invSpace.getCode()); -// if (count > 0) { -// return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "此货位已被使用，无法删除！"); -// } invSpaceDao.deleteById(spaceId); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index 62fb3da0..4a4f88fb 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -193,7 +193,6 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { @Override public boolean unbindThrWarehouse(String id, String sysId) { - return invWarehouseDao.updateThridId(id, null, sysId); } diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java index 0d209fc1..499c90be 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java @@ -20,12 +20,10 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @Resource SysDictDataMapper baseMapper; - @Override public List selectDictDataList(SysDictDataRequest sysDictDataRequest) { // 分页处理 sysDictDataRequest.pageDispose(); - return baseMapper.selectDictDataList(sysDictDataRequest); } @@ -38,7 +36,6 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @Override public void deleteDictDataByIds(Long[] dictCodes) { for (Long dictCode : dictCodes) { - SysDictData data = selectDictDataById(dictCode); baseMapper.deleteById(dictCode); } } diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java index b2825bdb..f67661f9 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java @@ -267,10 +267,6 @@ public class SysRoleServiceImpl implements ISysRoleService { public int authDataScope(SysRole role) { // 修改角色信息 sysRoleMapper.updateById(role); - // 删除角色与部门关联 -// roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysRoleDept::getRoleId, role.getRoleId())); -// // 新增角色和部门信息（数据权限） -// return insertRoleDept(role); return 0; } diff --git a/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java index 271ffef1..55c8ebfd 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java @@ -43,76 +43,8 @@ public class BasicGenExcelService { @Resource BasicCorpExportLogService basicCorpExportLogService; @Resource - BasicCorpService basicUnitMaintainService; - @Resource BasicProductsExportLogService basicProductsExportLogService; - //往来单位导出excel文件 - @Async - @Log(title = "单据管理", businessType = BusinessType.UPDATE) - public void exportCorp(String genKey, BasicCorpsExportRequest basicCorpsExportRequest) { - - BasicCorpsExportLogEntity corpExportLogEntity = basicCorpExportLogService.selectByGenKey(genKey); - List> excelData = new ArrayList<>(); - List head = new ArrayList<>(); - head.add("往来单位ID"); - head.add("往来单位名称"); - head.add("往来单位拼音简写"); - head.add("地址"); - head.add("联系人"); - head.add("联系电话"); - head.add("社会信用号"); - head.add("往来单位状态"); - head.add("往来单位类型"); - head.add("thirdId"); - head.add("thirdName"); - head.add("thirdI1d"); - head.add("thirdName1"); - head.add("thirdId2"); - head.add("thirdName2"); - head.add("thirdId3"); - head.add("thirdName3"); - head.add("thirdId4"); - head.add("thirdName4"); - excelData.add(head); - //选中导出 - if (basicCorpsExportRequest.getIds() != null && basicCorpsExportRequest.getIds().size() > 0) { -// List ids = basicCorpsExportRequest.getIds(); - List ids =basicCorpsExportRequest.getIds(); - - for (Long id : ids) { - BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest(); - filterRequest.setId(id); - List> genDatas = genExcelData(filterRequest); - if (genDatas != null && genDatas.size() > 0) { - excelData.addAll(genDatas); - } - } - - } else {//一键导出 - BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest(); - BeanUtils.copyProperties(basicCorpsExportRequest, filterRequest); - filterRequest.setPage(null); - List> genDatas = genExcelData(filterRequest); - if (genDatas != null && genDatas.size() > 0) { - excelData.addAll(genDatas); - } - } - - String sheetName = "往来单位信息"; - File file = new File(corpExportLogEntity.getFilePath()); - if (!file.exists()) { - try { - file.createNewFile(); - } catch (IOException e) { - e.printStackTrace(); - } - } - new ExcelUtil().exportExcel(excelData, sheetName, corpExportLogEntity.getFilePath(), 20); - corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); - basicCorpExportLogService.updateCorpExportLog(corpExportLogEntity); - } - @Async @Log(title = "单据管理", businessType = BusinessType.UPDATE) public void uploadCorpSmpJson(String genKey, BasicCorpExportLogResponse exportData) { @@ -134,7 +66,6 @@ public class BasicGenExcelService { @Log(title = "单据管理", businessType = BusinessType.UPDATE) public void uploadProductsSmpJson(String genKey, UdiRelevanceExportJsonResponse exportData) { BasicProductsExportLogEntity basicProductsExportLogEntity = basicProductsExportLogService.selectByGenKey(genKey); -// String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/basic/products/upload", exportData); String response = httpOkClient.uCloudPost(getIpUrl() + "/spssync/basic/udiinfo/upload", exportData); BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { }); @@ -147,34 +78,5 @@ public class BasicGenExcelService { basicProductsExportLogService.updateUdiInfoExportLog(basicProductsExportLogEntity); } - public List> genExcelData(BasicUnitMaintainFilterRequest filterUdiInfoRequest) { - - List> excelData = new ArrayList<>(); - List unitMaintainEntities = basicUnitMaintainService.filterList(filterUdiInfoRequest); - for (BasicCorpEntity basicUnitMaintainEntity : unitMaintainEntities) { - List rows = new ArrayList<>(); - rows.add(basicUnitMaintainEntity.getErpId()); - rows.add(basicUnitMaintainEntity.getName()); - rows.add(basicUnitMaintainEntity.getSpell()); - rows.add(basicUnitMaintainEntity.getAddr()); - rows.add(basicUnitMaintainEntity.getContact()); - rows.add(basicUnitMaintainEntity.getMobile()); - rows.add(basicUnitMaintainEntity.getCreditNo()); - rows.add(String.valueOf(basicUnitMaintainEntity.getStatus())); - rows.add(basicUnitMaintainEntity.getType()); - rows.add(basicUnitMaintainEntity.getThirdId()); - rows.add(basicUnitMaintainEntity.getThirdName()); - rows.add(basicUnitMaintainEntity.getThirdId1()); - rows.add(basicUnitMaintainEntity.getThirdName1()); - rows.add(basicUnitMaintainEntity.getThirdId2()); - rows.add(basicUnitMaintainEntity.getThirdName2()); - rows.add(basicUnitMaintainEntity.getThirdId3()); - rows.add(basicUnitMaintainEntity.getThirdName3()); - rows.add(basicUnitMaintainEntity.getThirdId4()); - rows.add(basicUnitMaintainEntity.getThirdName4()); - excelData.add(rows); - } - return excelData; - } } diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java index d3cd8d7a..8b2efe49 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java @@ -24,7 +24,6 @@ public interface IBasicBussinessTypeService extends IService filterJoinByInv(FilterBussinessTypeRequest filterBussinessTypeRequest); - /** * 添加单据类型 * @@ -115,7 +114,6 @@ public interface IBasicBussinessTypeService extends IService selectIgnoreSelf(String action); - List findByVueType(String vueType); List selectbyNotAction(List list); diff --git a/src/main/java/com/glxp/api/service/basic/SyncUdiService.java b/src/main/java/com/glxp/api/service/basic/SyncUdiService.java index 91ddf53e..d3e3f359 100644 --- a/src/main/java/com/glxp/api/service/basic/SyncUdiService.java +++ b/src/main/java/com/glxp/api/service/basic/SyncUdiService.java @@ -80,8 +80,6 @@ public class SyncUdiService { return ResultVOUtils.error(500, "请输入完整的产品通用名称！"); } productInfoFilterRequest.setIsNewest(1); -// productInfoFilterRequest.setDiType("1"); - String keyCache = productInfoFilterRequest.toCacheKey(); if (StrUtil.isEmpty(keyCache)) { return ResultVOUtils.error(500, "查询条件不能为空！"); diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 0af8856f..a75f80a0 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -135,17 +135,6 @@ public class UdiContrastService { return udiRelevanceEntities; } - public List findByUnion(String originUuid, String mainId) { - UdiProductEntity udiProductEntity = udiProductService.findOneByOriginUuid(originUuid); - if (udiProductEntity == null) { - return null; - } - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setMainId(mainId); - filterUdiRelRequest.setDeviceRecordKey(udiProductEntity.getDeviceRecordKey()); - List udiRelevanceEntities = udiRelevanceDao.contrastJoinSelect(filterUdiRelRequest); - return udiRelevanceEntities; - } public List findDrkByUnion(String deviceRecordKey, String mainId) { FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); @@ -172,13 +161,6 @@ public class UdiContrastService { return null; } - public List findByOriginUuid(String originUuid) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setOriginUuid(originUuid); - List udiRelevanceEntities = udiRelevanceDao.contrastJoinSelect(filterUdiRelRequest); - return udiRelevanceEntities; - } - public List findByDeviceRecordKey(String deviceRecordKey) { FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); filterUdiRelRequest.setDeviceRecordKey(deviceRecordKey); @@ -195,12 +177,6 @@ public class UdiContrastService { } - public List filterAll(FilterUdiRelRequest filterUdiRelRequest) { - List udiRelevanceEntities = udiRelevanceDao.contrastJoinSelect(filterUdiRelRequest); - return udiRelevanceEntities; - } - - public void createUnionContrast(UdiCombineRequest udiCombineRequest, String key) { List udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index 40d7a74a..15ddb6a3 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -17,8 +17,6 @@ import java.util.List; */ public interface UdiProductService { - List filterUdiInfo(FilterUdiRelRequest filterUdiRelRequest); - UdiProductEntity findBySptm(String sptm); List filterAllUdiInfo(FilterUdiRelRequest filterUdiRelRequest); diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index a535bcd7..d92c5a83 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -79,7 +79,6 @@ public interface UdiRelevanceService extends IService { boolean deleteByUuid(String uuid); - List selectGroupByNameCode(String nameCode, Boolean isDisable); /** diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index 8b80a03e..8abe09d9 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.basic.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypeChangeDao; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 4dc248c4..d8c72e6a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypePreDao; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index 526aae8c..2afc1758 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java index d478b09c..01e22586 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java @@ -84,8 +84,6 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport batchSession.commit(); } batchSession.close(); -// udiInfoDao.importUdiInfo(udiRelevanceExportJsonResponse.getUdiInfoEntities()); - } //关联表导入 @@ -98,7 +96,6 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport } batchSession.commit(); batchSession.close(); -// udiRelevanceDao.importUdiRelevance(udiRelevanceExportJsonResponse.getUdiRelevanceEntities()); } //第三方产品信息导入 @@ -112,7 +109,6 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport } batchSession.commit(); batchSession.close(); -// thrProductsDao.importThrProductss(udiRelevanceExportJsonResponse.getThrProductsEntities()); } //供应商关联表导入 diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java index 610d24ef..58c7dc5b 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java @@ -25,7 +25,6 @@ import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrDataService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.HttpClient; import org.springframework.beans.BeanUtils; @@ -251,7 +250,6 @@ public class BasicProductsImportLogServiceImpl implements BasicProductsImportLog public void updateValue(UdiRelevanceEntity udiRelevanceEntity, BasicProductsImportDetailEntity basicProductsImportDetailEntity, BasicProductsImportLogEntity basicProductsImportLogEntity, String mainId) { - String time = DateUtil.getDateTime(); udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceEntity.setModifyTime(new Date()); if (basicProductsImportDetailEntity.getIsUseDy() != null && !basicProductsImportDetailEntity.getIsUseDy().trim().equals("")) { diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 39adc085..fe12ac74 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -23,8 +23,6 @@ import com.glxp.api.res.DiLevelResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.UdiContrastService; import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.thrsys.ThirdAliDrugService; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.thrsys.YbDrugService; import com.glxp.api.util.IntUtil; @@ -58,22 +56,8 @@ public class UdiProductServiceImpl implements UdiProductService { @Resource private CustomerService customerService; - private static final Logger logger = LoggerFactory.getLogger(UdiProductService.class); - @Override - public List filterUdiInfo(FilterUdiRelRequest filterUdiRelRequest) { - if (filterUdiRelRequest == null) { - return Collections.emptyList(); - } - // 分页处理 - filterUdiRelRequest.pageDispose(); - - List data = udiProductDao.filterUdiInfo(filterUdiRelRequest); - return data; - } - - @Override public UdiProductEntity findBySptm(String sptm) { FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); @@ -144,26 +128,6 @@ public class UdiProductServiceImpl implements UdiProductService { } return udiProductDao.insertUdiInfo(udiProductEntity); } -// @Override -// public boolean insertUdiInfo(UdiProductEntity udiProductEntity) { -// udiProductEntity.setUpdateTime(new Date()); -// if (udiProductEntity.getId() == null) { -// udiProductEntity.setId(IdUtil.getSnowflakeNextId()); -// } -// -// //医保编码解析 -// String catalogcode = udiProductEntity.getCatalogcode(); -// if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) { -// Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); -// Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); -// Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); -// udiProductEntity.setCatalogCode1(catalogcode1); -// udiProductEntity.setCatalogCode2(catalogcode2); -// udiProductEntity.setCatalogCode3(catalogcode3); -// } -// -// return udiProductDao.insertUdiInfo(udiProductEntity); -// } @Override public boolean insertUdiInfos(List udiInfoEntities) { @@ -178,46 +142,12 @@ public class UdiProductServiceImpl implements UdiProductService { return udiProductDao.updateUdiInfo(udiProductEntity); } -// @Override -// public boolean updateUdiInfoByUuid(UdiProductEntity udiProductEntity) { -// if (StrUtil.isEmpty(udiProductEntity.getUuid())) -// return false; -// udiProductEntity.setUpdateTime(new Date()); -// //医保编码解析 -// String catalogcode = udiProductEntity.getCatalogcode(); -// if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) { -// Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); -// Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); -// Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); -// udiProductEntity.setCatalogCode1(catalogcode1); -// udiProductEntity.setCatalogCode2(catalogcode2); -// udiProductEntity.setCatalogCode3(catalogcode3); -// } -// return udiProductDao.updateUdiInfoByUuid(udiProductEntity); -// } public boolean updateUdiInfoByUuid(UdiProductEntity udiProductEntity) { if (StrUtil.isEmpty(udiProductEntity.getUuid())) return false; return udiProductDao.updateUdiInfoByUuid(udiProductEntity); } - - // @Override -// public boolean updateUdiInfoById(UdiProductEntity udiProductEntity) { -// udiProductEntity.setUpdateTime(new Date()); -// //医保编码解析 -// String catalogcode = udiProductEntity.getCatalogcode(); -// if (StrUtil.isNotEmpty(catalogcode) && catalogcode.length() >= 7) { -// Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); -// Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); -// Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); -// udiProductEntity.setCatalogCode1(catalogcode1); -// udiProductEntity.setCatalogCode2(catalogcode2); -// udiProductEntity.setCatalogCode3(catalogcode3); -// } -// -// return udiProductDao.updateUdiInfoById(udiProductEntity); -// } @Override public boolean updateUdiInfoById(UdiProductEntity udiProductEntity) { return udiProductDao.updateUdiInfoById(udiProductEntity); @@ -247,24 +177,13 @@ public class UdiProductServiceImpl implements UdiProductService { return udiProductDao.updateUdiInfoNotAll(udiInfoRequest); } - @Value("${UDI_SERVER_URL}") - private String udiUrl; - - @Override - - - /** - * 新增/编辑药品信息 - * - * @param addProductRequest - * @return - */ /** * 新增/编辑药品信息 * * @param addProductRequest * @return */ + @Override public AddProductRequest addDrug(AddProductRequest addProductRequest) { UdiRelevanceEntity udiRelevanceEntity; @@ -272,7 +191,6 @@ public class UdiProductServiceImpl implements UdiProductService { if (addProductRequest.getRelId() != null) { udiRelevanceEntity = udiRelevanceDao.selectById(addProductRequest.getRelId()); List udiProductEntities = udiProductDao.findByUuids(udiRelevanceEntity.getUuid()); -// List list = new ArrayList<>(); for (UdiProductEntity udiProductEntity : udiProductEntities) { addProductRequest.setNameCode(udiProductEntity.getNameCode()); addProductRequest.setId(udiProductEntity.getId()); @@ -286,25 +204,12 @@ public class UdiProductServiceImpl implements UdiProductService { if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) { udiProductEntity.setDiType(1); } -// CodeRel codeRel = new CodeRel(); -// codeRel.setDrugCode(udiProductEntity.getNameCode()); -// codeRel.setYbbm(udiProductEntity.getYbbm()); -// codeRel.setUpdateTime(new Date()); -// codeRel.setPackUnit(udiProductEntity.getPackUnit()); -// codeRel.setBhxjsl(udiProductEntity.getBhxjsl()); -// codeRel.setXjdw(udiProductEntity.getXjdw()); -// codeRel.setYbBzgg(udiProductEntity.getBzgg()); -// list.add(codeRel); + int i = udiProductDao.updateById(udiProductEntity); if (i == 0) { throw new JsonException(500, "更新错误"); } } -// if (list != null && list.size() > 0) { -// // 上传多玛关系 -// udiContrastService.codeRelUpdateBatch(list); -// } - //修改关联表 // udiRelevanceEntity.setUseLeverCount(addProductRequest.getUseLeverCount()); udiRelevanceEntity.setSplitEnable(addProductRequest.getSplitEnable()); @@ -341,25 +246,6 @@ public class UdiProductServiceImpl implements UdiProductService { udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime()); udiRelevanceEntity.setDetailSort(addProductRequest.getDetailSort()); udiRelevanceEntity.setUpdateTime(new Date()); -// if (addProductRequest.getDistributeLevelDi() != null) { -// udiRelevanceEntity.setDistributeLevelDi(addProductRequest.getDistributeLevelDi()); -// } -// if (addProductRequest.getDistributeLevelCount() != null) { -// udiRelevanceEntity.setDistributeLevelCount(addProductRequest.getDistributeLevelCount()); -// } -// if (addProductRequest.getDistributeLevelUnit() != null) { -// udiRelevanceEntity.setDistributeLevelUnit(addProductRequest.getDistributeLevelUnit()); -// } -// -// if (addProductRequest.getUseLevelDi() != null) { -// udiRelevanceEntity.setUseLevelDi(addProductRequest.getUseLevelDi()); -// } -// if (addProductRequest.getUseLevelUnit() != null) { -// udiRelevanceEntity.setUseLevelUnit(addProductRequest.getUseLevelUnit()); -// } -// if (addProductRequest.getUseLeverCount() != null) { -// udiRelevanceEntity.setUseLeverCount(addProductRequest.getUseLeverCount()); -// } if (addProductRequest.getDistributeLevel() != null) { udiRelevanceEntity.setDistributeLevel(addProductRequest.getDistributeLevel()); } @@ -455,16 +341,9 @@ public class UdiProductServiceImpl implements UdiProductService { codeRel.setYbBzgg(udiProductEntity1.getBzgg()); codeRelArrayList.add(codeRel); } - - // 上传到多码融合表 udiContrastService.codeRelUpdateBatch(codeRelArrayList); - -// if (IntUtil.value(udiProductEntity1.getPackLevel()) == 1) { -// calculateDistCount(udiProductEntity1, udiRelevanceEntity); -// calculateUseCount(udiProductEntity1, udiRelevanceEntity); -// } } else { UdiProductEntity udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode()); if (udiProductEntity1 != null) { @@ -532,8 +411,6 @@ public class UdiProductServiceImpl implements UdiProductService { List udiProductEntities = udiProductDao.findByUuids(udiProductEntity.getUuid()); CountWrapper xjCountWrapper = new CountWrapper(); findUltimateEntity(udiProductEntity, udiProductEntities, xjCountWrapper); -// udiRelevanceEntity.setDistributeLevelDi(udiProductEntity.getNameCode()); -// udiRelevanceEntity.setDistributeLevelUnit(udiProductEntity.getPackUnit()); udiRelevanceEntity.setDistributeLevel(IntUtil.value(udiProductEntity.getPackLevel())); udiRelevanceEntity.setDistributeLevelCount(xjCountWrapper.getCount()); } @@ -545,10 +422,7 @@ public class UdiProductServiceImpl implements UdiProductService { List udiProductEntities = udiProductDao.findByUuids(udiProductEntity.getUuid()); CountWrapper xjCountWrapper = new CountWrapper(); findUltimateEntity(udiProductEntity, udiProductEntities, xjCountWrapper); -// udiRelevanceEntity.setUseLevelDi(udiProductEntity.getNameCode()); -// udiRelevanceEntity.setUseLevelUnit(udiProductEntity.getPackUnit()); udiRelevanceEntity.setUseLevel(IntUtil.value(udiProductEntity.getPackLevel())); -// udiRelevanceEntity.setUseLeverCount(xjCountWrapper.getCount()); } public static UdiProductEntity findUltimateEntity(UdiProductEntity udiProductEntity, List udiProductEntities, CountWrapper xjCountWrapper) { @@ -628,23 +502,13 @@ public class UdiProductServiceImpl implements UdiProductService { @Resource private ThrProductsService thrProductsService; @Resource - private UdiProductService udiProductService; - @Resource - private ThirdAliDrugService thirdAliDrugService; - @Resource private YbDrugService ybDrugService; @Resource private UdiContrastService udiContrastService; - @Resource - private UdiRelevanceService udiRelevanceService; @Override public BaseResponse saveOrUpadateLevelDrugAli(ThirdAliDrugRequest thirdAliDrugRequest) { Integer detailSort = 0; -// ThirdAliDrug thirdAliDrugServiceOne = thirdAliDrugService.getOne( -// new QueryWrapper().eq("nameCode", thirdAliDrugRequest.getNameCodeRow()).last("limit 1") -// ); - String str = ""; List thirdAliDrugList = new ArrayList<>(); thirdAliDrugRequest.setNameCode(thirdAliDrugRequest.getNameCodeRow()); thirdAliDrugList = udiContrastService.optThirdAliDrug(thirdAliDrugRequest); diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index de93e2a8..ddb41dca 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -372,14 +372,7 @@ public class UdiRelevanceServiceImpl extends ServiceImpl { - - List pageList(DeviceUpkeepDetailQuery query); - - - - List listByTaskId(Long taskId, String deviceCode); DeviceUpkeepDetailEntity getOne(Long taskId, String deviceCode); - - void finishItem(Long taskId, String deviceCode, String deptCode, Boolean normalFlag, AuthAdmin user); } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailItemServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailItemServiceImpl.java index 93b62290..7aa2247b 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailItemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceCheckDetailItemServiceImpl.java @@ -117,8 +117,6 @@ public class DeviceCheckDetailItemServiceImpl extends ServiceImpl list = super.baseMapper.pageVo(query); -// List list = super.list(Wrappers.lambdaQuery(DeviceCheckEntity.class) -// .orderByAsc(DeviceCheckEntity::getCreateTime) -// ); - return list; + return super.baseMapper.pageVo(query); } @Override diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java index ebfcbcef..dc5aa629 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java @@ -33,11 +33,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl pageList(DevicePlanQuery query) { PageHelper.startPage(query.getPage(), query.getLimit()); List list =super.baseMapper.pageVo(query); -// List list = super.list(Wrappers.lambdaQuery(DevicePlanEntity.class) -// .like(StrUtil.isNotBlank(query.getName()), DevicePlanEntity::getName, query.getName()) -// .orderByDesc(DevicePlanEntity::getStartDate) -// ); return list; } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java index 516f26cc..3fbe9db8 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceUpkeepDetailItemServiceImpl.java @@ -70,9 +70,6 @@ public class DeviceUpkeepDetailItemServiceImpl extends ServiceImpl invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); -// List codes = new ArrayList<>(); -// if (!invWarehouseEntities.isEmpty()) { -// for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { -// codes.add(invWarehouseEntity.getCode()); -// } -// } -// FilterInvProductRequest filterInvProductDetailRequest = new FilterInvProductRequest(); -// filterInvProductDetailRequest.setRelIdFk(codeEnttity.getRelId()); -// filterInvProductDetailRequest.setBatchNo(codeEnttity.getBatchNo()); -// filterInvProductDetailRequest.setInvCodes(codes); -// List invProductEntities = invProductService.filterInvProduct(filterInvProductDetailRequest); -// if (invProductEntities.size() > 0) { -// String supId = invProductEntities.get(0).getSupId(); -// int count = 0; -// for (InvProductEntity invProductEntity : invProductEntities) { -// if (!supId.equals(invProductEntity.getSupId())) { -// return null; -// } -// count = count + (invProductEntity.getInCount() - invProductEntity.getOutCount()); -// } -// if (count > 0) -// return supId; -// } - - return null; - } - - //查寄售库存 todo - public String checkPreInv(IoCodeEntity codeEnttity) { -// FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); -// filterInvWarehouseRequest.setLevel(1); -// filterInvWarehouseRequest.setAdvanceType(true); -// List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); -// List codes = new ArrayList<>(); -// if (!invWarehouseEntities.isEmpty()) { -// for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { -// codes.add(invWarehouseEntity.getCode()); -// } -// } -// FilterInvProductRequest filterInvProductDetailRequest = new FilterInvProductRequest(); -// filterInvProductDetailRequest.setRelIdFk(codeEnttity.getRelId()); -// filterInvProductDetailRequest.setBatchNo(codeEnttity.getBatchNo()); -// filterInvProductDetailRequest.setInvCodes(codes); -// List invProductEntities = invPreProductService.filterInvProduct(filterInvProductDetailRequest); -// if (invProductEntities.size() > 0) { -// String supId = invProductEntities.get(0).getSupId(); -// int count = 0; -// for (InvProductEntity invProductEntity : invProductEntities) { -// if (!supId.equals(invProductEntity.getSupId())) { -// return null; -// } -// count = count + (invProductEntity.getInCount() - invProductEntity.getOutCount()); -// } -// if (count > 0) -// return supId; -// } - - return null; - } //查询本单是否有重复条码 public String checkOrderRepeatCode(IoCodeTempEntity codeEntity, List filterList) { diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 6803d5bd..00bc1d25 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -16,7 +16,6 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoCodeTempService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; -import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; @@ -41,8 +40,6 @@ public class IoChangeInoutService { @Resource IoOrderService orderService; @Resource - InvProductServiceNew invProductServiceNew; - @Resource IBasicBussinessTypeService basicBussinessTypeService; @Resource GennerOrderUtils gennerOrderUtils; @@ -158,18 +155,9 @@ public class IoChangeInoutService { outOrder.setFromInvCode(upInv.getCode()); outOrder.setFromDeptCode(upInv.getParentId()); } - - //原先流程---使用流转单据默认仓库 -// outOrder.setFromInvCode(bussinessChangeTypeEntity.getDefaultInvCode()); -// outOrder.setFromDeptCode(bussinessChangeTypeEntity.getDefaultDeptCode()); outOrder.setFromCorp(null); } outOrder.setCorpOrderId(CustomUtil.getId() + "x"); - //原先流程---使用流转单据默认仓库 -// InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getInvCode()); -// outOrder.setInvCode(invWarehouseEntity.getCode()); -// outOrder.setDeptCode(invWarehouseEntity.getParentId()); - InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode()); outOrder.setInvCode(invWarehouseEntity.getCode()); outOrder.setDeptCode(invWarehouseEntity.getParentId()); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index 14c9103b..c91ea57f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -152,11 +152,7 @@ public class IoCheckInoutService { orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS); orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); orderService.update(orderEntity); - List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); - //序列号唯一性校验 -// serialNoUniquenessVerification(codeTempEntities); - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); if (!bussinessTypeEntity.isCheckEnable()) { @@ -302,13 +298,11 @@ public class IoCheckInoutService { curCount = codeEntity.getMyReCount(); } // TODO 药品单据临时数量超出不做校验(为了湖里妇幼) -// if (codeEntity.getProductType() != null){ if (!codeEntity.getProductType().equals(2)) { if (curCount > bizEntity.getCount()) { return "当前产品" + bizEntity.getCoName() + "数量超出！"; } } -// } if (bizEntity.getPrice() != null) codeEntity.setPrice(bizEntity.getPrice()); if (StrUtil.isNotEmpty(codeEntity.getProduceDate()) && StrUtil.isEmpty(bizEntity.getProductDate())) { @@ -426,8 +420,6 @@ public class IoCheckInoutService { }); } - - //临时表转正式表 for (IoCodeTempEntity codeTempEntity : codeTempEntities) { IoCodeEntity codeEnttity = new IoCodeEntity(); @@ -551,7 +543,6 @@ public class IoCheckInoutService { orderDetailResultService.insert(orderDetailResultEntity); } -// orderDetailCodeDao.updateBatchById(orderDetailCodeEntities); //临时表转正式表 for (IoCodeTempEntity codeTempEntity : codeTempEntities) { @@ -1005,7 +996,6 @@ public class IoCheckInoutService { if ( IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT) && bussinessTypeEntity.isScanPreIn()) { -// ThreadUtil.execAsync(() -> { // 内网同步出来不进行退货 if (StrUtil.isNotEmpty(bussinessTypeEntity.getPreInBackAction())) { if (bussinessTypeEntity.getBackPreinType() == 1) { //按单退货 @@ -1071,10 +1061,7 @@ public class IoCheckInoutService { } } } -// }); } - - //校验是否是不入库存单据 if (bussinessTypeEntity.isInStock()) { //生成库存 @@ -1146,8 +1133,6 @@ public class IoCheckInoutService { } - - // 预验收使用出库处理1.不带回扣库存;2.带回时生成退货出库单 @Resource GennerOrderUtils gennerOrderUtils; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java index cc662c7a..569084eb 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -44,8 +44,6 @@ public class IoOrderUtilsService { private IoOrderDetailResultDao ioOrderDetailResultDao; @Resource private IoOrderInvoiceMapper ioOrderInvoiceMapper; - @Value("${file_path}") - private String filePath; public String getIoder(ioUploadOrderResponse ioUploadOrderRespons) { @@ -56,18 +54,13 @@ public class IoOrderUtilsService { List ioOrderDetailBizEntityList = ioUploadOrderRespons.getIoOrderDetailBizEntityList(); List ioOrderDetailResultEntityList = ioUploadOrderRespons.getIoOrderDetailResultEntityList(); List ioOrderInvoiceEntityList = ioUploadOrderRespons.getIoOrderInvoiceEntityList(); - //用来存储耗材字典结果集避免重复查询数据库 Map map = new HashMap<>(); Boolean checkUdi = false; //判断是不是有错误 - //根据供应商id查询用户id AuthAdmin authAdmins = authAdminDao.findByCustomerld(platformLinkRespons.getCustomerId()).get(0); - //单据表生成 String billNO = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")); - - //扫码明细表生成 FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest(); List ioCodeTempEntities = new ArrayList<>(); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java index 861118a7..c57f93ed 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -148,14 +147,6 @@ public class IoCodeService extends ServiceImpl { return ioCodeResponses; } - /** - * code分组sum实际库存数量 - * @param codes - * @return - */ - public List findByCodeSumReCount(List codes) { - return ioCodeDao.findByCodeSumReCount(codes); - } public List filterListexcelExport(FilterCodeRequest filterCodeRequest) { return ioCodeDao.filterListexcelExport(filterCodeRequest); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java index 461850b0..974473f9 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -714,11 +713,8 @@ public class IoCodeTempService { IoCodeEntity ioCodeEntity = new IoCodeEntity(); BeanUtils.copyProperties(codeEnttity, ioCodeEntity); - String supId = transInoutService.checkInvExitSup(ioCodeEntity); - if (supId == null) { - supId = transInoutService.checkExitSup(codeEnttity.getRelId()); - } - if (supId == null) { + String supId = transInoutService.checkExitSup(codeEnttity.getRelId()); + if (StringUtils.isEmpty(supId)) { codeEnttity.setSupId(null); BaseResponse baseResponse = ResultVOUtils.error(503, "该产品未绑定供应商,请指定对应的供应商"); baseResponse.setData(codeEnttity); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index c81167c1..bd883857 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; @@ -273,8 +272,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Override public BaseResponse addBizProduct(AddBizProductReqeust addBizProductReqeust) { -// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("vail_product_cert"); -// boolean isVailCert = systemParamConfigEntity.getParamValue().equals("1") ? true : false; AuthAdmin authAdmin = customerService.getUserBean(); if (addBizProductReqeust.getRelId() == null && CollUtil.isEmpty(addBizProductReqeust.getDatas())) return ResultVOUtils.error(500, "未选择产品信息"); @@ -453,13 +450,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { ioOrderInvoiceEntity.setLicenseUrl(""); boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity); - -// if (CollUtil.isNotEmpty(orderInvoiceEntities)) { -// orderDetailCodeEntity.setRegStatus(true); -// } else { -// orderDetailCodeEntity.setRegStatus(false); -// } -// orderDetailCodeDao.updateById(orderDetailCodeEntity); } } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index 7e845509..38e2804b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.entity.basic.UdiProductEntity; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index 718040f8..825f826c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoOrderDetailResultDao; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.CptTraceRequest; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index ed52017f..c80c2e8e 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -9,7 +9,6 @@ import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; @@ -75,10 +74,6 @@ public class IoOrderServiceImpl implements IoOrderService { @Resource IBasicBussinessTypeService basicBussinessTypeService; @Resource - InvPreinOrderService preinOrderService; - @Resource - InvPreinDetailService preinDetailService; - @Resource InvProductServiceNew invProductServiceNew; @Resource InvProductService invProductService; @@ -274,8 +269,6 @@ public class IoOrderServiceImpl implements IoOrderService { invProductService.update(invProductEntity); } } -// //删除库存详情 -// invProductServiceNew.deleteByOrderId(billNo); } } } @@ -386,19 +379,6 @@ public class IoOrderServiceImpl implements IoOrderService { invPreProductService.update(invProductEntity); } else { //普通库存 InvProductNewVo invProductNewVo = invProductServiceNew.selectByCode(billNo, code,null); - //TODO 120241022 之前关于详情表的删除修改操作去了 -// if (invProductNewVo != null) { -// int count = invProductNewVo.getCount() - 1; -// if (count == 0) { -// invProductServiceNew.deleteById(invProductNewVo.getId()); -// } else { -// //更新详情表 -// invProductNewVo.setCount(count); -// int reCount = udiCalCountUtil.getActCount(invProductNewVo.getNameCode()); -// invProductNewVo.setReCount(invProductNewVo.getReCount() - reCount); -// invProductServiceNew.update(invProductNewVo); -// } -// } //更新产品表 InvProductEntity invProductEntity = invProductService.selectByUnique(invProductNewVo.getRelIdFk(), invProductNewVo.getBatchNo(), invProductNewVo.getSupId(), invProductNewVo.getDeptCode(), invProductNewVo.getInvCode()); if (invProductEntity != null) { @@ -690,11 +670,10 @@ public class IoOrderServiceImpl implements IoOrderService { @Override public List setActions(FilterOrderRequest filterOrderRequest) { List bussinessTypeEntities; - List actions = null; if (filterOrderRequest.getVueType() == null) return null; bussinessTypeEntities = basicBussinessTypeService.findByVueType(filterOrderRequest.getVueType()); - actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList()); + List actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList()); filterOrderRequest.setActions(actions); return actions; } @@ -903,56 +882,8 @@ public class IoOrderServiceImpl implements IoOrderService { * @return */ private List getAllOrder(IoOrderEntity order) { -// Set billNos = new HashSet<>(); -// billNos.add(order.getBillNo()); - - - List orderEntities = orderDao.selectList(new QueryWrapper().eq("relKey", order.getRelKey())); - -// getLinkedBillNo(order.getBillNo(), billNos); -// -// //去除本单的单据号 -// Iterator iterator = billNos.iterator(); -// while (iterator.hasNext()) { -// if (iterator.next().equals(order.getBillNo())) { -// iterator.remove(); -// break; -// } -// } -// -// ArrayList orders = new ArrayList<>(); -// if (CollUtil.isNotEmpty(billNos)) { -// List list = orderDao.selectList(new QueryWrapper().in("billNo", billNos).orderByDesc("id")); -// orders.addAll(list); -// } - //将查询入口单据放在第一位的顺序 -// orders.add(0, order); - return orderEntities; - } - - /** - * 查询关联的单据号 - * - * @param billNo - * @param billNos - */ - private void getLinkedBillNo(String billNo, Set billNos) { - List list = getOneBillNosByOrderId(billNo); - if (!billNos.containsAll(list)) { - //找出不包含在原有集合中的单号，回调方法 - String orderId = null; - for (String item : list) { - if (!billNos.contains(item)) { - orderId = item; - break; - } - } - billNos.addAll(list); - //递归，继续查询未包含的单据号关联的单据 - getLinkedBillNo(orderId, billNos); - } + return orderDao.selectList(new QueryWrapper().eq("relKey", order.getRelKey())); } - /** * 查询一条单据上关联的所有单据号 * diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java index 99196ab8..56ec42e8 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inout.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.ReceiveDetailDao; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java index 2d9952e0..dee4e9f1 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inout.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.ReceiveDao; import com.glxp.api.dao.inout.ReceiveDetailDao; import com.glxp.api.entity.inout.PurReceiveDetailEntity; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java index 3eb7fd1c..23d57cd3 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inv; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.DeviceInspectTaskMapper; import com.glxp.api.entity.inv.DeviceInspectTaskEntity; import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java b/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java index e2222a50..9fefd688 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inv; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.DeviceProjectSetMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.inv.DeviceProjectSet; @@ -60,7 +59,7 @@ public class DeviceProjectSetService extends ServiceImpl list = null; + List list; if (id != null && !"".equals(id)) { list = deviceProjectSetMapper.selectList(new QueryWrapper().eq("code", code).ne("id", id)); } else diff --git a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java index b15685df..f4b76e6f 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java @@ -20,7 +20,6 @@ public interface DeviceReceiveOrderDetailService { */ List filterList(FilterDeviceReceiveOrderDetailRequest detailRequest); - /** * 更新设备领用记录详情 * @@ -45,7 +44,6 @@ public interface DeviceReceiveOrderDetailService { */ BaseResponse checkCode(String code); - List selectByorderIdFk(FilterDeviceReceiveOrderDetailRequest detailRequest); diff --git a/src/main/java/com/glxp/api/service/inv/JaspaperService.java b/src/main/java/com/glxp/api/service/inv/JaspaperService.java index 5298b22b..b771bc03 100644 --- a/src/main/java/com/glxp/api/service/inv/JaspaperService.java +++ b/src/main/java/com/glxp/api/service/inv/JaspaperService.java @@ -19,8 +19,6 @@ import java.util.Map; @Service public class JaspaperService { - @Value("${file_path}") - private String dirPath; @Resource private InvInnerOrderPdfTempDao innerOrderPdfTempDao; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderDetailServiceImpl.java index cda11ae3..edb9076c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderDetailServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderServiceImpl.java index 17243f14..9a626965 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java index 9a8be5ce..d3ac23ce 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java index 8f54ad6c..e7f52b66 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -96,7 +95,6 @@ public class DeviceReceiveOrderServiceImpl implements DeviceReceiveOrderService if (CollUtil.isEmpty(detailList)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请添加领用设备！"); } - List details = new ArrayList<>(detailList.size()); //检验序列号，校验通过更新无序列号产品编码 for (DeviceReceiveOrderDetailEntity deviceReceiveOrderDetailEntity : detailList) { diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java index 2c874c7a..7c03750d 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java index fe5966d7..d2435d36 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.inv.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java index 5a7a60e5..b79760d3 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java @@ -3,25 +3,17 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.constant.ConstantType; -import com.glxp.api.dao.basic.BasicBusTypeChangeDao; -import com.glxp.api.dao.basic.BasicBussinessTypeDao; -import com.glxp.api.dao.basic.UdiRlSupDao; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.dao.inout.IoOrderDao; import com.glxp.api.dao.inv.InvCountCodesDao; import com.glxp.api.dao.inv.InvCountOrderDao; import com.glxp.api.dao.inv.InvCountOrderDetailDao; -import com.glxp.api.dao.inv.InvProductNewDao; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderEntity; @@ -37,13 +29,11 @@ import com.glxp.api.service.inv.InvCountOrderService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; -import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; @@ -64,21 +54,11 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { @Resource private CustomerService customerService; @Resource - private InvProductNewDao invProductNewDao; - @Resource - private BasicBusTypeChangeDao busTypeChangeDao; - @Resource - private BasicBussinessTypeDao bussinessTypeDao; - @Resource private IoOrderDao orderDao; @Resource private IoCodeTempDao codesTempDao; @Resource private InvCountCodesService invCountCodesService; - @Resource - private UdiRlSupDao udiRlSupDao; - @Resource - private UdiCalCountUtil udiCalCountUtil; @Override public List filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) { @@ -207,42 +187,6 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { return ResultVOUtils.success(); } - - /** - * 生成盘盈/盘亏单据 - * - * @param invCountOrder 盘点单据 - * @param inCodes 盘盈单据码明细 - * @param outCodes 盘亏单据码明细 - * @param transferOrderSettings 单据转换单据类型 - */ - private void createNewOrder(InvCountOrderEntity invCountOrder, List inCodes, List outCodes, List transferOrderSettings) { - BasicBussinessTypeEntity inBusType = new BasicBussinessTypeEntity(); - BasicBussinessTypeEntity outBusType = new BasicBussinessTypeEntity(); - for (BasicBussinessTypeEntity basicBussinessTypeEntity : transferOrderSettings) { - if (basicBussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { - inBusType = basicBussinessTypeEntity; - } else if (basicBussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - outBusType = basicBussinessTypeEntity; - } - } - - log.info("开始生成盘盈单据"); - //开始生成盘盈单据 - String inOrderId = buildOrder(invCountOrder, inCodes, inBusType); - invCountOrder.setInOrderIds(inOrderId); - log.info("盘盈单据生成成功"); - - //开始生成盘亏单据 - log.info("开始生成盘亏单据"); - String outOrderId = buildOrder(invCountOrder, outCodes, outBusType); - invCountOrder.setOrderId(outOrderId); - log.info("盘亏单据生成成功"); - - //更新盘点单据的出入库单据信息 - invCountOrderDao.updateById(invCountOrder); - } - /** * 生成单据逻辑 * @@ -290,56 +234,4 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { return null; } - - - /** - * 设置条码供应商信息 - * - * @param codeTemp 条码数据 - * @param countStatus 盈亏状态 - */ - private void setSupInfo(IoCodeTempEntity codeTemp, String countStatus) { - /** - * 根据此码明细的盈亏状态，使用不同的逻辑生成供应商信息 - * 盘盈：此条码不存在于库存详情中，需要从供应商产品信息表查询供应商信息 - * 盘亏：此条码在库存中存在，但是盘点中没有此条码，直接查询库存详情表中的供应商ID - * - * 若查询出的供应商信息多余1条，则表明此产品被多个供应商绑定，在此处不进行绑定，单据生成之后会进入异常单据页面，在异常单据页面手动指定供应商 - */ - if (countStatus.equals("loss")) { - log.info("生成盘亏单据条码供应商信息，条码信息：{}", codeTemp.getCode()); - List supIds = invProductNewDao.selectSupIdByCode(codeTemp.getCode()); - if (CollUtil.isNotEmpty(supIds) && supIds.size() == 1) { - //此产品在库存中存在且只绑定了一个供应商，若绑定了多个供应商，则不填供应商ID字段，生成单据之后会进入异常单据页面，由操作人员手动指定供应商 - codeTemp.setSupId(supIds.get(0)); - } - } else { - log.info("生成盘盈单据条码供应商详情，条码信息：{}", codeTemp.getCode()); - List unitFkList = udiRlSupDao.selectUnitFkByRelId(codeTemp.getRelId()); - if (CollUtil.isNotEmpty(unitFkList) && unitFkList.size() == 1) { - //此产品只绑定了一个供应商，若绑定了多个供应商，则不填供应商ID字段，生成单据之后会进入异常单据页面，手动指定供应商 - codeTemp.setSupId(unitFkList.get(0)); - } - } - } - - /** - * 查询单据生成中配置的关联扫码单据类型 - * - * @return - */ - private List getOrderSettings() { - //查询类型为盘点转单的配置 - List list = busTypeChangeDao.selectList(new QueryWrapper().eq("type", 4)); - if (CollUtil.isNotEmpty(list)) { - List busTypes = new ArrayList<>(2); - for (BasicBusTypeChangeEntity basicBusTypeChangeEntity : list) { - if ("PDRK".equals(basicBusTypeChangeEntity.getOriginAction()) || "PDCK".equals(basicBusTypeChangeEntity.getOriginAction())) { - busTypes.add(bussinessTypeDao.selectOne(new QueryWrapper().eq("action", basicBusTypeChangeEntity.getTargetAction()))); - } - } - } - return null; - } - } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 620dd055..83cf494e 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -110,7 +110,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService a = Integer.parseInt(filterUdiRelRequest.getPackLevel()) - 1; } //查询耗材字典信息 - //UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(a); //查询产品信息 UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode()); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java index 2a5031cb..36172772 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -60,13 +59,10 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { UdiEntity udi = FilterUdiUtils.getUdi(invMAOrderDetailEntity.getCode()); //查询此条码是否重复 InvMAOrderDetailEntity maintenanceOrderDetailEntity = invMAOrderDetailDao.selectByOrderIdAndCode(invMAOrderDetailEntity.getOrderIdFk(), invMAOrderDetailEntity.getCode()); - //查询养护说明 InvMAExplanationEntity invMAExplanationEntity = invMAExplanationDao.selectByStatus(1); - //查询养护记录信息 InvMAOrderEntity maOrder = invMAOrderDao.selectOne(new QueryWrapper().eq("orderId", invMAOrderDetailEntity.getOrderIdFk()).last("LIMIT 1")); - if (null != maintenanceOrderDetailEntity) { if (StrUtil.isBlank(udi.getSerialNo()) || (StrUtil.isBlank(udi.getBatchNo()) && StrUtil.isBlank(udi.getSerialNo()))) { //查询库存数量，判断盘点数量是否超出库存数量 @@ -81,7 +77,6 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "条码重复！"); } } else { - //查询此产品库存详情是否存在 FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setCode(invMAOrderDetailEntity.getCode()); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java index 64723745..5cd3a5d4 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index b595e798..afda3524 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index 77c576da..82367ba6 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBussinessTypeDao; @@ -141,8 +140,6 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe if (order != null) { response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); } - -// response.setOrderTime(DateUtil.toDateStr(new DateTime(), "yyyy-MM-dd HH:mm:ss")); } @Override diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java index e669f3aa..46fcb9e1 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBussinessTypeDao; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java index 10eb5791..96e2ba6e 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InvPreProductDao; import com.glxp.api.entity.inv.InvPreProductEntity; import com.glxp.api.req.inv.FilterInvPreProductRequest; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java index 1d01a31d..8c102cde 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.inv.InvPreinDetailDao; import com.glxp.api.entity.inv.InvPreinDetailEntity; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java index c278ce6f..9ef1a30d 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinOrderServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inv.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InvPreinOrderDao; import com.glxp.api.entity.inv.InvPreinOrderEntity; import com.glxp.api.req.inv.FilterInvPreinRequest; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java index 3ccd6f53..4bf6f271 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InvPreinProductDao; import com.glxp.api.entity.inv.InvPreinProductEntity; import com.glxp.api.req.inv.FilterInvPreinProductRequest; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java index f0ac0746..601902f2 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InvProductDao; import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvProductRequest; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java index 459be50f..9438c8e6 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.dao.basic.UdiProductDao; @@ -62,14 +61,6 @@ public class InvProductServiceNew extends ServiceImpl selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode) { - return invProductNewDao.selectList(new QueryWrapper().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)); - } - - public List filterInvProductDetailList(FilterInvProductDetailRequest filterInvProductDetailRequest) { if (null == filterInvProductDetailRequest) { return Collections.emptyList(); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java index 5156fae8..09c46fa1 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java index 355e40ff..7fd15ff3 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java index 378a82ae..17ad514b 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.purchase.SupCertDao; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java index 2b211a76..eef57961 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.SupCompanyDao; import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.req.purchase.FilterSupCompanyRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java index a78d0bed..9c2d55c2 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao; import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadLogServiceImpl.java index 0b266888..3636799c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderUploadLogServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoOrderUploadLogDao; import com.glxp.api.req.thrsys.FilterThrOrderUploadLogRequest; import com.glxp.api.res.thrsys.ThrOrderUploadLogResponse;