租赁物导入调整22

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

@@ -19,7 +19,7 @@ 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.url=jdbc:oracle:thin:@10.200.17.180:1521/HLCMTEST
 db.username=hl_cm_dev
 db.password=hl_cm_dev
 db.maxPoolSize=100

src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import_details.lview

@@ -49,11 +49,21 @@
                 record.getField('seq').setReadOnly(true);
                 record.getField('asset_num').setReadOnly(true);
                 record.getField('asset_type').setReadOnly(true);
+                record.getField('asset_type_n').setReadOnly(true);
+                record.getField('asset_name').setReadOnly(true);
                 record.getField('asset_name_n').setReadOnly(true);
                 record.getField('specification').setReadOnly(true);
                 record.getField('posted_date').setReadOnly(true);
                 record.getField('price').setReadOnly(true);
                 record.getField('manufacturer').setReadOnly(true);
+            }else if('${/parameter/@project_status}'=='NEW' && record!=''){
+                record.getField('asset_num').setRequired(true);
+                record.getField('asset_type').setRequired(true);
+                record.getField('asset_name').setRequired(true);
+                record.getField('specification').setRequired(true);
+                record.getField('posted_date').setRequired(true);
+                record.getField('price').setRequired(true);
+                record.getField('manufacturer').setRequired(true);
             }
         }
 

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview

@@ -15,11 +15,11 @@
                 model="zjwfl.sys_role_flag" rootPath="role_flag_path"/>
         <a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
         <a:model-query fetchAll="true" model="prj.PRJ500D.prj_project_get_description" rootPath="description"/>
-        <a:model-query fetchAll="true"  model="prj.PRJ500D.prj_project_residual_value" rootPath="residual_value"/>
+
         <s:server-script import="contract_print_path.js"><![CDATA[
-        $ctx.parameter.file_path = con_print_path['con_print_path'];
-        $ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
-        ]]>
+            $ctx.parameter.file_path = con_print_path['con_print_path'];
+            $ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
+            ]]>
         </s:server-script>
     </a:init-procedure>
     <a:view>
@@ -166,6 +166,19 @@
                 window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 //首次插入
                 if (!record.get('calc_session_id')) {
+
+                    var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
+                    var current_red= $(ds_id).getCurrentRecord();
+                    if(division=='30' || division=='50'){
+                        var set_number=current_red.get('set_number');
+                        var total_number=current_red.get('total_number');
+                        if(total_number!=0 && set_number!=total_number){
+                            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                            Leaf.showMessage('${l:HLS.PROMPT}', '租赁物台数与查看明细中台数不一致，请重新维护！');
+                            return;
+                        }
+                    }
+
                     record.set('to_doc_table', 'HLS_FIN_CALCULATOR_HD');
                     var calc_recreate_L_formula;
                     calc_recreate_L_formula = 'Y';
@@ -233,9 +246,10 @@
                     var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
                     var current_red= $(ds_id).getCurrentRecord();
                     if(division=='30' || division=='50'){
-                      var set_number=current_red.get('set_number');
-                      var total_number=current_red.get('total_number');
+                        var set_number=current_red.get('set_number');
+                        var total_number=current_red.get('total_number');
                         if(total_number!=0 && set_number!=total_number){
+                            window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                             Leaf.showMessage('${l:HLS.PROMPT}', '租赁物台数与查看明细中台数不一致，请重新维护！');
                             return;
                         }
@@ -569,6 +583,9 @@
                 $(prj_quotation_ds_id).query();
                 $(score_ds_id).query();
             }
+            if (prj_project_lease_item_ds_id==ds.id){
+                $(prj_quotation_ds_id).query();
+            }
 
             window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
         };
@@ -1598,8 +1615,8 @@
                                         var total_price=records.get('total_price');
                                         var lease_item_amount=record.get('lease_item_amount');
                                         var  residual_value=record.get('residual_value');
-                                        debugger;
-                                        var  q_value='${/model/residual_value/record/@residual_value}';
+
+                                        var  q_value=records.get('q_value');
                                         if(total_price!=lease_item_amount &&total_price!=null){
                                             Leaf.showMessage('${l:PROMPT}', '支付计划页面“设备价格”字段值与租赁物明细“设备单价（总）”合计不相等，无法进行提交!');
                                             return;
@@ -1658,8 +1675,8 @@
                                 var total_price=records.get('total_price');
                                 var lease_item_amount=record.get('lease_item_amount');
                                 var  residual_value=record.get('residual_value');
-                                var  q_value='${/model/residual_value/record/@residual_value}';
-                                debugger;
+                                var  q_value=records.get('q_value');
+
                                 if(total_price!=lease_item_amount &&total_price!=null){
                                     Leaf.showMessage('${l:PROMPT}', '支付计划页面“设备价格”字段值与租赁物明细“设备单价（总）”合计不相等，无法进行提交!');
                                     return;