From 41d73152d6f691d67770c875d732ca5ce2810b58 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Fri, 17 Oct 2025 14:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=A1=E6=81=AF=20=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E6=8F=90=E4=BA=A4=20=E7=BC=96=E7=A0=81=E6=97=A0?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9=20=20?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9=20=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bas/BasCustomer/domain/BasCustomer.java | 54 +++++++++++++------ .../service/impl/BasCustomerServiceImpl.java | 14 +++++ .../bas/BasSupplier/domain/BasSupplier.java | 50 ++++++++++++----- .../service/impl/BasSupplierServiceImpl.java | 14 +++++ .../mapper/bas/BasCustomerMapper.xml | 13 ++--- .../mapper/bas/BasSupplierMapper.xml | 14 ++--- ruoyi-ui/src/views/bas/basCustomer/index.vue | 22 ++++---- ruoyi-ui/src/views/bas/basSupplier/index.vue | 24 ++++----- 8 files changed, 142 insertions(+), 63 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java index 8a4a0f5..2238cc0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java @@ -23,7 +23,7 @@ public class BasCustomer extends BaseEntity private String customerNo; /** 客户基本分类 */ - @Excel(name = "客户基本分类") +// @Excel(name = "客户基本分类") private String customerGroupNo; /** 客户名称 */ @@ -38,62 +38,86 @@ public class BasCustomer extends BaseEntity @Excel(name = "是否可用",dictType = "is_available") private String useable; + /** 备注 */ + @Excel(name = "备注") + private String remark; + /** 业务部门 */ - @Excel(name = "业务部门") + //@Excel(name = "业务部门") private String businessDepartment; /** 业务员 */ - @Excel(name = "业务员") + //@Excel(name = "业务员") private String salesman; /** 助忆码 */ - @Excel(name = "助忆码") + //@Excel(name = "助忆码") private String mnemonicCode; /** 客户类型 */ - @Excel(name = "客户类型") + //@Excel(name = "客户类型") private String type; /** 纳税人登记号 */ - @Excel(name = "纳税人登记号") + //@Excel(name = "纳税人登记号") private String taxpayerRegistrationNumber; /** 对应财务组织 */ - @Excel(name = "对应财务组织") + //@Excel(name = "对应财务组织") private String organization; /** 上级客户 */ - @Excel(name = "上级客户") + //@Excel(name = "上级客户") private String supCustomer; /** 散户 */ - @Excel(name = "散户") + //@Excel(name = "散户") private String retailInvestor; /** 国家/地区 */ - @Excel(name = "国家/地区") + //@Excel(name = "国家/地区") private String country; /** 时区 */ - @Excel(name = "时区") + //@Excel(name = "时区") private String timeZone; /** 数据格式 */ - @Excel(name = "数据格式") + //@Excel(name = "数据格式") private String dataFormat; /** 联系人姓名 */ - @Excel(name = "联系人姓名") + //@Excel(name = "联系人姓名") private String contactName; /** 发货国家 */ - @Excel(name = "发货国家") + //@Excel(name = "发货国家") private String shipment; /** 税类 */ - @Excel(name = "税类") + //@Excel(name = "税类") private String taxCategory; + private String updateId; + + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateId() { + return updateId; + } + + public void setUpdateId(String updateId) { + this.updateId = updateId; + } + public void setId(String id) { this.id = id; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/service/impl/BasCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/service/impl/BasCustomerServiceImpl.java index 1025ee3..1066554 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/service/impl/BasCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/service/impl/BasCustomerServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.bas.BasCustomer.service.impl; +import cn.hutool.core.collection.CollUtil; import com.ruoyi.bas.BasCustomer.domain.BasCustomer; import com.ruoyi.bas.BasCustomer.mapper.BasCustomerMapper; import com.ruoyi.bas.BasCustomer.service.IBasCustomerService; @@ -53,6 +54,12 @@ public class BasCustomerServiceImpl implements IBasCustomerService @Override public int insertBasCustomer(BasCustomer basCustomer) { + BasCustomer basCustomerParam = new BasCustomer(); + basCustomerParam.setCustomerNo(basCustomer.getCustomerNo()); + List basCustomers = basCustomerMapper.selectBasCustomerList(basCustomerParam); + if (CollUtil.isNotEmpty(basCustomers)){ + throw new RuntimeException("客户编号已存在"); + } return basCustomerMapper.insertBasCustomer(basCustomer); } @@ -65,6 +72,13 @@ public class BasCustomerServiceImpl implements IBasCustomerService @Override public int updateBasCustomer(BasCustomer basCustomer) { + BasCustomer basCustomerParam = new BasCustomer(); + basCustomerParam.setCustomerNo(basCustomer.getCustomerNo()); + basCustomerParam.setUpdateId(basCustomer.getId()); + List basCustomers = basCustomerMapper.selectBasCustomerList(basCustomerParam); + if (CollUtil.isNotEmpty(basCustomers)){ + throw new RuntimeException("客户编号已存在"); + } return basCustomerMapper.updateBasCustomer(basCustomer); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/domain/BasSupplier.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/domain/BasSupplier.java index 556f542..3a58a56 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/domain/BasSupplier.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/domain/BasSupplier.java @@ -23,7 +23,6 @@ public class BasSupplier extends BaseEntity private String supplierNo; /** 供应商名称 */ - @Excel(name = "供应商名称") private String supplierGroupNo; /** 供应商名称 */ @@ -38,54 +37,79 @@ public class BasSupplier extends BaseEntity @Excel(name = "是否可用",dictType = "is_available") private String useable; + @Excel(name = "备注") + private String remark; + + /** 地区分类 */ - @Excel(name = "地区分类") + //@Excel(name = "地区分类") private String supplierArae; /** 纳税人登记号 */ - @Excel(name = "纳税人登记号") + //@Excel(name = "纳税人登记号") private String taxpayerRegistrationNumber; /** 国家 */ - @Excel(name = "国家") + //@Excel(name = "国家") private String country; /** 时区 */ - @Excel(name = "时区") + //@Excel(name = "时区") private String timeZone; /** 数据格式 */ - @Excel(name = "数据格式") + //@Excel(name = "数据格式") private String dataFormat; /** 收货国家 */ - @Excel(name = "收货国家") + //@Excel(name = "收货国家") private String receivingCountry; /** 税类 */ - @Excel(name = "税类") + //@Excel(name = "税类") private String taxCategory; /** 法人 */ - @Excel(name = "法人") + //@Excel(name = "法人") private String legalPerson; /** 注册资金 */ - @Excel(name = "注册资金") + //@Excel(name = "注册资金") private String registeredCapital; /** 企业地址 */ - @Excel(name = "企业地址") + //@Excel(name = "企业地址") private String address; /** 联系人姓名 */ - @Excel(name = "联系人姓名") + //@Excel(name = "联系人姓名") private String contactName; /** 联系电话 */ - @Excel(name = "联系电话") + //@Excel(name = "联系电话") private String contactNumber; + private String updateId; + + + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUpdateId() { + return updateId; + } + + public void setUpdateId(String updateId) { + this.updateId = updateId; + } + public void setId(String id) { this.id = id; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/service/impl/BasSupplierServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/service/impl/BasSupplierServiceImpl.java index ce6be5e..b22deea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/service/impl/BasSupplierServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/service/impl/BasSupplierServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.bas.BasSupplier.service.impl; +import cn.hutool.core.collection.CollUtil; import com.ruoyi.bas.BasSupplier.domain.BasSupplier; import com.ruoyi.bas.BasSupplier.mapper.BasSupplierMapper; import com.ruoyi.bas.BasSupplier.service.IBasSupplierService; @@ -53,6 +54,12 @@ public class BasSupplierServiceImpl implements IBasSupplierService @Override public int insertBasSupplier(BasSupplier basSupplier) { + BasSupplier basSupplierParam = new BasSupplier(); + basSupplierParam.setSupplierNo(basSupplier.getSupplierNo()); + List basSuppliers = basSupplierMapper.selectBasSupplierList(basSupplierParam); + if (CollUtil.isNotEmpty(basSuppliers)) { + throw new RuntimeException("供应商编码已存在"); + } return basSupplierMapper.insertBasSupplier(basSupplier); } @@ -65,6 +72,13 @@ public class BasSupplierServiceImpl implements IBasSupplierService @Override public int updateBasSupplier(BasSupplier basSupplier) { + BasSupplier basSupplierParam = new BasSupplier(); + basSupplierParam.setSupplierNo(basSupplier.getSupplierNo()); + basSupplierParam.setUpdateId(basSupplier.getId()); + List basSuppliers = basSupplierMapper.selectBasSupplierList(basSupplierParam); + if (CollUtil.isNotEmpty(basSuppliers)) { + throw new RuntimeException("供应商编码已存在"); + } return basSupplierMapper.updateBasSupplier(basSupplier); } diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml index d762e50..45c38fe 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -34,8 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - - and supplier_no like concat('%', #{supplierNo}, '%') + + and supplier_no = #{supplierNo} and supplier_group_no like concat('%', #{supplierGroupNo}, '%') and supplier_name like concat('%', #{supplierName}, '%') and simple_name like concat('%', #{simpleName}, '%') @@ -50,9 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and address like concat('%', #{address}, '%') and contact_name like concat('%', #{contactName}, '%') and contact_number = like concat('%',#{contactNumber}, '%') + and id != #{updateId} + order by id desc - +