From c0b36da2747c263cd74a08c5be42be95a48b158e Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 11 Mar 2024 09:53:07 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=8C=BA=E5=9F=9F=E4=BA=BA?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basedata/master/service/impl/SalesServiceImpl.java | 4 +++- .../src/main/java/org/nl/wms/sch/wql/TEST0002.wql | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java index 351d6340d..c35e148a7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java @@ -84,7 +84,9 @@ public class SalesServiceImpl implements SalesService { String sales_code = dto.getSales_code(); SalesDto unitDto = this.findByCode(sales_code); if (unitDto != null) { - throw new BadRequestException("存在相同的编码"); + if (unitDto.getArea().equals(dto.getArea())) { + throw new BadRequestException("存在相同区域的业务员!"); + } } dto.setSales_id(IdUtil.getSnowflake(1, 1).nextId()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql index 401bcddb0..388e00f01 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/wql/TEST0002.wql @@ -40,11 +40,13 @@ IF 输入.flag = "1" QUERY SELECT - cust.*, + cust.cust_code, + cust.cust_name, + SUBSTRING_INDEX(cust.sales_owner, '|', 1) AS sales_owner, info1.area FROM md_cs_customerbase cust - INNER JOIN md_cs_areasalesinfo info1 ON info1.sales_name = cust.sales_owner + INNER JOIN md_cs_areasalesinfo info1 ON info1.sales_name = SUBSTRING_INDEX(cust.sales_owner, '|', 1) WHERE cust.is_delete = '0' AND cust.is_used = '1'