From c44aea35851f5f21714e5b1cea95318a232eea5b Mon Sep 17 00:00:00 2001 From: erdanergou Date: Sat, 18 Mar 2023 15:27:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depository_manage/service/impl/ExcelServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java index f04e4595..0cb4a8fc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java @@ -314,7 +314,12 @@ public class ExcelServiceImpl implements ExcelService { Material material = materialService.findMaterialByMnameAndVersion(insert); if (material == null) { - material = materialService.findMaterialByCode(excelInfoByInventory.getCode()); + String code = excelInfoByInventory.getCode(); + if (code != null && !"".equals(code)) { + material = materialService.findMaterialByCode(code); + }else{ + material = materialMapper.findMaterialByCondition(insert).get(0); + } } // 添加库存记录