商业伙伴变更修改

pom.xml

@@ -159,6 +159,13 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/jodconverter-2.2.2.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>com.gson</groupId>
+            <artifactId>sys-gson</artifactId>
+            <version>1.0.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/gson-2.6.2.jar</systemPath>
+        </dependency>
 
 
         <!--end -->

src/main/resources/config.properties

@@ -9,7 +9,7 @@ redis.sentinel=\
 redis.useSentinel=false
 
 redis.ip=localhost
-redis.port=7777
+redis.port=6379
 redis.db=10
 
 #db.jndiName=java:comp/env/jdbc/hap_dev
@@ -19,7 +19,7 @@ redis.db=10
 db.type=oracle
 db.driverClassName=oracle.jdbc.driver.OracleDriver
 
-db.url=jdbc:oracle:thin:@10.200.17.100:1521/HLS
+db.url=jdbc:oracle:thin:@10.200.17.70:1521/HLS.orcl
 db.username=hl_cm_dev
 db.password=hl_cm_dev
 db.maxPoolSize=100

src/main/resources/profiles/dev/config.properties

@@ -9,7 +9,7 @@ redis.sentinel=\
 redis.useSentinel=false
 
 redis.ip=localhost
-redis.port=7777
+redis.port=6379
 redis.db=2
 
 #db.jndiName=java:comp/env/jdbc/hap_dev
@@ -19,7 +19,7 @@ redis.db=2
 db.type=oracle
 db.driverClassName=oracle.jdbc.driver.OracleDriver
 
-db.url=jdbc:oracle:thin:@10.200.17.100:1521/HLS
+db.url=jdbc:oracle:thin:@10.200.17.70:1521/HLS.orcl
 db.username=hl_cm_dev
 db.password=hl_cm_dev
 db.maxPoolSize=100

src/main/webapp/WEB-INF/classes/hls/HLS214N/hls_bp_master_req_create.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: wangwei  
+    $Date: 2015-11-12 下午2:15:58  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                begin
+                    hls_bp_master_change_req_pkg.hls_bp_master_req_ins(p_bp_id         =>  ${@bp_id},
+                                                                       p_company_id    =>  ${/session/@company_id},
+                                                                       p_user_id       =>  ${/session/@user_id},
+                                                                       p_change_type   =>  ${@change_type},
+                                                                       p_change_req_id =>  ${@change_req_id});
+
+                end;
+                ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="change_req_id" dataType="java.lang.Long" output="true" outputPath="@change_req_id"/>
+            </bm:parameters>
+        </bm:operation>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                begin
+                    hls_bp_master_change_req_pkg.hls_bp_master_basic_ins(p_bp_id         =>  ${@bp_id},
+                                                                         p_company_id    =>  ${/session/@company_id},
+                                                                         p_user_id       =>  ${/session/@user_id},
+                                                                         p_change_req_id =>  ${@change_req_id});
+
+                end;
+                ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="change_req_id" dataType="java.lang.Long" output="true" outputPath="@change_req_id"/>
+            </bm:parameters>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/hls/HLS214N/hls_bp_master_req_submit.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: wangwei  
+    $Date: 2015-11-12 下午2:15:58  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="execute">
+            <bm:update-sql><![CDATA[
+                begin
+                    hls_bp_master_change_req_pkg.hls_bp_master_wfl_submit(p_change_req_id =>  ${@change_req_id},
+                                                                          p_company_id    =>  ${/session/@company_id},
+                                                                          p_user_id       =>  ${/session/@user_id});
+
+                end;
+                ]]></bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/uncertain.local.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <uncertain-engine defaultLogLevel="INFO">
-    <path-config logPath="D:\install_soft\jenkins_logs" uiPackageBasePath="D:\install_soft\apache-tomcat-jenkins\webapps\hlcm\lib\LeafUI\src"/>
+    <path-config logPath="D:\Users\Leauan\Logs\HLCM_Log" uiPackageBasePath="D:\Users\Leauan\workspace\leaf-hlcm\target\hlcm\lib\LeafUI\src"/>
 </uncertain-engine>
\ No newline at end of file

src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify_entrance.lview

@@ -16,6 +16,8 @@
                 modelaction="update"/>
         <a:link id="hls_bp_master_modify_link"
                 url="${/request/@context_path}/modules/hls/HLS214N/hls_bp_master_modify.lview"/>
+        <a:link id="hls_bp_master_req_modify_link"
+                url="${/request/@context_path}/modules/hls/HLS214N/hls_bp_master_req_modify.lview"/>
         <a:link id="Identity_ccx_link"
                 url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>
         <a:link id="IcInfo_ccx_link"
@@ -34,60 +36,112 @@
 
         //信息变更
         window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function () {
+            debugger;
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'hls_bp_master');
-            var data=$(ds_id).selected[0];
-            var bp_class = data.get('bp_class');
+            var record=$(ds_id).selected[0];
+            var param = record.data;
+            var bp_class = record.get('bp_class');
+            if(record.get('bp_wfl_status') == 'APPROVING'){
+                // 展示变更信息
+                param['function_code'] = 'HLS214BR';
+                param['function_usage'] = 'QUERY';
+                param['bp_class'] = bp_class;
+                param['change_req_id'] = record.get('invoice_change_id');
+                param['document_id'] = record.get('invoice_change_id');
+                param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
+                hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id);
+            }else {
+                window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
+                var url = '${/request/@context_path}/autocrud/hls.HLS214N.hls_bp_master_req_create/update';
+                Leaf.request({
+                    url: url,
+                    para: {
+                        bp_id: record.get('bp_id'),
+                        change_type: 'INVOICE_REQ'
+                    },
+                    success: function (res) {
+                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        if (res.result.change_req_id) {
+                            debugger;
+                            param['winid'] = 'bp_master_invoice_detail_win';
+                            param['function_code'] = 'HLS214B';
+                            param['bp_class'] = bp_class;
+                            param['url_title'] = '开票申请信息';
+                            param['change_req_id'] = res.result.change_req_id;
+                            param['document_id'] = res.result.change_req_id;
+                            param['function_usage'] = 'MODIFY';
+                            param['maintain_type'] = 'MODIFY';
+                            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_billing_link', ds_id);
+                        }
 
-            if(bp_class == 'NP'){
-                Leaf.showMessage('${l:PROMPT}', '只有法人类型商业伙伴才可以修改开票信息！');
-                return false;
-            }else if(bp_class == 'ORG'){
-                var invoice_bp_bank_account = data.get('invoice_bp_bank_account');
-                var invoice_title = data.get('invoice_title');
-                var invoice_bp_address_phone_num = data.get('invoice_bp_address_phone_num');
-                var phone =data.get('phone');
-                var taxpayer_type =data.get('taxpayer_type');
-                var invoice_bp_bank =data.get('invoice_bp_bank');
-                var ref_v07=data.get('ref_v07');
-                var bp_id=data.get('bp_id');
-                new Leaf.Window({
-                    id: 'hls_bp_master_billing',
-                    url: $('hls_bp_master_billing_link').getUrl(),
-                    params: {
-                        function_code:'HLS214NS',
-                        invoice_bp_bank_account:invoice_bp_bank_account,
-                        invoice_title:invoice_title,
-                        invoice_bp_address_phone_num:invoice_bp_address_phone_num,
-                        phone:phone,
-                        taxpayer_type:taxpayer_type,
-                        invoice_bp_bank:invoice_bp_bank,
-                        bp_id:bp_id,
-                        ref_v07:ref_v07
                     },
-                    title: '开票信息',
-                    fullScreen: true
+                    failure: function () {
+                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    },
+                    error: function () {
+                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                    },
+                    scope: this
                 });
             }
-
-        }
+        };
 
         // stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_BP_RESULT', 'hls_bp_master');
 
         function open_bp_modify_win(ds_id, record_id) {
-            var user_category ='${/model/default_value/record/@user_category}';
+            debugger;
             var record = $(ds_id).findById(record_id);
+            var bp_class = record.get('bp_class');
+            var user_category ='${/model/default_value/record/@user_category}';
+            var submit_flag = record.get('submit_flag');
             var param = record.data;
-            param['function_code'] = 'HLS214D';
-            // debugger;
-            // if (record.get('bp_category') == 'AGENT') {
-            //     param['function_code'] = 'HLS228DL';
-            // }
-            param['function_usage'] = 'MODIFY';
-            param['bp_class'] = record.get('bp_class');
-            param['cond_para1'] = user_category;
-            param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
-            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id);
-
+            if(record.get('bp_wfl_status') == 'APPROVING'){
+                // 展示原始信息，后续待定
+                param['function_code'] = 'HLS215D';
+                param['function_usage'] = 'QUERY';
+                param['bp_class'] = bp_class;
+                param['cond_para1'] = user_category;
+                param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
+                hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id);
+            }else{
+                if(submit_flag == 'Y'){
+                    window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
+                    var url = '${/request/@context_path}/autocrud/hls.HLS214N.hls_bp_master_req_create/execute';
+                    Leaf.request({
+                        url: url,
+                        para: {
+                            bp_id: record.get('bp_id')                },
+                        success: function (res) {
+                            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                            if(res.result.change_req_id){
+                                debugger;
+                                param['function_code'] = 'HLS214F';
+                                param['function_usage'] = 'MODIFY';
+                                param['bp_class'] = bp_class;
+                                param['change_req_id'] = res.result.change_req_id;
+                                param['document_id'] = res.result.change_req_id;
+                                param['cond_para1'] = user_category;
+                                param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
+                                hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_req_modify_link', ds_id);
+                            }
+                        },
+                        failure: function () {
+                            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        },
+                        error: function () {
+                            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                        },
+                        scope: this
+                    });
+                }else{
+                    param['function_code'] = 'HLS214D';
+                    param['function_usage'] = 'MODIFY';
+                    param['bp_class'] = bp_class;
+                    param['cond_para1'] = user_category;
+                    param['url_title'] = '${l:HLS212.BP_MASTER_MAINTAIN}';
+                    hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls_bp_master_modify_link', ds_id);
+                }
+            }
         }
 
         function open_ccx_detail_win(ds_id, record_id) {