From 2ccc6f6998a5265b3f8227eb855bc86a2011d119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 17 Dec 2021 23:23:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=95=8C=E9=9D=A2=E7=9A=84=E5=A4=9A=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/MaterialController.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java index f6bc738e..11755d9b 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java @@ -208,11 +208,26 @@ public class MaterialController { for (MaterialVo4Unit material : dataList) { JSONObject item = new JSONObject(); item.put("id", material.getMeId()); //商品扩展表的id - String ratioStr; //比例 - if (material.getUnitId() == null || material.getUnitId().equals("")) { + String ratioStr = ""; //比例 + Unit unit = new Unit(); + if (material.getUnitId() == null) { ratioStr = ""; } else { - ratioStr = "[多单位]"; + unit = unitService.getUnit(material.getUnitId()); + //拼接副单位的比例 + String commodityUnit = material.getCommodityUnit(); + if(commodityUnit.equals(unit.getBasicUnit())) { + ratioStr = "[基本]"; + } + if(commodityUnit.equals(unit.getOtherUnit())) { + ratioStr = "[" + unit.getRatio() + unit.getBasicUnit() + "]"; + } + if(commodityUnit.equals(unit.getOtherUnitTwo())) { + ratioStr = "[" + unit.getRatioTwo() + unit.getBasicUnit() + "]"; + } + if(commodityUnit.equals(unit.getOtherUnitThree())) { + ratioStr = "[" + unit.getRatioThree() + unit.getBasicUnit() + "]"; + } } item.put("mBarCode", material.getmBarCode()); item.put("name", material.getName()); @@ -230,7 +245,6 @@ public class MaterialController { } else { stock = depotItemService.getStockByParam(depotId,material.getId(),null,null); if (material.getUnitId()!=null){ - Unit unit = unitService.getUnit(material.getUnitId()); String commodityUnit = material.getCommodityUnit(); stock = unitService.parseStockByUnit(stock, unit, commodityUnit); }