查询当个物料出参增加字段

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/BrandController.java

@@ -0,0 +1,51 @@
+package com.abi.qms.platform.controller.console;
+
+import com.abi.qms.platform.dto.req.ListBrandForSelectReq;
+import com.abi.qms.platform.dto.res.ListBrandForSelectRes;
+import com.abi.qms.platform.service.BrandService;
+import com.abi.task.common.api.base.BaseResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 品牌管理
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+@Slf4j
+@RestController
+@RequestMapping("brand")
+@Api(tags = "品牌管理")
+public class BrandController {
+
+    @Autowired
+    private BrandService brandService;
+
+    @ApiOperation("下拉选择品牌列表")
+    @GetMapping("listBrandForSelect")
+    public BaseResponse<ListBrandForSelectRes> listBrandForSelect(@Validated ListBrandForSelectReq listBrandForSelectReq) throws Exception{
+        //下拉选择品牌列表
+        ListBrandForSelectRes  result = brandService.listBrandForSelect(listBrandForSelectReq);
+        //包装出参
+        return BaseResponse.create(result);
+    }
+
+
+
+}
+
+
+
+
+
+
+
+

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/MaterialController.java

@@ -97,15 +97,6 @@ public class MaterialController {
         return BaseResponse.create(result);
     }
 
-    @ApiOperation("下拉选择品牌列表")
-    @GetMapping("listBrandForSelect")
-    public BaseResponse<ListBrandForSelectRes> listBrandForSelect(@Validated ListBrandForSelectReq listBrandForSelectReq) throws Exception{
-        //下拉选择品牌列表
-        ListBrandForSelectRes  result = materialService.listBrandForSelect(listBrandForSelectReq);
-        //包装出参
-        return BaseResponse.create(result);
-    }
-
 }
 
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/BaseMaterial.java

@@ -33,9 +33,6 @@ public class BaseMaterial {
 	@Schema(name = "物料类型 1-瓶&罐盖 2-成品酒")
     private Integer materialType;
 
-	@Schema(name = "品牌")
-    private String brandCode;
-
 	@Schema(name = "描述")
     private String description;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/MaterialVO.java

@@ -27,9 +27,6 @@ public class MaterialVO {
     @Schema(name = "物料类型 1-瓶&罐盖 2-成品酒")
     private Integer materialType;
 
-    @Schema(name = "品牌")
-    private String brandCode;
-
     @Schema(name = "描述")
     private String description;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/AddMaterialReq.java

@@ -27,10 +27,6 @@ public class AddMaterialReq implements Serializable {
     @Schema(name = "物料类型 1-瓶&罐盖 2-成品酒")
     private Integer materialType;
 
-    @NotEmpty(message = "品牌为空")
-    @Schema(name = "品牌")
-    private String brandCode;
-
     @Schema(name = "描述")
     private String description;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListMaterialReq.java

@@ -23,9 +23,6 @@ public class ListMaterialReq extends PageReq implements Serializable {
     @Schema(name = "物料类型 1-瓶&罐盖 2-成品酒")
     private Integer materialType;
 
-    @Schema(name = "品牌")
-    private String brandCode;
-
     @Schema(name = "是否有效 0-无效 1-有效")
     private Integer valid;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetMaterialRes.java

@@ -29,12 +29,6 @@ public class GetMaterialRes implements Serializable {
     @Schema(name = "物料类型 1-瓶&罐盖 2-成品酒")
     private Integer materialType;
 
-    @Schema(name = "品牌")
-    private String brandCode;
-
-    @Schema(name = "主品牌+子品牌2条数据的列表 方便前台展示")
-    private List<String> brandCodeList;
-
     @Schema(name = "描述")
     private String description;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListMaterialRes.java

@@ -47,9 +47,6 @@ public class ListMaterialRes extends PageResp implements Serializable {
         @Schema(name = "物料类型 1-瓶&罐盖 2-成品酒")
         private Integer materialType;
 
-        @Schema(name = "品牌")
-        private String brandCode;
-
         @Schema(name = "描述")
         private String description;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/BrandService.java

@@ -0,0 +1,32 @@
+package com.abi.qms.platform.service;
+
+
+import com.abi.qms.platform.dao.entity.BaseBrand;
+import com.abi.qms.platform.dto.req.ListBrandForSelectReq;
+import com.abi.qms.platform.dto.res.ListBrandForSelectRes;
+
+/**
+ * <p>
+ * 品牌管理
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+public interface BrandService{
+
+    /**
+     * 获取品牌信息
+     * @param brandCode
+     * @return
+     */
+    BaseBrand getBrand(String brandCode);
+
+    /**
+     * 下拉选择品牌列表
+     * @param listBrandForSelectReq
+     * @return
+     * @throws Exception
+     */
+    ListBrandForSelectRes listBrandForSelect(ListBrandForSelectReq listBrandForSelectReq) throws Exception;
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/MaterialService.java

@@ -58,7 +58,6 @@ public interface MaterialService{
 
     ListMaterialForSelectRes listMaterialForSelect(ListMaterialForSelectReq listMaterialForSelectReq) throws Exception;
 
-    ListBrandForSelectRes listBrandForSelect(ListBrandForSelectReq listBrandForSelectReq) throws Exception;
 
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BrandServiceImpl.java

@@ -0,0 +1,100 @@
+package com.abi.qms.platform.service.impl;
+
+import com.abi.qms.platform.dao.entity.BaseBrand;
+import com.abi.qms.platform.dao.mapper.BaseBrandMapper;
+import com.abi.qms.platform.dto.req.ListBrandForSelectReq;
+import com.abi.qms.platform.dto.res.ListBrandForSelectRes;
+import com.abi.qms.platform.infrastructure.util.AssertUtil;
+import com.abi.qms.platform.service.BrandService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 品牌管理
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+@Service
+public class BrandServiceImpl implements BrandService {
+
+    @Autowired
+    private BaseBrandMapper baseBrandMapper;
+
+    /**
+     * 查询品牌信息
+     * @param brandCode
+     * @return
+     */
+    @Override
+    public BaseBrand getBrand(String brandCode){
+        QueryWrapper<BaseBrand> brandQw = new QueryWrapper<>();
+        brandQw.eq("brand_code",brandCode);
+        brandQw.eq("is_delete",0);
+        BaseBrand baseBrand = baseBrandMapper.selectOne(brandQw);
+        AssertUtil.isNull(baseBrand,"品牌不存在");
+
+        return baseBrand;
+    }
+
+    /**
+     * 下拉选择品牌列表
+     **/
+    @Override
+    public ListBrandForSelectRes listBrandForSelect(ListBrandForSelectReq req) {
+        //1-查询所有品牌
+        QueryWrapper<BaseBrand> baseBrandQw = new QueryWrapper<>();
+        baseBrandQw.eq("is_delete",0);
+        List<BaseBrand> baseBrandList = baseBrandMapper.selectList(baseBrandQw);
+
+        //出参列表
+        List<ListBrandForSelectRes.BrandBean> brandBeanList = new ArrayList<>();
+
+        //2-构造树形结构
+        //定义map用来存放父类bean
+        Map<String,ListBrandForSelectRes.BrandBean> brandBeanMap = new HashMap<>();
+        //分一级和二级两组
+        List<BaseBrand> l1BrandList = baseBrandList.stream().filter(brand -> brand.getBrandLevel() == 1).collect(Collectors.toList());
+        List<BaseBrand> l2BrandList = baseBrandList.stream().filter(brand -> brand.getBrandLevel() == 2).collect(Collectors.toList());
+        //循环放入一级
+        for(BaseBrand brand:l1BrandList){
+            ListBrandForSelectRes.BrandBean brandBean = new ListBrandForSelectRes.BrandBean();
+            brandBean.setBrandCode(brand.getBrandCode());
+            brandBean.setBrandName(brand.getBrandName());
+            brandBean.setSubBrandBeanList(new ArrayList<>());
+            //放入出参列表
+            brandBeanList.add(brandBean);
+            //放入map
+            brandBeanMap.put(brandBean.getBrandCode(),brandBean);
+        }
+        //循环放入二级
+        for(BaseBrand brand:l2BrandList){
+            ListBrandForSelectRes.BrandBean parentBrandBean = brandBeanMap.get(brand.getParentBrandCode());
+            if(parentBrandBean==null){
+                continue;
+            }
+            //构建bean
+            ListBrandForSelectRes.BrandBean brandBean = new ListBrandForSelectRes.BrandBean();
+            brandBean.setBrandCode(brand.getBrandCode());
+            brandBean.setBrandName(brand.getBrandName());
+            //加入子品牌
+            parentBrandBean.getSubBrandBeanList().add(brandBean);
+        }
+
+        //构造出参
+        ListBrandForSelectRes res = new ListBrandForSelectRes();
+        res.setBrandBeanList(brandBeanList);
+
+        return res;
+    }
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/MaterialServiceImpl.java

@@ -69,7 +69,6 @@ public class MaterialServiceImpl implements MaterialService {
         material.setMaterialCode(req.getMaterialCode());
         material.setMaterialName(req.getMaterialName());
         material.setMaterialType(req.getMaterialType());
-        material.setBrandCode(req.getBrandCode());
         material.setDescription(req.getDescription());
         baseMaterialMapper.insert(material);
 
@@ -88,7 +87,6 @@ public class MaterialServiceImpl implements MaterialService {
         //2-修改物料
         material.setMaterialName(req.getMaterialName());
         material.setMaterialType(req.getMaterialType());
-        material.setBrandCode(req.getBrandCode());
         material.setDescription(req.getDescription());
         material.setValid(req.getValid());
         baseMaterialMapper.updateById(material);
@@ -127,14 +125,8 @@ public class MaterialServiceImpl implements MaterialService {
         BaseMaterial material = baseMaterialMapper.selectById(req.getId());
         AssertUtil.isNull(material, "物料不存在");
 
-        //2-查询父类品牌（前台需要）
-        BaseBrand parentBrand = getBrand(material.getBrandCode());
-        String parentBrandCode = parentBrand.getParentBrandCode();
-        List<String> brandCodeList = Arrays.asList(parentBrandCode, material.getBrandCode());
-
         //转化出参
         GetMaterialRes res = PojoConverterUtils.copy(material, GetMaterialRes.class);
-        res.setBrandCodeList(brandCodeList);
 
         return res;
 
@@ -186,21 +178,6 @@ public class MaterialServiceImpl implements MaterialService {
         }
     }
 
-    /**
-     * 查询品牌信息
-     * @param brandCode
-     * @return
-     */
-    private BaseBrand getBrand(String brandCode){
-        QueryWrapper<BaseBrand> brandQw = new QueryWrapper<>();
-        brandQw.eq("brand_code",brandCode);
-        brandQw.eq("is_delete",0);
-        BaseBrand baseBrand = baseBrandMapper.selectOne(brandQw);
-        AssertUtil.isNull(baseBrand,"品牌不存在");
-
-        return baseBrand;
-    }
-
     /**
      * 下拉选择物料列表
      **/
@@ -220,56 +197,8 @@ public class MaterialServiceImpl implements MaterialService {
         return res;
     }
 
-    /**
-     * 下拉选择品牌列表
-     **/
-    @Override
-    public ListBrandForSelectRes listBrandForSelect(ListBrandForSelectReq req) {
-        //1-查询所有品牌
-        QueryWrapper<BaseBrand> baseBrandQw = new QueryWrapper<>();
-        baseBrandQw.eq("is_delete",0);
-        List<BaseBrand> baseBrandList = baseBrandMapper.selectList(baseBrandQw);
-
-        //出参列表
-        List<ListBrandForSelectRes.BrandBean> brandBeanList = new ArrayList<>();
-
-        //2-构造树形结构
-        //定义map用来存放父类bean
-        Map<String,ListBrandForSelectRes.BrandBean> brandBeanMap = new HashMap<>();
-        //分一级和二级两组
-        List<BaseBrand> l1BrandList = baseBrandList.stream().filter(brand -> brand.getBrandLevel() == 1).collect(Collectors.toList());
-        List<BaseBrand> l2BrandList = baseBrandList.stream().filter(brand -> brand.getBrandLevel() == 2).collect(Collectors.toList());
-        //循环放入一级
-        for(BaseBrand brand:l1BrandList){
-            ListBrandForSelectRes.BrandBean brandBean = new ListBrandForSelectRes.BrandBean();
-            brandBean.setBrandCode(brand.getBrandCode());
-            brandBean.setBrandName(brand.getBrandName());
-            brandBean.setSubBrandBeanList(new ArrayList<>());
-            //放入出参列表
-            brandBeanList.add(brandBean);
-            //放入map
-            brandBeanMap.put(brandBean.getBrandCode(),brandBean);
-        }
-        //循环放入二级
-        for(BaseBrand brand:l2BrandList){
-            ListBrandForSelectRes.BrandBean parentBrandBean = brandBeanMap.get(brand.getParentBrandCode());
-            if(parentBrandBean==null){
-                continue;
-            }
-            //构建bean
-            ListBrandForSelectRes.BrandBean brandBean = new ListBrandForSelectRes.BrandBean();
-            brandBean.setBrandCode(brand.getBrandCode());
-            brandBean.setBrandName(brand.getBrandName());
-            //加入子品牌
-            parentBrandBean.getSubBrandBeanList().add(brandBean);
-        }
 
-        //构造出参
-        ListBrandForSelectRes res = new ListBrandForSelectRes();
-        res.setBrandBeanList(brandBeanList);
 
-        return res;
-    }
 
 
 }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseMaterialMapper.xml

@@ -8,7 +8,6 @@
         <result column="MATERIAL_CODE" property="materialCode" />
         <result column="MATERIAL_NAME" property="materialName" />
         <result column="MATERIAL_TYPE" property="materialType" />
-        <result column="BRAND_CODE" property="brandCode" />
         <result column="DESCRIPTION" property="description" />
         <result column="VALID" property="valid" />
         <result column="CREATE_TIME" property="createTime" />
@@ -20,16 +19,15 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, MATERIAL_CODE, MATERIAL_NAME, MATERIAL_TYPE, BRAND_CODE, DESCRIPTION, VALID, CREATE_TIME, CREATE_BY, UPDATE_TIME, UPDATE_BY, IS_DELETE
+        ID, MATERIAL_CODE, MATERIAL_NAME, MATERIAL_TYPE, DESCRIPTION, VALID, CREATE_TIME, CREATE_BY, UPDATE_TIME, UPDATE_BY, IS_DELETE
     </sql>
 
     <select id="listMaterial" resultType="com.abi.qms.platform.dao.vo.result.MaterialVO">
         select
-            m.id, m.material_code, m.material_name, m.material_type, m.brand_code, b.brand_name, m.description,
+            m.id, m.material_code, m.material_name, m.material_type, m.description,
             m.valid,m.create_time,m.update_time
 
         from base_material m
-        left join base_brand b on b.brand_code = m.brand_code and b.is_delete=0
 
         <where>
             <if test="req.materialCode!=null and req.materialCode!=''">
@@ -41,9 +39,6 @@
             <if test="req.materialType!=null and req.materialType!=''">
                 and m.material_type = #{req.materialType}
             </if>
-            <if test="req.brandCode!=null and req.brandCode!=''">
-                and m.brand_code = #{req.brandCode}
-            </if>
             <if test="req.valid!=null and req.valid!=''">
                 and m.valid = #{req.valid}
             </if>