5-30 111

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryVo.java

@@ -23,7 +23,15 @@ public class FinishProductInventoryVo implements Vo {
     private Double price;
 
     //品牌名称
-    private String name;
+    private String InformationName;
     //品牌编号
     private String InformationNumber;
+    //类型名称
+    private String typeName;
+    //类型编码
+    private String typeNumber;
+    //商品名称
+    private String prodName;
+    //商品编码
+    private String prodNumber;
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryMapper.java

@@ -21,6 +21,5 @@ public interface FinishProductInventoryMapper extends BaseMapper<FinishProductIn
 
     FinishProductInventory selectPriceByProdSid(@Param("prodSid") String prodSid);
 
-    @Select("select count(*) from finish_product_inventory where prodSid = #{prodSid)")
     Integer selectByProdSid(@Param("prodSid") String prodSid);
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryMapper.xml

@@ -2,9 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.supervise.cyf.biz.finishproductinventory.FinishProductInventoryMapper">
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventoryVo">
-        select p.*,i.name,i.number InformationNumber
+        select p.*,t.name typeName,t.number typeNumber,i.name InformationName,i.number InformationNumber,pt.name prodName,pt.number prodNumber
         from finish_product_inventory p
-        inner join product_information i on p.prodSid = i.sid
+        left join product_type t on p.prodSid = t.sid
+        inner join product_type pt on pt.sid = t.pSid
+        left join product_information i on i.sid = pt.prodSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -13,4 +15,8 @@
     <select id="selectPriceByProdSid" resultType="com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventory">
         select * from finish_product_inventory where prodSid = #{prodSid}
     </select>
+
+    <select id="selectByProdSid" resultType="int">
+        select count(*) from finish_product_inventory where prodSid = #{prodSid}
+    </select>
 </mapper>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryService.java

@@ -52,7 +52,7 @@ public class FinishProductInventoryService extends MybatisBaseService<FinishProd
         QueryWrapper<FinishProductInventory> wq = new QueryWrapper<>();
         if (params != null){
             if (!params.getInformationNumber().equals("")){
-                wq.eq("i.number",params.getInformationNumber());
+                wq.eq("t.number",params.getInformationNumber());
             }
         }
         IPage<FinishProductInventory> page = PagerUtil.queryToPage(pq);

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.supervise.cyf.biz.finisprodinvenrecord.FinisProdInvenRecordMapper">
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.finisprodinvenrecord.FinisProdInvenRecordVo">
-        select r.*,i.name,i.number
+        select r.*,t.number
         from finis_prod_inven_record r
-        left join product_information i on r.prodSid = i.sid
+        left join product_type t on r.prodSid	= t.sid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordService.java

@@ -66,7 +66,7 @@ public class FinisProdInvenRecordService extends MybatisBaseService<FinisProdInv
                 wq.eq("r.recordDate",params.getRecordDate());
             }
             if (!params.getNumber().equals("")){
-                wq.eq("i.number",params.getNumber());
+                wq.eq("t.number",params.getNumber());
             }
         }
         IPage<FinisProdInvenRecord> page = PagerUtil.queryToPage(pq);

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationService.java

@@ -59,7 +59,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("i.name",params.getName());
+            qw.eq("number",params.getName());
         }
         IPage<ProductInformation> page = PagerUtil.queryToPage(pq);
         IPage<ProductInformationVo> vo = baseMapper.selectPageVo(page, qw);