From 046744149004a2754b41af0b65558244333d918a Mon Sep 17 00:00:00 2001 From: erdanergou Date: Tue, 7 Feb 2023 14:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PageController.java | 27 ++++++++++++------- .../pages/depository/table-stock.html | 5 ---- .../pages/stockTaking/stockTaking.html | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index fe2ccef2..44175b84 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -21,6 +21,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -485,6 +486,8 @@ public class PageController { @GetMapping("/selectPlaceByDepository") // 库位树形菜单 public ModelAndView selectPlaceByDepository(Integer depositoryId, Integer mid, String placeCode, String unit) { + + ModelAndView mv = new ModelAndView(); @@ -507,18 +510,24 @@ public class PageController { placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(place.getId(), mid); mv.addObject("placeId", place.getId()); } - if ("-1".equals(unit)) { + Inventory inventoryById = materialService.findInventoryById(mid); + if (unit.equals(inventoryById.getUnit())) { // 如果转移的基础单位 mv.addObject("quantity", placeAndMaterialByMidAndPid.getQuantity()); } else { // 获取当前的拆单记录 Map paramForSplitInfo = new HashMap<>(); - Inventory inventoryById = materialService.findInventoryById(mid); + paramForSplitInfo.put("mid", inventoryById.getMid()); paramForSplitInfo.put("newUnit", unit); SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), splitInfo.getId()); - mv.addObject("quantity", splitInventory.getSaveQuantity()); + if (splitInventory != null) { + mv.addObject("quantity", splitInventory.getSaveQuantity()); + }else{ + int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + mv.addObject("quantity",inventoryById.getQuantity() * Scale); + } } mv.addObject("depositoryId", depositoryId); mv.addObject("mid", mid); @@ -2428,9 +2437,9 @@ public class PageController { StringBuilder sb = new StringBuilder(); mv.setViewName("pages/notice/notice-edit"); String[] split = noticeById.getViewRangeId().split(","); - for (String s:split - ) { - if(!"".equals(s)){ + for (String s : split + ) { + if (!"".equals(s)) { // 获取对应的部门名称 qywxDepartment qyWxDepartment = QyWxConfig.getQyWxDepartment(crypt, ObjectFormatUtil.toInteger(s)); sb.append(qyWxDepartment.getName()).append(","); @@ -2449,17 +2458,17 @@ public class PageController { } @GetMapping("/noticeAll") - public ModelAndView noticeAll(HttpServletRequest request){ + public ModelAndView noticeAll(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/notice/notice-out_user"); UserByPort userToken = (UserByPort) request.getAttribute("userToken"); - mv.addObject("userId",userToken.getId()); + mv.addObject("userId", userToken.getId()); Integer role = userToken.getIsadmin(); if (role == null) { role = 1; } if (role == 4) { - mv.setViewName("pages/notice/notice-out"); + mv.setViewName("pages/notice/notice-out"); } return mv; } diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html index 5622fdd5..a3fd3e1f 100644 --- a/src/main/resources/templates/pages/depository/table-stock.html +++ b/src/main/resources/templates/pages/depository/table-stock.html @@ -365,7 +365,6 @@ }); return false; } else if (obj.event === 'changeUnit') { - let splitInfoList = data.splitInfoList; let showQuantity = data.showQuantity; let btn = $("#btn_" + data.id); let clickNum = Number(btn.attr("click_num")); @@ -415,10 +414,6 @@ // 当前点击行中的计量单位按钮 let unitBtn = obj.parentNode.parentNode.parentNode.childNodes[5].childNodes[0].childNodes[1]; let unit = unitBtn.innerText; - let click_num = Number(unitBtn.getAttribute("click_num")); - if (click_num === 0) { - unit = "-1"; - } var index = layer.open({ title: '选择库位', type: 2, diff --git a/src/main/resources/templates/pages/stockTaking/stockTaking.html b/src/main/resources/templates/pages/stockTaking/stockTaking.html index be5b9735..abed7a7b 100644 --- a/src/main/resources/templates/pages/stockTaking/stockTaking.html +++ b/src/main/resources/templates/pages/stockTaking/stockTaking.html @@ -789,7 +789,7 @@ form.render(); } let unitItem = $("#unit" + idNumber); - unitItem.empty() + unitItem.empty(); unitItem.append(new Option(material.unit, "-1")); let splitInfoList = material.splitInfoList; if (splitInfoList.length > 0) {