From dfa21eea5938f0c5dd2437afb2a2b13486603169 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 8 Feb 2023 14:43:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=81=97?= =?UTF-8?q?=E6=BC=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MaterialServiceImpl.java | 9 +++++++++ .../resources/templates/pages/group/group-add_back.html | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index e1e9641f..97de49f4 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -829,6 +829,15 @@ public class MaterialServiceImpl implements MaterialService { } } List splitInfoByMid = splitUnitService.findSplitInfoByMid(m.getMid()); + if(splitInfoByMid == null){ + splitInfoByMid = new ArrayList<>(); + } + + Map paramByBarcode = new HashMap<>(); + paramByBarcode.put("mcode", m.getCode()); + paramByBarcode.put("codeFlag", 1); + List materialByBarCodeByCondition = materialMapper.findMaterialByBarCodeByCondition(paramByBarcode); + m.setMaterialAndBarCodeList(materialByBarCodeByCondition); m.setSplitInfoList(splitInfoByMid); MaterialType materialTypeByOldId = materialTypeMapper.findMaterialTypeByOldId(material.getMaterialTypeId()); m.setTypeName(materialTypeByOldId.getTname()); diff --git a/src/main/resources/templates/pages/group/group-add_back.html b/src/main/resources/templates/pages/group/group-add_back.html index 0f356f50..75420577 100644 --- a/src/main/resources/templates/pages/group/group-add_back.html +++ b/src/main/resources/templates/pages/group/group-add_back.html @@ -608,7 +608,7 @@ var idNumber = materialId.name.split("mid")[1]; var unit = $("#unit" + idNumber); unit.empty(); - $("#unit" + idNumber).append(new Option(material.baseUnit, "-1")); + $("#unit" + idNumber).append(new Option(material.unit, "-1")); var unitList = material["splitInfoList"]; for (let i = 0; i < unitList.length; i++) { $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); @@ -772,7 +772,7 @@ unit.empty(); $("#unit" + idNumber).append(new Option(material.baseUnit, "-1")); var unitList = material["splitInfoList"]; - if (unitList !== null && unitList != undefined) { + if (unitList !== null && unitList !== undefined) { for (let i = 0; i < unitList.length; i++) { $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); }