I-20855【建机】合同结束日取值逻辑调整，收款核销优化

src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_agent_lov.lwm

@@ -10,6 +10,7 @@
         <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
         <bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
         <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
+        <bm:field name="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" physicalName="EXTRA_NAM" prompt="代理店简称"/>
         <bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
         <bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>
         <bm:field name="company_short_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_SHORT_NAME" prompt="HLS_BP_MASTER_V.COMPANY_SHORT_NAME"/>

src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_agent_vender_lov.lwm

@@ -9,6 +9,7 @@
     <bm:fields>
         <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
         <bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
+        <bm:field name="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" physicalName="EXTRA_NAM" prompt="代理店简称"/>
         <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
         <bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
         <bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>

src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm

@@ -12,6 +12,8 @@
 			             t1.bp_id_tenant,
 			             t1.bp_id_agent_level1,
 			             (select bp_name from hls_bp_master where bp_id = t1.bp_id_tenant) bp_name,
+			             (SELECT u.unit_name from exp_org_unit_v u,hls_bp_master h
+			              WHERE u.unit_id = h.unit_id and h.bp_id=t1.bp_id_tenant) agent_name,
 			             (SELECT sc.code_value_name
                             FROM sys_code_values_v sc
                             WHERE sc.code = 'CON500_CONTRACT_STATUS'
@@ -56,6 +58,7 @@ select t.parent_company_id company_id
         <bm:field name="division"/>
         <bm:field name="business_type_n"/>
         <bm:field name="search_term_1"/>
+        <bm:field name="agent_name"/>
     </bm:fields>
     <bm:query-fields>
         <bm:query-field field="contract_id" queryOperator="="/>

src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview

@@ -277,6 +277,7 @@
                             <a:column name="search_term_1" align="center" prompt="厂商合同编号" width="100"/>
                             <a:column name="business_type_n" align="center" prompt="业务类型" width="80"/>
                             <a:column name="contract_status_desc" prompt="合同状态" align="center" width="100"/>
+                            <a:column name="agent_name" prompt="代理店简称" align="center" width="100"/>
                             <a:column name="bp_name" prompt="客户名" width="250"/>
                         </a:columns>
                     </a:grid>