From 1f3f613111d5f20dc392371bcf44c5366b300f65 Mon Sep 17 00:00:00 2001
From: fkf <1475794025@qq.com>
Date: Mon, 29 May 2023 18:16:06 +0800
Subject: [PATCH] =?UTF-8?q?5-29=20=E6=88=90=E5=93=81=E6=B2=B9=E5=93=81?=
 =?UTF-8?q?=E7=89=8C=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cyf/api/productinformation/ProductInformationVo.java   | 5 -----
 .../com/yxt/supervise/cyf/api/producttype/ProductType.java | 3 +++
 .../biz/productinformation/ProductInformationMapper.java   | 4 ++++
 .../biz/productinformation/ProductInformationMapper.xml    | 6 ++----
 .../cyf/biz/productinformation/ProductInformationRest.java | 6 ++++++
 .../biz/productinformation/ProductInformationService.java  | 7 +++++++
 .../supervise/cyf/biz/producttype/ProductTypeMapper.xml    | 6 +++++-
 7 files changed, 27 insertions(+), 10 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 0d01d3c6..3df7944d 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
@@ -19,9 +19,4 @@ public class ProductInformationVo implements Vo {
     private String name;
     //品牌编号
     private String number;
-
-    //品牌初始库存
-    private Double inventoryQuantity;
-    //品牌现有库存
-    private Double amount;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductType.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductType.java
index d5aeaa87..aa5e1694 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductType.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductType.java
@@ -21,4 +21,7 @@ public class ProductType extends BaseEntity {
     private String pSid;
     //产品sid
     private String prodSid;
+
+    private Double amount;
+    private Double price;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationMapper.java
index 51ac821f..98b34c58 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationMapper.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationMapper.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.supervise.cyf.api.productinformation.ProductInformation;
 import com.yxt.supervise.cyf.api.productinformation.ProductInformationVo;
+import com.yxt.supervise.cyf.api.producttype.ProductType;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -29,4 +30,7 @@ public interface ProductInformationMapper extends BaseMapper<ProductInformation>
 
     @Select("select count(*) from product_information where name = #{name}")
     Integer selectInformationByName(@Param("name") String name);
+
+    @Select("select * from product_type where prodSid = #{sid}")
+    List<ProductType> selectInformationType(@Param("sid") String sid);
 }
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 e849558f..5ef17342 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,8 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.productinformation.ProductInformationVo">
-        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
+        select *
+        from product_information
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationRest.java
index efe13970..b85baaa2 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationRest.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationRest.java
@@ -54,4 +54,10 @@ public class ProductInformationRest {
     public ResultBean selectList(){
         return productInformationService.selectList();
     }
+
+    @ApiOperation("查询此品牌下商品")
+    @GetMapping("/selectInformationType/{sid}")
+    public ResultBean selectInformationType(@PathVariable String sid){
+        return productInformationService.selectInformationType(sid);
+    }
 }
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 a427e68e..b634455f 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
@@ -12,6 +12,7 @@ import com.yxt.supervise.cyf.api.productinformation.ProductInformation;
 import com.yxt.supervise.cyf.api.productinformation.ProductInformationDto;
 import com.yxt.supervise.cyf.api.productinformation.ProductInformationQuery;
 import com.yxt.supervise.cyf.api.productinformation.ProductInformationVo;
+import com.yxt.supervise.cyf.api.producttype.ProductType;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -71,4 +72,10 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
         List<ProductInformation> productInformations = baseMapper.selectList();
         return rb.success().setData(productInformations);
     }
+
+    public ResultBean selectInformationType(String sid){
+        ResultBean rb = new ResultBean();
+        List<ProductType> productTypes = baseMapper.selectInformationType(sid);
+        return rb.success().setData(productTypes);
+    }
 }
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 de48d203..b9587192 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
@@ -10,7 +10,11 @@
     </select>
 
     <select id="selectProductType" resultType="com.yxt.supervise.cyf.api.producttype.ProductType">
-        select * from product_type where pSid = #{sid}
+        select t.*,i.amount,i.price
+        from product_type t
+        left join finish_product_inventory i
+        on t.sid = i.prodSid
+        where pSid = #{sid}
     </select>
 
     <select id="selectProductTypeByName" resultType="int">