销项发票问题修复

src/main/resources/config.properties

@@ -19,9 +19,9 @@ redis.db=10
 db.type=oracle
 db.driverClassName=oracle.jdbc.driver.OracleDriver
 
-db.url=jdbc:oracle:thin:@10.200.17.70:1521/HLS.orcl
-db.username=hl_cm_dev
-db.password=hl_cm_dev
+db.url=jdbc:oracle:thin:@10.200.17.180:1521/HLCMTEST
+db.username=hl_cm_dev_2023
+db.password=hl_cm_dev_2023
 db.maxPoolSize=100
 db.minIdle=10
 

src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_op_query.lwm

@@ -12,6 +12,7 @@
             <bm:query-sql><![CDATA[
                 SELECT *
   FROM (SELECT t1.invoice_hd_id,
+               t1.description,
                t1.document_number,
                TO_CHAR(t1.invoice_date, 'yyyy-mm-dd') AS invoice_date,
                t1.document_category,

src/main/webapp/WEB-INF/classes/acr/ACR610/acr_invoice_apply_detail.lwm

@@ -57,18 +57,29 @@
                                From con_contract_cashflow t
                                Where t.cashflow_id = al.cashflow_id))         times,
 
-                                 (Select to_char(h.journal_date, 'yyyy-mm')
-                                  From hls_journal_header h, hls_journal_detail l
-                                  Where h.journal_header_id = l.journal_header_id
-                                        And ((l.cashflow_id = al.cashflow_id
-                                    and al.cf_item<>9) or (al.ref_n04=l.journal_line_id  and al.cf_item=9))
-                                        And rownum = 1)                      journal_month,
-                     (Select h.sbo_num
-                      From hls_journal_header h, hls_journal_detail l
-                      Where h.journal_header_id = l.journal_header_id
-                        And ((l.cashflow_id = al.cashflow_id
-                          and al.cf_item<>9) or (al.ref_n04=l.journal_line_id  and al.cf_item=9))
-                        And rownum = 1)                      journal_num,
+                             nvl((Select to_char(h.journal_date, 'yyyy-mm')
+                                   From hls_journal_header h,
+                                        hls_journal_detail l
+                                  Where h.journal_header_id =
+                                        l.journal_header_id
+                                    And ((l.cashflow_id = al.cashflow_id and
+                                        al.cf_item <> 9) or
+                                        (al.ref_n04 = l.journal_line_id and
+                                        al.cf_item = 9))
+                                    And rownum = 1),
+                                 (select to_char(t.invoice_date, 'yyyy-mm')
+                                    from acr_invoice_hd t
+                                   where t.invoice_hd_id = ah.invoice_hd_id)) journal_month,
+                             (Select h.sbo_num
+                                From hls_journal_header h,
+                                     hls_journal_detail l
+                               Where h.journal_header_id =
+                                     l.journal_header_id
+                                 And ((l.cashflow_id = al.cashflow_id and
+                                     al.cf_item <> 9) or
+                                     (al.ref_n04 = l.journal_line_id and
+                                     al.cf_item = 9))
+                                 And rownum = 1) journal_num,
 
                           al.tax_type_rate,
                           al.total_amount,
@@ -164,6 +175,7 @@
     <bm:query-fields>
         <bm:query-field name="contract_number" queryExpression="t1.contract_number = ${@contract_number}"/>
         <bm:query-field name="pur_contract_number" queryExpression="t1.pur_contract_number = ${@pur_contract_number}"/>
+        <bm:query-field name="pur_number" queryExpression="t1.pur_number = ${@pur_number}"/>
         <bm:query-field name="bp_code" queryExpression="t1.bp_code = ${@bp_code}"/>
         <bm:query-field name="journal_month" queryExpression="t1.journal_month = ${@journal_month}"/>
         <bm:query-field name="paid_byother_flag_n" queryExpression="t1.paid_byother_flag = ${@paid_byother_flag}"/>

src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview

@@ -384,11 +384,17 @@
         }
 
         function acr512_op_invoice_insert() {
+            debugger;
             var records = $('acr512_invoice_op_result_ds').getSelected();
+            var description = records[0].data.description.length;
             if (records.length < 1) {
                 Leaf.showMessage('${l:HLS.PROMPT}', '请选择需要审批的发票！');
                 return;
             }
+            if(description > 230){
+                Leaf.showMessage('${l:HLS.PROMPT}', '单据编号为'+records[0].data.document_number+'的发票说明字段超出230个字符，请调整！');
+                return;
+            }
             var datas = {};
             var saveData = [];
             var invoice_hd_ids = '';