From e4a2d548551683a6fbeb8ab60225c30cbb0c238c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 23 Apr 2025 10:08:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=9F=E5=88=9D=E4=B8=8A=E6=9E=B6=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=AF=BC=E5=85=A5=E4=BE=9B=E5=BA=94=E5=95=86=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/asbasesupplierinfo/BaseSupplierInfoMapper.java | 3 +++ .../biz/asbasesupplierinfo/BaseSupplierInfoMapper.xml | 4 ++++ .../biz/asbasesupplierinfo/BaseSupplierInfoRest.java | 6 ++++++ .../asbasesupplierinfo/BaseSupplierInfoService.java | 10 ++++++++++ .../com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java | 10 ++++++++++ .../base/basesupplierinfo/BaseSupplierInfoFeign.java | 4 ++++ 6 files changed, 37 insertions(+) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoMapper.java index 80df1adfde..26346f2cd0 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoMapper.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.as.api.asbasesupplierinfo.BaseSupplierInfo; +import com.yxt.anrui.as.api.asbasesupplierinfo.BaseSupplierInfoDetailsVo; import com.yxt.anrui.as.api.asbasesupplierinfo.BaseSupplierInfoVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -59,4 +60,6 @@ public interface BaseSupplierInfoMapper extends BaseMapper { @Select("select * from base_supplier_info") List selectListVo(); + + BaseSupplierInfoDetailsVo selectByName(String name); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoMapper.xml index 7933ee9371..473045c694 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoMapper.xml @@ -10,4 +10,8 @@ + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoRest.java index 62cd529b6b..c32e386610 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoRest.java @@ -89,4 +89,10 @@ public class BaseSupplierInfoRest { BaseSupplierInfoDetailsVo vo = baseSupplierInfoService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @ApiOperation("根据名称查询供应商信息") + @GetMapping("/selectByName") + ResultBean selectByName(@RequestParam("name")String name){ + return baseSupplierInfoService.selectByName(name); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoService.java index f595bb54f2..4288173bbd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbasesupplierinfo/BaseSupplierInfoService.java @@ -32,6 +32,7 @@ import com.yxt.anrui.as.api.asbasesupplierinfo.*; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -123,4 +124,13 @@ public class BaseSupplierInfoService extends MybatisBaseService selectByName(String name) { + ResultBean rb = ResultBean.fireFail(); + BaseSupplierInfoDetailsVo baseSupplierInfoDetailsVo = baseMapper.selectByName(name); + if(baseSupplierInfoDetailsVo != null){ + return rb.success().setData(baseSupplierInfoDetailsVo); + } + return rb; + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java index 3697ac5aa0..7251d21b2a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java @@ -35,6 +35,8 @@ import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetail; import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailService; import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailVo; import com.yxt.wms.feign.base.basegoodspu.BaseGoodsSpuFeign; +import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoDetailsVo; +import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; @@ -77,6 +79,8 @@ public class WmsInitialRest { private WmsInitialService wmsInitialService; @Autowired private WmsInitialDetailService wmsInitialDetailService; + @Autowired + private BaseSupplierInfoFeign baseSupplierInfoFeign; @PostMapping("/getExcelInfo") @ResponseBody @@ -403,6 +407,12 @@ public class WmsInitialRest { if (StringUtils.isBlank(excelInfo.getSupplierName())) { checkWord.add("供应商不能为空"); break; + }else{ + ResultBean resultBean = baseSupplierInfoFeign.selectByName(excelInfo.getSupplierName()); + if(!resultBean.getSuccess()){ + checkWord.add(excelInfo.getSupplierName()+"供应商不存在，请先添加供应商类别和供应商信息"); + break; + } } if (StringUtils.isBlank(excelInfo.getSaleGuidePrice())) { checkWord.add("销售指导价不能为空"); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java index c1ba274dbd..0ba9386ac1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java @@ -20,4 +20,8 @@ public interface BaseSupplierInfoFeign { @ApiOperation("根据SID获取供应商") @GetMapping("/fetchDetailsBySid/{sid}") ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据名称查询供应商信息") + @GetMapping("/selectByName") + ResultBean selectByName(@RequestParam("name")String name); }