From 3cc15bf44a20a566560b1c73336f84058ef03cb6 Mon Sep 17 00:00:00 2001 From: cjl Date: Fri, 1 Feb 2019 09:14:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=BA=93=E5=AD=98=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=E4=B8=8D=E8=83=BD=E6=B7=BB=E5=8A=A0=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serialNumber/SerialNumberService.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index 3285eb1a..819e693b 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -247,6 +247,8 @@ public class SerialNumberService { * 1、根据商品名称必须查询到唯一的商品 * 2、该商品必须已经启用序列号 * 3、该商品已绑定序列号数量小于商品现有库存 + * 2019-02-01 + * 用商品的库存去限制序列号的添加有点不合乎道理，去掉此限制 * create time: 2019/1/23 17:04 * @Param: materialName * @return Long 满足使用条件的商品的id @@ -257,15 +259,15 @@ public class SerialNumberService { //库存=入库-出库 //入库数量 Long materialId=checkMaterialName(materialName); - int inSum = depotItemService.findByTypeAndMaterialId(BusinessConstants.DEPOTHEAD_TYPE_STORAGE, materialId); - //出库数量 - int outSum = depotItemService.findByTypeAndMaterialId(BusinessConstants.DEPOTHEAD_TYPE_OUT, materialId); - //查询当前商品下有效的序列号 - int serialNumberSum = serialNumberMapperEx.findSerialNumberByMaterialId(materialId); - if((inSum-outSum)<=serialNumberSum){ - throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_MORE_THAN_STORAGE_CODE, - ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_MORE_THAN_STORAGE_MSG); - } +// int inSum = depotItemService.findByTypeAndMaterialId(BusinessConstants.DEPOTHEAD_TYPE_STORAGE, materialId); +// //出库数量 +// int outSum = depotItemService.findByTypeAndMaterialId(BusinessConstants.DEPOTHEAD_TYPE_OUT, materialId); +// //查询当前商品下有效的序列号 +// int serialNumberSum = serialNumberMapperEx.findSerialNumberByMaterialId(materialId); +// if((inSum-outSum)<=serialNumberSum){ +// throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_MORE_THAN_STORAGE_CODE, +// ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_MORE_THAN_STORAGE_MSG); +// } return materialId; } return null;