From 315fe488e03737e5f674099d98eafab8179d2855 Mon Sep 17 00:00:00 2001
From: chen <2710907404@qq.com>
Date: Wed, 13 Nov 2024 09:59:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=201.=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=AF=92=E5=93=81=E5=BA=93=E4=B8=AD=E7=9A=84=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=BD=92=E8=BF=98=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imr/service/impl/DrugMaterialInfoServiceImpl.java        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/imr/service/impl/DrugMaterialInfoServiceImpl.java b/src/main/java/digital/laboratory/platform/imr/service/impl/DrugMaterialInfoServiceImpl.java
index 86ca07a..572e68c 100644
--- a/src/main/java/digital/laboratory/platform/imr/service/impl/DrugMaterialInfoServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/imr/service/impl/DrugMaterialInfoServiceImpl.java
@@ -180,7 +180,7 @@ public class DrugMaterialInfoServiceImpl extends ServiceImpl<DrugMaterialInfoMap
                 .getDrugMaterialVO(Wrappers.<DrugMaterialInfo>query()
                         .in("drug_no",
                                 sample.stream().map(InRepositoryDTO::getSampleNo).collect(Collectors.toList()))
-                        .eq("dm.status", DrugMaterialStatus.ENTER_DRUG_INFO.getStatus())); // 状态为为未入库的
+                        .in("dm.status", DrugMaterialStatus.ENTER_DRUG_INFO.getStatus(), DrugMaterialStatus.OUTBOUND.getStatus())); // 状态为为未入库或已出库的
         if (CollUtil.isEmpty(drugMaterialInfoVOS)) {
             return Collections.emptyList();
         }
@@ -205,9 +205,6 @@ public class DrugMaterialInfoServiceImpl extends ServiceImpl<DrugMaterialInfoMap
 //                throw new ValidateCodeException(String.format("毒品检材编号为 %s 的毒品信息不存在请重试!", dto.getSampleNo()));
                 continue;
             }
-            if (drugMaterialInfoVO.getStatus() != 0) {// 判断检材是否是未入库状态
-                throw new ValidateCodeException(String.format("编号为 %s 的样本当前状态不是入库状态!", dto.getSampleNo()));
-            }
             // 查询当前毒品检材是否已经录入过
             SampleStorage sampleStorage = sampleStorageMap.get(drugMaterialInfoVO.getId());
             //已经录入到关联表;待存放状态