diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index d2e4eadb..75c31eb3 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -138,7 +138,6 @@ public class UdiTraceController { // TODO 20241017先把这个接口注释了 @AuthRuleAnnotation("") @GetMapping("spms/inv/products/order/trace") - public BaseResponse filterOrderTrace(FilterCodeTraceRequest filterCodeTraceRequest) { if (filterCodeTraceRequest.getCode() == null) { 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 24cafff0..57949693 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,7 @@ public class SpsSyncDownloadController { saveUploadProBusinessData(JSONUtil.toBean(obj, SpsSyncProBusinessDataResponse.class)); break; case DRUG_DATA_TASK: - //不允许内网同步zhi + //不允许内网同步至外网 // saveUploadDrugData(JSONUtil.toBean(obj, SpsSyncDrugDataTaskResponse.class)); break; } @@ -439,23 +439,6 @@ public class SpsSyncDownloadController { @Resource RelCodeBatchMapper relCodeBatchMapper; - private void saveUploadDrugData(SpsSyncDrugDataTaskResponse bean) { - if (CollectionUtil.isNotEmpty(bean.getRelCodeBatches())) { - for (RelCodeBatch entity : bean.getRelCodeBatches()) { - entity.setUpdateTime(null); - entity.setUploadFlagDown(1); - entity.setUploadFlagUp(0); - } - boolean b = relCodeBatchMapper.replaceBatchs(bean.getRelCodeBatches()); - } - if (CollectionUtil.isNotEmpty(bean.getRelCodeDetails())) { -// for (RelCodeDetail entity : bean.getRelCodeDetails()) { -// entity.setUpdateTime(null); -// } - boolean b = relCodeDetailMapper.replaceBatchs(bean.getRelCodeDetails()); - } - } - private String writeFile(String filePath, String fileDesc, String content) throws IOException { filePath = String.format("%s/%s", filePath, DateUtil.getDate()); diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index 8f72a7be..f7d47a10 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -1358,7 +1358,10 @@ public class SpsSyncDownloadService { jsonMap.put(SpsSyncDrugDataTaskResponse.class.getSimpleName(), dataResponse); remark.append("药品关联关系任务:").append(relCodeBatches.size()).append("条\n"); - boolean update = relCodeBatchService.update(new LambdaUpdateWrapper().set(RelCodeBatch::getUploadFlagDown, 1).in(RelCodeBatch::getId, batchIds)); + if (createFile) { + boolean update = relCodeBatchService.update(new LambdaUpdateWrapper().set(RelCodeBatch::getUploadFlagDown, 1).in(RelCodeBatch::getId, batchIds)); + } + } } diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeDetailMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeDetailMapper.xml index 5a27c7db..344bfef4 100644 --- a/src/main/resources/mybatis/mapper/collect/RelCodeDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/RelCodeDetailMapper.xml @@ -57,7 +57,7 @@ AND rcd.curCode = #{curCode} - AND rcd.parentCode = #{parentCode} + AND (rcd.parentCode = #{parentCode} or rcd.curCode = #{parentCode}) AND rcb.batchNo = #{batchNo}