Merge branch 'feature/payment_fix' into develop

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm

@@ -10,16 +10,16 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-               SELECT t1.*,
+                SELECT t1.*,
         (select v.code_value_name
            from sys_code_values_v v
           where v.code = 'CON_WRITE_OFF_FLAG'
-            and v.code_value = t1.cf_61_write_off_flag) cf_61_write_off_flag_n,
-         (select v.code_value_name
+            and v.code_value = t1.cf_61_write_off_flag) cf_61_write_off_flag_n
+       /*  (select v.code_value_name
            from sys_code_values_v v
           where v.code = 'VENDER_NAME'
-            and v.code_value = t1.vender_name) vender_name_n
-   FROM (SELECT hli.vender_name,
+            and v.code_value = t1.vender_name) vender_name_n*/
+   FROM (SELECT
                 t.contract_id,
                 t.contract_name,
                 f.cashflow_id,
@@ -36,6 +36,17 @@
                 h.description     cf_item_desc,
                 h.cf_item,
                 f.due_amount,
+                --开票状态
+                f.billing_status,
+                 (SELECT code_value_name
+                     FROM sys_code_values_v scv
+                    WHERE scv.code = 'CON_BILLING_STATUS'
+                       AND code_value= f.billing_status
+                      AND scv.code_value_enabled_flag = 'Y'
+                      AND scv.code_enabled_flag = 'Y') billing_status_n,
+
+                --发票状态
+               acp_invoice_pkg.return_invoice_status(p_contract_id=>t.contract_id) invoice_status_n,
                 t.currency,
                 /* (SELECT dbms_lob.substr(wmsys.wm_concat(ci.serial_number))
                  FROM con_contract_lease_item ci
@@ -146,7 +157,9 @@
                 --add by shen
                 (select bp_name
                    from hls_bp_master
-                  where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n
+                  where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n,
+                --查找厂商
+                (SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n
 
            FROM con_contract_cashflow   f,
                 hls_cashflow_item       h,
@@ -195,10 +208,10 @@
                      ),
                      0)) > 0
             AND t.data_class = 'NORMAL'
-            AND t.contract_status NOT IN
-                ('NEW', 'SIGN', 'CANCEL', 'PENDING', 'CLOSED')
+          --  AND t.contract_status  IN
+          --     ('INCEPT')
                 --测试用，cf_itme应当为0
-            AND f.cf_item in (0,21)) t1
+            AND f.cf_item in (0)) t1
 
            #WHERE_CLAUSE#
            #ORDER_BY_CLAUSE#
@@ -244,7 +257,7 @@
         <bm:field name="con_business_type_n"/>
         <bm:field name="cdd_list_id"/>
         <bm:field name="bp_id_agent_n"/>
-        <bm:field name="vender_name"/>
+<!--        <bm:field name="vender_name"/>-->
         <bm:field name="vender_name_n"/>
         <bm:field name="division"/>
         <bm:field name="division_n"/>
@@ -263,6 +276,8 @@
         <bm:field name="agent_extra_nam"/>
         <bm:field name="cf_61_write_off_flag"/>
         <bm:field name="cf_61_write_off_flag_n"/>
+        <bm:field name="billing_status_n"/>
+        <bm:field name="invoice_status_n"/>
     </bm:fields>
     <bm:features>
         <s:bm-script><![CDATA[

src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview

@@ -39,15 +39,21 @@
                 return;
             }
             //对是否为同一个厂商进行检查
-            var vender_name=record.get('vender_name');
+            var vender_name=record.get('vender_name_n');
             var vender_flag=true;
+            //校验发票状态必须是全部开票且发票已确认
             for (i = 0; i < a.length; i++) {
                     //检验厂商
-                    if(a[i].get('vender_name')!=vender_name){
+                    if(a[i].get('vender_name_n')!=vender_name){
                         vender_flag=false;
                         $L.showErrorMessage("提示",'请选择厂商相同的现金流信息！');
                         return;
                     }
+                if(a[i].get('billing_status_n')!='FULL' ||a[i].get('billing_status_n')!='发票已确认'){
+                    $L.showErrorMessage("提示",'请选择开票状态为已开票，发票状态为已确认的现金流！');
+                    return;
+                }
+
                     cashflow_id = a[i].get('cashflow_id');
                     var arr = {};
                     contract_id_list[i] = a[i].get('contract_id');
@@ -371,6 +377,8 @@
                     <a:column name="due_date" prompt="应付日期"/>
                     <a:column name="bp_id_agent_n" prompt="代理店"/>
                     <a:column name="vender_name_n" prompt="厂商"/>
+                    <a:column name="billing_status_n" prompt="开票状态"/>
+                    <a:column name="invoice_status_n" prompt="发票状态"/>
                    <!-- <a:column name="received_amount" align="right" prompt="实际支付金额" renderer="Leaf.formatMoney"/>
                     <a:column name="residual_amount" align="right" prompt="剩余未支付金额" renderer="Leaf.formatMoney" width="110"/>
                     <a:column name="invoice_uploaded_flag_n" align="center" prompt="发票上传标志"/>