From 5469e79d6925dcd1c219278903dfa295828ae0ba Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 22 Feb 2023 16:42:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E5=85=A5=E5=BA=93=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E7=94=B3=E8=AF=B7=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GroupController.java | 1 - .../controller/MaterialController.java | 11 +- .../impl/DepositoryRecordServiceImpl.java | 2 +- .../service/impl/GroupServiceImpl.java | 15 ++- .../templates/pages/group/group-add_back.html | 114 +++++++++--------- .../depository_manage/TestOther.java | 2 +- .../templates/pages/group/group-add_back.html | 114 +++++++++--------- 7 files changed, 133 insertions(+), 126 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java index 16123f25..68ea8909 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -57,7 +57,6 @@ public class GroupController { public RestResponse addGroup(@RequestBody Map map, HttpServletRequest request) { // 获取物料数量 Integer len = ObjectFormatUtil.toInteger(map.get("len")); - // 获取添加成功的数量 Integer integer = groupService.addGroup(map); return CrudUtil.postHandle(len, integer); 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 8d45cbe7..9bf816ba 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -301,8 +301,8 @@ public class MaterialController { } List placePList = new ArrayList<>(); List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); - for (int i = 0; i < depositoryByAdminorg.size(); i++) { - List placeByMidAndDid = placeService.findPlaceByMidAndDid(ObjectFormatUtil.toInteger(mid), depositoryByAdminorg.get(i).getId()); + for (Depository depository : depositoryByAdminorg) { + List placeByMidAndDid = placeService.findPlaceByMidAndDid(ObjectFormatUtil.toInteger(mid), depository.getId()); placePList.addAll(placeByMidAndDid); } Map param = new HashMap<>(); @@ -320,10 +320,11 @@ public class MaterialController { map.put("materialById", materialP); } else { materialById.setPrice(0.0); - materialById.setMaterialAndBarCodeList(materialByBarCodeByCondition); List splitInfoByMid = splitUnitService.findSplitInfoByMid(materialById.getId()); - materialById.setSplitInfoList(splitInfoByMid); - map.put("materialById", materialById); + MaterialP m = new MaterialP(materialById); + m.setSplitInfoList(splitInfoByMid); + m.setMaterialAndBarCodeList(materialByBarCodeByCondition); + map.put("materialById", m); } map.put("placeList", placePList); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index e3b90498..3491450a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -687,7 +687,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (!flagForApproval) { // 如果不需要审批 Integer result = updateInventoryInfoForApproval(map, quantity, materialById, placeById); - map.remove("applicationInId"); + map.remove("id"); return result; } else { map.put("applicationInId", map.get("id")); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java index 6e6c1b1d..82b905d2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java @@ -892,10 +892,12 @@ public class GroupServiceImpl implements GroupService { depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId"))); } else { // 如果需要将其添加到列表中待后续使用 - recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); - depositoryIds.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + recordIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId"))); + depositoryIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("depositoryId"))); + insertForApplicationInRecord.remove("applicationInId"); } - } else { + } + else { insertForApplicationInRecord.put("price", String.valueOf(0)); insertForApplicationInRecord.put("unit", unit); insertForApplicationInRecord.put("type", "in"); @@ -905,13 +907,14 @@ public class GroupServiceImpl implements GroupService { depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId"))); } else { // 如果需要将其添加到列表中待后续使用 - recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); - depositoryIds.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + recordIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId"))); + depositoryIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("depositoryId"))); + insertForApplicationInRecord.remove("applicationInId"); } insertForApplicationInRecord.remove("applicationInId"); } } - + insertForApplicationInRecord.remove("toGroupId"); insertForApplicationInRecord.put("flagForGroup", 2); insertForApplicationInRecord.put("quantity", quantityForGroup.toString()); insertForApplicationInRecord.put("mid", gid); 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 bda67b74..98739101 100644 --- a/src/main/resources/templates/pages/group/group-add_back.html +++ b/src/main/resources/templates/pages/group/group-add_back.html @@ -70,7 +70,7 @@
-
+
组合明细
@@ -353,7 +353,7 @@ // 获取当前高度 var height = parseInt(($("#stepForm").css('height')).split("px")[0]); params.push(NewIdNumber); - $("#stepForm").css("height", height + 384 + 'px'); + $("#stepForm").css("height", height + 339 + 'px'); $("#" + parentId).after(materialItem); }; @@ -366,7 +366,7 @@ // 获取祖父节点 var reparent = parent.parentNode; var height = parseInt(($("#stepForm").css('height')).split("px")[0]); - $("#stepForm").css("height", height - 384 + 'px'); + $("#stepForm").css("height", height - 339 + 'px'); params = remove(params, parentId); reparent.removeChild(parent); }; @@ -667,65 +667,67 @@ var req = {}; req.code = code; req.type = "in"; - $.ajax({ - url: "/material/findMatrialByCode", - type: "get", - dataType: 'json', - data: (req), - contentType: "application/json;charset=utf-8", - success: function (d) { - var d = d.data; - if (d == null) { - layer.msg("仓库中暂无该物料"); - materialName.value = ""; - materialId.value = ""; - obj.value = ""; - $('#place' + objId).empty(); + if(code !== "") { + $.ajax({ + url: "/material/findMatrialByCode", + type: "get", + dataType: 'json', + data: (req), + contentType: "application/json;charset=utf-8", + success: function (d) { + var d = d.data; + if (d == null) { + layer.msg("仓库中暂无该物料"); + materialName.value = ""; + materialId.value = ""; + obj.value = ""; + $('#place' + objId).empty(); - } else { - materialName.value = d.mname; - materialId.value = d.mid; - var idNumber = materialId.name.split("mid")[1]; - // 获取物料与条形码的对应关系 - var materialAndBarCodeList = d["materialAndBarCodeList"]; - var unit = $("#unit" + idNumber); - unit.empty(); - $("#unit" + idNumber).append(new Option(d.baseUnit, "-1")); - var unitList = d["splitInfoList"]; - for (let i = 0; i < unitList.length; i++) { - $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); - } - form.render(); - if (materialAndBarCodeList.length > 0) { - // 如果有对应的条形码 - var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; - var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; - var id = barCodeInput.id; - $("#" + id).remove(); - $("#barCode" + idNumber).empty(); - var barCode = $("#barCode" + idNumber); - if (barCode.length > 0) { - barCode.empty(); - } else { - var barCodeSelect = ` - `; - $("#" + barCodeImg.id).before(barCodeSelect); + } else { + materialName.value = d.mname; + materialId.value = d.mid; + var idNumber = materialId.name.split("mid")[1]; + // 获取物料与条形码的对应关系 + var materialAndBarCodeList = d["materialAndBarCodeList"]; + var unit = $("#unit" + idNumber); + unit.empty(); + $("#unit" + idNumber).append(new Option(d.baseUnit, "-1")); + var unitList = d["splitInfoList"]; + for (let i = 0; i < unitList.length; i++) { + $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); } form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 - }); - form.render(); - } else { - var barCode = $("#barCode" + idNumber); - if (barCode.length > 0) { - barCode.empty(); + if (materialAndBarCodeList.length > 0) { + // 如果有对应的条形码 + var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; + var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; + var id = barCodeInput.id; + $("#" + id).remove(); + $("#barCode" + idNumber).empty(); + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } else { + var barCodeSelect = ` + `; + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } else { + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } } } } - } - }); + }); + } }; //用于实现物料名称搜索 diff --git a/src/test/java/com/dreamchaser/depository_manage/TestOther.java b/src/test/java/com/dreamchaser/depository_manage/TestOther.java index e8e13343..80336932 100644 --- a/src/test/java/com/dreamchaser/depository_manage/TestOther.java +++ b/src/test/java/com/dreamchaser/depository_manage/TestOther.java @@ -44,7 +44,7 @@ public class TestOther { @Test public void Test() throws IOException { - String spNo = "202302220012"; + String spNo = "202302220024"; String mainId = (String) redisTemplate.opsForHash().get(spNo, "mainId"); ApprovalInfo_Details finalApprovalInfo_details = new ApprovalInfo_Details(); ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver(); diff --git a/target/classes/templates/pages/group/group-add_back.html b/target/classes/templates/pages/group/group-add_back.html index bda67b74..98739101 100644 --- a/target/classes/templates/pages/group/group-add_back.html +++ b/target/classes/templates/pages/group/group-add_back.html @@ -70,7 +70,7 @@
-
+
组合明细
@@ -353,7 +353,7 @@ // 获取当前高度 var height = parseInt(($("#stepForm").css('height')).split("px")[0]); params.push(NewIdNumber); - $("#stepForm").css("height", height + 384 + 'px'); + $("#stepForm").css("height", height + 339 + 'px'); $("#" + parentId).after(materialItem); }; @@ -366,7 +366,7 @@ // 获取祖父节点 var reparent = parent.parentNode; var height = parseInt(($("#stepForm").css('height')).split("px")[0]); - $("#stepForm").css("height", height - 384 + 'px'); + $("#stepForm").css("height", height - 339 + 'px'); params = remove(params, parentId); reparent.removeChild(parent); }; @@ -667,65 +667,67 @@ var req = {}; req.code = code; req.type = "in"; - $.ajax({ - url: "/material/findMatrialByCode", - type: "get", - dataType: 'json', - data: (req), - contentType: "application/json;charset=utf-8", - success: function (d) { - var d = d.data; - if (d == null) { - layer.msg("仓库中暂无该物料"); - materialName.value = ""; - materialId.value = ""; - obj.value = ""; - $('#place' + objId).empty(); + if(code !== "") { + $.ajax({ + url: "/material/findMatrialByCode", + type: "get", + dataType: 'json', + data: (req), + contentType: "application/json;charset=utf-8", + success: function (d) { + var d = d.data; + if (d == null) { + layer.msg("仓库中暂无该物料"); + materialName.value = ""; + materialId.value = ""; + obj.value = ""; + $('#place' + objId).empty(); - } else { - materialName.value = d.mname; - materialId.value = d.mid; - var idNumber = materialId.name.split("mid")[1]; - // 获取物料与条形码的对应关系 - var materialAndBarCodeList = d["materialAndBarCodeList"]; - var unit = $("#unit" + idNumber); - unit.empty(); - $("#unit" + idNumber).append(new Option(d.baseUnit, "-1")); - var unitList = d["splitInfoList"]; - for (let i = 0; i < unitList.length; i++) { - $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); - } - form.render(); - if (materialAndBarCodeList.length > 0) { - // 如果有对应的条形码 - var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; - var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; - var id = barCodeInput.id; - $("#" + id).remove(); - $("#barCode" + idNumber).empty(); - var barCode = $("#barCode" + idNumber); - if (barCode.length > 0) { - barCode.empty(); - } else { - var barCodeSelect = ` - `; - $("#" + barCodeImg.id).before(barCodeSelect); + } else { + materialName.value = d.mname; + materialId.value = d.mid; + var idNumber = materialId.name.split("mid")[1]; + // 获取物料与条形码的对应关系 + var materialAndBarCodeList = d["materialAndBarCodeList"]; + var unit = $("#unit" + idNumber); + unit.empty(); + $("#unit" + idNumber).append(new Option(d.baseUnit, "-1")); + var unitList = d["splitInfoList"]; + for (let i = 0; i < unitList.length; i++) { + $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); } form.render(); - $.each(materialAndBarCodeList, function (index, item) { - $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 - }); - form.render(); - } else { - var barCode = $("#barCode" + idNumber); - if (barCode.length > 0) { - barCode.empty(); + if (materialAndBarCodeList.length > 0) { + // 如果有对应的条形码 + var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; + var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; + var id = barCodeInput.id; + $("#" + id).remove(); + $("#barCode" + idNumber).empty(); + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } else { + var barCodeSelect = ` + `; + $("#" + barCodeImg.id).before(barCodeSelect); + } + form.render(); + $.each(materialAndBarCodeList, function (index, item) { + $("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 + }); + form.render(); + } else { + var barCode = $("#barCode" + idNumber); + if (barCode.length > 0) { + barCode.empty(); + } } } } - } - }); + }); + } }; //用于实现物料名称搜索