'调整费用报销与借款单逻辑'

webmain/model/flow/emfkModel.php

@@ -50,7 +50,7 @@ class flow_emfkClassModel extends flowModel
 
     }
 
-    //二级 或一级审批同意之后进行预扣款
+//    //二级 或一级审批同意之后进行预扣款
 //    protected function flowcheckbefore($zt, $sm){
 //        $id=$this->rs['id'];
 //        $sql = " mid ='$id' and `table`='c_emfk' ";
@@ -69,7 +69,6 @@ class flow_emfkClassModel extends flowModel
 //            foreach ($option as $key => $value) {
 //                if(in_array($value['value'], $allcheckid)){
 //                    $checkid= $value['value'];
-//                    $explain= $value['explain'];
 //                    break;
 //                }
 //            }
@@ -79,46 +78,14 @@ class flow_emfkClassModel extends flowModel
 //        //zt 1代表同意
 //        if($zt==1){
 //            $flowid=$this->getflow();
-//            if($explain){
-//                if($flowid['nowcheckid']==$checkid &&  $flowid['nowcourseid']==$explain){
-//                    $data = m('c_emfk_details')->getall('mid='.$this->rs['id'], 'id,cbzxid,amount');
-//                    foreach ($data as $key => $vo) {
-//                        $cbzx_code=$vo['cbzxid'];
-//                        $sql = " cost_id='$cbzx_code' and status = 1 and  is_default=1";
-//                        $cost = m('c_fund_account')->getone($sql, 'id,type,freeze_amount,account_balance');//查询账户表成本中心
 //
-//                        if($cost['type']=='1'){
-//                            if(($cost['account_balance']-$cost['freeze_amount'])<$vo['amount']){
-//                                return "账户余额不足";die;
-//                            }
-//                        }
-//                        $id=$cost['id'];
-//
-//                        $c_withhold = array(
-//                            'fund_account_id' => $id,
-//                            'docnum' => $this->rs['docnum'],
-//                            'cost_id' => $vo['cbzxid'],
-//                            'amount' =>  $vo['amount'],
-//                            'status' => 1,
-//                            'create_time' => date("Y-m-d H:i:s"),
-//                            'uid' => $this->rs['uid'],
-//                        );
-//                        m('c_withhold_emfk')->insert($c_withhold);
-//
-//                        //修改冻结余额
-//                        $freeze = array(
-//                            'freeze_amount' => $cost['freeze_amount'] + $vo['amount'],
-//                        );
-//
-//                        m('c_fund_account')->update($freeze, "`id`='$id'");
-//                    }
-//                }
-//            }else{
 //                if($flowid['nowcheckid']==$checkid){
 //                    $data = m('c_emfk_details')->getall('mid='.$this->rs['id'], 'id,cbzxid,amount');
 //
 //                    foreach ($data as $key => $vo) {
 //                        $cbzx_code=$vo['cbzxid'];
+//                        $cbzxid = m('tmp_department')->getone('', 'id,cost');//查询账户表成本中心id
+//
 //                        $sql = " cost_id='$cbzx_code' and status = 1 and  is_default=1";
 //                        $cost = m('c_fund_account')->getone($sql, 'id,type,freeze_amount,account_balance');//查询账户表成本中心id
 //                        if($cost['type']=='1'){
@@ -147,7 +114,7 @@ class flow_emfkClassModel extends flowModel
 //                        m('c_fund_account')->update($freeze, "`id`='$id'");
 //                    }
 //                }
-//            }
+//
 //        }else{
 //            $docnum=$this->rs['docnum'];
 //            //将单据状态作废余额

webmain/model/flow/finfybxModel.php

@@ -616,6 +616,7 @@ class flow_finfybxClassModel extends flowModel
                 m('c_fininfom_jk')->update($jkbalance, "`docnum`='$jk_num'");
                 $deduct_status = array(
                     'status' =>   1,
+                    'update_time' =>date("Y-m-d H:i:s"),
                 );
                 m('c_deduct_detail')->update($deduct_status, "`bx_num`='$docnum' and status=0");