From 7186017965bb763a21f41bd152ecf9c7aa16dd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Mon, 11 Jul 2022 22:32:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E5=94=AE=E6=88=96=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=8D=95=E4=BB=B7=E4=BD=8E=E4=BA=8E=E6=9C=80=E4=BD=8E=E5=94=AE?= =?UTF-8?q?=E4=BB=B7=EF=BC=8C=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/constants/ExceptionConstants.java | 3 +++ .../jsh/erp/service/depotItem/DepotItemService.java | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java index b6846a84..e4b85bcb 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java @@ -382,6 +382,9 @@ public class ExceptionConstants { //单据录入-累计订金超出原订单中的订金 public static final int DEPOT_HEAD_DEPOSIT_OVER_PRE_CODE = 8000017; public static final String DEPOT_HEAD_DEPOSIT_OVER_PRE_MSG = "抱歉,累计订金超出原订单中的订金"; + //单据录入-商品条码XXX的单价低于最低售价 + public static final int DEPOT_HEAD_UNIT_PRICE_LOW_CODE = 8000018; + public static final String DEPOT_HEAD_UNIT_PRICE_LOW_MSG = "商品条码%s的单价低于最低售价"; /** * 单据明细信息 * type = 90 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 7f80bead..7878bbe4 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -486,7 +486,17 @@ public class DepotItemService { } } if (StringUtil.isExist(rowObj.get("unitPrice"))) { - depotItem.setUnitPrice(rowObj.getBigDecimal("unitPrice")); + BigDecimal unitPrice = rowObj.getBigDecimal("unitPrice"); + depotItem.setUnitPrice(unitPrice); + if(materialExtend.getLowDecimal()!=null) { + //零售或销售单价低于最低售价,进行提示 + if("零售".equals(depotHead.getSubType()) || "销售".equals(depotHead.getSubType())) { + if (unitPrice.compareTo(materialExtend.getLowDecimal()) < 0) { + throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_UNIT_PRICE_LOW_CODE, + String.format(ExceptionConstants.DEPOT_HEAD_UNIT_PRICE_LOW_MSG, barCode)); + } + } + } } if (StringUtil.isExist(rowObj.get("taxUnitPrice"))) { depotItem.setTaxUnitPrice(rowObj.getBigDecimal("taxUnitPrice"));