chitanda 发布系统代码

app_CRM/src/mock/entity/products/products.ts

@@ -314,6 +314,138 @@ mock.onGet(new RegExp(/^\/products\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply((co
     console.groupEnd();
     return [status, records ?  records : []];
 });
+    
+// FetchEffective
+mock.onGet(new RegExp(/^\/products\/fetcheffective$/)).reply((config: any) => {
+    console.groupCollapsed("实体:product 方法: FetchEffective");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas ? mockDatas : []];
+});
+
+// FetchEffective
+mock.onGet(new RegExp(/^\/products\/fetcheffective(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+    console.groupCollapsed("实体:product 方法: FetchEffective");
+    console.table({url:config.url, method: config.method, data:config.data});
+    if(config.url.includes('page')){
+        let url = config.url.split('?')[1];
+        let params  =  qs.parse(url);
+        Object.assign(config, params);
+    }
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    let total = mockDatas.length;
+    let records: Array<any> = [];
+    if(!config.page || !config.size){
+        records = mockDatas;
+    }else{
+        if((config.page-1)*config.size < total){
+          records = mockDatas.slice(config.page,config.size);
+        }
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(records ?  records : []);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, records ?  records : []];
+});
+    
+// FetchRevise
+mock.onGet(new RegExp(/^\/products\/fetchrevise$/)).reply((config: any) => {
+    console.groupCollapsed("实体:product 方法: FetchRevise");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas ? mockDatas : []];
+});
+
+// FetchRevise
+mock.onGet(new RegExp(/^\/products\/fetchrevise(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+    console.groupCollapsed("实体:product 方法: FetchRevise");
+    console.table({url:config.url, method: config.method, data:config.data});
+    if(config.url.includes('page')){
+        let url = config.url.split('?')[1];
+        let params  =  qs.parse(url);
+        Object.assign(config, params);
+    }
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    let total = mockDatas.length;
+    let records: Array<any> = [];
+    if(!config.page || !config.size){
+        records = mockDatas;
+    }else{
+        if((config.page-1)*config.size < total){
+          records = mockDatas.slice(config.page,config.size);
+        }
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(records ?  records : []);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, records ?  records : []];
+});
+    
+// FetchStop
+mock.onGet(new RegExp(/^\/products\/fetchstop$/)).reply((config: any) => {
+    console.groupCollapsed("实体:product 方法: FetchStop");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas ? mockDatas : []];
+});
+
+// FetchStop
+mock.onGet(new RegExp(/^\/products\/fetchstop(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+    console.groupCollapsed("实体:product 方法: FetchStop");
+    console.table({url:config.url, method: config.method, data:config.data});
+    if(config.url.includes('page')){
+        let url = config.url.split('?')[1];
+        let params  =  qs.parse(url);
+        Object.assign(config, params);
+    }
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    let total = mockDatas.length;
+    let records: Array<any> = [];
+    if(!config.page || !config.size){
+        records = mockDatas;
+    }else{
+        if((config.page-1)*config.size < total){
+          records = mockDatas.slice(config.page,config.size);
+        }
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(records ?  records : []);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, records ?  records : []];
+});
 // URI参数传递情况未实现
 // URI参数传递情况未实现
 // URI参数传递情况未实现

app_CRM/src/service/product/product-service-base.ts

@@ -324,4 +324,46 @@ export default class ProductServiceBase extends EntityService {
         let tempData:any = JSON.parse(JSON.stringify(data));
         return Http.getInstance().get(`/products/fetchdefault`,tempData,isloading);
     }
+
+    /**
+     * FetchEffective接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ProductServiceBase
+     */
+    public async FetchEffective(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/products/fetcheffective`,tempData,isloading);
+    }
+
+    /**
+     * FetchRevise接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ProductServiceBase
+     */
+    public async FetchRevise(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/products/fetchrevise`,tempData,isloading);
+    }
+
+    /**
+     * FetchStop接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof ProductServiceBase
+     */
+    public async FetchStop(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/products/fetchstop`,tempData,isloading);
+    }
 }
\ No newline at end of file

app_CRM/src/utils/http/http.ts

@@ -46,7 +46,7 @@ export class Http {
         }
         params = this.handleRequestData(params);
         try {
-            const response = await axios({ method: 'post', url: url, data: { ...params }, headers: { 'Content-Type': 'application/json;charset=UTF-8', 'Accept': 'application/json' } });
+            const response = await axios({ method: 'post', url: url, data: params, headers: { 'Content-Type': 'application/json;charset=UTF-8', 'Accept': 'application/json' } });
             this.doResponseResult(response, serialNumber);
             return response;
         } catch (response) {

businesscentral-app/businesscentral-app-crm/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-crm.jar
 
-EXPOSE 10320
+EXPOSE 8080
 
 ADD businesscentral-app-crm.jar /businesscentral-app-crm.jar

businesscentral-app/businesscentral-app-crm/src/main/docker/businesscentral-app-crm.yaml

@@ -3,23 +3,9 @@ services:
   businesscentral-app-crm:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-crm:latest
     ports:
-      - "10320:10320"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10320
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
     deploy:
       resources:
            limits:

businesscentral-app/businesscentral-app-website/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-website.jar
 
-EXPOSE 10320
+EXPOSE 8080
 
 ADD businesscentral-app-website.jar /businesscentral-app-website.jar

businesscentral-app/businesscentral-app-website/src/main/docker/businesscentral-app-website.yaml

@@ -3,23 +3,9 @@ services:
   businesscentral-app-website:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-website:latest
     ports:
-      - "10320:10320"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10320
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
     deploy:
       resources:
            limits:

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/mapper/ProductMapper.java

@@ -20,6 +20,9 @@ import com.alibaba.fastjson.JSONObject;
 public interface ProductMapper extends BaseMapper<Product>{
 
     Page<Product> searchDefault(IPage page, @Param("srf") ProductSearchContext context, @Param("ew") Wrapper<Product> wrapper) ;
+    Page<Product> searchEffective(IPage page, @Param("srf") ProductSearchContext context, @Param("ew") Wrapper<Product> wrapper) ;
+    Page<Product> searchRevise(IPage page, @Param("srf") ProductSearchContext context, @Param("ew") Wrapper<Product> wrapper) ;
+    Page<Product> searchStop(IPage page, @Param("srf") ProductSearchContext context, @Param("ew") Wrapper<Product> wrapper) ;
     @Override
     Product selectById(Serializable id);
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/service/IProductService.java

@@ -37,6 +37,9 @@ public interface IProductService extends IService<Product>{
     boolean save(Product et) ;
     void saveBatch(List<Product> list) ;
     Page<Product> searchDefault(ProductSearchContext context) ;
+    Page<Product> searchEffective(ProductSearchContext context) ;
+    Page<Product> searchRevise(ProductSearchContext context) ;
+    Page<Product> searchStop(ProductSearchContext context) ;
     List<Product> selectByPricelevelid(String pricelevelid) ;
     void removeByPricelevelid(String pricelevelid) ;
     List<Product> selectByParentproductid(String productid) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/product/service/impl/ProductServiceImpl.java

@@ -271,6 +271,33 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         return new PageImpl<Product>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
+    /**
+     * 查询集合 有效
+     */
+    @Override
+    public Page<Product> searchEffective(ProductSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Product> pages=baseMapper.searchEffective(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Product>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+    /**
+     * 查询集合 正在修订
+     */
+    @Override
+    public Page<Product> searchRevise(ProductSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Product> pages=baseMapper.searchRevise(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Product>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+    /**
+     * 查询集合 已停用
+     */
+    @Override
+    public Page<Product> searchStop(ProductSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Product> pages=baseMapper.searchStop(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Product>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
 
 
     /**

businesscentral-core/src/main/resources/mapper/product/product/ProductMapper.xml

@@ -90,11 +90,55 @@
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
      </select>
 
+    <!--数据集合[Effective]-->
+	 <select id="searchEffective"  parameterType="cn.ibizlab.businesscentral.core.product.filter.ProductSearchContext"  resultMap="ProductResultMap">
+         select t1.* from (
+                <include refid="Effective" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据集合[Revise]-->
+	 <select id="searchRevise"  parameterType="cn.ibizlab.businesscentral.core.product.filter.ProductSearchContext"  resultMap="ProductResultMap">
+         select t1.* from (
+                <include refid="Revise" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据集合[Stop]-->
+	 <select id="searchStop"  parameterType="cn.ibizlab.businesscentral.core.product.filter.ProductSearchContext"  resultMap="ProductResultMap">
+         select t1.* from (
+                <include refid="Stop" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
 		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
 			]]>
     </sql>
+    <!--数据查询[Effective]-->
+    <sql id="Effective" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
+					 WHERE 	( t1.`STATECODE` = 0 )
+			]]>
+    </sql>
+    <!--数据查询[Revise]-->
+    <sql id="Revise" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
+			]]>
+    </sql>
+    <!--数据查询[Stop]-->
+    <sql id="Stop" databaseId="mysql">
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
+					 WHERE 	( t1.`STATECODE` = 1 )
+			]]>
+    </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
 		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  

businesscentral-core/src/main/resources/permission/systemResource.json

@@ -391,7 +391,7 @@
     "dename":"Product",
     "delogicname":"产品",
     "sysmoudle":{"id":"PRODUCT","name":"Product"},
-    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"},{"id":"Effective" , "name":"有效"},{"id":"Revise" , "name":"正在修订"},{"id":"Stop" , "name":"已停用"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/rest/ProductResource.java

@@ -160,5 +160,68 @@ public class ProductResource {
 	    return ResponseEntity.status(HttpStatus.OK)
                 .body(new PageImpl(productMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Product-searchEffective-all') and hasPermission(#context,'iBizBusinessCentral-Product-Get')")
+	@ApiOperation(value = "获取有效", tags = {"产品" } ,notes = "获取有效")
+    @RequestMapping(method= RequestMethod.GET , value="/products/fetcheffective")
+	public ResponseEntity<List<ProductDTO>> fetchEffective(ProductSearchContext context) {
+        Page<Product> domains = productService.searchEffective(context) ;
+        List<ProductDTO> list = productMapping.toDto(domains.getContent());
+        return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Product-searchEffective-all') and hasPermission(#context,'iBizBusinessCentral-Product-Get')")
+	@ApiOperation(value = "查询有效", tags = {"产品" } ,notes = "查询有效")
+    @RequestMapping(method= RequestMethod.POST , value="/products/searcheffective")
+	public ResponseEntity<Page<ProductDTO>> searchEffective(@RequestBody ProductSearchContext context) {
+        Page<Product> domains = productService.searchEffective(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(productMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Product-searchRevise-all') and hasPermission(#context,'iBizBusinessCentral-Product-Get')")
+	@ApiOperation(value = "获取正在修订", tags = {"产品" } ,notes = "获取正在修订")
+    @RequestMapping(method= RequestMethod.GET , value="/products/fetchrevise")
+	public ResponseEntity<List<ProductDTO>> fetchRevise(ProductSearchContext context) {
+        Page<Product> domains = productService.searchRevise(context) ;
+        List<ProductDTO> list = productMapping.toDto(domains.getContent());
+        return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Product-searchRevise-all') and hasPermission(#context,'iBizBusinessCentral-Product-Get')")
+	@ApiOperation(value = "查询正在修订", tags = {"产品" } ,notes = "查询正在修订")
+    @RequestMapping(method= RequestMethod.POST , value="/products/searchrevise")
+	public ResponseEntity<Page<ProductDTO>> searchRevise(@RequestBody ProductSearchContext context) {
+        Page<Product> domains = productService.searchRevise(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(productMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Product-searchStop-all') and hasPermission(#context,'iBizBusinessCentral-Product-Get')")
+	@ApiOperation(value = "获取已停用", tags = {"产品" } ,notes = "获取已停用")
+    @RequestMapping(method= RequestMethod.GET , value="/products/fetchstop")
+	public ResponseEntity<List<ProductDTO>> fetchStop(ProductSearchContext context) {
+        Page<Product> domains = productService.searchStop(context) ;
+        List<ProductDTO> list = productMapping.toDto(domains.getContent());
+        return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Product-searchStop-all') and hasPermission(#context,'iBizBusinessCentral-Product-Get')")
+	@ApiOperation(value = "查询已停用", tags = {"产品" } ,notes = "查询已停用")
+    @RequestMapping(method= RequestMethod.POST , value="/products/searchstop")
+	public ResponseEntity<Page<ProductDTO>> searchStop(@RequestBody ProductSearchContext context) {
+        Page<Product> domains = productService.searchStop(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(productMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
 }
 

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibizbusinesscentral/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizbusinesscentral/
-      mvn clean package -Pcrm
-      cd businesscentral-app/businesscentral-app-crm
-      mvn -Pcrm docker:build
-      mvn -Pcrm docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-app-crm.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>