From 47bda0203526b903533a697d3a7dbc630ee462b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sat, 2 Oct 2021 21:59:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BA=8F=E5=88=97=E5=8F=B7?= =?UTF-8?q?=E4=BC=9A=E9=87=8D=E5=A4=8D=E6=96=B0=E5=A2=9E=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serialNumber/SerialNumberService.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index 3b971373..64e7520b 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -473,17 +473,25 @@ public class SerialNumberService { public void addSerialNumberByBill(Long materialId, Long depotId, String snList) throws Exception { List snArr = StringUtil.strToStringList(snList); for(String sn: snArr) { - SerialNumber serialNumber = new SerialNumber(); - serialNumber.setMaterialId(materialId); - serialNumber.setDepotId(depotId); - serialNumber.setSerialNumber(sn); - Date date=new Date(); - serialNumber.setCreateTime(date); - serialNumber.setUpdateTime(date); - User userInfo=userService.getCurrentUser(); - serialNumber.setCreator(userInfo==null?null:userInfo.getId()); - serialNumber.setUpdater(userInfo==null?null:userInfo.getId()); - serialNumberMapper.insertSelective(serialNumber); + List list = new ArrayList<>(); + SerialNumberExample example = new SerialNumberExample(); + example.createCriteria().andMaterialIdEqualTo(materialId).andSerialNumberEqualTo(sn) + .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + list = serialNumberMapper.selectByExample(example); + //判断如果不存在重复序列号就新增 + if(list == null || list.size() == 0) { + SerialNumber serialNumber = new SerialNumber(); + serialNumber.setMaterialId(materialId); + serialNumber.setDepotId(depotId); + serialNumber.setSerialNumber(sn); + Date date = new Date(); + serialNumber.setCreateTime(date); + serialNumber.setUpdateTime(date); + User userInfo = userService.getCurrentUser(); + serialNumber.setCreator(userInfo == null ? null : userInfo.getId()); + serialNumber.setUpdater(userInfo == null ? null : userInfo.getId()); + serialNumberMapper.insertSelective(serialNumber); + } } } }