From d313d19f3596cf6109a22816d0d1d1bdb858d457 Mon Sep 17 00:00:00 2001 From: yewj Date: Wed, 16 Oct 2024 09:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=93=E5=AD=98=E6=98=8E?= =?UTF-8?q?=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/service/inout/IoAddInoutService.java | 14 +++++++++----- .../api/service/inv/impl/InvProductService.java | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) 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 9533662e1..c0043a459 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -863,6 +863,8 @@ public class IoAddInoutService { return null; } + @Resource + IoCodeLostService codeLostService; public String checkOriginCode(IoCodeTempEntity warehouseEntity) { @@ -873,16 +875,18 @@ public class IoAddInoutService { if (udiRelevanceResponse == null) { return "耗材字典不存在此产品"; } - InvProductDetailEntity invProductDetailEntity = invProductDetailService.sortFindByCode(warehouseEntity.getCode()); - if (invProductDetailEntity != null) { + + + IoCodeLostEntity codeLostEntity = codeLostService.findByCode(warehouseEntity.getCode()); + if (codeLostEntity != null) { if (StrUtil.isEmpty(warehouseEntity.getBatchNo())) { - warehouseEntity.setBatchNo(invProductDetailEntity.getBatchNo()); + warehouseEntity.setBatchNo(codeLostEntity.getBatchNo()); } if (StrUtil.isEmpty(warehouseEntity.getProduceDate())) { - warehouseEntity.setProduceDate(invProductDetailEntity.getProduceDate()); + warehouseEntity.setProduceDate(codeLostEntity.getProduceDate()); } if (StrUtil.isEmpty(warehouseEntity.getExpireDate())) { - warehouseEntity.setExpireDate(invProductDetailEntity.getExpireDate()); + warehouseEntity.setExpireDate(codeLostEntity.getExpireDate()); } } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java index 186c34be6..ef302caf5 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductService.java @@ -194,4 +194,7 @@ public class InvProductService extends ServiceImpl