Merge branch 'dev' into dev_wf

app/admin/controller/OrderInv.php

@@ -102,6 +102,13 @@ class OrderInv extends BaseController{
                     	Db::rollback();
                         return error_show(1004,"确认单{$value['sequenceNo']}待开票金额不足");
                     }
+                  $ainv=  Db::name("invoice_pool")->alias("a")
+			->leftJoin("invoice_good b","a.invNo=b.invNo and b.is_del=0")
+			->where(["a.status"=>[0,1,2,3],"b.orderCode"=>$value['sequenceNo']])->sum("b.goodNum");
+                    if($ainv+$value['num']>$qrd['goodNum']) {
+                    	Db::rollback();
+                        return error_show(1004,"确认单{$value['sequenceNo']}待开票数量不足");
+                    }
                     $good_info = Db::name("good")->where(["spuCode"=>$qrd["goodNo"],"status"=>1])->findOrEmpty();
                     if(empty($good_info)){
                      Db::rollback();
@@ -230,7 +237,7 @@ class OrderInv extends BaseController{
         return error_show(1004,"确认单发票申请失败");
         }catch (\Exception $e){
             Db::rollback();
-            return error_show(1004,$e->getMessage()."|".$e->getLine());
+            return error_show(1004,$e->getMessage());
         }
    }
     //   1财务审核通过  2 金税开票中/验票中 3 开票成功 4 财务驳回 5 开票失败 6 发票退票/废弃 7取消申请
@@ -1116,7 +1123,8 @@ class OrderInv extends BaseController{
         $poolinfo['drawer'] = $pool['drawer']??'';
         $poolinfo['reviewer'] = $pool['reviewer']??'';
         $poolinfo['ownerPlace'] = $pool['ownerPlace']??'';
-        $orderList =Db::name("invoice_good")->where(["invNo"=>$invNo,"is_del"=>0])->select()->toArray();
+        $orderList =Db::name("invoice_good")->where(["invNo"=>$invNo,"is_del"=>0])->column("*","orderCode");
+
         $poolinfo['goodList']=$orderList;
         $poolinfo['invinfo']=Db::name("invoice_ticket")->withoutField("pdfstream")->where(["invNo"=>$invNo,"type"=>0,"is_del"=>0])
         ->findOrEmpty();
@@ -1125,6 +1133,14 @@ class OrderInv extends BaseController{
            	->order("a.addtime desc")
            	->field("c.*,a.cancel_fee")
            	->select()->toArray();
+         foreach ($orderinfo as &$item){
+//			$good_num = Db::name("qrd_info")->where("sequenceNo",$item['orderCode'])->value("goodNum",0);
+			$item['ainv_num'] = Db::name("invoice_pool")->alias("a")
+			->leftJoin("invoice_good b","a.invNo=b.invNo and b.is_del=0")
+			->where(["a.status"=>[0,1,2,3],"b.orderCode"=>$item['sequenceNo']])->sum("b.goodNum");
+			$item['winv_num'] = $item['goodNum'] - $item['ainv_num'];
+			$item['inv_num'] = $orderList[$item['sequenceNo']]['goodNum'];
+        }
         $poolinfo['orderinfo']=$orderinfo;
        return app_show(0,"获取成功",$poolinfo);
     }

app/admin/controller/Payment.php

@@ -816,7 +816,7 @@ class Payment extends BaseController
           $condition []=["sequenceNo","like","%$sequenceNo%"];
         }
 
-         $orderCode = isset($post['orderCode']) && $post['orderCode']!='' ? trim($post['orderCode']) :"";
+         $orderCode = isset($post['qrdCode']) && $post['qrdCode']!='' ? trim($post['qrdCode']) :"";
         if($orderCode!=""){
           $condition []=["qrdCode","like","%$orderCode%"];
         }

app/admin/controller/Role.php

@@ -61,7 +61,7 @@ class Role extends BaseController{
         $post=$this->request->only(["role_name"=>"","level"=>"","action"=>"","action_data"=>"","private_data"=>"","relaComNo"=>"","companyNo"=>""],"post");
         $valid =Validate::rule([
         	"role_name|角色名称"=>"require|max:255|min:2",
-        	"level|角色级别"=>"require|number|in:1,2",
+        	"level|角色级别"=>"require|number|in:1,2,3",
         	"relaComNo|业务公司编号"=>"max:255",
         	"companyNo|业务公司编号"=>"max:255",
         	"action|角色权限"=>"require|array",