diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index 1eaf23981..1b9e32ecd 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -15,7 +15,7 @@ public enum BasicExportTypeEnum { /** * 国家库DI数据 */ - COUNTRY_DI_DATA("country_di_data", "国家库DI数据"), +// COUNTRY_DI_DATA("country_di_data", "国家库DI数据"), /** * 单据类型 diff --git a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java index 810e75dad..f044a9b26 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java @@ -33,6 +33,7 @@ public class FilterReceiveRequest extends ListPageRequest { private Integer status; private String corpName; private String billAction; + private String targetInvCode; private Integer type; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 514dbe2ea..25fef7231 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -108,7 +108,7 @@ public class IoOrderResponse { /** * ID */ - private Long customerId; + private String customerId; /** * 部门编码 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 31348b15d..5cdcdf54d 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 @@ -238,7 +238,7 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl() - .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT) + .eq("mainAction", ConstantType.TYPE_PUT) .gt("spUse", 0).eq("actionType", 1).eq("enable", true)); break; diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index eca7e14bf..ec55a5295 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -119,7 +119,7 @@ public class IoAddInoutService { basicCorpEntity.setOutType(ConstantStatus.CORP_SICK_SICK); basicCorpEntity.setName(orderEntity.getFromCorp()); basicCorpEntity.setId(IdUtil.getSnowflakeNextId()); - basicCorpService.insertBasicUnitMaintain(basicCorpEntity); + basicCorpService.insert(basicCorpEntity); } orderEntity.setFromCorp(basicCorpEntity.getErpId()); orderEntity.setUpdateTime(new Date()); 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 7fd0fbfe4..ed544dc5e 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -157,7 +157,7 @@ public class IoChangeInoutService { Map> filterSupMaps = new HashMap<>(); BasicBussinessTypeEntity targetBustypeEntity = basicBussinessTypeService.findByAction(bussinessChangeTypeEntity.getAction()); //过滤供应商 - if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT || bussinessChangeTypeEntity.getCreateType() == 3 || bussinessChangeTypeEntity.getCreateType() == 4) { for (IoCodeEntity warehouseEntity : useInList) { if (warehouseEntity.getSupId() != null) { if (filterSupMaps.get(warehouseEntity.getSupId()) == null) { diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index f179b977c..4ea310ae9 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -101,6 +101,7 @@ public class IoGenInvService { BeanUtils.copyProperties(codeEntity, invProductDetailEntity); invProductDetailEntity.setRelId(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()); @@ -171,6 +172,7 @@ public class IoGenInvService { BeanUtils.copyProperties(codeEntity, invProductDetailEntity); invProductDetailEntity.setRelId(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()); @@ -252,6 +254,7 @@ public class IoGenInvService { BeanUtils.copyProperties(codeEntity, invProductDetailEntity); invProductDetailEntity.setRelId(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()); 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 853ed68ce..5a3d0c362 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 @@ -178,7 +178,7 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic @Override public InvPreProductDetailEntity findUseOneByCode(String code) { List invPreinDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper().eq("code", code) - .eq("status", ConstantStatus.INVIN_IN).last("limit 1")); + .last("limit 1")); if (CollUtil.isNotEmpty(invPreinDetailEntities)) { return invPreinDetailEntities.get(0); } diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index b38869634..641330c91 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -293,7 +293,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_PRODUCTS); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List hospTypeList = basicHospTypeDao.selectList(Wrappers.lambdaQuery(BasicHospTypeEntity.class) .le((boolean) map.get("isNew"), BasicHospTypeEntity::getUpdateTime, now) @@ -349,7 +349,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_CORP); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List corpList = corpDao.selectList(Wrappers.lambdaQuery(BasicCorpEntity.class) .le((boolean) map.get("isNew"), BasicCorpEntity::getUpdateTime, now) @@ -372,7 +372,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SUP_CERT); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List supCertList = supCertDao.selectList(Wrappers.lambdaQuery(SupCertEntity.class) .le((boolean) map.get("isNew"), SupCertEntity::getUpdateTime, now) @@ -466,7 +466,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.IO_CODE_LOST); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List ioCodeLostList = ioCodeLostMapper.selectList(Wrappers.lambdaQuery(IoCodeLostEntity.class) .le((boolean) map.get("isNew"), IoCodeLostEntity::getUpdateTime, now) @@ -486,7 +486,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.IO_CODE_REL); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List ioCodeRelList = ioCodeRelMapper.selectList(Wrappers.lambdaQuery(IoCodeRelEntity.class) .le((boolean) map.get("isNew"), IoCodeRelEntity::getUpdateTime, now) @@ -558,7 +558,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List bussinessTypeEntities = bussinessTypeService.list(Wrappers.lambdaQuery(BasicBussinessTypeEntity.class) .le((boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime, now) @@ -578,7 +578,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List busTypeChangeList = busTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class) .le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now) @@ -601,7 +601,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_BUSTYPE_ORIGIN); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List thrBusTypeOriginEntities = thrBusTypeOriginService.list(Wrappers.lambdaQuery(ThrBusTypeOriginEntity.class) .le((boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime, now) @@ -655,7 +655,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEPT_DATA); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List deptEntityList = deptService.list(Wrappers.lambdaQuery(DeptEntity.class) .le((boolean) map.get("isNew"), DeptEntity::getUpdateTime, now) @@ -688,7 +688,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.WAREHOUSE_DICT); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List warehouseEntityList = warehouseService.list(Wrappers.lambdaQuery(InvWarehouseEntity.class) .le((boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime, now) @@ -747,7 +747,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.USER_DATA); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List adminList = adminService.list(Wrappers.lambdaQuery(AuthAdmin.class) .le((boolean) map.get("isNew"), AuthAdmin::getLastModifyTime, now) @@ -808,7 +808,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_DEPT); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List deptEntityList = thrDeptService.list(Wrappers.lambdaQuery(ThrDeptEntity.class) .le((boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime, now) @@ -829,7 +829,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_WAREHOUSE); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List warehouseEntityList = thrInvWarehouseService.list(Wrappers.lambdaQuery(ThrInvWarehouseEntity.class) .le((boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime, now) @@ -852,7 +852,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_PRODUCTS); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List productsEntityList = thrProductsService.list(Wrappers.lambdaQuery(ThrProductsEntity.class) .le((boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime, now) @@ -875,7 +875,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_CORP); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List corpEntities = thrCorpService.list(Wrappers.lambdaQuery(ThrCorpEntity.class) .le((boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime, now) @@ -930,7 +930,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SYSTEM_PARAM_CONFIG); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List systemParamConfigEntities = systemParamConfigService.list(Wrappers.lambdaQuery(SystemParamConfigEntity.class) .le((boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime, now) @@ -949,7 +949,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.ENTRUST_ACCEPT); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List entrustReceEntities = entrustReceService.list(Wrappers.lambdaQuery(EntrustReceEntity.class) .le((boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime, now) @@ -970,7 +970,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.PRINT_CONFIG); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List systemPDFModuleEntities = systemPDFModuleService.list(Wrappers.lambdaQuery(SystemPDFModuleEntity.class) .le((boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time, now) @@ -1057,7 +1057,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SCAN_CHANGE); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List basicBusTypePreEntities = iBasicBusTypePreService.list(Wrappers.lambdaQuery(BasicBusTypePreEntity.class) .le((boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime, now) @@ -1076,7 +1076,7 @@ public class HeartService { map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BUS_TYPE_CHANGE); } else { map = syncTimeMap; - now = syncTime; + now = syncTime; } List basicBusTypeChangeEntities = iBasicBusTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class) .le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now) @@ -1415,6 +1415,14 @@ public class HeartService { basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date()); basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode()); + + try { + String fileFullPath = writeFile(filePrefix, NEW_ALL_ORDER, response.getData()); + basicDownloadStatusEntity.setCacheFilePath(fileFullPath); + } catch (IOException e) { + throw new RuntimeException(e); + } + basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity); diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml index 986b3a027..8590a8ad9 100644 --- a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml +++ b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml @@ -28,6 +28,9 @@ AND invCode = #{invCode} + + AND targetInvCode = #{targetInvCode} + AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')