新建开票申请时判断待开票数量优化

app/admin/controller/OrderInv.php

@@ -102,9 +102,11 @@ 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,4],"b.orderCode"=>$value['sequenceNo']])->sum("b.goodNum");
+                   $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, 4], "b.orderCode" => $value['sequenceNo']])
+                       ->sum("b.goodNum");
                     if($ainv+$value['num']>($qrd['goodNum']-$qrd['thNum'])) {
                     	Db::rollback();
                         return error_show(1004,"确认单{$value['sequenceNo']}待开票数量不足");
@@ -114,8 +116,11 @@ class OrderInv extends BaseController{
                      Db::rollback();
                      return error_show(1004,"确认单{$value['sequenceNo']}商品未确认开票类目");
                     }
-					$num = DB::name("assoc")->alias("a")->leftJoin("invoice_good b","a.viceCode=b.invNo")
-					->where(["a.status"=>[1,2],"a.is_del"=>0,"a.type"=>1,"a.orderCode"=>$value['sequenceNo']])->sum("b.goodNum");
+                   $num = Db::name("assoc")
+                       ->alias("a")
+                       ->leftJoin("invoice_good b", "a.viceCode=b.invNo AND b.orderCode=a.orderCode")
+                       ->where(["a.status" => [1, 2], "a.is_del" => 0, "a.type" => 1, "a.orderCode" => $value['sequenceNo']])
+                       ->sum("b.goodNum");
                     if($qrd['goodNum']-$qrd['thNum']-$num<$value['num']){
                     	Db::rollback();
                         return error_show(1004,"确认单{$value['sequenceNo']}待开票数量不足");