供应商接口调整

src/main/java/com/qs/serve/modules/bms/controller/BmsSkuSupplierController.java

@@ -11,6 +11,7 @@ import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.modules.bms.entity.bo.BmsSkuSupplierBo;
 import com.qs.serve.modules.bms.entity.bo.BmsSkuSupplierBo2;
 import com.qs.serve.modules.bms.entity.vo.BmsSkuSupplierVo;
+import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 import lombok.AllArgsConstructor;
@@ -25,7 +26,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * 基础档案 sku供应商关联
+ * 基础档案 指定客户的商品规则
  * @author YenHex
  * @since 2022-10-17
  */
@@ -45,14 +46,14 @@ public class BmsSkuSupplierController {
      */
     @GetMapping("/page")
     @PreAuthorize("hasRole('bms:skuSupplier:query')")
-    public R<PageVo<BmsSkuSupplierVo>> getPage(BmsSkuSupplier param){
+    public R<PageVo<BmsSkuSupplierVo>> getPage(BmsSkuSupplierVo param){
         PageUtil.startPage();
         List<BmsSkuSupplierVo> list = bmsSkuSupplierService.selectList(param);
         return R.byPageHelperList(list);
     }
 
     /**
-     * 供应商可购指定商品(购买设置等级优先级最高)
+     * 客户指定SKU(优先级最高)
      * @param param
      * @return
      */
@@ -77,7 +78,7 @@ public class BmsSkuSupplierController {
     }
 
     /**
-     * 供应商可购指定商品(购买设置等级比区域设置高)
+     * 客户指定SPU(优先级级比区域设置高)
      * @param param
      * @return
      */

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java

@@ -7,6 +7,8 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.service.BmsSupplierService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -31,6 +33,7 @@ import java.util.List;
 public class BmsSupplierAddressController {
 
     private BmsSupplierAddressService bmsSupplierAddressService;
+    private BmsSupplierService bmsSupplierService;
 
     /**
      * 翻页查询
@@ -43,6 +46,10 @@ public class BmsSupplierAddressController {
         PageUtil.startPage();
         LambdaQueryWrapper<BmsSupplierAddress> supplierAddressWrapper = new LambdaQueryWrapper<>(param);
         List<BmsSupplierAddress> list = bmsSupplierAddressService.list(supplierAddressWrapper);
+        for (BmsSupplierAddress supplierAddress : list) {
+            BmsSupplier supplier = bmsSupplierService.getById(supplierAddress.getSupplierId());
+            supplierAddress.setSupplierName(supplier.getName());
+        }
         return R.byPageHelperList(list);
     }
 
@@ -56,6 +63,8 @@ public class BmsSupplierAddressController {
     @PreAuthorize("hasRole('bms:supplierAddress:query')")
     public R<BmsSupplierAddress> getById(@PathVariable("id") String id){
         BmsSupplierAddress bmsSupplierAddress = bmsSupplierAddressService.getById(id);
+        BmsSupplier supplier = bmsSupplierService.getById(bmsSupplierAddress.getSupplierId());
+        bmsSupplierAddress.setSupplierName(supplier.getName());
         return R.ok(bmsSupplierAddress);
     }
 

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierBandController.java

@@ -7,6 +7,9 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
+import com.qs.serve.modules.bms.service.BmsSupplierService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -30,6 +33,7 @@ import java.util.List;
 public class BmsSupplierBandController {
 
     private BmsSupplierBandService bmsSupplierBandService;
+    private BmsSupplierService bmsSupplierService;
 
     /**
      * 翻页查询
@@ -42,6 +46,10 @@ public class BmsSupplierBandController {
         PageUtil.startPage();
         LambdaQueryWrapper<BmsSupplierBand> supplierBandWrapper = new LambdaQueryWrapper<>(param);
         List<BmsSupplierBand> list = bmsSupplierBandService.list(supplierBandWrapper);
+        for (BmsSupplierBand supplierBand : list) {
+            BmsSupplier supplier = bmsSupplierService.getById(supplierBand.getSupplierId());
+            supplierBand.setSupplierName(supplier.getName());
+        }
         return R.byPageHelperList(list);
     }
 
@@ -55,11 +63,11 @@ public class BmsSupplierBandController {
     @PreAuthorize("hasRole('bms:supplierBand:query')")
     public R<BmsSupplierBand> getById(@PathVariable("id") String id){
         BmsSupplierBand bmsSupplierBand = bmsSupplierBandService.getById(id);
+        BmsSupplier supplier = bmsSupplierService.getById(bmsSupplierBand.getSupplierId());
+        bmsSupplierBand.setSupplierName(supplier.getName());
         return R.ok(bmsSupplierBand);
     }
 
-
-
     /**
      * 根据ID更新
      * @param param

src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java

@@ -6,12 +6,14 @@ import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.common.util.*;
+import com.qs.serve.modules.bms.entity.BmsErpInfo;
+import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierBatchBo;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierBo;
 import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo;
+import com.qs.serve.modules.bms.service.BmsErpInfoService;
+import com.qs.serve.modules.bms.service.BmsRegionService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -36,6 +38,8 @@ import java.util.stream.Collectors;
 public class BmsSupplierController {
 
     private BmsSupplierService bmsSupplierService;
+    private BmsRegionService bmsRegionService;
+    private BmsErpInfoService bmsErpInfoService;
 
     /**
      * 翻页查询
@@ -45,12 +49,25 @@ public class BmsSupplierController {
     @GetMapping("/page")
     @PreAuthorize("hasRole('bms:supplier:query')")
     public R<PageVo<BmsSupplier>> getPage(BmsSupplier param){
+        BmsRegion bmsRegion = bmsRegionService.getById(param.getRegionId());
+        if(bmsRegion.getLevel()==1){
+            param.setRegionFirst(param.getRegionId());
+        }
+        if(bmsRegion.getLevel()==2){
+            param.setRegionSecond(param.getRegionId());
+        }
+        if(bmsRegion.getLevel()==3){
+            param.setRegionThird(param.getRegionId());
+        }
         PageUtil.startPage();
         LambdaQueryWrapper<BmsSupplier> supplierWrapper = new LambdaQueryWrapper<>(param);
         List<BmsSupplier> list = bmsSupplierService.list(supplierWrapper);
+        initSupplierList(list);
         return R.byPageHelperList(list);
     }
 
+
+
     /**
      * 树查询
      * @param param
@@ -61,6 +78,23 @@ public class BmsSupplierController {
     public R<List<BmsSupplierTreeVo>> getTree(BmsSupplier param){
         LambdaQueryWrapper<BmsSupplier> supplierWrapper = new LambdaQueryWrapper<>(param);
         List<BmsSupplier> list = bmsSupplierService.list(supplierWrapper);
+        initSupplierList(list);
+        List<BmsErpInfo> erpInfos = bmsErpInfoService.list();
+        for (BmsSupplier supplier : list) {
+            String regionId = supplier.getRegionLast();
+            if(regionId!=null&&!regionId.equals("0")){
+                BmsRegion bmsRegion2 = bmsRegionService.getById(regionId);
+                supplier.setRegionLabel(bmsRegion2.getName());
+            }
+            if(StringUtils.hasText(supplier.getBelong())){
+                for (BmsErpInfo erpInfo : erpInfos) {
+                    if(supplier.getBelong().equals(erpInfo.getCode())){
+                        supplier.setBelongLabel(erpInfo.getName());
+                        break;
+                    }
+                }
+            }
+        }
         List<BmsSupplierTreeVo> list2 = list.stream().map(supplier->{
             BmsSupplierTreeVo treeNode = CopierUtil.copy(supplier,new BmsSupplierTreeVo());
             treeNode.setId(supplier.getId());
@@ -85,8 +119,6 @@ public class BmsSupplierController {
         return R.ok(bmsSupplier);
     }
 
-
-
     /**
      * 根据ID更新
      * @param param
@@ -145,7 +177,39 @@ public class BmsSupplierController {
         return R.ok();
     }
 
-    //todo 迁移
+    /**
+     * 显示关联
+     * @param list
+     */
+    private void initSupplierList(List<BmsSupplier> list){
+        List<String> regionIds = list.stream()
+                .filter(sup->sup.getRegionLast()!=null&&!sup.getRegionLast().equals("0"))
+                .map(BmsSupplier::getRegionLast).collect(Collectors.toList());
+        List<BmsRegion> regionList = null;
+        if(CollectionUtil.isNotEmpty(regionIds)){
+            regionList = bmsRegionService.listByIds(regionIds);
+        }
+        List<BmsErpInfo> erpInfos = bmsErpInfoService.list();
+        for (BmsSupplier supplier : list) {
+            String regionId = supplier.getRegionLast();
+            if(regionId!=null&&CollectionUtil.isNotEmpty(regionList)){
+                for (BmsRegion region : regionList) {
+                    if(region.getId().equals(regionId)){
+                        supplier.setRegionLabel(region.getName());
+                        break;
+                    }
+                }
+            }
+            if(StringUtils.hasText(supplier.getBelong())){
+                for (BmsErpInfo erpInfo : erpInfos) {
+                    if(supplier.getBelong().equals(erpInfo.getCode())){
+                        supplier.setBelongLabel(erpInfo.getName());
+                        break;
+                    }
+                }
+            }
+        }
+    }
 
 }
 

src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -20,7 +22,7 @@ import javax.validation.constraints.NotBlank;
  * @since 2022-10-10
  */
 @Data
-@TableName("bms_region")
+@TableName(value = "bms_region",autoResultMap = true)
 public class BmsRegion implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -45,7 +47,8 @@ public class BmsRegion implements Serializable {
     private Integer level;
 
     /** 工厂产地ID */
-    private Long factoryId;
+    @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
+    private String[] factoryIds;
 
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@@ -38,6 +38,9 @@ public class BmsSupplier implements Serializable {
     /** 三级区域ID */
     private String regionThird;
 
+    /** 最子级区域ID */
+    private String regionLast;
+
     /** 详细地址 */
     private String address;
 
@@ -94,5 +97,15 @@ public class BmsSupplier implements Serializable {
     @TableField(exist = false)
     private String currUserId;
 
+    /** 区域ID */
+    @TableField(exist = false)
+    private String regionId;
+
+    @TableField(exist = false)
+    private String regionLabel;
+
+    /** 所属ERP信息 */
+    @TableField(exist = false)
+    private String belongLabel;
 }
 

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierAddress.java

@@ -113,5 +113,9 @@ public class BmsSupplierAddress implements Serializable {
     @TableField(fill = FieldFill.UPDATE)
     private String updateBy;
 
+    /** 客户名称 */
+    @TableField(exist = false)
+    private String supplierName;
+
 }
 

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierBand.java

@@ -82,5 +82,8 @@ public class BmsSupplierBand implements Serializable {
     @TableField(fill = FieldFill.UPDATE)
     private String updateBy;
 
+    /** 客户名称 */
+    @TableField(exist = false)
+    private String supplierName;
 }
 

src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSkuSupplierVo.java

@@ -23,4 +23,10 @@ public class BmsSkuSupplierVo extends BmsSkuSupplier {
     /** 商品标题 */
     private String spuTitle;
 
+    private String supplierName;
+
+    private String supplierCode;
+
+    /** 搜索值 */
+    private String searchValue;
 }

src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSupplierTreeVo.java

@@ -1,12 +1,19 @@
 package com.qs.serve.modules.bms.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.qs.serve.common.model.dto.TreeNode;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
 
 /**
  * @author YenHex
@@ -40,4 +47,24 @@ public class BmsSupplierTreeVo extends TreeNode {
     /** 父级id */
     private String pid;
 
+    /** 区域ID */
+    private String regionId;
+
+    private String regionLabel;
+
+    /** 所属ERP信息 */
+    private String belongLabel;
+
+    /** 最子级区域ID */
+    private String regionLast;
+
+
+    private String parentCode;
+
+    /** 归属ERP编码,如JSL、JSB、KL 对应ERP信息表作显示 */
+    @NotBlank(message = "客户编码不能为空")
+    private String belong;
+
+
+
 }

src/main/java/com/qs/serve/modules/bms/mapper/BmsSkuSupplierMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
 public interface BmsSkuSupplierMapper extends BaseMapper<BmsSkuSupplier> {
 
     @InterceptorIgnore(tenantLine = "1")
-    List<BmsSkuSupplierVo> selectList2(@Param("query") BmsSkuSupplier skuSupplier);
+    List<BmsSkuSupplierVo> selectList2(@Param("query") BmsSkuSupplierVo skuSupplier);
 
 }
 

src/main/java/com/qs/serve/modules/bms/service/BmsErpInfoService.java

@@ -10,5 +10,7 @@ import com.qs.serve.modules.bms.entity.BmsErpInfo;
  */
 public interface BmsErpInfoService extends IService<BmsErpInfo> {
 
+    BmsErpInfo getByCode(String code);
+
 }
 

src/main/java/com/qs/serve/modules/bms/service/BmsSkuSupplierService.java

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface BmsSkuSupplierService extends IService<BmsSkuSupplier> {
 
-    List<BmsSkuSupplierVo> selectList(BmsSkuSupplier skuSupplier);
+    List<BmsSkuSupplierVo> selectList(BmsSkuSupplierVo skuSupplier);
 
 }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsErpInfoServiceImpl.java

@@ -18,5 +18,11 @@ import com.qs.serve.modules.bms.mapper.BmsErpInfoMapper;
 @AllArgsConstructor
 public class BmsErpInfoServiceImpl extends ServiceImpl<BmsErpInfoMapper,BmsErpInfo> implements BmsErpInfoService {
 
+    @Override
+    public BmsErpInfo getByCode(String code) {
+
+        return null;
+    }
+
 }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSkuSupplierServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.List;
 public class BmsSkuSupplierServiceImpl extends ServiceImpl<BmsSkuSupplierMapper,BmsSkuSupplier> implements BmsSkuSupplierService {
 
     @Override
-    public List<BmsSkuSupplierVo> selectList(BmsSkuSupplier skuSupplier) {
+    public List<BmsSkuSupplierVo> selectList(BmsSkuSupplierVo skuSupplier) {
         return baseMapper.selectList2(skuSupplier);
     }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java

@@ -46,11 +46,7 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
         if(param.getRegionId()!=null){
             this.initRegion(supplier,param.getRegionId());
         }
-        if(supplier.getId()!=null){
-            this.updateById(supplier);
-        }else {
-            this.save(supplier);
-        }
+        this.saveOrUpdate(supplier);
     }
 
     @Override
@@ -124,8 +120,12 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
         BmsRegion region1 = regionService.getById(regionId);
         if(region1==null){
             supplier.setRegionFirst("0");
+            supplier.setRegionSecond("");
+            supplier.setRegionThird("");
+            supplier.setRegionLast("0");
             return;
         }
+        supplier.setRegionLast(regionId+"");
         if(!region1.getPid().equals("0")){
             BmsRegion region2 = regionService.getById(region1.getPid());
             if(!region2.getPid().equals("0")){

src/main/resources/mapper/bms/BmsSkuSupplierMapper.xml

@@ -56,6 +56,18 @@
             <if test="query.updateBy != null and query.updateBy != ''"> and `bms_sku_supplier`.`update_by` = #{query.updateBy}</if>
             <if test="query.tenantId != null and query.tenantId != ''"> and `bms_sku_supplier`.`tenant_id` = #{query.tenantId}</if>
             <if test="query.delFlag != null"> and `bms_sku_supplier`.`del_flag` = #{query.delFlag}</if>
+            <if test="query.searchValue != null and query.searchValue != ''">
+                and
+                (`goods_sku`.`sku_code`LIKE CONCAT('%',#{query.searchValue},'%')
+                or
+                `goods_spu`.`spu_code`LIKE CONCAT('%',#{query.searchValue},'%')
+                or
+                `goods_spu`.`name`LIKE CONCAT('%',#{query.searchValue},'%')
+                or
+                `bms_supplier`.`name`LIKE CONCAT('%',#{query.searchValue},'%')
+                or
+                `bms_supplier`.`code`LIKE CONCAT('%',#{query.searchValue},'%'))
+             </if>
         </where>
     </select>