diff --git a/yxt_supervise/pom.xml b/yxt_supervise/pom.xml
index fc4e2373..50cd2d9b 100644
--- a/yxt_supervise/pom.xml
+++ b/yxt_supervise/pom.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.yxt.anrui
- anrui
+ com.yxt.supervise
+ yxt_supervise
0.0.1
diff --git a/yxt_supervise/supervise-portal/pom.xml b/yxt_supervise/supervise-portal/pom.xml
index b294c30e..d0703127 100644
--- a/yxt_supervise/supervise-portal/pom.xml
+++ b/yxt_supervise/supervise-portal/pom.xml
@@ -10,7 +10,7 @@
supervise-portal-api
supervise-portal-biz
- com.yxt.anrui
+ com.yxt.supervise
0.0.1
pom
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/brandinfo/BrandInfoMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/brandinfo/BrandInfoMapper.java
index a119a941..266ca22e 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/brandinfo/BrandInfoMapper.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/brandinfo/BrandInfoMapper.java
@@ -64,4 +64,6 @@ public interface BrandInfoMapper extends BaseMapper {
List selectListVo();
@Select("select * from brand_info where code=#{code}")
BrandInfoVo selectByCode(String code);
+ @Select("select name,code from restricted_brand where code=#{code} group by name")
+ BrandInfo fetchByCodeForLimit(String brandSid);
}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/brandinfo/BrandInfoService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/brandinfo/BrandInfoService.java
index 18e78224..a779d2d5 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/brandinfo/BrandInfoService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/brandinfo/BrandInfoService.java
@@ -105,4 +105,9 @@ public class BrandInfoService extends MybatisBaseService {
DictCommonDetailsVo fetchByKey(@Param("key")String key);
@Select("select * from dict_common where dictkey=#{key} and dictType=#{type}")
DictCommonDetailsVo fetchByKeyAndType(@Param("key")String key, @Param("type")String type);
+ @Select("select * from restricted_category where dictkey=#{key} and dictType=#{type}")
+ DictCommonDetailsVo fetchByKeyAndTypeForLimit(@Param("type")String category, @Param("key")String categoryKey);
}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonService.java
index f780d90c..99bb5bb8 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/dictcommon/DictCommonService.java
@@ -112,4 +112,9 @@ public class DictCommonService extends MybatisBaseService productNums=productNumService.getAll();
// 第一步,创建一个HSSFWorkbook,对应一个Excel文件
if(wb == null){
wb = new HSSFWorkbook();
@@ -329,29 +334,48 @@ public class InventoryInformationService extends MybatisBaseService
List selectListVo();
ProductInformationVo selectByCode(@Param("code")String code);
+ @Select("SELECT * FROM `product_information` WHERE (brandSid IN(SELECT CODE FROM restricted_brand) " +
+ "AND categoryKey IN(SELECT dictKey FROM restricted_category) AND CODE = #{code}) or (categoryKey in('081101','081102','081103'))")
+ ProductInformationVo limitJudgement(String code);
}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java
index b8e5e7bc..acf876ba 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java
@@ -552,4 +552,8 @@ public class ProductInformationService extends MybatisBaseService
- anrui
- com.yxt.anrui
+ yxt_supervise
+ com.yxt.supervise
0.0.1
4.0.0