wugg 2 years ago
parent
commit
6354150b30
2 changed files with 10 additions and 2 deletions
  1. 9 1
      app/admin/controller/OrderInv.php
  2. 1 1
      app/admin/controller/Role.php

+ 9 - 1
app/admin/controller/OrderInv.php

@@ -230,7 +230,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取消申请
@@ -1117,6 +1117,14 @@ class OrderInv extends BaseController{
         $poolinfo['reviewer'] = $pool['reviewer']??'';
         $poolinfo['ownerPlace'] = $pool['ownerPlace']??'';
         $orderList =Db::name("invoice_good")->where(["invNo"=>$invNo,"is_del"=>0])->select()->toArray();
+        foreach ($orderList as &$item){
+			$good_num = Db::name("qrd_info")->where("orderCode",$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['orderCode']])->sum("b.goodNum");
+			$item['winv_num'] = $good_num - $item['ainv_num'];
+        }
+
         $poolinfo['goodList']=$orderList;
         $poolinfo['invinfo']=Db::name("invoice_ticket")->withoutField("pdfstream")->where(["invNo"=>$invNo,"type"=>0,"is_del"=>0])
         ->findOrEmpty();

+ 1 - 1
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",