Merge branch 'feature/hls_bp_master_create_entrance' into develop

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_finish_for_query.lwm

@@ -54,7 +54,8 @@
         <bm:query-field field="contract_number" queryExpression="contract_number like upper(&apos;%&apos;||${@contract_number}||&apos;%&apos;)"/>
         <bm:query-field field="owner_user_id" queryOperator="="/>
         <bm:query-field field="bp_id_tenant" queryOperator="="/>
-        <bm:query-field field="lease_organization" queryOperator="="/>
+<!--        <bm:query-field field="lease_organization" queryOperator="="/>-->
+        <bm:query-field field="contract_status" queryOperator="="/>
         <bm:query-field field="bp_id_agent_desc" queryExpression="bp_id_agent_desc like upper(&apos;%&apos;||${@bp_id_agent_desc}||&apos;%&apos;)"/>
     </bm:query-fields>
     <bm:data-filters>

src/main/webapp/WEB-INF/classes/hls/HLS204N/hls_lease_item_gps_list_tmp.lwm

@@ -13,63 +13,66 @@
                 hd.created_by,
                 li.source_table,
                 li.attribute_1,
+                (select cc.contract_name
+                from con_contract cc
+                where cc.contract_number = li.attribute_1) contract_name,
                 li.attribute_2,
                 li.attribute_3,
                 li.attribute_4,
                 li.attribute_5,
+                (select cc.lease_start_date
+                from con_contract cc
+                where cc.contract_number = li.attribute_1) lease_start_date,
                 li.attribute_6,
                 li.attribute_7,
-               li.attribute_8,
+                trim(to_char(round(li.attribute_8,1),'999999999999990.99')) attribute_8,
+                trim(to_char(round(li.attribute_8 /
+                to_char(last_day(sysdate), 'dd'),
+                1),
+                '999999999999990.99')) average_hour,
                 li.attribute_9,
                 li.attribute_10,
                 li.attribute_11,
-               li.attribute_12,
-               li.attribute_13,
-               li.attribute_14,
-               li.attribute_15,
-               li.attribute_16,
-               li.attribute_17,
-               li.attribute_18,
-               li.attribute_19,
-               li.attribute_20,
-               li.attribute_21,
-               li.attribute_22,
-               li.attribute_23,
-               li.attribute_24,
-               li.attribute_25,
-               li.attribute_26
-          FROM fnd_interface_headers hd,
-               fnd_interface_lines   li
+                li.attribute_12
+                FROM fnd_interface_headers hd, fnd_interface_lines li
                 WHERE hd.header_id = li.header_id
-           AND hd.template_code = 'CSH_TRX_BANK'
-           AND li.line_number >0
+                AND hd.template_code = 'HLS_LEASE_ITEM_GPS_IMPORT'
+                AND li.line_number > 0
+                AND li.source_table = 'GPS'
                 AND HD.CREATED_BY = ${/session/@user_id}
-        ) t1
- #WHERE_CLAUSE#
+                AND hd.header_id=${/parameter/@header_id}) t1
                 order by t1.line_number
-
-]]></bm:query-sql>
+                ]]>
+            </bm:query-sql>
         </bm:operation>
         <bm:operation name="update">
             <bm:update-sql><![CDATA[
                 begin
-            hls_lease_item_gps_import_pkg.gps_import_check(p_header_id => ${/model/header/record/@header_id},
+                hls_lease_item_gps_import_pkg.gps_import_check(p_header_id => ${@header_id},
                 p_user_id => ${/session/@user_id});
                 end;
-]]></bm:update-sql>
+                ]]>
+            </bm:update-sql>
         </bm:operation>
         <bm:operation name="insert">
             <bm:update-sql><![CDATA[
-        begin
+                BEGIN
                 hls_lease_item_gps_import_pkg.gps_import(
-                                    p_header_id   =>${/parameter/@header_id},
-                                    p_user_id     =>${/session/@user_id}
-                                    );
-        end;
-        ]]></bm:update-sql>
+                p_contract_number    =>  ${@contract_number},
+                p_machine_model      =>  ${@machine_model},
+                p_machine_number     =>  ${@machine_number},
+                p_interval_date      =>  ${@interval_date},
+                p_working_hours_latest=> ${@working_hours_latest},
+                p_working_hours_new_m => ${@working_hours_new_m},
+                p_working_hours_ave_m => ${@working_hours_ave_m},
+                p_machine_location   =>  ${@machine_location},
+                p_note               =>  ${@note},
+                p_attention          =>  ${@attention},
+                p_machine_number_full=> ${@machine_number_full},
+                p_user_id            =>  ${/session/@user_id});
+                END;
+                ]]>
+            </bm:update-sql>
         </bm:operation>
     </bm:operations>
-    <bm:query-fields>
-        <bm:query-field name="header_id" queryExpression="t1.header_id=${@header_id}"/>
-    </bm:query-fields>
 </bm:model>

src/main/webapp/modules/hls/HLS204N/hls_lease_item_gps_import.lview

 <?xml version="1.0" encoding="UTF-8"?>
 
-
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
     <a:init-procedure/>
     <a:view>
         <script type="text/javascript"><![CDATA[
 
         function saveClick() {
-
-
             if (document.getElementById('importFile').value) {
                 var fileName = document.getElementById('importFile').value;
                 var fileType = fileName.substr(fileName.lastIndexOf("."));
@@ -19,13 +16,14 @@
                 }
             }
         }
+
         var _input_window;
 
-        function doSubmit() {
+        function doSubmit() {debugger;
             _input_window = new $L.Window({
                 title: '${l:HLS.IMPORT}',
-                width: 1050,
-                height: 500
+                width: 1100,
+                height: 400
             });
             new Ext.Template('<iframe id ="_input_window" name="_input_window" border="0" frameborder="0" height="100%"  width="100%"  style="border:none;padding:0px;margin:0px;"></iframe>').insertFirst(_input_window.body.dom, {}, true);
             var form = document.getElementById('importForm');
@@ -33,15 +31,17 @@
             form.action = url;
             form.submit();
             $('${/parameter/@winid}').close();
-
-            _input_window.on('close', function() {
+            _input_window.on('close', function () {
+                //  $('${/parameter/@parent_ds_id}').setQueryParameter('batch_id','${/parameter/@batch_id}');
                 $('${/parameter/@parent_ds_id}').query();
             });
         }
+
         ]]></script>
         <a:dataSets>
             <a:dataSet id="label_ds" autoCreate="true">
                 <a:fields>
+                    <!--<a:field name="label1" defaultValue="注意："/>-->
                     <a:field name="label2" defaultValue="${l:STRICT_IMPORTED_TEMPLATE_DATA}"/>
                     <a:field name="label3" defaultValue="${l:PRODUCT_MASTER_DATA_IMPORT}"/>
                     <a:field name="label4" defaultValue="${l:IMPORTER_ONLY_SUPPORTS}"/>
@@ -55,15 +55,20 @@
             <a:label name="label2" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
             <a:label name="label3" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
             <a:label name="label4" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
-            <a:label name="label5" bindTarget="label_ds" style="color:#055A78;font-weight:bold;margin-left:10px;" width="380"/>
-            <a:label name="label6" bindTarget="label_ds" style="color:#055A78;font-weight:bold;margin-left:10px;" width="380"/>
+            <a:label name="label5" bindTarget="label_ds" style="color:#055A78;font-weight:bold;margin-left:10px;"
+                     width="380"/>
+            <a:label name="label6" bindTarget="label_ds" style="color:#055A78;font-weight:bold;margin-left:10px;"
+                     width="380"/>
         </a:fieldSet>
         <a:fieldSet style="margin-left:10px;margin-top:10px;" title="TMPLT_IMPORT_FILE" width="400">
-            <form name="upload" id="importForm" action="modules/prj/PRJ501N/prj_lease_item_trans_upload.lview?session_id=${/parameter/@session_id}&amp;project_id=${/parameter/@project_id}&amp;parent_ds_id=${/parameter/@parent_ds_id}&amp;type=${/parameter/@type}&amp;_csrf=${/session/@_csrf.token}" enctype="multipart/form-data" method="post" target="_input_window">
+            <form name="upload" id="importForm"
+                  action="modules/hls/HLS204N/hls_lease_item_gps_excel_import.lview?session_id=${/parameter/@session_id}&amp;project_id=${/parameter/@project_id}&amp;parent_ds_id=${/parameter/@parent_ds_id}&amp;type=${/parameter/@type}&amp;_csrf=${/session/@_csrf.token}"
+                  enctype="multipart/form-data" method="post" target="_input_window">
                 <label style="margin-left:10px;margin-top:10px;font-size:13px"><![CDATA[${l:PLEASE_SELECT_A_FILE}]]></label>
                 <input name="CONTENT" id="importFile" style="font-size:15px" type="file"/>
                 <!-- <input onclick="downloadFile()" style="margin-left:10px;margin-top:10px;width:60px;height:23px" type="button" value="模板下载"/> -->
-                <input onclick="saveClick()" style="margin-left:25px;margin-top:10px;width:60px;height:23px" type="button" value="${l:TMPLT_IMPORT}"/>
+                <input onclick="saveClick()" style="margin-left:25px;margin-top:10px;width:60px;height:23px"
+                       type="button" value="${l:TMPLT_IMPORT}"/>
             </form>
         </a:fieldSet>
     </a:view>

src/main/webapp/modules/hls/HLS204N/hls_lease_item_gps_modify_entrance.lview

@@ -12,22 +12,23 @@
         <a:link id="hls_lease_item_gps_import_link" url="${/request/@context_path}/modules/hls/HLS204N/hls_lease_item_gps_import.lview"/>
         <script><![CDATA[
         //导入按钮
-        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {debugger;
             var url_l = $('hls_lease_item_gps_import_link').getUrl();
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_lease_item');
             var win = new Leaf.Window({
                 id: 'hls_lease_item_gps_import_link_win',
                 url: url_l,
                 params: {
                     'winid': 'hls_lease_item_gps_import_link_win',
                     'session_id': '${/session/@session_id}',
-                    'parent_ds_id': 'hls_lease_item_gps_modify_entrance_result_ds'
+                    'parent_ds_id': ds_id
                 },
                 title: '导入',
-                width: 430,
+                width: 420,
                 height: 390
             });
             win.on('close', function () {
-                $('hls_lease_item_gps_modify_entrance_result_ds').query();
+                $(ds_id).query();
             });
         }
 

src/main/webapp/modules/hls/HLS303/bp_agent_entrance.lview

@@ -207,8 +207,8 @@
                 <a:lov name="bp_code" bindTarget="bp_agent_query_ds" prompt="代理商编码"/>
                 <a:textField name="bp_name" bindTarget="bp_agent_query_ds" prompt="代理商名称"/>
                 <a:textField name="extra_nam" bindTarget="bp_agent_query_ds" prompt="代理商简称"/>
-                <a:textField name="re_kunnr" bindTarget="bp_agent_query_ds" prompt="SAP客户编码"/>
-                <a:textField name="re_lifnr" bindTarget="bp_agent_query_ds" prompt="SAP供应商编码"/>
+<!--                <a:textField name="re_kunnr" bindTarget="bp_agent_query_ds" prompt="SAP客户编码"/>-->
+<!--                <a:textField name="re_lifnr" bindTarget="bp_agent_query_ds" prompt="SAP供应商编码"/>-->
                 <!-- <a:comboBox name="bp_category_n" bindTarget="bp_agent_query_ds" prompt="商业伙伴类型"/>
                 <a:comboBox name="agent_type_n" bindTarget="bp_agent_query_ds" prompt="代理商类型"/>
                 <a:comboBox name="agent_instance_status_n" bindTarget="bp_agent_query_ds" prompt="工作流状态"/>-->
@@ -233,8 +233,8 @@
 <!--                    <a:column name="enterprise_certification" align="center" prompt="企业认证"-->
 <!--                              renderer="enterprise_certification_render" width="80"/>-->
 <!--                    <a:column name="certification_status" align="center" prompt="认证状态" width="80"/>-->
-                    <a:column name="re_kunnr" align="center" prompt="SAP客户编码" width="100"/>
-                    <a:column name="re_lifnr" align="center" prompt="SAP供应商编码" width="100"/>
+<!--                    <a:column name="re_kunnr" align="center" prompt="SAP客户编码" width="100"/>-->
+<!--                    <a:column name="re_lifnr" align="center" prompt="SAP供应商编码" width="100"/>-->
                     <!--<a:column name="bp_class_n" align="center" prompt="商业伙伴类型" width="120"/>
                     <a:column name="bp_category_n" align="center" prompt="商业伙伴类别" width="150"/>
                     <a:column name="agent_type_n" align="center" prompt="代理商类型" width="150"/>