From 3a9c48c6ecb6fdddb383102238e126329e04cbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 19 Oct 2022 23:30:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=85=B3=E8=81=94=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E9=9A=90=E8=97=8F=E6=8E=89=E9=94=80=E5=94=AE=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/controller/DepotItemController.java | 15 +++++++++------ .../erp/service/depotHead/DepotHeadService.java | 7 +++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index 3bf9dfa9..5a7d51b3 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -213,18 +213,21 @@ public class DepotItemController { item.put("preNumber", diEx.getOperNumber()); //原数量 item.put("finishNumber", depotItemService.getFinishNumber(diEx.getMaterialExtendId(), diEx.getId(), diEx.getHeaderId(), unitInfo, materialUnit, linkType)); //已入库|已出库 item.put("purchaseDecimal", diEx.getPurchaseDecimal()); //采购价 - item.put("unitPrice", diEx.getUnitPrice()); - item.put("taxUnitPrice", diEx.getTaxUnitPrice()); - item.put("allPrice", diEx.getAllPrice()); + if("basic".equals(linkType)) { + //正常情况显示金额，而以销定购的情况不能显示金额 + item.put("unitPrice", diEx.getUnitPrice()); + item.put("taxUnitPrice", diEx.getTaxUnitPrice()); + item.put("allPrice", diEx.getAllPrice()); + item.put("taxRate", diEx.getTaxRate()); + item.put("taxMoney", diEx.getTaxMoney()); + item.put("taxLastMoney", diEx.getTaxLastMoney()); + } item.put("remark", diEx.getRemark()); item.put("linkId", diEx.getLinkId()); item.put("depotId", diEx.getDepotId() == null ? "" : diEx.getDepotId()); item.put("depotName", diEx.getDepotId() == null ? "" : diEx.getDepotName()); item.put("anotherDepotId", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotId()); item.put("anotherDepotName", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotName()); - item.put("taxRate", diEx.getTaxRate()); - item.put("taxMoney", diEx.getTaxMoney()); - item.put("taxLastMoney", diEx.getTaxLastMoney()); item.put("mType", diEx.getMaterialType()); item.put("op", 1); dataArray.add(item); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 43274b04..d04b82bc 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -150,8 +150,15 @@ public class DepotHeadService { if(dh.getOperTime() != null) { dh.setOperTimeStr(getCenternTime(dh.getOperTime())); } + //商品信息简述 dh.setMaterialsList(findMaterialsListByHeaderId(dh.getId())); + //商品总数量 dh.setMaterialCount(getMaterialCountByHeaderId(dh.getId())); + //以销定购的情况（不能显示销售单据的金额） + if(StringUtil.isNotEmpty(purchaseStatus)) { + dh.setTotalPrice(null); + dh.setDiscountLastMoney(null); + } resList.add(dh); } }