供应商

admin/src/main/java/com/fjhx/admin/entity/supplier/dto/SupplierInfoSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class SupplierInfoSelectDto extends BaseSelectDto {
 
+    /**
+     * 供应商类型 1贸易商 2工厂
+     */
+    private Integer type;
+
 }

admin/src/main/java/com/fjhx/admin/entity/supplier/po/SupplierInfo.java

@@ -1,8 +1,7 @@
 package com.fjhx.admin.entity.supplier.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,7 +10,7 @@ import lombok.Setter;
  * 供应商
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-03-17
  */
 @Getter
@@ -20,6 +19,11 @@ import lombok.Setter;
 public class SupplierInfo extends BasePo {
 
     /**
+     * 供应商编码
+     */
+    private String code;
+
+    /**
      * 供应商类型 1贸易商 2工厂
      */
     private Integer type;

admin/src/main/java/com/fjhx/admin/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -9,8 +9,10 @@ import com.fjhx.admin.entity.supplier.po.SupplierInfo;
 import com.fjhx.admin.entity.supplier.vo.SupplierInfoVo;
 import com.fjhx.admin.mapper.supplier.SupplierInfoMapper;
 import com.fjhx.admin.service.supplier.SupplierInfoService;
+import com.fjhx.admin.utils.CodeEnum;
 import com.fjhx.area.utils.AreaUtil;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -31,6 +33,11 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
     public Page<SupplierInfoVo> getPage(SupplierInfoSelectDto dto) {
         IWrapper<SupplierInfo> wrapper = getWrapper();
         wrapper.orderByDesc("si", SupplierInfo::getId);
+        wrapper.eq("si", SupplierInfo::getType, dto.getType());
+        wrapper.keyword(dto,
+                new SqlField("si", SupplierInfo::getName),
+                new SqlField("si", SupplierInfo::getCode)
+        );
         Page<SupplierInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         List<SupplierInfoVo> records = page.getRecords();
@@ -51,11 +58,13 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
 
     @Override
     public void add(SupplierInfoDto supplierInfoDto) {
+        supplierInfoDto.setCode(CodeEnum.SUPPLIER_INFO.getCode());
         this.save(supplierInfoDto);
     }
 
     @Override
     public void edit(SupplierInfoDto supplierInfoDto) {
+        supplierInfoDto.setCode(null);
         this.updateById(supplierInfoDto);
     }
 

admin/src/main/java/com/fjhx/admin/utils/CodeEnum.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.admin.service.product.ProductInfoService;
+import com.fjhx.admin.service.supplier.SupplierInfoService;
 import com.ruoyi.common.exception.ServiceException;
 import lombok.Getter;
 
@@ -18,6 +19,7 @@ public enum CodeEnum {
 
     // 产品编码
     PRODUCT("P", null, "code", 5, ProductInfoService.class),
+    SUPPLIER_INFO("S", null, "code", 5, SupplierInfoService.class),
     ;
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {

admin/src/main/resources/mapper/supplier/SupplierInfoMapper.xml

@@ -4,6 +4,7 @@
     <select id="getPage" resultType="com.fjhx.admin.entity.supplier.vo.SupplierInfoVo">
         select
             si.id,
+            si.code,
             si.type,
             si.name,
             si.country_id,