更新

1.更新毒品库中的入库归还逻辑

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());
             //已经录入到关联表;待存放状态