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 @Select("select count(*) from product_information where name = #{name}") Integer selectInformationByName(@Param("name") String name); + + @Select("select * from product_type where prodSid = #{sid}") + List 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 @@