From b0f8938012ba93d1d80defebd28cf189e28b95c5 Mon Sep 17 00:00:00 2001
From: fkf <1475794025@qq.com>
Date: Fri, 26 May 2023 15:10:43 +0800
Subject: [PATCH] 111

---
 .../ProductInformationVo.java                   |  9 +++++++--
 .../ProductInformationMapper.xml                |  8 ++++----
 .../ProductInformationService.java              |  2 +-
 .../cyf/biz/producttype/ProductTypeMapper.java  |  4 ++--
 .../cyf/biz/producttype/ProductTypeMapper.xml   |  4 ++--
 .../cyf/biz/producttype/ProductTypeService.java | 17 +++++++++--------
 6 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/productinformation/ProductInformationVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/productinformation/ProductInformationVo.java
index e718c312..0d01d3c6 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/productinformation/ProductInformationVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/productinformation/ProductInformationVo.java
@@ -15,8 +15,13 @@ public class ProductInformationVo implements Vo {
     private String id;
     private String sid;
 
-    //产品类型名称
+    //品牌名称
     private String name;
-    //产品类型编号
+    //品牌编号
     private String number;
+
+    //品牌初始库存
+    private Double inventoryQuantity;
+    //品牌现有库存
+    private Double amount;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationMapper.xml
index 67fdee4f..e849558f 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationMapper.xml
@@ -4,10 +4,10 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.productinformation.ProductInformationVo">
-        SELECT
-        *
-        FROM
-        product_information
+        select i.*,r.inventoryQuantity,p.amount
+        from product_information i
+        left join finis_prod_inven_record r on i.sid = r.prodSid
+        left join finish_product_inventory p on i.sid = p.prodSid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationService.java
index be383193..a427e68e 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationService.java
@@ -58,7 +58,7 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
         ProductInformationQuery params = pq.getParams();
         QueryWrapper<ProductInformation> qw = new QueryWrapper<>();
         if (params.getName() != null && !params.getName().equals("")){
-            qw.eq("name",params.getName());
+            qw.eq("i.name",params.getName());
         }
         IPage<ProductInformation> page = PagerUtil.queryToPage(pq);
         IPage<ProductInformationVo> vo = baseMapper.selectPageVo(page, qw);
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java
index 5796d1d6..52e64e47 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java
@@ -22,7 +22,7 @@ public interface ProductTypeMapper extends BaseMapper<ProductType> {
 
     List<ProductType> selectProductType(@Param("sid") String sid);
 
-    Integer selectProductTypeByName(@Param("name") String name);
+    Integer selectProductTypeByName(@Param("name") String name,@Param("prodSid") String prodSid);
 
-    Integer selectProductTypeByNumber(@Param("number") String number);
+    Integer selectProductTypeByNumber(@Param("number") String number,@Param("prodSid") String prodSid);
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml
index f74f57c9..de48d203 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml
@@ -14,10 +14,10 @@
     </select>
 
     <select id="selectProductTypeByName" resultType="int">
-        select count(*) from product_type where name = #{name}
+        select count(*) from product_type where name = #{name} and prodSid = #{prodSid}
     </select>
 
     <select id="selectProductTypeByNumber" resultType="int">
-        select count(*) from product_type where number = #{number}
+        select count(*) from product_type where number = #{number} and prodSid = #{prodSid}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java
index 5f86b2d9..e20f7ae2 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java
@@ -29,13 +29,13 @@ public class ProductTypeService extends MybatisBaseService<ProductTypeMapper, Pr
         List<ProductTypeDto> typeList = dto.getTypeList();
         if (dto.getSid() != null){
             for (ProductTypeDto productTypeDto : typeList){
-                Integer integer = baseMapper.selectProductTypeByName(productTypeDto.getName());
+                Integer integer = baseMapper.selectProductTypeByName(productTypeDto.getName(),dto.getProdSid());
                 if (integer != 0) {
-                    return rb.success().setMsg("该品牌商品已有此类型名称");
+                    return rb.setMsg("该品牌商品已有此类型名称");
                 }
-                Integer integer1 = baseMapper.selectProductTypeByNumber(productTypeDto.getNumber());
+                Integer integer1 = baseMapper.selectProductTypeByNumber(productTypeDto.getNumber(),dto.getProdSid());
                 if (integer1 != 0){
-                    return rb.success().setMsg("该编码已有品牌商品类型占用");
+                    return rb.setMsg("该编码已有品牌商品类型占用");
                 }
                 ProductType type1 = new ProductType();
                 BeanUtil.copyProperties(productTypeDto,type1,"id","sid");
@@ -44,13 +44,13 @@ public class ProductTypeService extends MybatisBaseService<ProductTypeMapper, Pr
             }
             return rb.success().setMsg("添加成功");
         }else {
-            Integer integer = baseMapper.selectProductTypeByName(dto.getName());
+            Integer integer = baseMapper.selectProductTypeByName(dto.getName(),dto.getProdSid());
             if (integer != 0) {
-                return rb.success().setMsg("该品牌已有该商品");
+                return rb.setMsg("该品牌已有该商品");
             }
-            Integer integer1 = baseMapper.selectProductTypeByNumber(dto.getNumber());
+            Integer integer1 = baseMapper.selectProductTypeByNumber(dto.getNumber(),dto.getProdSid());
             if (integer1 != 0){
-                return rb.success().setMsg("该编码已有品牌商品占用");
+                return rb.setMsg("该编码已有品牌商品占用");
             }
             ProductType type = new ProductType();
             BeanUtil.copyProperties(dto,type,"id","sid","typeList");
@@ -87,6 +87,7 @@ public class ProductTypeService extends MybatisBaseService<ProductTypeMapper, Pr
                 wq.eq("p.name",params.getName());
             }
         }
+        wq.eq("pSid",'0');
         IPage<ProductType> page = PagerUtil.queryToPage(pq);
         IPage<ProductTypeVo> pageVo = baseMapper.selectPageVo(page, wq);
         PagerVo<ProductTypeVo> vo = PagerUtil.pageToVo(pageVo, null);