rev：区域人员

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());

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'