From 2ea6d9dc50e471a01795ee9822570e983d671baa Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Wed, 8 Feb 2023 08:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E4=BF=A1=E6=81=AF,=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=A1=E6=81=AF=202023?= =?UTF-8?q?=E5=B9=B42=E6=9C=888=E6=97=A5=20=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gaotao/common/constant/SysMsgConstant.java | 1 + .../com/gaotao/modules/app/dao/SupplierMapper.java | 12 ++++++++++++ .../gaotao/modules/app/service/SupplierService.java | 10 ++++++++++ .../app/service/impl/SupplierServiceImpl.java | 6 ++++++ .../toolman/service/impl/ToolHeaderServiceImpl.java | 12 ++++++++++++ src/main/resources/mapper/app/SupplierMapper.xml | 4 ++++ 6 files changed, 45 insertions(+) diff --git a/src/main/java/com/gaotao/common/constant/SysMsgConstant.java b/src/main/java/com/gaotao/common/constant/SysMsgConstant.java index 7cce683..96f1e75 100644 --- a/src/main/java/com/gaotao/common/constant/SysMsgConstant.java +++ b/src/main/java/com/gaotao/common/constant/SysMsgConstant.java @@ -634,6 +634,7 @@ public class SysMsgConstant { public final static String OBJECT_ID_200609 = "200609"; public final static String OBJECT_ID_200610 = "200610"; public final static String OBJECT_ID_200611 = "200611"; + public final static String OBJECT_ID_200612 = "200612"; } diff --git a/src/main/java/com/gaotao/modules/app/dao/SupplierMapper.java b/src/main/java/com/gaotao/modules/app/dao/SupplierMapper.java index 9c71798..5c463b8 100644 --- a/src/main/java/com/gaotao/modules/app/dao/SupplierMapper.java +++ b/src/main/java/com/gaotao/modules/app/dao/SupplierMapper.java @@ -2,7 +2,9 @@ package com.gaotao.modules.app.dao; import com.gaotao.modules.app.entity.Supplier; import com.gaotao.modules.app.query.SupplierQuery; +import com.gaotao.modules.base.entity.SupplierData; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -63,4 +65,14 @@ public interface SupplierMapper { int updateSupplier(SupplierQuery supplierQuery); List getViewSupplierList(SupplierQuery supplierQuery); + + + /** + * @author: sxm + * @description: 获取供应商信息 + * @param [site, supplierId] + * @return: com.gaotao.modules.base.entity.SupplierData + * @date: 2023/2/7 17:28 + */ + SupplierData getSupplier(@Param("site") String site,@Param("supplierId") String supplierId); } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/app/service/SupplierService.java b/src/main/java/com/gaotao/modules/app/service/SupplierService.java index 75980bf..81d7d99 100644 --- a/src/main/java/com/gaotao/modules/app/service/SupplierService.java +++ b/src/main/java/com/gaotao/modules/app/service/SupplierService.java @@ -2,6 +2,7 @@ package com.gaotao.modules.app.service; import com.gaotao.modules.app.entity.Supplier; import com.gaotao.modules.app.query.SupplierQuery; +import com.gaotao.modules.base.entity.SupplierData; import java.util.List; @@ -13,4 +14,13 @@ import java.util.List; public interface SupplierService { List getSupplierList(SupplierQuery supplierQuery); + + /** + * @author: sxm + * @description: 获取供应商信息 + * @param [site, supplierId] + * @return: com.gaotao.modules.base.entity.SupplierData + * @date: 2023/2/7 17:28 + */ + SupplierData getSupplier(String site, String supplierId); } diff --git a/src/main/java/com/gaotao/modules/app/service/impl/SupplierServiceImpl.java b/src/main/java/com/gaotao/modules/app/service/impl/SupplierServiceImpl.java index 40df562..7e361d3 100644 --- a/src/main/java/com/gaotao/modules/app/service/impl/SupplierServiceImpl.java +++ b/src/main/java/com/gaotao/modules/app/service/impl/SupplierServiceImpl.java @@ -4,6 +4,7 @@ import com.gaotao.modules.app.dao.SupplierMapper; import com.gaotao.modules.app.entity.Supplier; import com.gaotao.modules.app.query.SupplierQuery; import com.gaotao.modules.app.service.SupplierService; +import com.gaotao.modules.base.entity.SupplierData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,4 +27,9 @@ public class SupplierServiceImpl implements SupplierService { // return supplierMapper.getSupplierList(supplierQuery); return supplierMapper.getViewSupplierList(supplierQuery); } + + @Override + public SupplierData getSupplier(String site, String supplierId) { + return supplierMapper.getSupplier(site,supplierId); + } } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java index 0d997a6..2532e83 100644 --- a/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java +++ b/src/main/java/com/gaotao/modules/toolman/service/impl/ToolHeaderServiceImpl.java @@ -9,7 +9,9 @@ import com.gaotao.common.exception.XJException; import com.gaotao.common.utils.DateUtils; import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; +import com.gaotao.modules.app.service.SupplierService; import com.gaotao.modules.base.entity.PartFamilyData; +import com.gaotao.modules.base.entity.SupplierData; import com.gaotao.modules.base.service.BaseService; import com.gaotao.modules.finishedProduct.dao.ReportFileDao; import com.gaotao.modules.finishedProduct.entity.ReportfilelistUserprinter; @@ -76,6 +78,9 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { @Autowired private SysMsgService sysMsgService; + @Autowired + private SupplierService supplierService; + @Transactional public R saveToolDetail1(ToolDetailQuery toolDetailQuery) { @@ -808,6 +813,13 @@ public class ToolHeaderServiceImpl implements ToolHeaderService { throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200206)); } } + // 校验供应商 + if (StringUtils.isNotEmpty(toolDetailQuery.getSupplierId())) { + SupplierData supplierData = supplierService.getSupplier(toolDetailQuery.getSite(),toolDetailQuery.getSupplierId()); + if (supplierData == null) { + throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200612)); + } + } toolDetailMapper.updateToolDetailInfo(toolDetailQuery); } } diff --git a/src/main/resources/mapper/app/SupplierMapper.xml b/src/main/resources/mapper/app/SupplierMapper.xml index b0fa934..9a059e5 100644 --- a/src/main/resources/mapper/app/SupplierMapper.xml +++ b/src/main/resources/mapper/app/SupplierMapper.xml @@ -187,4 +187,8 @@ A.Buyer,A.Currency,A.SupplierGroup,A.ABC,A.Active,A.CreateDate,A.BankName,A.Bank + \ No newline at end of file