diff --git a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java index e15f7e25..2ac7d613 100644 --- a/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java +++ b/src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java @@ -82,7 +82,8 @@ public class RelCodeBatchController extends BaseController { @GetMapping("/udiwms/relCode/batch/filter") public BaseResponse list(RelCodeBatchRequest relCodeBatchRequest, BindingResult bindingResult) { String customerId = getCustomerId(); - relCodeBatchRequest.setErpId(customerId); + if (!customerId.equals("110")) + relCodeBatchRequest.setErpId(customerId); List relCodeBatchResponses = relCodeBatchService.filterList(relCodeBatchRequest); PageInfo pageInfo = new PageInfo<>(relCodeBatchResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index 30e5a5ce..24cafff0 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -406,7 +406,8 @@ public class SpsSyncDownloadController { saveUploadProBusinessData(JSONUtil.toBean(obj, SpsSyncProBusinessDataResponse.class)); break; case DRUG_DATA_TASK: - saveUploadDrugData(JSONUtil.toBean(obj, SpsSyncDrugDataTaskResponse.class)); + //不允许内网同步zhi +// saveUploadDrugData(JSONUtil.toBean(obj, SpsSyncDrugDataTaskResponse.class)); break; } String taskId = obj.getStr("taskId"); diff --git a/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSinglerelationResponse.java b/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSinglerelationResponse.java index 2b1eb862..b7c62dfc 100644 --- a/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSinglerelationResponse.java +++ b/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSinglerelationResponse.java @@ -105,8 +105,8 @@ public class AlihealthKytSinglerelationResponse extends AlihealthKytCommonParame // relCodeBatch.setCreateUser(); relCodeBatch.setUpdateTime(new Date()); relCodeBatch.setUpdateUser(customerId); - relCodeBatch.setUploadFlagUp(1); - relCodeBatch.setUploadFlagDown(1); + relCodeBatch.setUploadFlagUp(0); + relCodeBatch.setUploadFlagDown(0); relCodeBatch.setParentCode(null); // relCodeBatch.setErpId(); diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index 6c7bcf0a..04cd2b53 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -430,7 +430,7 @@ public class RelCodeBatchService extends ServiceImpl relCodeDetails = codeMap.get(StrUtil.isNotBlank(parentCode) ? parentCode : "0"); - if (relCodeDetails == null){ + if (relCodeDetails == null) { List newRelCodeDetails = new ArrayList<>(); newRelCodeDetails.add(relCodeDetail); - codeMap.put(StrUtil.isNotBlank(parentCode) ? parentCode : "0",newRelCodeDetails); - }else { + codeMap.put(StrUtil.isNotBlank(parentCode) ? parentCode : "0", newRelCodeDetails); + } else { relCodeDetails.add(relCodeDetail); - codeMap.put(StrUtil.isNotBlank(parentCode) ? parentCode : "0",relCodeDetails); + codeMap.put(StrUtil.isNotBlank(parentCode) ? parentCode : "0", relCodeDetails); } } } //开始处理codeMap - if (!codeMap.isEmpty()){ + if (!codeMap.isEmpty()) { Map> sortedCodeMap = codeMap.entrySet() .stream() @@ -540,10 +540,10 @@ public class RelCodeBatchService extends ServiceImpl list = entry.getValue(); - if ("0".equals(key)){ + if ("0".equals(key)) { for (RelCodeDetail relCodeDetail : list) { RelCodeBatch addRelCodeBatch = new RelCodeBatch(); - BeanUtils.copyProperties(relCodeBatch,addRelCodeBatch); + BeanUtils.copyProperties(relCodeBatch, addRelCodeBatch); addRelCodeBatch.setParentCode(key); String curCode = relCodeDetail.getCurCode(); String diStr = FilterUdiUtils.getUdi(curCode).getUdi(); @@ -553,16 +553,16 @@ public class RelCodeBatchService extends ServiceImpl { + updateDrugLevelRelCodeBatch.forEach(item -> { this.updateDrugLevelCount(item); }); } @@ -604,15 +604,16 @@ public class RelCodeBatchService extends ServiceImpl list = relCodeDetailService.list(new LambdaQueryWrapper().eq(RelCodeDetail::getParentCode, curCode)); - if (CollUtil.isNotEmpty(list)){ + if (CollUtil.isNotEmpty(list)) { RelCodeDetail relCodeDetail = list.get(0); Integer packLayer = relCodeDetail.getPackLayer(); - if (packLayer == 2){ + if (packLayer == 2) { item.setThreeLevelCount(1); item.setTwoLevelCount(list.size()); @@ -623,12 +624,12 @@ public class RelCodeBatchService extends ServiceImpl twoRelCodeBatchs = this.list(new LambdaQueryWrapper().in(RelCodeBatch::getCurCode, twoCurCodes)); - if (CollUtil.isNotEmpty(twoRelCodeBatchs)){ - twoRelCodeBatchs.forEach( t -> { + if (CollUtil.isNotEmpty(twoRelCodeBatchs)) { + twoRelCodeBatchs.forEach(t -> { this.updateDrugLevelCount(t); }); } - }else if (packLayer == 1){ + } else if (packLayer == 1) { item.setThreeLevelCount(0); item.setTwoLevelCount(1); item.setOneLevelCount(list.size()); 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 97df8b67..0e1bc858 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -306,7 +306,7 @@ public class IoCheckInoutService { isTrue = true; } } - if (isTrue) { + if (isTrue && codeLostEntity.getId() != null) { codeLostEntity.setCreateTime(new Date()); codeLostService.insertOrUpdate(codeLostEntity); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java index 71a2d9ed..1d08a5e7 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java @@ -5,7 +5,10 @@ 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.req.inout.IoCodeLostRequest; +import com.glxp.api.res.collect.RelCodeDetailResponse; import com.glxp.api.res.inout.IoCodeLostResponse; +import com.glxp.api.service.collect.RelCodeDetailService; +import com.glxp.api.util.MsDateUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -38,16 +41,31 @@ public class IoCodeLostServiceImpl extends ServiceImpl codeLostEntities = codeLostEntityMapper.selectList(new QueryWrapper().eq("code", code).last("limit 1")); + RelCodeDetailResponse codeRelEntity = relCodeDetailService.findByCode(code); + if (codeRelEntity != null) { + IoCodeLostEntity udiEntity = new IoCodeLostEntity(); + udiEntity.setBatchNo(codeRelEntity.getBatchNo()); + udiEntity.setCode(code); + udiEntity.setProduceDate(MsDateUtil.formatDate(codeRelEntity.getMadeDate(), "yyMMdd")); + udiEntity.setExpireDate(MsDateUtil.formatDate(codeRelEntity.getValidateDate(), "yyMMdd")); + return udiEntity; + } + + List codeLostEntities = codeLostEntityMapper.selectList(new QueryWrapper().like("code", code).last("limit 1")); if (CollUtil.isNotEmpty(codeLostEntities)) { return codeLostEntities.get(0); } + return null; } + @Override public int insert(IoCodeLostEntity ioCodeLostEntity) { diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml b/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml index 0f09f934..007e3085 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml @@ -3,18 +3,18 @@