From d20da956d28661797582cfa0263bd9e99d2b507d Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 8 Feb 2023 14:35:53 +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 --- .../depository_manage/controller/MaterialController.java | 9 ++++++--- .../depository_manage/entity/MaterialAndBarCode.java | 1 + .../depository_manage/mapper/MaterialMapper.xml | 1 + .../templates/pages/application/application-in.html | 2 +- .../pages/application/application-transfer.html | 5 ++++- .../resources/templates/pages/group/group-add_back.html | 5 +++-- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index f3340072..7d32b3bf 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -1208,23 +1208,26 @@ public class MaterialController { // 获取条形码与物料的映射 MaterialAndBarCode materialByBarCode = materialService.findMaterialByBarCode(qrCode); if (materialByBarCode != null) { - for (int j = 0; j < depositoryByAdminorg.size(); j++) { + for (Depository depository : depositoryByAdminorg) { List placePList = new ArrayList<>(); Boolean isExist = false; Map param = new HashMap<>(); - param.put("depositoryId", depositoryByAdminorg.get(j).getId()); + param.put("depositoryId", depository.getId()); param.put("mcode", materialByBarCode.getMcode()); List inventory = materialService.findInventory(param); if (inventory.size() > 0) { // 如果存在该物料 InventoryP materialP = inventory.get(0); materialByBarCode.setMid(materialP.getId()); - List placeByMidAndDid = placeService.findPlaceByMidAndDid(materialP.getId(), depositoryByAdminorg.get(j).getId()); + List placeByMidAndDid = placeService.findPlaceByMidAndDid(materialP.getId(), depository.getId()); placePList.addAll(placeByMidAndDid); isExist = true; } if (isExist) { materialByBarCode.setPlacePList(placePList); + Inventory inventoryById = materialService.findInventoryById(materialByBarCode.getMid()); + List splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryById.getMid()); + materialByBarCode.setSplitInfoList(splitInfoByMid); return new RestResponse(materialByBarCode); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java index 2144d38e..c9421811 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java @@ -80,4 +80,5 @@ public class MaterialAndBarCode { * 该物料对应的拆单记录 */ private List splitInfoList; + } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml index 287d9a6e..189186ab 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml @@ -589,6 +589,7 @@ and bmcode = #{qrCode} and codeFlag = 2 + group by bmcode diff --git a/src/main/resources/templates/pages/application/application-in.html b/src/main/resources/templates/pages/application/application-in.html index f22f201a..15780b87 100644 --- a/src/main/resources/templates/pages/application/application-in.html +++ b/src/main/resources/templates/pages/application/application-in.html @@ -1138,7 +1138,7 @@ form.render(); 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)); diff --git a/src/main/resources/templates/pages/application/application-transfer.html b/src/main/resources/templates/pages/application/application-transfer.html index 43d6c7b3..985cee7d 100644 --- a/src/main/resources/templates/pages/application/application-transfer.html +++ b/src/main/resources/templates/pages/application/application-transfer.html @@ -455,11 +455,14 @@ var unit = $("#unit" + idNumber); unit.empty(); - $("#unit" + idNumber).append(new Option(data.baseUnit, "-1")); + $("#unit" + idNumber).append(new Option(data.unit, "-1")); + form.render(); var unitList = data["splitInfoList"]; for (let i = 0; i < unitList.length; i++) { $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); } + form.render(); + $('#place' + codeId).empty(); $.each(data.placePList, function (index, item) { 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 f9874ee9..0f356f50 100644 --- a/src/main/resources/templates/pages/group/group-add_back.html +++ b/src/main/resources/templates/pages/group/group-add_back.html @@ -428,7 +428,7 @@ var materialCode = materialCodeItem[1]; - var data = d.data; + var data = d.data.material; if (data !== null) { materialName.value = data.mname; materialId.value = data.mid; @@ -438,7 +438,7 @@ var idNumber = materialId.name.split("mid")[1]; var unit = $("#unit" + idNumber); unit.empty(); - $("#unit" + idNumber).append(new Option(data.baseUnit, "-1")); + $("#unit" + idNumber).append(new Option(data.unit, "-1")); var unitList = data["splitInfoList"]; for (let i = 0; i < unitList.length; i++) { $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); @@ -457,6 +457,7 @@ }) } }) + }; // 用于扫码功能