From 1bcf3bd93ff46c02e0f4bc17c5decbf046832e20 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 30 Nov 2022 15:37:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/service/impl/SectattrServiceImpl.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java index 37d554e3a..c766ea2c7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/SectattrServiceImpl.java @@ -85,10 +85,11 @@ public class SectattrServiceImpl implements SectattrService { @Transactional(rollbackFor = Exception.class) public void create(SectattrDto dto) { String sect_code = dto.getSect_code(); - SectattrDto sectattrDto = this.findByCode(sect_code); - if (sectattrDto != null && sectattrDto.getIs_delete().equals("0")) { - throw new BadRequestException("存在相同的库区编号"); - } + + WQLObject tab = WQLObject.getWQLObject("st_ivt_sectattr"); + JSONObject json2 = tab.query("sect_code = '" + sect_code + "' and stor_id = '" + dto.getStor_id() + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json2)) throw new BadRequestException("存在相同仓库的库区编号"); + Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -116,11 +117,14 @@ public class SectattrServiceImpl implements SectattrService { throw new BadRequestException("被删除或无权限，操作失败!"); } - String sect_code = dto.getSect_code(); + /* String sect_code = dto.getSect_code(); SectattrDto sectattrDto = this.findByCode(sect_code); if (sectattrDto != null && !dto.getSect_id().equals(sectattrDto.getSect_id()) && sectattrDto.getIs_delete().equals("0")) { throw new BadRequestException("存在相同的库区编号"); - } + }*/ + String sect_code = dto.getSect_code(); + + WQLObject tab = WQLObject.getWQLObject("st_ivt_sectattr"); Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -135,6 +139,9 @@ public class SectattrServiceImpl implements SectattrService { WQLObject wo = WQLObject.getWQLObject("st_ivt_sectattr"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); wo.update(json); + + JSONArray resultJSONArray = tab.query("sect_code = '" + sect_code + "' and stor_id = '" + dto.getStor_id() + "'").getResultJSONArray(0); + if (resultJSONArray.size() > 1) throw new BadRequestException("存在相同仓库的库区编号"); } @Override